🎨 #12645

src/main/resources/lang_en_US.properties

@@ -18,12 +18,14 @@
 
 #
 # Description: Solo language configurations(en_US).
-# Version: 2.30.0.0, Feb 10, 2019
+# Version: 2.31.0.0, Feb 10, 2019
 # Author: Liang Ding
 # Author: Liyuan Li
 # Author: Dongxu Wang
 #
 
+cancelLabel=Cancel
+langLabel=en_US
 pushSuccLabel=Sync Successful
 pushToHacpaiLabel=Sync to Hacpai
 getUploadTokenErrLabel=Get community file storage service upload token failed
@@ -222,16 +224,6 @@ viewCount1Label=View Count:
 articleCount1Label=Article Count:
 commentCountLabel=Comment Count
 commentCount1Label=Comment Count:
-commentEmotions1Label=Emotions:
-commentEmotionsLabel=Emotions
-commentName1Label=Name:
-commentNameLabel=Name
-commentEmail1Label=Email:
-commentEmailLabel=Email
-commentURL1Label=URL:
-commentURLLabel=URL
-commentContent1Label=Content:
-commentContentLabel=Content
 getDateLabel=Get Date
 getArticleLabel=Get Article
 selectDateLabel=Select Date

src/main/resources/lang_zh_CN.properties

@@ -18,12 +18,14 @@
 
 #
 # Description: Solo default language configurations(zh_CN).
-# Version: 2.30.0.0, Feb 10, 2019
+# Version: 2.31.0.0, Feb 10, 2019
 # Author: Liang Ding
 # Author: Liyuan Li
 # Author: Dongxu Wang
 #
 
+cancelLabel=\u53D6\u6D88
+langLabel=zh_CN
 pushSuccLabel=\u63A8\u9001\u6210\u529F
 pushToHacpaiLabel=\u63A8\u9001\u5230\u793E\u533A
 getUploadTokenErrLabel=\u83B7\u53D6\u793E\u533A\u6587\u4EF6\u5B58\u50A8\u670D\u52A1\u4E0A\u4F20\u51ED\u8BC1\u5F02\u5E38
@@ -222,16 +224,6 @@ viewCount1Label=\u6D4F\u89C8\u6B21\u6570\uFF1A
 articleCount1Label=\u6587\u7AE0\u603B\u6570\uFF1A
 commentCountLabel=\u8BC4\u8BBA\u6570
 commentCount1Label=\u8BC4\u8BBA\u603B\u6570\uFF1A
-commentEmotions1Label=\u8868\u60C5\uFF1A
-commentEmotionsLabel=\u8868\u60C5
-commentName1Label=\u59D3\u540D\uFF1A
-commentNameLabel=\u59D3\u540D
-commentEmail1Label=\u90AE\u7BB1\uFF1A
-commentEmailLabel=\u90AE\u7BB1
-commentURL1Label=URL\uFF1A
-commentURLLabel=URL
-commentContent1Label=\u8BC4\u8BBA\u5185\u5BB9\uFF1A
-commentContentLabel=\u8BC4\u8BBA\u5185\u5BB9
 getDateLabel=\u83B7\u53D6\u65E5\u671F
 getArticleLabel=\u83B7\u53D6\u6587\u7AE0
 selectDateLabel=\u9009\u62E9\u65E5\u671F

src/main/webapp/common-template/macro-comment_script.ftl

+<#--
+
+    Solo - A small and beautiful blogging system written in Java.
+    Copyright (c) 2010-2019, b3log.org & hacpai.com
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+-->
+<#macro comment_script oId commentable>
+<#if isLoggedIn && commentable>
+    <div style="position: fixed;bottom: -300px;width: 100%;opacity: 0;background-color: #f1f7fe;padding: 20px 0;transition: all .15s ease-in-out;z-index: 100;left: 0;"
+         id="soloEditor">
+        <div style="max-width: 768px;margin: 0 auto;padding: 0 10px;">
+            <div id="soloEditorComment"></div>
+            <div style="display: flex;margin-top: 10px;line-height: 30px">
+                <div style="flex: 1;" id="soloEditorReplyTarget"></div>
+                <div style="color: #d23f31" id="soloEditorError"></div>
+                <span id="soloEditorCancel" style="margin: 0 10px;padding: 0 12px;cursor: pointer">
+                    ${cancelLabel}
+                </span>
+                <button id="soloEditorAdd" style="border-radius: 4px;background-color: #60b044;border-color: #569e3d;color: #fff;padding: 0 12px">
+                    ${confirmLabel}
+                </button>
+            </div>
+        </div>
+    </div>
+</#if>
+<script type="text/javascript" src="${staticServePath}/js/page${miniPostfix}.js?${staticResourceVersion}"
+        charset="utf-8"></script>
+<script type="text/javascript">
+    var page = new Page({
+        "commentContentCannotEmptyLabel": "${commentContentCannotEmptyLabel}",
+        "langLabel": "${langLabel}",
+        "oId": "${oId}",
+        "blogHost": "${blogHost}",
+        "randomArticles1Label": "${randomArticles1Label}",
+        "externalRelevantArticles1Label": "${externalRelevantArticles1Label}"
+    });
+    (function () {
+        page.load();
+        // emotions
+        page.replaceCommentsEm("#comments .content-reset");
+        <#nested>
+    })();
+</script>
+</#macro>
\ No newline at end of file

src/main/webapp/js/admin/article.js

@@ -20,7 +20,7 @@
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.6.0.1, Feb 10, 2019
+ * @version 1.6.0.2, Feb 10, 2019
  */
 admin.article = {
   // 当发文章，取消发布，更新文章时设置为 false。不需在离开编辑器时进行提示。
@@ -441,11 +441,13 @@ admin.article = {
       id: 'articleContent',
       height: 500,
       fun: fun,
+      previewShow: true
     })
 
     admin.editors.abstractEditor = new SoloEditor({
       id: 'abstract',
       height: 200,
+      previewShow: false
     })
 
     admin.article.clearDraftTimer()

src/main/webapp/js/admin/editor.js

@@ -19,7 +19,7 @@
  * @fileoverview editor
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 1.2.0.0, Feb 6, 2019
+ * @version 1.2.0.1, Feb 10, 2019
  */
 
 admin.editors = {}
@@ -45,7 +45,7 @@ $.extend(SoloEditor.prototype, {
       cache: true,
       preview: {
         delay: 500,
-        show: false,
+        show: this.conf.previewShow,
         url: latkeConfig.servePath + '/console/markdown/2html',
         parse: function (element) {
           if (element.style.display === 'none') {