Merge branch 'master' of github.com:leanote/leanote

README.md

@@ -3,6 +3,7 @@
 ## 1. Introduction
 
 Leanote, not just a notebook!
+![leanote.png](leanote.png "")
 
 **Some Features**
 
@@ -110,6 +111,7 @@ Please fork this repository and contribute back using [pull requests](https://gi
 ## 1. 介绍
 
 Leanote, 不只是笔记!
+![leanote.png](leanote.png "")
 
 **特性**
 

mongodb_backup/leanote_install_data/albums.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.albums", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.albums" } ] }

mongodb_backup/leanote_install_data/attachs.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.attachs", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.attachs" } ] }

mongodb_backup/leanote_install_data/blog_comments.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.blog_comments", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.blog_comments" } ] }

mongodb_backup/leanote_install_data/blog_likes.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.blog_likes", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.blog_likes" } ] }

mongodb_backup/leanote_install_data/blog_singles.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.blog_singles", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.blog_singles" } ] }

mongodb_backup/leanote_install_data/configs.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.configs", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.configs" } ] }

mongodb_backup/leanote_install_data/email_logs.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.email_logs", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.email_logs" } ] }

mongodb_backup/leanote_install_data/files.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.files", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.files" } ] }

mongodb_backup/leanote_install_data/find_pwds.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.find_pwds", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.find_pwds" } ] }

mongodb_backup/leanote_install_data/group_users.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.group_users", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.group_users" } ] }

mongodb_backup/leanote_install_data/groups.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.groups", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.groups" } ] }

mongodb_backup/leanote_install_data/has_share_notes.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.has_share_notes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1, "ToUserId" : 1 }, "unique" : true, "ns" : "leanote_beta2.has_share_notes", "name" : "UserId_1_ToUserId_1" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.has_share_notes" }, { "v" : 1, "unique" : true, "key" : { "UserId" : 1, "ToUserId" : 1 }, "name" : "UserId_1_ToUserId_1", "ns" : "leanote.has_share_notes" } ] }

mongodb_backup/leanote_install_data/leanote.ShareNotes.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.leanote.ShareNotes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1, "ToUserId" : 1, "NoteId" : 1 }, "unique" : true, "ns" : "leanote_beta2.leanote.ShareNotes", "name" : "UserId_1_ToUserId_1_NoteId_1" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.leanote.ShareNotes" }, { "v" : 1, "unique" : true, "key" : { "UserId" : 1, "ToUserId" : 1, "NoteId" : 1 }, "name" : "UserId_1_ToUserId_1_NoteId_1", "ns" : "leanote.leanote.ShareNotes" } ] }

mongodb_backup/leanote_install_data/leanote.has_share_notes.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.leanote.has_share_notes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1, "ToUserId" : 1 }, "unique" : true, "ns" : "leanote_beta2.leanote.has_share_notes", "name" : "UserId_1_ToUserId_1" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.leanote.has_share_notes" }, { "v" : 1, "unique" : true, "key" : { "UserId" : 1, "ToUserId" : 1 }, "name" : "UserId_1_ToUserId_1", "ns" : "leanote.leanote.has_share_notes" } ] }

mongodb_backup/leanote_install_data/note_content_histories.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.note_content_histories", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.note_content_histories" } ] }

mongodb_backup/leanote_install_data/note_contents.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.note_contents", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.note_contents" } ] }

mongodb_backup/leanote_install_data/note_images.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.note_images", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.note_images" } ] }

mongodb_backup/leanote_install_data/notebooks.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.notebooks", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1 }, "ns" : "leanote_beta2.notebooks", "name" : "UserId_1" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.notebooks" }, { "v" : 1, "key" : { "UserId" : 1 }, "name" : "UserId_1", "ns" : "leanote.notebooks" } ] }

mongodb_backup/leanote_install_data/notes.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.notes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1 }, "ns" : "leanote_beta2.notes", "name" : "UserId_1" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.notes" }, { "v" : 1, "key" : { "UserId" : 1 }, "name" : "UserId_1", "ns" : "leanote.notes" } ] }

mongodb_backup/leanote_install_data/reports.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.reports", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.reports" } ] }

mongodb_backup/leanote_install_data/sessions.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.sessions", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.sessions" } ] }

mongodb_backup/leanote_install_data/share_notebooks.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.share_notebooks", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.share_notebooks" } ] }

mongodb_backup/leanote_install_data/share_notes.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.share_notes", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.share_notes" } ] }

mongodb_backup/leanote_install_data/suggestions.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.suggestions", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.suggestions" } ] }

mongodb_backup/leanote_install_data/tag_count.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.tag_count", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.tag_count" } ] }

mongodb_backup/leanote_install_data/tags.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.tags", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1 }, "ns" : "leanote_beta2.tags", "name" : "UserId_1" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.tags" }, { "v" : 1, "key" : { "UserId" : 1 }, "name" : "UserId_1", "ns" : "leanote.tags" } ] }

mongodb_backup/leanote_install_data/themes.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.themes", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.themes" } ] }

mongodb_backup/leanote_install_data/tokens.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.tokens", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.tokens" } ] }

mongodb_backup/leanote_install_data/user_blogs.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.user_blogs", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.user_blogs" } ] }

mongodb_backup/leanote_install_data/users.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.users", "name" : "_id_" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.users" } ] }

public/css/zTreeStyle/zTreeStyle.css

