add some function:

1. 添加百度推荐 2. 添加日历云
pengloo53 · May 12, 2016 · 8f1bae1 · 8f1bae1
1 parent 807c8cf
commit 8f1bae1
Show file tree

Hide file tree

Showing 19 changed files with 1,077 additions and 39 deletions.
diff --git a/_config.yml b/_config.yml
@@ -1,9 +1,6 @@
 menu:
   首页: /
-#  文集: /collection
-#  图集: /gallery
   归档: /archives
-  分类: /index.html#categories
   关于我: /resume
 
 submenu:
@@ -12,15 +9,15 @@ submenu:
 
 
 widgets:
-#- search
+- search
 - category
-- baidu_tuijian
-- archive
+- calendar
 - recent_comments
-# - tag
+- links
 - tagcloud
-- weibo
-
+# - tag
+# - archive
+# - weibo
 
 excerpt_link: Read More
 comment_link: Comments
@@ -30,30 +27,34 @@ avatar: /assets/img/avatar/avatar.jpg
 # header右侧图片展示
 ad: /assets/img/avatar/hello.jpg
 
-
 baidu_share: true
 
 # 请到baidu_tongji.ejs中替换代码
-baidu_tongji: false
-
-# 百度推荐小挂件，enable是否开启，id百度推荐代码id
-baidu_tuijian: 
-  enable: false 
-  id: hm_t_88638
+baidu_tongji: true
 
 # enable是否开启；height小挂件高度；url替换成自己的微博挂件地址，同步修改url中height的值
 weibo:
   enable: false
-  height: 800
+  height: 400
   url: http://widget.weibo.com/weiboshow/index.php?language=&width=0&height=800&fansRow=1&ptype=1&speed=0&skin=1&isTitle=0&noborder=0&isWeibo=1&isFans=0&uid=1934606495&verifier=a6769878&dpc=1
 
 # 评论提供可以选择 duoshuo 或者 wumii，无需评论，此处不填就行。
 comment_provider: duoshuo
+# 推荐提供可以选择 wumii 或者 baidu_tuijian , 无需评论，此处不填即可。
+relate_provider: baidu_tuijian
 
 duoshuo:
   short_name: your duoshuo name
 
 wumii: 
   relateditems: false
-  siteprefix: http://lupeng.me
+  siteprefix: http://xxxxxx.com
+
+baidu_tuijian:
+  enable: false
+  id: hm_t_88638
+
+# Calendar
+calendar:
+  language: zh-CN
 
diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml
@@ -10,3 +10,4 @@ archive_a: 归档
 archive_b: 归档：%s
 page: 第 %d 页
 recent_posts: 最新文章
+calendar: 日历云
diff --git a/layout/_partial/after_footer.ejs b/layout/_partial/after_footer.ejs
@@ -1,6 +1,22 @@
 <script src="http://libs.baidu.com/jquery/2.1.1/jquery.min.js"></script>
 <script src="<%- config.root %>js/jquery.imagesloaded.min.js"></script>
 <script src="<%- config.root %>js/gallery.js"></script>
+
+<!-- add calendar widget -->
+<% if (theme.widgets.indexOf('calendar') != -1){ %>
+  <script src="<%- config.root %>js/calendar.js"></script>
+  <script src="<%- config.root %>js/languages.js"></script>
+  <script type="text/javascript">
+    $(function() {
+    <% if (theme.calendar.options){ %>
+      $('#calendar').aCalendar('<%= theme.calendar.language || config.language %>', $.extend(<%- JSON.stringify(theme.calendar.options ) %>, {single:<%= config.calendar.single %>, root:'<%= config.calendar.root %>'});
+    <% }else{ %>
+      $('#calendar').aCalendar('<%= theme.calendar.language || config.language %>',{single:<%= config.calendar.single %>, root:'<%= config.calendar.root %>'});
+    <% } %>
+    });
+  </script>
+<% } %>
+
 <!-- 添加『不蒜子』计数服务 -->
 <script async src="http://dn-lbstatics.qbox.me/busuanzi/2.3/busuanzi.pure.mini.js"></script>
 
@@ -14,4 +30,4 @@
   $('.fancybox').fancybox();
 })(jQuery);
 </script>
