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

src/main/resources/lang_en_US.properties

@@ -16,7 +16,7 @@
 
 #
 # Description: Solo language configurations(en_US).
-# Version: 2.21.0.0, Feb 24, 2018
+# Version: 2.21.0.1, Apr 5, 2018
 # Author: Liang Ding
 # Author: Liyuan Li
 # Author: Dongxu Wang
@@ -47,7 +47,7 @@ duplicatedCategoryLabel=Duplicated category!
 addArticleWithTagFirstLabel=Please add an article with tag [{tag}]
 searchLabel=Search
 dynamicLabel=Dynamic
-APILabel=Open API
+APILabel=Open API, welcome independent bloggers to connect
 exportSQLLabel=Export SQL file
 exportJSONLabel=Export JSON file
 exportHexoLabel=Export Hexo file
@@ -172,6 +172,7 @@ downloadURLLabel=Download URL
 downloadLabel=Download
 createDateLabel=Create Date
 updateDateLabel=Update Date
+dateLabel=Date
 titleLabel=Title
 title1Label=Title:
 content1Label=Content:
@@ -205,7 +206,7 @@ configSettingsLabel=Configuration
 skinLabel=Skins
 signLabel=Signs
 sign1Label=Signs:
-noSignLabel=No Signs
+noSignLabel=None
 signIsNullLabel=This Sign is Null
 statisticLabel=Blog Statistic
 viewLabel=View
@@ -249,7 +250,7 @@ indexRecentArticleDisplayCnt1Label=Recent Article Display Count:
 indexRecentCommentDisplayCntLabel=Recent Comment Display Count
 indexRecentCommentDisplayCnt1Label=Recent Comment Display Count: 
 indexMostCommentArticleDisplayCntLabel=Most Comment Article Display Count
-indexMostCommentArticleDisplayCnt1Label=Most Comment Article Display Count:
+indexMostCommentArticleDisplayCnt1Label=Most Comment Article Count:
 indexMostViewArticleDisplayCntLabel=Most View Article Display Count
 indexMostViewArticleDisplayCnt1Label=Most View Article Display Count:
 relevantArticlesDisplayCntLabel=Relevant Article Display Count
@@ -257,7 +258,7 @@ relevantArticlesDisplayCnt1Label=Relevant Article Display Count:
 randomArticlesDisplayCntLabel=Random Article Display Count
 randomArticlesDisplayCnt1Label=Random Article Display Count:
 externalRelevantArticlesDisplayCntLabel=External Relevant Article Display Count
-externalRelevantArticlesDisplayCnt1Label=External Relevant Article Display Count: 
+externalRelevantArticlesDisplayCnt1Label=External Relevant Article Count: 
 windowSizeLabel=Pagination Window Size
 windowSize1Label=Pagination Window Size:
 pageSizeLabel=Pagination Page Size

src/main/resources/lang_zh_CN.properties

@@ -16,7 +16,7 @@
 
 #
 # Description: Solo default language configurations(zh_CN).
-# Version: 2.21.0.0, Feb 24, 2018
+# Version: 2.21.0.1, Apr 5, 2018
 # Author: Liang Ding
 # Author: Liyuan Li
 # Author: Dongxu Wang
@@ -172,6 +172,7 @@ downloadURLLabel=\u4E0B\u8F7D\u5730\u5740
 downloadLabel=\u4E0B\u8F7D
 createDateLabel=\u521B\u5EFA\u65E5\u671F
 updateDateLabel=\u66F4\u65B0\u65E5\u671F
+dateLabel=\u65E5\u671F
 titleLabel=\u6807\u9898
 title1Label=\u6807\u9898\uFF1A
 content1Label=\u6B63\u6587\uFF1A
@@ -205,7 +206,7 @@ configSettingsLabel=\u4FE1\u606F\u914D\u7F6E
 skinLabel=\u76AE\u80A4
 signLabel=\u7B7E\u540D\u6863
 sign1Label=\u7B7E\u540D\u6863\uFF1A
