From 5c1903432c8d663a4ea8c88583dbf9a468dc4909 Mon Sep 17 00:00:00 2001
From: life <lealife@outlook.com>
Date: Tue, 1 Dec 2015 22:19:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E8=AF=BB=E4=B8=8E=E5=8F=AF=E5=86=99?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=9A=84=E6=8C=89=E9=92=AE=E6=94=BE=E5=88=B0?=
 =?UTF-8?q?tool=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 note.html                   | 11 ++++++++---
 public/config.js            |  2 +-
 public/js/app/note.js       |  9 +++++++--
 public/langs/zh-cn.js       |  4 +++-
 public/langs/zh-hk.js       |  3 ++-
 public/themes/basic.less    |  7 +++++++
 public/themes/default.css   |  6 ++++++
 public/themes/writting.css  |  9 ++++++++-
 public/themes/writting.less | 10 +++++++++-
 9 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/note.html b/note.html
index 7ad6cf4f..50512b35 100755
--- a/note.html
+++ b/note.html
@@ -267,7 +267,7 @@ function log(o) {
         
         <div class="noteSplit" id="noteSplitter"></div>
           
-        <div id="note">
+        <div id="note" class="read-only-editor">
           
           <!-- 遮罩, 为了resize3Columns用 -->
           <div id="noteMask" class="note-mask"></div>
@@ -307,6 +307,11 @@ function log(o) {
               
               <ul class="pull-right" id="editorTool">
 
+                <li><a class="ios7-a lang-title lang-title" id="editBtn"
+                  data-toggle="dropdown" title="ctrl/cmd+e Toggle Modify with Readonly">
+                  <span class="fa"></span>
+                  </a></li>
+
                 <li class="dropdown" id="attachDropdown">
                   <a class="ios7-a dropdown-toggle lang-title" data-toggle="dropdown" id="showAttach" title="Attachments">
                     <span class="fa fa-paperclip"></span>
@@ -358,7 +363,7 @@ function log(o) {
 
               <!-- 查看信息 -->
               <div id="infoToolbar" class="info-toolbar">
-                <a class="toolbar-update" title="ctrl/cmd + e"><i class="fa fa-pencil"></i> <span class="lang">Modify</span></a>
+               
                 <span class="lang">Created</span>: <span class="created-time">2015-04-03</span>
                 <span class="lang">Updated</span>: <span class="updated-time">2015-05-01</span>
               </div>
@@ -399,7 +404,7 @@ function log(o) {
                     <div class="navbar navbar-default">
                         <div class="navbar-inner" id="wmd-button-bar">
                             <div id="mdInfoToolbar" class="info-toolbar">
-                              <a class="toolbar-update" title="ctrl/cmd + e"><i class="fa fa-pencil"></i> <span class="lang">Modify</span></a>
+                              
                               <span class="lang">Created</span>: <span class="created-time">2015-04-03</span>
                               <span class="lang">Updated</span>: <span class="updated-time">2015-05-01</span>
                             </div>
diff --git a/public/config.js b/public/config.js
index 18a9b67f..44571e1d 100644
--- a/public/config.js
+++ b/public/config.js
@@ -24,6 +24,6 @@ var Config = {
             "name": "繁体中文"
         }
     ],
-    "lang": "en-us",
+    "lang": "zh-cn",
     "theme": ""
 };
\ No newline at end of file
diff --git a/public/js/app/note.js b/public/js/app/note.js
index bb1d8b12..7682610f 100644
--- a/public/js/app/note.js
+++ b/public/js/app/note.js
@@ -1762,6 +1762,7 @@ Note.toggleReadOnly = function(needSave) {
 
 	// markdown
 	$('#mdEditor').addClass('read-only');
+	$('#note').addClass('read-only-editor');
 
 	if(!note) {
 		return;
@@ -1798,6 +1799,7 @@ LEA.toggleWriteable = Note.toggleWriteable = function() {
 
 	// $('#infoToolbar').hide();
 	$('#editor').removeClass('read-only');
+	$('#note').removeClass('read-only-editor');
 	$('#editorContent').attr('contenteditable', true);
 
 	// markdown
@@ -3258,8 +3260,11 @@ $(function() {
 
 	// readony
 	// 修改
-	$('.toolbar-update').click(function() {
-		Note.toggleWriteable();
+	// $('.toolbar-update').click(function() {
+	// 	Note.toggleWriteable();
+	// });
+	$("#editBtn").click(function() {
+		Note.toggleWriteableAndReadOnly();
 	});
 
 });
diff --git a/public/langs/zh-cn.js b/public/langs/zh-cn.js
index d5e53c33..a5929c9e 100644
--- a/public/langs/zh-cn.js
+++ b/public/langs/zh-cn.js
@@ -300,5 +300,7 @@
     "Sync error, retry to sync after 3 seconds": "同步失败, 3 秒后自动重新尝试同步",
     "Network error!": "网络异常",
 
-    "Load Database Error": "加载数据库出错, 请尝试在帐户管理中优化数据库"
+    "Load Database Error": "加载数据库出错, 请尝试在帐户管理中优化数据库",
+
+    "ctrl/cmd+e Toggle Modify with Readonly": "ctrl/cmd+e 切换编辑与只读"
 }
\ No newline at end of file
diff --git a/public/langs/zh-hk.js b/public/langs/zh-hk.js
index cda99881..cfe23f64 100644
--- a/public/langs/zh-hk.js
+++ b/public/langs/zh-hk.js
@@ -300,5 +300,6 @@
     "Sync error, retry to sync after 3 seconds": "同步失敗, 3 秒後自動重新嘗試同步",
     "Network error!": "網絡異常",
 
-    "Load Database Error": "加載數據庫出錯, 請嘗試在帳戶管理中優化數據庫"
+    "Load Database Error": "加載數據庫出錯, 請嘗試在帳戶管理中優化數據庫",
+    "ctrl/cmd+e Toggle Modify with Readonly": "ctrl/cmd+e 切換編輯與只讀"
 }
\ No newline at end of file
diff --git a/public/themes/basic.less b/public/themes/basic.less
index f84b7fcb..0457e946 100644
--- a/public/themes/basic.less
+++ b/public/themes/basic.less
@@ -2075,5 +2075,12 @@ img::selection {
     }
 }
 
+.read-only-editor #editBtn span:before {
+    content: "\f044";
+}
+#editBtn span:before {
+    content: "\f06e";
+}
+
 @import '../css/traffic.less';
 @import '../css/ani.less';
diff --git a/public/themes/default.css b/public/themes/default.css
index 08f62628..97b644c4 100644
--- a/public/themes/default.css
+++ b/public/themes/default.css
@@ -2014,6 +2014,12 @@ img::selection {
   cursor: pointer;
   font-size: 16px;
 }
+.read-only-editor #editBtn span:before {
+  content: "\f044";
+}
+#editBtn span:before {
+  content: "\f06e";
+}
 .win-tool {
   padding: 5px;
   position: absolute;
diff --git a/public/themes/writting.css b/public/themes/writting.css
index 24ac69af..2adbf684 100644
--- a/public/themes/writting.css
+++ b/public/themes/writting.css
@@ -7,7 +7,8 @@ body.writting.init #pageInner {
 body.writting #mainMask,
 body.writting #leftNotebook,
 body.writting .noteSplit,
-body.writting #noteList {
+body.writting #noteList,
+body.writting #editBtn {
   display: none;
 }
 body.writting #noteAndEditor {
@@ -73,6 +74,12 @@ body.writting #editor.all-tool #mceToolbar {
 body.writting #editor.all-tool #editorContentWrap {
   top: 70px;
 }
+body.writting #popularToolbar {
+  padding-top: 5px;
+}
+body.writting #moreBtn {
+  padding-top: 10px;
+}
 #editor .mce-tinymce {
   border: none;
 }
diff --git a/public/themes/writting.less b/public/themes/writting.less
index 04fc9b69..19b34a74 100644
--- a/public/themes/writting.less
+++ b/public/themes/writting.less
@@ -12,7 +12,8 @@ body.writting {
   #mainMask,
   #leftNotebook,
   .noteSplit,
-  #noteList
+  #noteList,
+  #editBtn
   {
     display: none;
   }
@@ -96,6 +97,13 @@ body.writting {
       }
     }
   }
+
+  #popularToolbar {
+    padding-top: 5px;
+  }
+  #moreBtn {
+    padding-top: 10px;
+  }
 }
 
 #editor .mce-tinymce {