local user. v0.8 release

data/version

@@ -1 +1 @@
-{"version":"0.7.0.2","updatedTime":"2015-10-16T07:11:51.505Z"}
+{"version":"0.8","updatedTime":"2015-10-24T07:11:51.505Z"}

node_modules/user.js

@@ -107,6 +107,7 @@ User = {
 				user.IsLocal = true;
 				user.IsActive = true;
 				user.UserId = Common.objectId();
+				user._id = user.UserId;
 				user.Pwd = Common.md5(pwd, user.UserId);
 				db.users.insert(user, function(err, doc) {
 					// 创建默认的笔记本

node_modules/web.js

@@ -125,7 +125,7 @@ var Web = {
 	// full sync
 	syncProcess: function(type, title) {
 		var me = this;
-		me.Note.syncProcess('Synchronizing ' + type + '... <br /> ' + title);
+		me.Note.syncProcess(getMsg('Synchronizing') + ' ' + type + '... <br /> ' + title);
 	},
 
 	// inc sync

note.html

@@ -378,7 +378,7 @@ function log(o) {
             <!-- 由此可以算高度 -->
             <div id="editorContentWrap">
               <div id="editorContent" name="editorContent" tabindex="2" >
-                {{.noteContent}}
+                Loading...
               </div>
             </div>
           </div>

public/config.js

@@ -20,6 +20,6 @@ var Config = {
             "name": "繁体中文"
         }
     ],
-    "lang": "zh-hk",
+    "lang": "en-us",
     "theme": ""
 };

public/js/app/page.js

@@ -2010,6 +2010,7 @@ function userMenu(allUsers) {
 		    });
 		    this.menu.append(this.blog);
 		}
+		this.menu.append(new gui.MenuItem({ type: 'separator' }));
 	    this.menu.append(this.switchAccount);
 	    this.menu.append(allUsersMenu); 
 	    this.menu.append(new gui.MenuItem({ type: 'separator' }));
@@ -2020,7 +2021,10 @@ function userMenu(allUsers) {
 		    this.menu.append(themeMenu);
 	    }
 
-		var height = 210;
+		var height = 230;
+		if (UserInfo.IsLocal) {
+			height = 200;
+		}
 		if(!isMac()) {
 			this.menu.append(new gui.MenuItem({ type: 'separator' }));
 

public/langs/zh-cn.js

@@ -278,6 +278,8 @@
     "Confirm password": "确认密码",
     "Username": "用户名",
     "User exists": "用户已存在",
-    "Local": "本地"
+    "Local": "本地",
+
+    "Synchronizing": "正在同步"
 
 }

public/langs/zh-hk.js

@@ -278,6 +278,7 @@
     "Confirm password": "確認密碼",
     "Username": "用戶名",
     "User exists": "用戶已存在",
-    "Local": "本地"
+    "Local": "本地",
 
+    "Synchronizing": "正在同步"
 }