From d8a402e1484a74b4346db09d7771b0d25d0315de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=93=A2=E7=A7=80?= <quanruzhuoxiu@gmail.com>
Date: Fri, 17 Jul 2015 12:06:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=98=93?=
 =?UTF-8?q?=E4=BA=91=E9=9F=B3=E4=B9=90=E6=8F=92=E4=BB=B6,=E5=B9=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E5=8D=9A=E6=8F=92=E4=BB=B6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在widgets中添加插件music,之后在author中添加music_id:
---
 languages/default.yml            |  1 +
 languages/zh-CN.yml              |  1 +
 languages/zh-TW.yml              |  1 +
 layout/_partial/after_footer.ejs | 37 +++++++++++++++++++++++++-------
 layout/_partial/footer.ejs       |  2 +-
 layout/_widget/music.ejs         |  4 ++++
 layout/_widget/weibo.ejs         |  4 ++--
 source/css/_partial/aside.styl   | 14 ++++++++++++
 8 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100644 layout/_widget/music.ejs

diff --git a/languages/default.yml b/languages/default.yml
index 0482680..4eb6fb9 100644
--- a/languages/default.yml
+++ b/languages/default.yml
@@ -13,6 +13,7 @@ page: Page %d
 recent_posts: Recent Posts
 menu: Menu
 weibo: Weibo
+music: music
 links: Links
 rss: RSS
 showsidebar: Show Sidebar
diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml
index 7cafd09..56c40ff 100644
--- a/languages/zh-CN.yml
+++ b/languages/zh-CN.yml
@@ -14,6 +14,7 @@ recent_posts: 近期文章
 menu: 菜单
 links: 友情链接
 weibo: 新浪微博
+music: 云音乐
 rss: RSS 订阅
 showsidebar: 显示侧边栏
 hidesidebar: 隐藏侧边栏
diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml
index ee639b4..6ae343b 100644
--- a/languages/zh-TW.yml
+++ b/languages/zh-TW.yml
@@ -14,6 +14,7 @@ recent_posts: 近期文章
 menu: 菜單
 links: 友情鏈接
 weibo: 新浪微博
+music: 雲音楽
 rss: RSS 訂閱
 showsidebar: 顯示側邊欄
 hidesidebar: 隱藏側邊欄
diff --git a/layout/_partial/after_footer.ejs b/layout/_partial/after_footer.ejs
index 9ec284c..792da7b 100644
--- a/layout/_partial/after_footer.ejs
+++ b/layout/_partial/after_footer.ejs
@@ -1,6 +1,7 @@
 <script src="<%- config.root %>js/jquery-2.0.3.min.js"></script>
 <script src="<%- config.root %>js/jquery.imagesloaded.min.js"></script>
 <script src="<%- config.root %>js/gallery.js"></script>
