diff --git a/data/version b/data/version index a6bf9a74..1e7a74a5 100644 --- a/data/version +++ b/data/version @@ -1 +1 @@ -{"version":"0.7.0.2","updatedTime":"2015-10-16T07:11:51.505Z"} \ No newline at end of file +{"version":"0.8","updatedTime":"2015-10-24T07:11:51.505Z"} \ No newline at end of file diff --git a/node_modules/user.js b/node_modules/user.js index 26e73864..5178995c 100644 --- a/node_modules/user.js +++ b/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) { // 创建默认的笔记本 diff --git a/node_modules/web.js b/node_modules/web.js index c62c46f4..e76cb888 100644 --- a/node_modules/web.js +++ b/node_modules/web.js @@ -125,7 +125,7 @@ var Web = { // full sync syncProcess: function(type, title) { var me = this; - me.Note.syncProcess('Synchronizing ' + type + '...
' + title); + me.Note.syncProcess(getMsg('Synchronizing') + ' ' + type + '...
' + title); }, // inc sync diff --git a/note.html b/note.html index 128ce023..1d8409d2 100755 --- a/note.html +++ b/note.html @@ -378,7 +378,7 @@ function log(o) {
- {{.noteContent}} + Loading...
diff --git a/public/config.js b/public/config.js index 9745fcd5..8a9676d5 100644 --- a/public/config.js +++ b/public/config.js @@ -20,6 +20,6 @@ var Config = { "name": "繁体中文" } ], - "lang": "zh-hk", + "lang": "en-us", "theme": "" }; \ No newline at end of file diff --git a/public/js/app/page.js b/public/js/app/page.js index e5ed1588..32a4850b 100644 --- a/public/js/app/page.js +++ b/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' })); diff --git a/public/langs/zh-cn.js b/public/langs/zh-cn.js index e242a4e8..733e134b 100644 --- a/public/langs/zh-cn.js +++ b/public/langs/zh-cn.js @@ -278,6 +278,8 @@ "Confirm password": "确认密码", "Username": "用户名", "User exists": "用户已存在", - "Local": "本地" + "Local": "本地", + + "Synchronizing": "正在同步" } \ No newline at end of file diff --git a/public/langs/zh-hk.js b/public/langs/zh-hk.js index 29ff0e93..dd9ee994 100644 --- a/public/langs/zh-hk.js +++ b/public/langs/zh-hk.js @@ -278,6 +278,7 @@ "Confirm password": "確認密碼", "Username": "用戶名", "User exists": "用戶已存在", - "Local": "本地" + "Local": "本地", + "Synchronizing": "正在同步" } \ No newline at end of file