Merge pull request #39 from myqianlan/master

感谢 @myqianlan 的PR
xiangming · Dec 29, 2014 · b2178bf · b2178bf
2 parents 6c9e1a5 + e43b179
commit b2178bf
Show file tree

Hide file tree

Showing 12 changed files with 91 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@ __MACOSX/
 public/
 .deploy/
 _SYNCAPP
-metadata.xml
+metadata.xml
+/.idea
diff --git a/_config.yml b/_config.yml
@@ -7,6 +7,7 @@ rss: /atom.xml
 # Content
 excerpt_link: Read More
 fancybox: false
+mathjax: false
 
 # Sidebar
 sidebar: right

diff --git a/languages/default.yml b/languages/default.yml
@@ -16,4 +16,5 @@ menu: Menu
 rss: RSS
 showsidebar: Show Sidebar
 hidesidebar: Hide Sidebar
-updated: Updated
+updated: Updated
+totop: totop
diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml
@@ -16,4 +16,5 @@ menu: 菜单
 rss: RSS 订阅
 showsidebar: 显示侧边栏
 hidesidebar: 隐藏侧边栏
-updated: 更新日期
+updated: 更新日期
+totop: 返回顶部
diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml
@@ -16,4 +16,5 @@ menu: 菜單
 rss: RSS 訂閱
 showsidebar: 顯示側邊欄
 hidesidebar: 隱藏側邊欄
-updated: 更新日期
+updated: 更新日期
+totop: 返回頂部
diff --git a/layout/_partial/after-footer.ejs b/layout/_partial/after-footer.ejs
@@ -1,3 +1,6 @@
+<!-- totop start -->
+<%- partial('totop') %>
+<!-- totop end -->
 <% if (theme.duoshuo_shortname){ %>
 <!-- 多说公共js代码 start -->
 <script type="text/javascript">
@@ -50,5 +53,7 @@ var duoshuoQuery = {short_name:"<%= theme.duoshuo_shortname %>"};
   <%- js('fancybox/jquery.fancybox.pack') %>
 <% } %>
 
+<% if (theme.mathjax){ %>
 <%- partial('mathjax') %>
+<% } %>
 <%- js('js/script') %>
diff --git a/layout/_partial/totop.ejs b/layout/_partial/totop.ejs
@@ -0,0 +1,3 @@
+<div id="totop">
+<a title="<%= __('totop')%>"><img src="/img/scrollup.png"/></a>
+</div>
diff --git a/layout/layout.ejs b/layout/layout.ejs
@@ -1,18 +1,43 @@
+<% if(page.layout=='page'){ %>
+<% if(page.source.match(/\.md$/)){ %>
 <%- partial('_partial/head') %>
 <body>
-  <div id="container">
-    <div id="wrap">
-      <%- partial('_partial/header', null, {cache: !config.relative_link}) %>
-      <div class="outer">
-        <section id="main"><%- body %></section>
-        <% if (theme.sidebar && theme.sidebar !== 'bottom'){ %>
-          <%- partial('_partial/sidebar', null, {cache: !config.relative_link}) %>
-        <% } %>
-      </div>
-      <%- partial('_partial/footer', null, {cache: !config.relative_link}) %>
+<div id="container">
+  <div id="wrap">
+    <%- partial('_partial/header', null, {cache: !config.relative_link}) %>
+    <div class="outer">
+      <section id="main"><%- body %></section>
+      <% if (theme.sidebar && theme.sidebar !== 'bottom'){ %>
+      <%- partial('_partial/sidebar', null, {cache: !config.relative_link}) %>
+      <% } %>
     </div>
-    <%- partial('_partial/mobile-nav', null, {cache: !config.relative_link}) %>
-    <%- partial('_partial/after-footer') %>
+    <%- partial('_partial/footer', null, {cache: !config.relative_link}) %>
   </div>
+  <%- partial('_partial/mobile-nav', null, {cache: !config.relative_link}) %>
+  <%- partial('_partial/after-footer') %>
+</div>
 </body>
-</html>
+</html>
+<% }else{ %>
+<%- page.content %>
+<% } %>
+<% }else{ %>
+<%- partial('_partial/head') %>
+<body>
+<div id="container">
+  <div id="wrap">
+    <%- partial('_partial/header', null, {cache: !config.relative_link}) %>
+    <div class="outer">
+      <section id="main"><%- body %></section>
+      <% if (theme.sidebar && theme.sidebar !== 'bottom'){ %>
+      <%- partial('_partial/sidebar', null, {cache: !config.relative_link}) %>
+      <% } %>
+    </div>
+    <%- partial('_partial/footer', null, {cache: !config.relative_link}) %>
+  </div>
+  <%- partial('_partial/mobile-nav', null, {cache: !config.relative_link}) %>
+  <%- partial('_partial/after-footer') %>
+</div>
+</body>
+</html>
+<% } %>
diff --git a/source/css/_partial/totop.styl b/source/css/_partial/totop.styl
@@ -0,0 +1,9 @@
+#totop
+  position fixed
+  display none
+  z-index 9999
+  bottom 5em
+  right 1em
+  cursor pointer
+  @media tabletmax
+    display none !important
diff --git a/source/css/style.styl b/source/css/style.styl
@@ -83,6 +83,7 @@ if sidebar is left
 @import "_partial/footer"
 @import "_partial/highlight"
 @import "_partial/mobile"
+@import "_partial/totop"
 
 if sidebar
   @import "_partial/sidebar"
diff --git a/source/img/scrollup.png b/source/img/scrollup.png
diff --git a/source/js/script.js b/source/js/script.js
@@ -1,4 +1,30 @@
 (function($){
+  /*toTop start*/
+  // When to show the scroll link
+  // higher number = scroll link appears further down the page
+  var upperLimit = 1000;
+  // Our scroll link element
+  var scrollElem = $('#totop');
+  // Scroll to top speed
+  var scrollSpeed = 500;
+  // Show and hide the scroll to top link based on scroll position
+  $(window).scroll(function() {
+    var scrollTop = $(document).scrollTop();
+    if (scrollTop > upperLimit) {
+      $(scrollElem).stop().fadeTo(300, 1); // fade back in
+    } else {
+      $(scrollElem).stop().fadeTo(300, 0); // fade out
+    }
+  });
+
+  // Scroll to top animation on click
+  $(scrollElem).click(function() {
+    $('html, body').animate({
+      scrollTop: 0
+    }, scrollSpeed);
+    return false;
+  });
+  /*toTop end*/
   // Search
   var $searchWrap = $('#search-form-wrap'),
     isSearchAnim = false,