+<script src="<%- config.root %>js/jquery.qrcode-0.12.0.min.js"></script>
 
 <script type="text/javascript">
 $(document).ready(function(){ 
@@ -90,8 +91,8 @@ $(document).ready(function(){
       tsina = $this.attr('data-tsina'),
       description = $this.attr('description');
   var html = [
-  '<a href="#" class="overlay" id="qrcode"></a>',
-  '<div class="qrcode clearfix"><span>扫描二维码分享到微信朋友圈</span><a class="qrclose" href="#nothing"></a><strong>Loading...Please wait</strong><img id="qrcode-pic" data-src="http://s.jiathis.com/qrcode.php?url=' + encodedUrl + '"/></div>',
+  '<div class="hoverqrcode clearfix"></div>',
+  '<a class="overlay" id="qrcode"></a>',
   '<a href="https://www.facebook.com/sharer.php?u=' + encodedUrl + '" class="article-share-facebook" target="_blank" title="Facebook"></a>',
   '<a href="https://twitter.com/intent/tweet?url=' + encodedUrl + '" class="article-share-twitter" target="_blank" title="Twitter"></a>',
   '<a href="#qrcode" class="article-share-qrcode" title="微信"></a>',
@@ -100,14 +101,34 @@ $(document).ready(function(){
   '<span title="Share to"></span>'
   ].join('');
   $this.append(html);
+
+  $('.hoverqrcode').hide();
+
+  var myWidth = 0;
+  function updatehoverqrcode(){
+    if( typeof( window.innerWidth ) == 'number' ) {
+      myWidth = window.innerWidth;
+    } else if( document.documentElement && document.documentElement.clientWidth) {
+      myWidth = document.documentElement.clientWidth;
+    };
+    var qrsize = myWidth > 1024 ? 200:100;
+    var options = {render: 'image', size: qrsize, fill: '#2ca6cb', text: url, radius: 0.5, quiet: 1};
+    var p = $('.article-share-qrcode').position();
+    $('.hoverqrcode').empty().css('width', qrsize).css('height', qrsize)
+                          .css('left', p.left-qrsize/2+20).css('top', p.top-qrsize-10)
+                          .qrcode(options);
+  };
+  $(window).resize(function(){
+    $('.hoverqrcode').hide();
+  });
   $('.article-share-qrcode').click(function(){
-    var imgSrc = $('#qrcode-pic').attr('data-src');
-    $('#qrcode-pic').attr('src', imgSrc);
-    $('#qrcode-pic').load(function(){
-        $('.qrcode strong').text(' ');
-    });
+    updatehoverqrcode();
+    $('.hoverqrcode').toggle();
+  });
+  $('.article-share-qrcode').hover(function(){}, function(){
+      $('.hoverqrcode').hide();
   });
-});     
+});   
 </script>
 <% } %>
 
diff --git a/layout/_partial/footer.ejs b/layout/_partial/footer.ejs
index 0bd9e24..153db3b 100644
--- a/layout/_partial/footer.ejs
+++ b/layout/_partial/footer.ejs
@@ -34,7 +34,7 @@
 		<a href="https://www.douban.com/people/<%=theme.author.douban %>" target="_blank" class="icon-douban" title="豆瓣"></a>
 		<% } %>
 		<% if(theme.author.zhihu){ %>
-		<a href="https://www.zhihu.com/people/<%=theme.author.zhihu %>" target="_blank" class="icon-zhihu" title="知乎"></a>
+		<a href="http://www.zhihu.com/people/<%=theme.author.zhihu %>" target="_blank" class="icon-zhihu" title="知乎"></a>
 		<% } %>
 		<% if(theme.author.google_plus){ %>
 		<a href="https://plus.google.com/<%=theme.author.google_plus %>?rel=author" target="_blank" class="icon-google_plus" title="Google+"></a>
diff --git a/layout/_widget/music.ejs b/layout/_widget/music.ejs
new file mode 100644
index 0000000..a12a6df
--- /dev/null
+++ b/layout/_widget/music.ejs
@@ -0,0 +1,4 @@
+<div class="music">
+  <p class="asidetitle"><%= __('music') %></p>
+    <iframe frameborder="no" border="0" marginwidth="0" marginheight="0" width=100% height=52 src="http://music.163.com/outchain/player?type=0&id=<%= theme.author.music_id %>&auto=1&height=32"></iframe>
+</div>
\ No newline at end of file
diff --git a/layout/_widget/weibo.ejs b/layout/_widget/weibo.ejs
index ca6b8cf..3e62487 100644
--- a/layout/_widget/weibo.ejs
+++ b/layout/_widget/weibo.ejs
@@ -1,4 +1,4 @@
 <div class="weiboshow">
   <p class="asidetitle"><%= __('weibo') %></p>
-    <iframe width="100%" height="119" class="share_self"  frameborder="0" scrolling="no" src="http://widget.weibo.com/weiboshow/index.php?language=&width=0&height=119&fansRow=2&ptype=1&speed=0&skin=9&isTitle=1&noborder=1&isWeibo=0&isFans=0&uid=<%= theme.author.tsina %>&verifier=<%- theme.author.weibo_verifier %>&dpc=1"></iframe>
-</div>
+    <iframe width="100%" height="550" class="share_self"  frameborder="0" scrolling="no" src="http://widget.weibo.com/weiboshow/index.php?language=&width=0&height=550&fansRow=2&ptype=1&speed=0&skin=1&isTitle=1&noborder=0&isWeibo=1&isFans=0&uid=<%= theme.author.tsina %>&verifier=<%- theme.author.weibo_verifier %>&dpc=1"></iframe>
+</div>
\ No newline at end of file
diff --git a/source/css/_partial/aside.styl b/source/css/_partial/aside.styl
index c600b13..00207bd 100644
--- a/source/css/_partial/aside.styl
+++ b/source/css/_partial/aside.styl
@@ -210,6 +210,20 @@
   iframe
     padding 0.5em 0
 
+//netease-music
+.music
+  margin-top 0.5em 
+  @media mini
+    width 45%
+    float left
+    margin 0 5% 0 0
+  @media tablet 
+    width 100%
+    float none
+    margin 1em 0 0
+  iframe
+    padding 0.5em 0
+
 //douban
 .doubanshow
   margin-top 0.5em

From 8b2f8fb42920bb00d4bdeaa37f78d3ad48db7015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=93=A2=E7=A7=80?= <quanruzhuoxiu@gmail.com>
Date: Thu, 27 Aug 2015 17:09:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=9D=9E=E7=BD=91?=
 =?UTF-8?q?=E6=98=93=E9=9F=B3=E4=B9=90=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layout/_partial/after_footer.ejs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/layout/_partial/after_footer.ejs b/layout/_partial/after_footer.ejs
index 792da7b..5912858 100644
--- a/layout/_partial/after_footer.ejs
+++ b/layout/_partial/after_footer.ejs
@@ -1,7 +1,6 @@
 <script src="<%- config.root %>js/jquery-2.0.3.min.js"></script>
 <script src="<%- config.root %>js/jquery.imagesloaded.min.js"></script>
 <script src="<%- config.root %>js/gallery.js"></script>
-<script src="<%- config.root %>js/jquery.qrcode-0.12.0.min.js"></script>
 
 <script type="text/javascript">
 $(document).ready(function(){ 
@@ -91,8 +90,8 @@ $(document).ready(function(){
       tsina = $this.attr('data-tsina'),
       description = $this.attr('description');
   var html = [
-  '<div class="hoverqrcode clearfix"></div>',
-  '<a class="overlay" id="qrcode"></a>',
+'<a href="#" class="overlay" id="qrcode"></a>',
+'<div class="qrcode clearfix"><span>扫描二维码分享到微信朋友圈</span><a class="qrclose" href="#nothing"></a><strong>Loading...Please wait</strong><img id="qrcode-pic" data-src="http://s.jiathis.com/qrcode.php?url=' + encodedUrl + '"/></div>',
   '<a href="https://www.facebook.com/sharer.php?u=' + encodedUrl + '" class="article-share-facebook" target="_blank" title="Facebook"></a>',
   '<a href="https://twitter.com/intent/tweet?url=' + encodedUrl + '" class="article-share-twitter" target="_blank" title="Twitter"></a>',
   '<a href="#qrcode" class="article-share-qrcode" title="微信"></a>',