-<% } %>
+<% } %>
diff --git a/layout/_partial/archive.ejs b/layout/_partial/archive.ejs
@@ -41,4 +41,4 @@ if (page.archive){
      <% }); %> 
   </div>
   <% } %>
-<%- partial('pagination') %>
+<%- partial('pagination') %>
diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs
@@ -22,7 +22,7 @@
       <% } %>
     </div>
     <footer>
-<!--       <% if (index){ %> -->
+      <% if (index){ %>
         <% if (item.excerpt){ %>
           <div class="alignleft">
             <a href="<%- config.root %><%- item.path %>#more" class="more-link"><%= theme.excerpt_link %></a>
@@ -33,19 +33,18 @@
           <a href="<%- config.root %><%- item.path %>#comment" class="comment-link"><%= theme.comment_link %></a>
         </div>
         <% } %>
-<!--       <% } else { %> -->
+      <% } else { %>
         <%- partial('post/category') %>
         <%- partial('post/tag') %>
         <%- partial('post/counter') %>
         <%- partial('post/share') %>
-<!--       <% } %> -->
+      <% } %>
       <div class="clearfix"></div>
     </footer>
   </div>
 </article>
-
-<%- partial('baidu_tongji') %>
-<%- partial('post/wumii') %>
-<%- partial('post/comment') %>
-
+<% if (!index) {%>
+  <%- partial('post/relate') %>
+  <%- partial('post/comment') %>
+<% } %>
 
diff --git a/layout/_partial/post/baidu_tuijian.ejs b/layout/_partial/post/baidu_tuijian.ejs
@@ -0,0 +1,3 @@
+<% if(theme.baidu_tuijian.enable){ %>
+  <div id="<%= theme.baidu_tuijian.id %>"></div>
+<% } %>
diff --git a/layout/_partial/post/comment.ejs b/layout/_partial/post/comment.ejs
@@ -8,4 +8,4 @@
     <%- partial('wumiicomments')%>
   <% } %>
 </section>
-<% } %>
+<% } %>
diff --git a/layout/_partial/post/relate.ejs b/layout/_partial/post/relate.ejs
@@ -0,0 +1,8 @@
+<section id = "relate">
+	<% if (theme.relate_provider == 'baidu_tuijian'){ %>
+	  <%- partial('baidu_tuijian') %>
+	<% } else if(theme.relate_provider == 'wumii'){%>
+	  <%- partial('wumii') %>
+	<% } %>	
+</section>
+
diff --git a/layout/_widget/calendar.ejs b/layout/_widget/calendar.ejs
@@ -0,0 +1,4 @@
+<div class="widget tag">
+  <h3 class="title"><%= __('calendar') %></h3>
+  <div id="calendar"></div>
+</div>
diff --git a/layout/_widget/links.ejs b/layout/_widget/links.ejs
@@ -0,0 +1,10 @@
+<% if (site.data.links){ %>
+  <div class="widget tag">
+    <h3 class="title">友情链接</h3>
+      <ul class="entry">
+        <% for (var i in site.data.links){ %>
+          <li class='link'><a href='<%- site.data.links[i] %>'><%= i %></a></li>
+        <% } %>
+      </ul>
+  </div>
+<% } %>
diff --git a/layout/_widget/recent_comments.ejs b/layout/_widget/recent_comments.ejs
@@ -1,7 +1,7 @@
 <div class="widget">
   <h3 class="title">最新评论</h3>
   	<!-- 多说最新评论 start -->
-	<div class="ds-recent-comments ds-recent-user" data-num-items="5" data-show-avatars="1" data-show-time="1" data-show-title="1" data-show-admin="1" data-excerpt-length="70"></div>
+	<div class="ds-recent-comments ds-recent-user" data-num-items="3" data-show-avatars="1" data-show-time="1" data-show-title="1" data-show-admin="1" data-excerpt-length="70"></div>
 	<!-- 多说最新评论 end -->
 	<!-- 多说公共JS代码 start (一个网页只需插入一次) -->
 	<script type="text/javascript">