@@ -63,7 +63,7 @@ ul.ztree.zTreeDragUL {z-index: 333;margin:0; padding:0; position:absolute; width
 .ztree li span.button {margin-top: -5px;}
 .ztree li span.button.switch {width: 16px;height: 30px; line-height: 30px; text-align: center}
 
-.ztree li a.level0 span {font-size: 14px;}
+.ztree li a.level0 span {font-size: 13px;}
 .ztree li span.button {
 	background-image: none;
 }

public/js/app/notebook.js

@@ -60,13 +60,13 @@ Notebook.getNotebookTitle = function(notebookId) {
 	}
 }
 
-/**
- * 我的notebooks
+/**
+ * 我的notebooks
 <ul class="folderBody" id="notebookList">
-	<li><a class="active">所有</a></li>
-	<li><a class="active">Hadoop</a></li>
-	<li><a>August 13, 2013</a></li>
-</ul>
+	<li><a class="active">所有</a></li>
+	<li><a class="active">Hadoop</a></li>
+	<li><a>August 13, 2013</a></li>
+</ul>
  */
  
 Notebook.getTreeSetting = function(isSearch, isShare){ 
@@ -236,7 +236,7 @@ Notebook.getTreeSetting = function(isSearch, isShare){
 	}
 	
 	return setting;
-}
+}
 Notebook.allNotebookId = "0";
 Notebook.trashNotebookId = "-1";
 Notebook.curNotebookIsTrashOrAll = function() {
@@ -401,38 +401,38 @@ Notebook.changeNav = function() {
 	log(t2-t1);
 }
 
-/**
- * 我的共享notebooks	    
- <div id="shareNotebooks">
-	 <div class="folderNote closed">
-      <div class="folderHeader">
-        <a>
-          <h1>
-            <i class="fa fa-angle-right"></i> 
-            Life's</h1>
-        </a>
-      </div>
-      <ul class="folderBody">
-        <li><a>Hadoop</a></li>
-        <li><a>Node webkit</a></li>
-        <li><a>Hadoop</a></li>
-        <li><a>Node webkit</a></li>
-      </ul>
-    </div>
- */
+/**
+ * 我的共享notebooks	    
+ <div id="shareNotebooks">
+	 <div class="folderNote closed">
+      <div class="folderHeader">
+        <a>
+          <h1>
+            <i class="fa fa-angle-right"></i> 
+            Life's</h1>
+        </a>
+      </div>
+      <ul class="folderBody">
+        <li><a>Hadoop</a></li>
+        <li><a>Node webkit</a></li>
+        <li><a>Hadoop</a></li>
+        <li><a>Node webkit</a></li>
+      </ul>
+    </div>
+ */
 // TODO 层级
 Notebook.renderShareNotebooks = function(sharedUserInfos, shareNotebooks) {
 	if(isEmpty(sharedUserInfos)) {
 		return;
 	}
-	
-	if(!shareNotebooks || typeof shareNotebooks != "object" || shareNotebooks.length < 0) {
-		return;
+	
+	if(!shareNotebooks || typeof shareNotebooks != "object" || shareNotebooks.length < 0) {
+		return;
 	}
-	
+	
 	var $shareNotebooks = $("#shareNotebooks");
-	var user2ShareNotebooks = {};
-	for(var i in shareNotebooks) {
+	var user2ShareNotebooks = {};
+	for(var i in shareNotebooks) {
 		var userNotebooks = shareNotebooks[i];
 		user2ShareNotebooks[userNotebooks.UserId] = userNotebooks;
 	}
@@ -442,17 +442,17 @@ Notebook.renderShareNotebooks = function(sharedUserInfos, shareNotebooks) {
 		
 		userNotebooks.ShareNotebooks = [{NotebookId: "-2", Title: "默认共享"}].concat(userNotebooks.ShareNotebooks)
 
-		var username = userInfo.Username || userInfo.Email;
-		var header = tt('<div class="folderNote closed"><div class="folderHeader"><a><h1 title="? 的共享"><i class="fa fa-angle-right"></i>?</h1></a></div>', username, username);
-		var body = '<ul class="folderBody">';
-		for(var j in userNotebooks.ShareNotebooks) {
-			var notebook = userNotebooks.ShareNotebooks[j];
-			body += tt('<li><a notebookId="?">?</a></li>', notebook.NotebookId, notebook.Title)
-		}
-		body += "</ul>";
-		
-		$shareNotebooks.append(header + body + "</div>")
-	}
+		var username = userInfo.Username || userInfo.Email;
+		var header = tt('<div class="folderNote closed"><div class="folderHeader"><a><h1 title="? 的共享"><i class="fa fa-angle-right"></i>?</h1></a></div>', username, username);
+		var body = '<ul class="folderBody">';
+		for(var j in userNotebooks.ShareNotebooks) {
+			var notebook = userNotebooks.ShareNotebooks[j];
+			body += tt('<li><a notebookId="?">?</a></li>', notebook.NotebookId, notebook.Title)
+		}
+		body += "</ul>";
+		
+		$shareNotebooks.append(header + body + "</div>")
+	}
 }
 
 // 左侧导航, 选中某个notebook
@@ -846,6 +846,12 @@ $(function() {
 		} else {
 			items.push("set2Blog");
 		}
+
+		//asktalk bebug#23
+		if(notebookId=="548125adf4e872105c000007"){
+			items.push("delete");
+		}
+
 		// 是否还有笔记
 		if(Note.notebookHasNotes(notebookId)) {
 			items.push("delete");