✨ #12180 article

src/main/webapp/skins/9IPHP/article.ftl

@@ -66,33 +66,35 @@
                                     ${articleTag}</a>
                             </#list>
 
-                            <div class="article-cr">
-                                转载请注明来源：
-                                <a href="http://9iphp.com/web/laravel/laravel-5-acl-define.html">使用Laravel5.1自带权限控制系统 ACL</a> -
-                                <a href="http://9iphp.com" title="" data-original-title="Specs' Blog-就爱PHP">Specs' Blog-就爱PHP</a>
-                            </div>
+                            <#-- div class="copyright">
+                                ${articleCP1Label}
+                                <a rel="bookmark" href="${servePath}${article.articlePermalink}">
+                                    ${article.articleTitle}
+                                </a> -
+                                <a href="${servePath}">
+                                    ${blogTitle}
+                                </a>
+                            </div -->
 
-                            <div class="post-nav fn-clear">
+                            <div class="rel fn-clear">
                                 <#if previousArticlePermalink??>
-                                    <div class="fn-left">
                                     <a href="${servePath}${previousArticlePermalink}" rel="prev"
+                                       class="fn-left tooltipped tooltipped-n"
                                        aria-label="${previousArticleTitle}">
                                         ${previousArticleLabel}
                                     </a>
-                                    </div>
                                 </#if>
                                 <#if nextArticlePermalink??>
-                                    <div class="fn-right">
                                     <a href="${servePath}${nextArticlePermalink}" rel="next"
+                                       class="fn-right tooltipped tooltipped-n"
                                        aria-label="${nextArticleTitle}">
                                         ${nextArticleLabel}
                                     </a>
-                                    </div>
                                 </#if>
                             </div>
                         </footer>
+                        <div id="externalRelevantArticles" class="list"></div>
                         <@comments commentList=articleComments article=article></@comments>
-                        <div id="externalRelevantArticles"></div>
                     </article>
                 </main>
                 <#include "side.ftl">
@@ -102,7 +104,8 @@
         <@comment_script oId=article.oId>
         page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
         <#if 0 != externalRelevantArticlesDisplayCount>
-        page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>");
+        page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>"
+            , "<header class='title'><h2>${externalRelevantArticlesLabel}</h2></header>");
         </#if>
         </@comment_script>    
     </body>

src/main/webapp/skins/9IPHP/css/base.css