diff --git a/layout/_widget/tag.ejs b/layout/_widget/tag.ejs
@@ -7,4 +7,4 @@
   <% }); %>
   </ul>
 </div>
-<% } %>
+<% } %>
diff --git a/source/css/_base/variable.styl b/source/css/_base/variable.styl
@@ -24,4 +24,7 @@ font-icon-path = 'font/fontawesome-webfont'
 }
 
 // Width
-page-width = 1060px
+page-width = 1060px
+
+// Calendar
+color-calendar-post-bg = #ea6753  // #007acc
diff --git a/source/css/_partial/calendar.styl b/source/css/_partial/calendar.styl
@@ -0,0 +1,101 @@
+#calendar
+  a
+    text-decoration none
+
+.cal-head
+  position relative
+  height 20px
+  padding 8px 6px 2px 6px
+
+.cal-prev,.cal-next
+  position absolute
+  top 9px
+  width 9px
+  height 10px
+  padding 3px 4px
+  border 1px solid transparent
+  color #333
+  outline 0
+
+.cal-prev
+  left 8px
+  &:before
+    border-right 9px solid #333
+
+.cal-next
+  right 8px
+  &:before
+    border-left 9px solid #333
+
+.cal-prev:before,.cal-next:before
+  content ''
+  display block
+  width 0
+  height 0
+  border-top 5px solid transparent
+  border-bottom 5px solid transparent
+
+.cal-title
+  width 120px
+  margin 0 auto
+  color #333
+  font bold 14px/18px Arial
+  text-align center
+  a
+    border 1px solid transparent
+    color color-link
+
+.cal,
+.cal th,
+.cal td
+  border 1px solid #eee
+
+.cal
+  border-collapse separate
+  border-spacing 0
+  border-width 1px 0 0 1px
+  table-layout fixed
+  width 100%
+  margin 0
+  th
+    color color-link
+    border-width 0 1px 1px 0
+    font-weight 700
+  td
+    border-width 0 1px 1px 0
+  tbody
+    a
+      background-color color-link
+      color #fff
+      display block
+      font-weight 700
+    .cal-today
+      color color-link
+      font-weight bold
+  .cal-gray
+    color #ddd
+
+.cal th,
+.cal td
+  font-weight normal
+  line-height 2.5625
+  padding 0
+  text-align center
+
+.cal .cal-foot
+  color color-link
+
+.cal-title a:hover,
+.cal-prev:hover,
+.cal-next:hover,
+.cal .cal-foot:hover,
+.cal .cal-foot:focus
+  background-color color-link
+  color #fff
+  cursor pointer
+
+.cal tbody a:hover,
+.cal tbody a:focus
+  background-color color-calendar-post-bg
+  color #fff
+  cursor pointer
diff --git a/source/css/_partial/header.styl b/source/css/_partial/header.styl
@@ -3,7 +3,7 @@
   margin-bottom 25px
 
   .avatar
-    background-image url(/assets/img/avatar/avatar.jpg)
+    background-image url(/assets/img/avatar/avatar.png)
     height 5em
     float left
     margin 0 0.8em
@@ -12,8 +12,8 @@
 
   .header-div
     a
-      font-family cursive
-      font-size 1.1em
+      font-family mistral 
+      font-size 1.3em
 
   .header-content
     padding 2em 0.5em
@@ -70,9 +70,6 @@
           background-color #EEE
           color #999
           font-style italic
-    a[href="/index.html#categories"]
-      @media screen and (min-width: 901px)
-        display none
 
   #sub-nav
     font-family font-title

diff --git a/source/css/_partial/relate.styl b/source/css/_partial/relate.styl
@@ -0,0 +1,3 @@
+#relate
+  margin-top 10px
+  margin-bottom 20px
diff --git a/source/css/style.styl b/source/css/style.styl
@@ -14,4 +14,6 @@
 @import '_partial/syntax'
 @import '_partial/resume'
 @import '_partial/toc'
-@import '_partial/gallery'
+@import '_partial/gallery'
+@import '_partial/relate'
+@import '_partial/calendar'