-noSignLabel=\u4E0D\u4F7F\u7528\u7B7E\u540D\u6863
+noSignLabel=\u4E0D\u4F7F\u7528
 signIsNullLabel=\u8BE5\u7B7E\u540D\u6863\u4E3A\u7A7A
 statisticLabel=\u535A\u5BA2\u7EDF\u8BA1
 viewLabel=\u6D4F\u89C8

src/main/webapp/admin-about.ftl

@@ -8,7 +8,7 @@
                 <img width="128" src="${staticServePath}/images/logo.png" alt="Solo" title="Solo" />
             </a>
         </div>
-        <div class="left content-reset" style="width: 73%">
+        <div class="left content-reset" style="margin-left: 20px;">
             <div id="aboutLatest" class="about-margin left">
                 ${checkingVersionLabel}
             </div>

src/main/webapp/admin-article.ftl

@@ -20,7 +20,9 @@
     </div>
     <div>
         <label>${tags1WithTips1Label}</label>
-        <input id="tag" type="text"/>
+        <div class="fn__flex">
+            <input id="tag" type="text"/>
+        </div>
     </div>
     <div class="comment-content">
         <label>${abstract1Label}</label>
@@ -28,27 +30,26 @@
             <textarea id="abstract" style="height: 200px;width: 100%;" name="abstract"></textarea>
         </div>
     </div>
-    <div>
-        <div class="left">
-            <label for="permalink">${permalink1Label}</label>
-            <input id="permalink" type="text" style="width: 416px;" />
+    <div class="fn__flex">
+        <div class="fn__flex fn__flex1" style="align-items: center">
+            <label for="permalink" style="margin-bottom: 0">${permalink1Label}</label>
+            <input id="permalink" class="fn__flex1" type="text" style="margin: 0 12px 0 6px;" />
         </div>
         <div class="right">
             <label for="viewPwd">${articleViewPwd1Label}</label>
             <input id="viewPwd" type="text" style="width: 156px" />
         </div>
-        <div class="clear"></div>
     </div>
     <div>
         <span class="signs">
             <label>${sign1Label}</label>
-            <button style="margin-left: 0px;" id="articleSign1" class="selected">${signLabel} 1</button>
-            <button id="articleSign2">${signLabel} 2</button>
-            <button id="articleSign3">${signLabel} 3</button>
+            <button style="margin-left: 0px;" id="articleSign1" class="selected">${signLabel}1</button>
+            <button id="articleSign2">${signLabel}2</button>
+            <button id="articleSign3">${signLabel}3</button>
             <button id="articleSign0">${noSignLabel}</button>
         </span>
         <div class="right">
-            <label for="articleCommentable">${allowComment1Label}</label>
+            <label for="articleCommentable" style="margin: 13px 0 0 0">${allowComment1Label}</label>
             <input type="checkbox" id="articleCommentable" checked="checked" />
             <span id="postToCommunityPanel" class="none">
                 <label for="postToCommunity">

src/main/webapp/admin-category-list.ftl

@@ -37,10 +37,10 @@
             </td>
         </tr>
         <tr>
-            <th>
+            <th
                 <label for="categoryTags">${tags1Label}</label>
             </th>
-            <td>
+            <td class="fn__flex">
                 <input id="categoryTags" type="text"/>
             </td>
         </tr>

src/main/webapp/admin-index.ftl

@@ -2,6 +2,12 @@
 <html>
     <head>
         <meta charset="utf-8" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+        <meta name="copyright" content="B3log">
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-status-bar-style" content="black">
+        <meta http-equiv="Window-target" content="_top">
         <meta name="robots" content="none" />
         <title>${blogTitle} - ${adminConsoleLabel}</title>
         <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" />

src/main/webapp/admin-label.ftl

@@ -40,6 +40,7 @@
         "tagsLabel": "${tagsLabel}",
         "authorLabel": "${authorLabel}",
         "createDateLabel": "${createDateLabel}",
+        "dateLabel": "${dateLabel}",
         "previousPageLabel": "${previousPageLabel}",
         "pageLabel": "${pageLabel}",
         "nextPagePabel": "${nextPagePabel}",

src/main/webapp/admin-others.ftl

@@ -23,11 +23,6 @@
                     <td>
                         <input id="replayEmailTemplateTitle" type="text" />
                     </td>
