♻️

2019-03-20 07:59:29 +08:00 · 2019-03-20 07:59:29 +08:00 · 1605dceed8
parent d5c44707aa
commit 1605dceed8
40 changed files with 161 additions and 142 deletions
--- a/9IPHP/article.ftl
+++ b/9IPHP/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/9IPHP/css/base.css
+++ b/9IPHP/css/base.css
--- a/9IPHP/css/base.scss
+++ b/9IPHP/css/base.scss
@ -515,6 +515,10 @@ aside .b3-solo-list {
 aside.has-toc > section:last-child {
    margin-top: 20px;
 }
+
+.article__toc {
+    display: none;
+}
 /* end side */

 /* start article list */
--- a/9IPHP/js/common.js
+++ b/9IPHP/js/common.js
@ -27,110 +27,106 @@
 * @static
 */
 var Skin = {
-    _initCommon: function ($goTop) {
-        var $banner = $('header .banner'),
-        $navbar = $('header .navbar');
+  _initCommon: function ($goTop) {
+    var $banner = $('header .banner'),
+      $navbar = $('header .navbar')

-        $(window).scroll(function () {
-            if ($(window).scrollTop() > 125) {
-                $goTop.show();
-            } else {
-                $goTop.hide();
-            }
+    $(window).scroll(function () {
+      if ($(window).scrollTop() > 125) {
+        $goTop.show()
+      } else {
+        $goTop.hide()
+      }

-            if ($(window).width() < 701) {
-                return false;
-            }
+      if ($(window).width() < 701) {
+        return false
+      }

-            if ($(window).scrollTop() > $banner.height()) {
-                $navbar.addClass('pin');
-                $('.main-wrap').parent().css('margin-top', '86px')
-            } else {
-                $navbar.removeClass('pin');
-                $('.main-wrap').parent().css('margin-top', '0')
-            }
-        });
-    },
-    init: function () {
-        this._initCommon($('.icon-up'));
+      if ($(window).scrollTop() > $banner.height()) {
+        $navbar.addClass('pin')
+        $('.main-wrap').parent().css('margin-top', '86px')
+      } else {
+        $navbar.removeClass('pin')
+        $('.main-wrap').parent().css('margin-top', '0')
+      }
+    })
+  },
+  init: function () {
+    this._initCommon($('.icon-up'))

-        $('.navbar nav a').each(function () {
-            if (this.href === location.href) {
-                this.className = 'current'
-            }
-        });
+    $('.navbar nav a').each(function () {
+      if (this.href === location.href) {
+        this.className = 'current'
+      }
+    })

-        $('.responsive .list a').each(function () {
-            if (this.href === location.href) {
-                $(this).parent().addClass('current');
-            }
-        });
+    $('.responsive .list a').each(function () {
+      if (this.href === location.href) {
+        $(this).parent().addClass('current')
+      }
+    })

-        $('.responsive .icon-list').click(function () {
-            $('.responsive .list').slideToggle();
-        });
-    },
-    _initArticleCommon: function (tocLabel, siteViewLabel) {
-        // TOC
-        if ($('.b3-solo-list li').length > 0 && $(window).width() > 1000) {
-            // add color to sidebar menu
-            $('aside').addClass('has-toc');
+    $('.responsive .icon-list').click(function () {
+      $('.responsive .list').slideToggle()
+    })
+  },
+  _initArticleCommon: function (tocLabel, siteViewLabel) {
+    // TOC
+    if ($('.article__toc').length > 0 && $(window).width() > 1000) {
+      $('.article__toc, .article__toc > ul').show()

-            // append toc to sidebar menu
-            var articleTocHTML = '<ul class="fn-clear"><li class="current" data-tab="toc">' + tocLabel
-            + '</li><li data-tab="site">' + siteViewLabel + '</li></ul><section></section>';
-            $('aside').prepend(articleTocHTML);
-            var $sectionF = $('aside section:first').html($('.b3-solo-list')),
-                    $sectionL = $('aside section:last');
-            $sectionF.height($(window).height() - 154).css({ 'overflow': 'auto', 'width':  $('aside').width() + 'px'});
-            $sectionL.hide();
-            // 切换 tab
-            $('aside > ul > li').click(function () {
-                if ($(this).data('tab') === 'toc') {
-                    $sectionL.animate({
-                        "opacity": '0',
-                        "top": '-50px'
-                    }, 300, function () {
-                        $sectionF.show().css('top', '-50px');
-                        $sectionF.animate({
-                            "opacity": '1',
-                            "top": '0'
-                        }, 300).show();
-                    });
-                } else {
-                    $sectionF.animate({
-                        "opacity": '0',
-                        "top": '-50px'
-                    }, 300, function () {
-                        $sectionF.hide().css('top', '-50px');
-                        $sectionL.animate({
-                            "opacity": '1',
-                            "top": '0'
-                        }, 300).show();
-                    }).hide();
-                }
-                $('aside > ul > li').removeClass('current');
-                $(this).addClass('current');
-            });
-
-            $(window).scroll(function () {
-                if ($(window).scrollTop() > 125) {
-                    $('aside section:eq(0)').css({
-                        position: "fixed",
-                        top: "51px",
-                        backgroundColor: "#fff"
-                    })
-                } else {
-                    $('aside section:eq(0)').css({
-                        position: "inherit",
-                        borderLeft: 0
-                    })
-                }
-            });
+      var $sectionF = $('aside section:first').html($('.b3-solo-list')),
+        $sectionL = $('aside section:last')
+      $sectionF.height($(window).height() - 154).
+        css({'overflow': 'auto', 'width': $('aside').width() + 'px'})
+      $sectionL.hide()
+      // 切换 tab
+      $('aside > ul > li').click(function () {
+        if ($(this).data('tab') === 'toc') {
+          $sectionL.animate({
+            'opacity': '0',
+            'top': '-50px',
+          }, 300, function () {
+            $sectionF.show().css('top', '-50px')
+            $sectionF.animate({
+              'opacity': '1',
+              'top': '0',
+            }, 300).show()
+          })
+        } else {
+          $sectionF.animate({
+            'opacity': '0',
+            'top': '-50px',
+          }, 300, function () {
+            $sectionF.hide().css('top', '-50px')
+            $sectionL.animate({
+              'opacity': '1',
+              'top': '0',
+            }, 300).show()
+          }).hide()
        }
-    },
-    initArticle: function (tocLabel, siteViewLabel) {
-        this._initArticleCommon(tocLabel, siteViewLabel);
+        $('aside > ul > li').removeClass('current')
+        $(this).addClass('current')
+      })
+
+      $(window).scroll(function () {
+        if ($(window).scrollTop() > 125) {
+          $('aside section:eq(0)').css({
+            position: 'fixed',
+            top: '51px',
+            backgroundColor: '#fff',
+          })
+        } else {
+          $('aside section:eq(0)').css({
+            position: 'inherit',
+            borderLeft: 0,
+          })
+        }
+      })
    }
-};
-Skin.init();
+  },
+  initArticle: function (tocLabel, siteViewLabel) {
+    this._initArticleCommon(tocLabel, siteViewLabel)
+  },
+}
+Skin.init()
--- a/9IPHP/page.ftl
+++ b/9IPHP/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/9IPHP/side.ftl
+++ b/9IPHP/side.ftl
@ -17,7 +17,26 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 -->
-<aside>
+<aside<#if article?? && article.articleToC?size &gt; 0 > class="has-toc"</#if>>
+    <ul class="fn__clear fn__none">
+        <li class="current" data-tab="toc">
+        ${tocLabel}
+        </li>
+        <li data-tab="site">
+        ${siteViewLabel}
+        </li>
+    </ul>
+    <section>
+        <#if article??>
+            <ul class="article__toc">
+                <#list article.articleToC as item>
+                    <li>
+                        <a class="${item.className}" href="#${item.id}">${item.text}</a>
+                    </li>
+                </#list>
+            </ul>
+        </#if>
+    </section>
    <section>
        <#if noticeBoard??>
            <div class="ad vditor-reset">
@ -33,7 +52,7 @@
                        <a href="${servePath}/category/${category.categoryURI}"
                           aria-label="${category.categoryTagCnt} ${cntLabel}${tagsLabel}"
                           class="tag tooltipped tooltipped-n">
-                                ${category.categoryTitle}</a>
+                            ${category.categoryTitle}</a>
                    </#list>
                </main>
            </div>
@ -48,7 +67,7 @@
                           href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}"
                           class="tag tooltipped tooltipped-n"
                           aria-label="${tag.tagPublishedRefCount} ${countLabel}${articleLabel}">
-                                ${tag.tagTitle}</a>
+                            ${tag.tagTitle}</a>
                    </#list>
                </main>
            </div>
@ -62,13 +81,13 @@
                <img src="${adminUser.userAvatar}" aria-label="${adminUser.userName}"/>
                <div class="fn-right">
                    <a href="${servePath}/archives.html">
-                        ${statistic.statisticPublishedBlogArticleCount}
+                    ${statistic.statisticPublishedBlogArticleCount}
                        <span class="ft-gray">${articleLabel}</span></a><br/>
                    <a href="${servePath}/dynamic.html">
-                        ${statistic.statisticPublishedBlogCommentCount}
+                    ${statistic.statisticPublishedBlogCommentCount}
                        <span class="ft-gray">${commentLabel}</span></a><br/>
-                    ${statistic.statisticBlogViewCount} <span class="ft-gray">${viewLabel}</span><br/>
-                    ${onlineVisitorCnt} <span class="ft-gray">${onlineVisitorLabel}</span>
+                ${statistic.statisticBlogViewCount} <span class="ft-gray">${viewLabel}</span><br/>
+                ${onlineVisitorCnt} <span class="ft-gray">${onlineVisitorLabel}</span>
                </div>
            </main>
        </div>
--- a/Andrea/article.ftl
+++ b/Andrea/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/Andrea/page.ftl
+++ b/Andrea/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/Bruce/article.ftl
+++ b/Bruce/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/Bruce/page.ftl
+++ b/Bruce/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/Community/article.ftl
+++ b/Community/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/Community/page.ftl
+++ b/Community/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/Finding/article.ftl
+++ b/Finding/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/Finding/page.ftl
+++ b/Finding/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/Jane/article.ftl
+++ b/Jane/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
 <head>
--- a/Jane/page.ftl
+++ b/Jane/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
 <head>
--- a/Medium/article.ftl
+++ b/Medium/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
 <head>
--- a/Medium/page.ftl
+++ b/Medium/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
 <head>
--- a/NeoEase/article.ftl
+++ b/NeoEase/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/NeoEase/page.ftl
+++ b/NeoEase/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/Pinghsu/article.ftl
+++ b/Pinghsu/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
 <head>
--- a/Pinghsu/page.ftl
+++ b/Pinghsu/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
 <head>
--- a/favourite/article.ftl
+++ b/favourite/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/favourite/page.ftl
+++ b/favourite/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/i-nove/article.ftl
+++ b/i-nove/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/i-nove/page.ftl
+++ b/i-nove/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/metro-hot/article.ftl
+++ b/metro-hot/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <#include "macro-side.ftl">
 <!DOCTYPE html>
 <html>
--- a/metro-hot/page.ftl
+++ b/metro-hot/page.ftl
@ -20,7 +20,7 @@
 <#include "macro-head.ftl">
 <#include "macro-side.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/next/article.ftl
+++ b/next/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/next/page.ftl
+++ b/next/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/nijigen/article.ftl
+++ b/nijigen/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
 <head>
--- a/nijigen/page.ftl
+++ b/nijigen/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
 <head>
--- a/owmx-3.0/article.ftl
+++ b/owmx-3.0/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/owmx-3.0/page.ftl
+++ b/owmx-3.0/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/timeline/article.ftl
+++ b/timeline/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/timeline/page.ftl
+++ b/timeline/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/tree-house/article.ftl
+++ b/tree-house/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/tree-house/page.ftl
+++ b/tree-house/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/yilia/article.ftl
+++ b/yilia/article.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>
--- a/yilia/page.ftl
+++ b/yilia/page.ftl
@ -19,7 +19,7 @@
 -->
 <#include "macro-head.ftl">
 <#include "macro-comments.ftl">
-<#include "../../common-template/macro-comment-script.ftl">
+<#include "../../common-template/macro-comment_script.ftl">
 <!DOCTYPE html>
 <html>
    <head>