@@ -576,6 +576,9 @@ a[class*=" icon-"]:hover {
 /* end common */
 
 /* start reset common */
+.icon-home:before {
+  content: "\f015";
+}
 .icon-logout:before {
   content: "\ea14";
 }
@@ -684,6 +687,32 @@ a {
 .ft-gray {
     color: #aaa;
 }
+
+.list,
+.module main.list {
+    padding: 0;
+}
+
+.list li {
+    list-style: none;
+    border-bottom: 1px solid #eee;
+    line-height: 40px;
+    padding: 0 20px;
+}
+
+.list li:last-child {
+    border-bottom: 0;
+}
+
+.list a {
+    color: #666;
+    text-decoration: none;
+    display: block;
+}
+
+.list a:hover {
+    color: #ff4d3a;
+}
 /* end reset common */
 
 /* start framework */
@@ -808,6 +837,7 @@ aside {
     padding: 30px 0;
     text-align: center;
     background: #111;
+    margin-top: 30px;
     color: #fff;
 }
 
@@ -868,27 +898,6 @@ aside .tag {
     margin-right: 10px;
     line-height: 22px;
 }
-
-aside .list {
-    padding: 0;
-}
-
-aside .list li {
-    list-style: none;
-    border-bottom: 1px solid #eee;
-    line-height: 40px;
-    padding: 0 20px;
-}
-
-aside .list li:last-child {
-    border-bottom: 0;
-}
-
-aside .list a {
-    color: #666;
-    text-decoration: none;
-    display: block;
-}
 /* end side */
 
 /* start article list */
@@ -947,4 +956,35 @@ aside .list a {
 .post footer > a.tag:hover {
     background: #999;
 }
+
+.post footer .copyright {
+    padding: 10px;
+    font-size: 14px;
+    line-height: 16px;
+    border: 1px solid #ff4d3a;
+    border-left-width: 20px;
+    margin: 20px 0;
+}
+
+.post .rel a {
+    display: inline-block;
+    padding: 5px 14px;
+    background-color: #fff;
+    border: 1px solid #ddd;
+    border-radius: 15px;
+    text-decoration: none;
+    margin: 20px 0;
+}
+
+.post .rel a:hover {
+    background-color: #eee;
+}
+
+.post .title h2 {
+    font-size: 16px;
+    font-weight: bold;
+    padding-bottom: 10px;
+    border-bottom: 1px solid #f1f1f1;
+    margin-top: 20px;
+}
 /* end article list */

src/main/webapp/skins/9IPHP/css/fonts/icomoon.svg

@@ -14,6 +14,7 @@
 <glyph unicode="&#xea13;" glyph-name="login" d="M384 448h-320v128h320v128l192-192-192-192zM1024 960v-832l-384-192v192h-384v256h64v-192h320v576l256 128h-576v-256h-64v320z" />
 <glyph unicode="&#xea14;" glyph-name="logout" d="M768 320v128h-320v128h320v128l192-192zM704 384v-256h-320v-192l-384 192v832h704v-320h-64v256h-512l256-128v-576h256v192z" />
 <glyph unicode="&#xf002;" glyph-name="search" horiz-adv-x="951" d="M658.286 475.428c0 141.143-114.857 256-256 256s-256-114.857-256-256 114.857-256 256-256 256 114.857 256 256zM950.857 0c0-40-33.143-73.143-73.143-73.143-19.429 0-38.286 8-51.429 21.714l-196 195.429c-66.857-46.286-146.857-70.857-228-70.857-222.286 0-402.286 180-402.286 402.286s180 402.286 402.286 402.286 402.286-180 402.286-402.286c0-81.143-24.571-161.143-70.857-228l196-196c13.143-13.143 21.143-32 21.143-51.429z" />
+<glyph unicode="&#xf015;" glyph-name="home" horiz-adv-x="951" d="M804.571 384v-274.286c0-20-16.571-36.571-36.571-36.571h-219.429v219.429h-146.286v-219.429h-219.429c-20 0-36.571 16.571-36.571 36.571v274.286c0 1.143 0.571 2.286 0.571 3.429l328.571 270.857 328.571-270.857c0.571-1.143 0.571-2.286 0.571-3.429zM932 423.428l-35.429-42.286c-2.857-3.429-7.429-5.714-12-6.286h-1.714c-4.571 0-8.571 1.143-12 4l-395.429 329.714-395.429-329.714c-4-2.857-8.571-4.571-13.714-4-4.571 0.571-9.143 2.857-12 6.286l-35.429 42.286c-6.286 7.429-5.143 19.429 2.286 25.714l410.857 342.286c24 20 62.857 20 86.857 0l139.429-116.571v111.429c0 10.286 8 18.286 18.286 18.286h109.714c10.286 0 18.286-8 18.286-18.286v-233.143l125.143-104c7.429-6.286 8.571-18.286 2.286-25.714z" />
 <glyph unicode="&#xf01c;" glyph-name="inbox" horiz-adv-x="878" d="M584.571 402.286h180.571c-1.143 2.857-1.714 6.286-2.857 9.143l-121.143 283.429h-404.571l-121.143-283.429c-1.143-2.857-1.714-6.286-2.857-9.143h180.571l54.286-109.714h182.857zM877.714 385.143v-275.429c0-20-16.571-36.571-36.571-36.571h-804.571c-20 0-36.571 16.571-36.571 36.571v275.429c0 20.571 6.286 50.857 14.286 70.286l136 315.429c8 18.857 30.857 33.714 50.857 33.714h475.429c20 0 42.857-14.857 50.857-33.714l136-315.429c8-19.429 14.286-49.714 14.286-70.286z" />
 <glyph unicode="&#xf021;" glyph-name="refresh" horiz-adv-x="878" d="M863.429 347.428c0-1.143 0-2.857-0.571-4-48.571-202.286-215.429-343.429-426.286-343.429-111.429 0-219.429 44-300.571 121.143l-73.714-73.714c-6.857-6.857-16-10.857-25.714-10.857-20 0-36.571 16.571-36.571 36.571v256c0 20 16.571 36.571 36.571 36.571h256c20 0 36.571-16.571 36.571-36.571 0-9.714-4-18.857-10.857-25.714l-78.286-78.286c53.714-50.286 125.143-78.857 198.857-78.857 101.714 0 196 52.571 249.143 139.429 13.714 22.286 20.571 44 30.286 66.857 2.857 8 8.571 13.143 17.143 13.143h109.714c10.286 0 18.286-8.571 18.286-18.286zM877.714 804.571v-256c0-20-16.571-36.571-36.571-36.571h-256c-20 0-36.571 16.571-36.571 36.571 0 9.714 4 18.857 10.857 25.714l78.857 78.857c-54.286 50.286-125.714 78.286-199.429 78.286-101.714 0-196-52.571-249.143-139.429-13.714-22.286-20.571-44-30.286-66.857-2.857-8-8.571-13.143-17.143-13.143h-113.714c-10.286 0-18.286 8.571-18.286 18.286v4c49.143 202.857 217.714 343.429 428.571 343.429 112 0 221.143-44.571 302.286-121.143l74.286 73.714c6.857 6.857 16 10.857 25.714 10.857 20 0 36.571-16.571 36.571-36.571z" />
 <glyph unicode="&#xf02c;" glyph-name="tags" horiz-adv-x="1085" d="M256 694.857c0 40.571-32.571 73.143-73.143 73.143s-73.143-32.571-73.143-73.143 32.571-73.143 73.143-73.143 73.143 32.571 73.143 73.143zM865.714 365.714c0-19.429-8-38.286-21.143-51.429l-280.571-281.143c-13.714-13.143-32.571-21.143-52-21.143s-38.286 8-51.429 21.143l-408.571 409.143c-29.143 28.571-52 84-52 124.571v237.714c0 40 33.143 73.143 73.143 73.143h237.714c40.571 0 96-22.857 125.143-52l408.571-408c13.143-13.714 21.143-32.571 21.143-52zM1085.143 365.714c0-19.429-8-38.286-21.143-51.429l-280.571-281.143c-13.714-13.143-32.571-21.143-52-21.143-29.714 0-44.571 13.714-64 33.714l268.571 268.571c13.143 13.143 21.143 32 21.143 51.429s-8 38.286-21.143 52l-408.571 408c-29.143 29.143-84.571 52-125.143 52h128c40.571 0 96-22.857 125.143-52l408.571-408c13.143-13.714 21.143-32.571 21.143-52z" />

src/main/webapp/skins/9IPHP/header.ftl

@@ -30,6 +30,10 @@
     <div class="navbar">
         <div class="fn-clear wrapper">
             <nav class="fn-left">
+                    <a href="${servePath}">
+                        <i class="icon-home"></i>
+                        ${indexLabel}
+                    </a>
                     <#list pageNavigations as page>
                         <a href="${page.pagePermalink}" target="${page.pageOpenTarget}" rel="section">
                             ${page.pageTitle}

src/main/webapp/skins/9IPHP/lang/lang_en_US.properties

@@ -25,6 +25,7 @@ tocLabel=Article ToC
 readLabel=Read More
 nextArticleLabel=Next
 previousArticleLabel=Previous
+articleCP1Label=Please indicate the source:
 
 searchLabel=Search
 subscribeLabel=Subscribe

src/main/webapp/skins/9IPHP/lang/lang_zh_CN.properties

@@ -25,6 +25,7 @@ tocLabel=\u6587\u7AE0\u76EE\u5F55
 readLabel=\u9605\u8BFB\u5168\u6587
 nextArticleLabel=\u65B0\u4E00\u7BC7
 previousArticleLabel=\u65E7\u4E00\u7BC7
+articleCP1Label=\u8F6C\u8F7D\u8BF7\u6CE8\u660E\u6765\u6E90\uFF1A
 
 searchLabel=\u641C\u7D22
 subscribeLabel=\u8BA2\u9605

src/main/webapp/skins/9IPHP/macro-comments.ftl

@@ -32,7 +32,8 @@
     </#list>
 </ul>
 <#if article.commentable>
-<div class="comment-body fn-wrap">
+    <header class='title'><h2>${postCommentsLabel}</h2></header>
+    <div>
         <table id="commentForm" class="form">
             <tbody>
                 <#if !isLoggedIn>
@@ -92,7 +93,7 @@
                 </tr>
             </tbody>
         </table>
-</div>
+    </div>
 </#if>
 </#macro>
 
@@ -143,7 +144,7 @@
                         };
                         (function () {
                             page.load();
-                            NexT.initArticle();
+                            Skin.initArticle();
                             // emotions
                             page.replaceCommentsEm("#comments .comment-content");
                             <#nested>