-                    <td rowspan="2" valign="top" width="260px">
-                        <div class="marginLeft12">
-                           ${replayEmailExplanationLabel}
-                        </div>
-                    </td>
                 </tr>
                 <tr>
                     <th valign="top">
@@ -44,6 +39,9 @@
                 </tr>
             </tbody>
         </table>
+        <div class="content-reset">
+        ${replayEmailExplanationLabel}
+        </div>
     </div>
     <div id="tabOthersPanel_other" class="none">
         <button class="margin12" onclick="admin.others.removeUnusedTags();">${removeUnusedTagsLabel}</button>

src/main/webapp/admin-preference.ftl

@@ -141,7 +141,7 @@
                 </td>
             </tr>
             <tr>
-                <th width="234px">
+                <th>
                     <label for="localeString">${localeString1Label}</label>
                 </th>
                 <td>
@@ -152,7 +152,7 @@
                 </td>
             </tr>
             <tr>
-                <th width="234px">
+                <th>
                     <label for="timeZoneId">${timeZoneId1Label}</label>
                 </th>
                 <td>

src/main/webapp/css/default-admin.css

@@ -17,7 +17,7 @@
 * admin style
 *
 * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
-* @version 2.5.0.0, Feb 25, 2018
+* @version 2.5.0.0, Apr 5, 2018
 */
 
 /* start resset */
@@ -25,7 +25,6 @@ body, input, textarea {
     font-family: "Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif;;
 }
 html, body {
-    min-width: 1024px;
     color: #767676;
     background: #f1f2f7;
     font-size: 13px;
@@ -1027,7 +1026,7 @@ button#submitArticle:hover {
 /* start about */
 .about-logo {
     float: left;
-    margin: 62px 36px 62px 24px;
+    margin: 20px 0 0 20px;
 }
 
 .about-margin {
@@ -1053,7 +1052,7 @@ button#submitArticle:hover {
  * @version 1.0.0.7, Oct 29, 2011
 */
 .completed-input {
-    margin: 2px 12px 0 0;
+    margin: 0 12px 0 0;
 }
 .completed-panel {
     background-color: #fff;

src/main/webapp/css/default-base.css

@@ -17,7 +17,7 @@
  * base style
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 1.0.4.3, Feb 24, 2018
+ * @version 1.1.0.0, Apr 5, 2018
 */
 
 html, body, div, ul, li, h1, h2, h3, h4, h5, h6, p, dd, dl, ol {
@@ -145,6 +145,15 @@ button:hover,.button:hover {
     clear: both;
 }
 
+.fn__flex {
+    display: flex;
+}
+
+.fn__flex1 {
+    flex: 1;
+    min-width: 1px;
+}
+
 .none {
     display: none;
 }

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

@@ -18,7 +18,7 @@
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.5.0.0, Feb 25, 2018
+ * @version 1.5.0.1, Apr 5, 2018
  */
 admin.article = {
     currentEditorType: '',
@@ -430,7 +430,7 @@ admin.article = {
                     height: 160,
                     buttonText: Label.selectLabel,
                     data: tags
-                }).innerWidth($("#tag").parent().width() - 68);
+                });
 
                 $("#loadMsg").text("");
             }

src/main/webapp/js/admin/categoryList.js

@@ -18,7 +18,7 @@
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.1.2.0, Feb 24, 2018
+ * @version 1.1.2.1, Apr 5, 2018
  * @since 2.0.0
  */
 
@@ -90,7 +90,7 @@ admin.categoryList = {
                     height: 160,
                     buttonText: Label.selectLabel,
                     data: tags
-                }).width($("#categoryTags").parent().width() - 94);
+                });
 
                 $("#loadMsg").text("");
             }

src/main/webapp/js/admin/commentList.js

@@ -18,7 +18,7 @@
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.1.5, Feb 23, 2013
+ * @version 1.0.1.6, Apr 5, 2018
  */
 
 /* comment-list 相关操作 */
@@ -43,7 +43,7 @@ admin.commentList = {
             width: 230,
             style: "padding-left: 12px;"
         }, {
-            text: Label.createDateLabel,
+            text: Label.dateLabel,
             index: "date",
             width: 90,
             style: "padding-left: 12px;"