diff --git a/public/css/theme/default.less b/public/css/theme/default.less
index 5b770c6..d38311c 100644
--- a/public/css/theme/default.less
+++ b/public/css/theme/default.less
@@ -1170,4 +1170,4 @@ background-position:-1px -670px
bottom: 10px;
overflow: scroll;
list-style: none;
-}
\ No newline at end of file
+}
diff --git a/public/css/zTreeStyle/zTreeStyle.css b/public/css/zTreeStyle/zTreeStyle.css
index 7aa8771..70a7fda 100644
--- a/public/css/zTreeStyle/zTreeStyle.css
+++ b/public/css/zTreeStyle/zTreeStyle.css
@@ -15,7 +15,9 @@ website: http://code.google.com/p/jquerytree/
.ztree li ul.line{ background:url(./img/line_conn.gif) 0 0 repeat-y;}
.ztree li a {padding:1px 3px 0 0; margin:0; cursor:pointer; height:17px; color:#333; background-color: transparent;
- text-decoration:none; vertical-align:top; display: block}
+ text-decoration:none; vertical-align:top; display: block;
+ position: relative;
+}
.ztree li a:hover {text-decoration:underline}
.ztree li a.curSelectedNode {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
.ztree li a.curSelectedNode_Edit {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
@@ -142,3 +144,18 @@ ul.ztree.zTreeDragUL {z-index: 333;margin:0; padding:0; position:absolute; width
*/
.ztree li a.curSelectedNode_Edit input {
}
+
+.notebook-setting {
+ display: none;
+ position: absolute;
+ right: 3px;
+ top: 0;
+ bottom: 0;
+ line-height: 30px;
+}
+.notebook-setting:before {
+ content: "\f013";
+}
+.ztree li a:hover .notebook-setting {
+ display: block;
+}
diff --git a/public/js/app/notebook.js b/public/js/app/notebook.js
index f502596..9da3b19 100644
--- a/public/js/app/notebook.js
+++ b/public/js/app/notebook.js
@@ -56,6 +56,9 @@ Notebook.getTreeSetting = function(isSearch){
icoObj = $("#" + treeId + " #" + treeNode.tId + "_ico");
switchObj.remove();
icoObj.before(switchObj);
+ if(!Notebook.isAllNotebookId(treeNode.NotebookId) && !Notebook.isTrashNotebookId(treeNode.NotebookId)) {
+ icoObj.after($(''));
+ }
if (treeNode.level > 1) {
var spaceStr = "";
switchObj.before(spaceStr);
@@ -797,13 +800,27 @@ $(function() {
return !Notebook.isTrashNotebookId(notebookId) && !Notebook.isAllNotebookId(notebookId);
}
- $("#notebookList li a").contextmenu(notebookListMenu);
+ Notebook.contextmenu = $("#notebookList li a").contextmenu(notebookListMenu);
- $("#notebookListForSearch").contextmenu(notebookListMenu2);
+ Notebook.contextmenuSearch = $("#notebookListForSearch li a").contextmenu(notebookListMenu2);
// 添加笔记本
$("#addNotebookPlus").click(function(e) {
e.stopPropagation();
Notebook.addNotebook();
});
+
+ // notebook setting
+ $("#notebookList").on("click", ".notebook-setting", function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ var $p = $(this).parent();
+ Notebook.contextmenu.showMenu(e, $p);
+ });
+ $("#notebookListForSearch").on("click", ".notebook-setting", function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ var $p = $(this).parent();
+ Notebook.contextmenuSearch.showMenu(e, $p);
+ });
});
\ No newline at end of file
diff --git a/public/js/app/share.js b/public/js/app/share.js
index 4ac2198..0e896f2 100644
--- a/public/js/app/share.js
+++ b/public/js/app/share.js
@@ -4,7 +4,7 @@
// 默认共享notebook id
Share.defaultNotebookId = "share0";
-Share.defaultNotebookTitle = "默认共享";
+Share.defaultNotebookTitle = "Default Share";
Share.sharedUserInfos = {}; // userId => {}
// 在render时就创建, 以后复用之