Merge branch '3.4.0-dev' of https://github.com/b3log/solo into 3.4.0-dev

src/main/java/org/b3log/solo/processor/IndexProcessor.java

@@ -56,7 +56,8 @@ import java.util.Map;
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author <a href="https://hacpai.com/member/DASHU">DASHU</a>
- * @version 1.2.4.15, Feb 11, 2019
+ * @author <a href="https://vanessa.b3log.org">Vanessa</a>
+ * @version 1.2.4.16, Mar 19, 2019
  * @since 0.3.1
  */
 @RequestProcessor
@@ -166,7 +167,7 @@ public class IndexProcessor {
             referer = Latkes.getServePath();
         }
 
-        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context, "start.ftl");
+        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context, "common-template/start.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
         final HttpServletRequest request = context.getRequest();
         final Map<String, String> langs = langPropsService.getAll(Locales.getLocale(request));
@@ -204,7 +205,7 @@ public class IndexProcessor {
     @RequestProcessing(value = "/kill-browser", method = HttpMethod.GET)
     public void showKillBrowser(final RequestContext context) {
         final HttpServletRequest request = context.getRequest();
-        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context, "kill-browser.ftl");
+        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context, "common-template/kill-browser.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
         try {
             final Map<String, String> langs = langPropsService.getAll(Locales.getLocale(request));

src/main/java/org/b3log/solo/processor/SearchProcessor.java

@@ -55,7 +55,7 @@ import java.util.Map;
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 1.1.1.2, Jan 5, 2019
+ * @version 1.1.1.3, Mar 19, 2019
  * @since 2.4.0
  */
 @RequestProcessor
@@ -128,7 +128,7 @@ public class SearchProcessor {
     @RequestProcessing(value = "/search", method = HttpMethod.GET)
     public void search(final RequestContext context) {
         final HttpServletRequest request = context.getRequest();
-        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context, "search.ftl");
+        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context, "common-template/search.ftl");
         final Map<String, String> langs = langPropsService.getAll(Latkes.getLocale());
         final Map<String, Object> dataModel = renderer.getDataModel();
         dataModel.putAll(langs);

src/main/java/org/b3log/solo/service/DataModelService.java

@@ -59,7 +59,7 @@ import static org.b3log.solo.model.Article.ARTICLE_CONTENT;
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 1.7.0.6, Mar 17, 2019
+ * @version 1.7.0.7, Mar 19, 2019
  * @since 0.3.1
  */
 @Service
@@ -1042,7 +1042,7 @@ public class DataModelService {
         Stopwatchs.start("Gens Top Bar HTML");
 
         try {
-            final Template topBarTemplate = Skins.getTemplate("top-bar.ftl");
+            final Template topBarTemplate = Skins.getTemplate("common-template/top-bar.ftl");
             final StringWriter stringWriter = new StringWriter();
             final Map<String, Object> topBarModel = new HashMap<>();
             final JSONObject currentUser = Solos.getCurrentUser(context.getRequest(), context.getResponse());

src/main/resources/lang_en_US.properties

@@ -18,7 +18,7 @@
 
 #
 # Description: Solo language configurations(en_US).
-# Version: 2.31.0.3, Mar 19, 2019
+# Version: 2.31.0.4, Mar 19, 2019
 # Author: Liang Ding
 # Author: Liyuan Li
 # Author: Dongxu Wang
@@ -290,7 +290,7 @@ goTopLabel=Top
 permalink1Label=Permalink:
 permalinkLabel=Permalink
 welcomeToSoloLabel=Welcome to
-killBrowserLabel=<h2>Let's kill outdated and insecure browser!</h2><div class="content-reset"><p>Let's kill outdated and insecure browser for browser evolution, human progress and better experience.</p><p>You can download</p><ul><li><a href="http://www.mozilla.com/" target="_blank">Firefox</a></li><li><a href="http://www.google.com/chrome" target="_blank">Chrome</a></li><li><a href="http://windows.microsoft.com/en-US/internet-explorer/downloads/ie" target="_blank">IE8 / IE9</a></li><li><a href="http://www.maxthon.com/" target="_blank">Maxthon</a> and <a href="http://www.google.com" target="_blank">so on</a>.</li></ul><span style="font-size: 10px">Tip: Remove "Util.killIE();" in /js/common.js can support all browser.</span></div>
+killBrowserLabel=<h2>Let's kill outdated and insecure browser!</h2><div class="vditor-reset"><p>Let's kill outdated and insecure browser for browser evolution, human progress and better experience.</p><p>You can download</p><ul><li><a href="http://www.mozilla.com/" target="_blank">Firefox</a></li><li><a href="http://www.google.com/chrome" target="_blank">Chrome</a></li><li><a href="http://windows.microsoft.com/en-US/internet-explorer/downloads/ie" target="_blank">IE8 / IE9</a></li><li><a href="http://www.maxthon.com/" target="_blank">Maxthon</a> and <a href="http://www.google.com" target="_blank">so on</a>.</li></ul><span style="font-size: 10px">Tip: Remove "Util.killIE();" in /js/common.js can support all browser.</span></div>
 closeLabel=Close
 closeForeverLabel=Close Forever
 readmoreLabel=Read more\u00BB

src/main/resources/lang_zh_CN.properties

@@ -18,7 +18,7 @@
 
 #
 # Description: Solo default language configurations(zh_CN).
-# Version: 2.31.0.3, Mar 19, 2019
+# Version: 2.31.0.4, Mar 19, 2019
 # Author: Liang Ding
 # Author: Liyuan Li
 # Author: Dongxu Wang
@@ -290,7 +290,7 @@ goTopLabel=\u9876\u90E8
 permalink1Label=\u94FE\u63A5\uFF1A
 permalinkLabel=\u94FE\u63A5
 welcomeToSoloLabel=\u6B22\u8FCE\u4F7F\u7528
-killBrowserLabel=<h2>\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01</h2><div class="content-reset"><p>\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002</p>\u60A8\u53EF\u4EE5\u4E0B\u8F7D<ul><li><a href="http://www.mozilla.com/" target="_blank">\u706B\u72D0</a></li><li><a href="http://www.google.com/chrome" target="_blank">\u8C37\u6B4C\u6D4F\u89C8\u5668</a></li><li><a href="http://windows.microsoft.com/en-US/internet-explorer/downloads/ie" target="_blank">IE8 / IE9</a></li><li><a href="http://www.maxthon.com/" target="_blank">\u9068\u6E38</a>\u6216\u8005<a href="http://www.google.com" target="_blank">\u5176\u5B83\u6D4F\u89C8\u5668</a>.</li></ul><span style="font-size: 10px">\u6CE8\uFF1A\u5220\u9664 /js/common.js \u4E2D\u7684 Util.killIE(); \u53EF\u5BF9\u6240\u6709\u6D4F\u89C8\u5668\u8FDB\u884C\u652F\u6301\u3002</span></div>
+killBrowserLabel=<h2>\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01</h2><div class="vditor-reset"><p>\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002</p>\u60A8\u53EF\u4EE5\u4E0B\u8F7D<ul><li><a href="http://www.mozilla.com/" target="_blank">\u706B\u72D0</a></li><li><a href="http://www.google.com/chrome" target="_blank">\u8C37\u6B4C\u6D4F\u89C8\u5668</a></li><li><a href="http://windows.microsoft.com/en-US/internet-explorer/downloads/ie" target="_blank">IE8 / IE9</a></li><li><a href="http://www.maxthon.com/" target="_blank">\u9068\u6E38</a>\u6216\u8005<a href="http://www.google.com" target="_blank">\u5176\u5B83\u6D4F\u89C8\u5668</a>.</li></ul><span style="font-size: 10px">\u6CE8\uFF1A\u5220\u9664 /js/common.js \u4E2D\u7684 Util.killIE(); \u53EF\u5BF9\u6240\u6709\u6D4F\u89C8\u5668\u8FDB\u884C\u652F\u6301\u3002</span></div>
 closeLabel=\u5173\u95ED
 closeForeverLabel=\u6C38\u4E45\u5173\u95ED
 readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB

src/main/webapp/admin/admin-label.ftl

@@ -18,86 +18,92 @@
 
 -->
 <script type="text/javascript">
-    <#include "../common-template/label.ftl">
-        Label.pushSuccLabel = '${pushSuccLabel}',
-        Label.pushToHacpaiLabel = '${pushToHacpaiLabel}',
-        Label.uploadMsg = '${uploadMsg}',
-        Label.uploadToken = "${uploadToken}",
-        Label.uploadURL = "${uploadURL}",
-        Label.skinDirName = "${skinDirName}",
-        Label.userRole = "${userRole}",
-        Label.PAGE_SIZE = "${articleListDisplayCount}",
-        Label.WINDOW_SIZE = "${articleListPaginationWindowSize}",
-        Label.localeString = "${localeString}",
-        Label.version = "${version}",
-        Label.reportIssueLabel = "please report this issue on https://github.com/b3log/solo/issues/new",
-        Label.noDataLabel = "${noDataLabel}",
-        Label.linkDescriptionLabel = "${linkDescriptionLabel}",
-        Label.addressInvalidLabel = "${addressInvalidLabel}",
-        Label.selectLabel = "${selectLabel}",
-        Label.outOfDateLabel = "${outOfDateLabel}",
-        Label.upToDateLabel = "${upToDateLabel}",
-        Label.commentContentLabel = "${commentContentLabel}",
-        Label.loadingLabel = "${loadingLabel}",
-        Label.noCommentLabel = "${noCommentLabel}",
-        Label.confirmRemoveLabel = "${confirmRemoveLabel}",
-        Label.removeLabel = "${removeLabel}",
-        Label.cancelPutTopLabel = "${cancelPutTopLabel}",
-        Label.putTopLabel = "${putTopLabel}",
-        Label.viewLabel = "${viewLabel}",
-        Label.updateLabel = "${updateLabel}",
-        Label.commentLabel = "${commentLabel}",
-        Label.titleLabel = "${titleLabel}",
-        Label.authorLabel = "${authorLabel}",
-        Label.dateLabel = "${dateLabel}",
-        Label.pageLabel = "${pageLabel}",
-        Label.gotoLabel = "${gotoLabel}",
-        Label.permalinkLabel = "${permalinkLabel}",
-        Label.titleEmptyLabel = "${titleEmptyLabel}",
-        Label.contentEmptyLabel = "${contentEmptyLabel}",
-        Label.linkTitleLabel = "${linkTitleLabel}",
-        Label.urlLabel = "${urlLabel}",
-        Label.addressEmptyLabel = "${addressEmptyLabel}",
-        Label.pluginNameLabel = "${pluginNameLabel}",
-        Label.statusLabel = "${statusLabel}",
-        Label.versionLabel = "${versionLabel}",
-        Label.userNameLabel = "${userNameLabel}",
-        Label.roleLabel = "${roleLabel}",
-        Label.administratorLabel = "${administratorLabel}",
-        Label.categoryLabel = "${categoryLabel}",
-        Label.tagsEmptyLabel = "${tagsEmptyLabel}",
-        Label.commonUserLabel = "${commonUserLabel}",
-        Label.articleLabel = "${articleLabel}",
-        Label.enabledLabel = "${enabledLabel}",
-        Label.disabledLabel = "${disabledLabel}",
-        Label.editorLeaveLabel = "${editorLeaveLabel}",
-        Label.editorPostLabel = "${editorPostLabel}",
-        Label.enableLabel = "${enableLabel}",
-        Label.disableLabel = "${disableLabel}",
-        Label.settingLabel = "${settingLabel}",
-        Label.linkEmptyLabel = "${linkEmptyLabel}",
-        Label.openMethodLabel = "${openMethodLabel}",
-        Label.typeLabel = "${typeLabel}",
-        Label.notFoundLabel = "${notFoundLabel}",
-        Label.paramSettingsLabel = "${paramSettingsLabel}",
-        Label.nonNegativeIntegerOnlyLabel = "${nonNegativeIntegerOnlyLabel}",
-        Label.indexTagDisplayCntLabel = "${indexTagDisplayCntLabel}",
-        Label.indexRecentCommentDisplayCntLabel = "${indexRecentCommentDisplayCntLabel}",
-        Label.indexMostCommentArticleDisplayCntLabel = "${indexMostCommentArticleDisplayCntLabel}",
-        Label.indexMostViewArticleDisplayCntLabel = "${indexMostViewArticleDisplayCntLabel}",
-        Label.pageSizeLabel = "${pageSizeLabel}",
-        Label.windowSizeLabel = "${windowSizeLabel}",
-        Label.randomArticlesDisplayCntLabel = "${randomArticlesDisplayCntLabel}",
-        Label.relevantArticlesDisplayCntLabel = "${relevantArticlesDisplayCntLabel}",
-        Label.externalRelevantArticlesDisplayCntLabel = "${externalRelevantArticlesDisplayCntLabel}",
-        Label.nameTooLongLabel = "${nameTooLongLabel}",
-        Label.navLabel = "${navLabel}",
-        Label.userLabel = "${userLabel}",
-        Label.changeRoleLabel = "${changeRoleLabel}",
-        Label.visitorUserLabel = "${visitorUserLabel}",
-        Label.categoryTooLongLabel = "${categoryTooLongLabel}",
-        Label.descriptionLabel = "${descriptionLabel}",
-        Label.autoSaveLabel = "${autoSaveLabel}",
-        Label.previewLabel = '${previewLabel}',
-    admin.init();
+    var Label = {
+        servePath: "${servePath}",
+        staticServePath: "${staticServePath}",
+        markedAvailable: ${markedAvailable?c},
+        hljsStyle: 'atom-one-light',
+        langLabel: "${langLabel}",
+        pushSuccLabel: '${pushSuccLabel}',
+        pushToHacpaiLabel: '${pushToHacpaiLabel}',
+        uploadMsg: '${uploadMsg}',
+        uploadToken: "${uploadToken}",
+        uploadURL: "${uploadURL}",
+        skinDirName: "${skinDirName}",
+        userRole: "${userRole}",
+        PAGE_SIZE: "${articleListDisplayCount}",
+        WINDOW_SIZE: "${articleListPaginationWindowSize}",
+        localeString: "${localeString}",
+        version: "${version}",
+        reportIssueLabel: 'please report this issue on https://github.com/b3log/solo/issues/new',
+        noDataLabel: "${noDataLabel}",
+        linkDescriptionLabel: "${linkDescriptionLabel}",
+        addressInvalidLabel: "${addressInvalidLabel}",
+        selectLabel: "${selectLabel}",
+        outOfDateLabel: "${outOfDateLabel}",
+        upToDateLabel: "${upToDateLabel}",
+        commentContentLabel: "${commentContentLabel}",
+        loadingLabel: "${loadingLabel}",
+        noCommentLabel: "${noCommentLabel}",
+        confirmRemoveLabel: "${confirmRemoveLabel}",
+        removeLabel: "${removeLabel}",
+        cancelPutTopLabel: "${cancelPutTopLabel}",
+        putTopLabel: "${putTopLabel}",
+        viewLabel: "${viewLabel}",
+        updateLabel: "${updateLabel}",
+        commentLabel: "${commentLabel}",
+        titleLabel: "${titleLabel}",
+        authorLabel: "${authorLabel}",
+        dateLabel: "${dateLabel}",
+        pageLabel: "${pageLabel}",
+        gotoLabel: "${gotoLabel}",
+        permalinkLabel: "${permalinkLabel}",
+        titleEmptyLabel: "${titleEmptyLabel}",
+        contentEmptyLabel: "${contentEmptyLabel}",
+        linkTitleLabel: "${linkTitleLabel}",
+        urlLabel: "${urlLabel}",
+        addressEmptyLabel: "${addressEmptyLabel}",
+        pluginNameLabel: "${pluginNameLabel}",
+        statusLabel: "${statusLabel}",
+        versionLabel: "${versionLabel}",
+        userNameLabel: "${userNameLabel}",
+        roleLabel: "${roleLabel}",
+        administratorLabel: "${administratorLabel}",
+        categoryLabel: "${categoryLabel}",
+        tagsEmptyLabel: "${tagsEmptyLabel}",
+        commonUserLabel: "${commonUserLabel}",
+        articleLabel: "${articleLabel}",
+        enabledLabel: "${enabledLabel}",
+        disabledLabel: "${disabledLabel}",
+        editorLeaveLabel: "${editorLeaveLabel}",
+        editorPostLabel: "${editorPostLabel}",
+        enableLabel: "${enableLabel}",
+        disableLabel: "${disableLabel}",
+        settingLabel: "${settingLabel}",
+        linkEmptyLabel: "${linkEmptyLabel}",
+        openMethodLabel: "${openMethodLabel}",
+        typeLabel: "${typeLabel}",
+        notFoundLabel: "${notFoundLabel}",
+        paramSettingsLabel: "${paramSettingsLabel}",
+        nonNegativeIntegerOnlyLabel: "${nonNegativeIntegerOnlyLabel}",
+        indexTagDisplayCntLabel: "${indexTagDisplayCntLabel}",
+        indexRecentCommentDisplayCntLabel: "${indexRecentCommentDisplayCntLabel}",
+        indexMostCommentArticleDisplayCntLabel: "${indexMostCommentArticleDisplayCntLabel}",
+        indexMostViewArticleDisplayCntLabel: "${indexMostViewArticleDisplayCntLabel}",
+        pageSizeLabel: "${pageSizeLabel}",
+        windowSizeLabel: "${windowSizeLabel}",
+        randomArticlesDisplayCntLabel: "${randomArticlesDisplayCntLabel}",
+        relevantArticlesDisplayCntLabel: "${relevantArticlesDisplayCntLabel}",
+        externalRelevantArticlesDisplayCntLabel: "${externalRelevantArticlesDisplayCntLabel}",
+        nameTooLongLabel: "${nameTooLongLabel}",
+        navLabel: "${navLabel}",
+        userLabel: "${userLabel}",
+        changeRoleLabel: "${changeRoleLabel}",
+        visitorUserLabel: "${visitorUserLabel}",
+        categoryTooLongLabel: "${categoryTooLongLabel}",
+        descriptionLabel: "${descriptionLabel}",
+        autoSaveLabel: "${autoSaveLabel}",
+        previewLabel: '${previewLabel}',
+    }
+    admin.init()
 </script>
\ No newline at end of file

src/main/webapp/admin/article-pwd.ftl

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 -->
-<#include "../macro-common-page.ftl">
+<#include "../common-template/macro-common-page.ftl">
 
 <@commonPage "${articleViewPwdLabel}">
 <h2>

src/main/webapp/common-template/label.ftl → src/main/webapp/common-template/skin-script.ftl

@@ -17,10 +17,13 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 -->
-var Label = {
-    "servePath": "${servePath}",
-    "staticServePath": "${staticServePath}",
-    "markedAvailable": ${markedAvailable?c},
-    "hljsStyle": "atom-one-light",
-    "langLabel": "${langLabel}"
-};
+<script>
+    var Label = {
+        "servePath": "${servePath}",
+        "staticServePath": "${staticServePath}",
+        "markedAvailable": ${markedAvailable?c},
+        "hljsStyle": "atom-one-light",
+        "langLabel": "${langLabel}"
+    };
+    Util.init()
+</script>
\ No newline at end of file

src/main/webapp/error/401.ftl

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 -->
-<#include "../macro-common-page.ftl">
+<#include "../common-template/macro-common-page.ftl">
 
 <@commonPage "401 Unauthorized!">
 <h2>401 Unauthorized!</h2>

src/main/webapp/error/403.ftl

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 -->
-<#include "../macro-common-page.ftl">
+<#include "../common-template/macro-common-page.ftl">
 
 <@commonPage "403 Forbidden!">
 <h2>403 Forbidden!</h2>

src/main/webapp/error/404.ftl

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 -->
-<#include "../macro-common-page.ftl">
+<#include "../common-template/macro-common-page.ftl">
 
 <@commonPage "404 Not Found!">
 <h2>404 Not Found!</h2>

src/main/webapp/error/500.ftl

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 -->
-<#include "../macro-common-page.ftl">
+<#include "../common-template/macro-common-page.ftl">
 
 <@commonPage "500 Internal Server Error!">
 <h2>500 Internal Server Error!</h2>