diff options
| -rw-r--r-- | source/_includes/article.html | 6 | ||||
| -rw-r--r-- | source/_includes/banner.html | 12 | ||||
| -rw-r--r-- | source/_includes/custom/after_footer.html | 3 | ||||
| -rw-r--r-- | source/_includes/header.html | 14 | ||||
| -rw-r--r-- | source/_includes/post/sharing.html | 8 | ||||
| -rw-r--r-- | source/javascripts/twitter.js | 152 |
6 files changed, 109 insertions, 86 deletions
diff --git a/source/_includes/article.html b/source/_includes/article.html index 347a52d..ddb24f3 100644 --- a/source/_includes/article.html +++ b/source/_includes/article.html @@ -3,12 +3,12 @@ <div class="entry"> {{ content | excerpt }} {% capture excerpted %}{{ content | has_excerpt }}{% endcapture %} - {% if excerpted == 'true' %}<a href="{{ root_url }}{{ post.url }}" class="more-link">閱讀全文</a>{% endif %} + {% if excerpted == 'true' %}<a href="{{ root_url }}{{ post.url }}" class="more-link">{{ site.excerpt_link }}</a>{% endif %} </div> <div class="meta"> <div class="date">{% include post/date.html %}{{ time }}</div> <div class="tags">{% include post/categories.html %}</div> - {% if site.disqus_short_name and post.comments == true %} + {% if site.disqus_short_name and post.comments == true and site.disqus_show_comment_count == true %} <div class="comments"><a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread">留言</a></div> {% endif %} </div> @@ -18,7 +18,7 @@ <div class="meta"> <div class="date">{% include post/date.html %}{{ time }}</div> <div class="tags">{% include post/categories.html %}</div> - {% if site.disqus_short_name and page.comments == true %} + {% if site.disqus_short_name and page.comments == true and site.disqus_show_comment_count == true %} <div class="comments"><a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread">留言</a></div> {% endif %} </div> diff --git a/source/_includes/banner.html b/source/_includes/banner.html index 5839bd4..e2493c9 100644 --- a/source/_includes/banner.html +++ b/source/_includes/banner.html @@ -1,7 +1,15 @@ +{% if site.twitter_user %} <div id="banner" class="inner"> <div class="container"> <ul class="feed"></ul> </div> - <small><a href="http://twitter.com/tommy351">tommy351</a> @ <a href="http://twitter.com">Twitter</a></small> + <small><a href="http://twitter.com/{{ site.twitter_user }}">{{ site.twitter_user }}</a> @ <a href="http://twitter.com">Twitter</a></small> <div class="loading">載入中...</div> -</div>
\ No newline at end of file +</div> +<script src="{{ root_url }}/javascripts/twitter.js"></script> +<script type="text/javascript"> + (function($){ + $('#banner').getTwitterFeed('{{ site.twitter_user }}', {{ site.twitter_tweet_count }}); + })(jQuery); +</script> +{% endif %}
\ No newline at end of file diff --git a/source/_includes/custom/after_footer.html b/source/_includes/custom/after_footer.html index 50003bb..1ea5c22 100644 --- a/source/_includes/custom/after_footer.html +++ b/source/_includes/custom/after_footer.html @@ -2,5 +2,4 @@ <script src="{{ root_url }}/javascripts/external.js"></script> <script src="{{ root_url }}/javascripts/navigation.js"></script> <script src="{{ root_url }}/javascripts/jquery.fancybox.pack.js"></script> -<script src="{{ root_url }}/javascripts/caption.js"></script> -<script src="{{ root_url }}/javascripts/twitter.js"></script>
\ No newline at end of file +<script src="{{ root_url }}/javascripts/caption.js"></script>
\ No newline at end of file diff --git a/source/_includes/header.html b/source/_includes/header.html index ac544be..234ffae 100644 --- a/source/_includes/header.html +++ b/source/_includes/header.html @@ -6,10 +6,18 @@ <input type="hidden" name="q" value="site:{{ site.url | shorthand_url }}"> </form> <div class="social right"> - <a href="http://www.facebook.com/tommy351" title="Facebook">Facebook</a> - <a href="https://plus.google.com/105931860008509594725" title="Google+">Google+</a> - <a href="http://twitter.com/tommy351" title="Twitter">Twitter</a> + {% if site.facebook_user %} + <a href="http://www.facebook.com/{{ site.facebook_user }}" title="Facebook">Facebook</a> + {% endif %} + {% if site.googleplus_user %} + <a href="https://plus.google.com/{{ site.googleplus_user }}" title="Google+">Google+</a> + {% endif %} + {% if site.twitter_user %} + <a href="http://twitter.com/{{ site.twitter_user }}" title="Twitter">Twitter</a> + {% endif %} + {% if site.subscribe_rss %} <a href="{{ site.subscribe_rss }}" title="RSS">RSS</a> + {% endif %} </div> </div> {% include custom/header.html %}
\ No newline at end of file diff --git a/source/_includes/post/sharing.html b/source/_includes/post/sharing.html index d41d1e0..b099de9 100644 --- a/source/_includes/post/sharing.html +++ b/source/_includes/post/sharing.html @@ -1,8 +1,14 @@ <div class="share"> <div class="addthis_toolbox addthis_default_style "> + {% if site.facebook_like %} <a class="addthis_button_facebook_like" fb:like:layout="button_count"></a> + {% endif %} + {% if site.twitter_tweet_button %} <a class="addthis_button_tweet"></a> - <a class="addthis_button_google_plusone" g:plusone:size="medium"></a> + {% endif %} + {% if site.google_plus_one %} + <a class="addthis_button_google_plusone" g:plusone:size="{{ site.google_plus_one_size }}"></a> + {% endif %} <a class="addthis_counter addthis_pill_style"></a> </div> <script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js#pubid=xa-4eb4a0c47196e907"></script> diff --git a/source/javascripts/twitter.js b/source/javascripts/twitter.js index 92fb7b1..3be21a0 100644 --- a/source/javascripts/twitter.js +++ b/source/javascripts/twitter.js @@ -1,90 +1,92 @@ (function($){ - var banner = $('#banner'), - feed = banner.find('.feed'), - interval = 10000, - speed = 500; + $.fn.getTwitterFeed = function(userid, count){ + var banner = $(this), + feed = banner.find('.feed'), + interval = 10000, + speed = 500; - var linkify = function(text){ - text = text.replace(/(https?:\/\/)([\w\-:;?&=+.%#\/]+)/gi, '<a href="$1$2">$2</a>').replace(/(^|\W)@(\w+)/g, '$1<a href="http://twitter.com/$2">@$2</a>').replace(/(^|\W)#(\w+)/g, '$1<a href="http://search.twitter.com/search?q=%23$2">#$2</a>'); + var linkify = function(text){ + text = text.replace(/(https?:\/\/)([\w\-:;?&=+.%#\/]+)/gi, '<a href="$1$2">$2</a>').replace(/(^|\W)@(\w+)/g, '$1<a href="http://twitter.com/$2">@$2</a>').replace(/(^|\W)#(\w+)/g, '$1<a href="http://search.twitter.com/search?q=%23$2">#$2</a>'); - return text; - } + return text; + } - var relativeDate = function(date){ - if (navigator.appName === 'Microsoft Internet Explorer') return ''; + var relativeDate = function(date){ + if (navigator.appName === 'Microsoft Internet Explorer') return ''; - var unit = { - now: '現在', - minute: '1 分鐘前', - minutes: ' 分鐘前', - hour: '1 小時前', - hours: ' 小時前', - day: '昨天', - days: ' 天前', - week: '1 週前', - weeks: ' 週前' - }; + var unit = { + now: '現在', + minute: '1 分鐘前', + minutes: ' 分鐘前', + hour: '1 小時前', + hours: ' 小時前', + day: '昨天', + days: ' 天前', + week: '1 週前', + weeks: ' 週前' + }; - var current = new Date(), - tweet = new Date(date), - diff = (((current.getTime() + (1 * 60000)) - tweet.getTime()) / 1000), - day_diff = Math.floor(diff / 86400); - - if (day_diff == 0){ - if (diff < 60) return unit.now; - else if (diff < 120) return unit.minute; - else if (diff < 3600) return Math.floor(diff / 60) + unit.minutes; - else if (diff < 7200) return unit.hour; - else if (diff < 86400) return Math.floor(diff / 3600) + unit.hours; - else return ''; - } else if (day_diff == 1) { - return unit.day; - } else if (day_diff < 7) { - return day_diff + unit.days; - } else if (day_diff == 7) { - return unit.week; - } else if (day_diff > 7) { - return Math.ceil(day_diff / 7) + unit.weeks; - } else { - return ''; + var current = new Date(), + tweet = new Date(date), + diff = (((current.getTime() + (1 * 60000)) - tweet.getTime()) / 1000), + day_diff = Math.floor(diff / 86400); + + if (day_diff == 0){ + if (diff < 60) return unit.now; + else if (diff < 120) return unit.minute; + else if (diff < 3600) return Math.floor(diff / 60) + unit.minutes; + else if (diff < 7200) return unit.hour; + else if (diff < 86400) return Math.floor(diff / 3600) + unit.hours; + else return ''; + } else if (day_diff == 1) { + return unit.day; + } else if (day_diff < 7) { + return day_diff + unit.days; + } else if (day_diff == 7) { + return unit.week; + } else if (day_diff > 7) { + return Math.ceil(day_diff / 7) + unit.weeks; + } else { + return ''; + } } - } - if ($(window).width() > 600){ - banner.show(); + if ($(window).width() > 600){ + banner.show(); - $.getJSON('http://twitter.com/status/user_timeline/tommy351.json?count=10&callback=?', function(json){ - var length = json.length, - fragment = document.createDocumentFragment(), - counts = 0, - timeout; + $.getJSON('http://twitter.com/status/user_timeline/'+userid+'.json?count='+count+'&callback=?', function(json){ + var length = json.length, + fragment = document.createDocumentFragment(), + counts = 0, + timeout; - for (var i=0; i<length; i++){ - var item = document.createElement('li'); - item.innerHTML = linkify(json[i].text) + '<small>'+relativeDate(json[i].created_at)+'</small>'; - fragment.appendChild(item); - } + for (var i=0; i<length; i++){ + var item = document.createElement('li'); + item.innerHTML = linkify(json[i].text) + '<small>'+relativeDate(json[i].created_at)+'</small>'; + fragment.appendChild(item); + } - var play = function(){ - timeout = setTimeout(function(){ - feed.animate({top: '-='+30}, speed, function(){ - $(this).append($(this).children().eq(counts).clone()); - counts++; - play(); - }); - }, interval); - } + var play = function(){ + timeout = setTimeout(function(){ + feed.animate({top: '-='+30}, speed, function(){ + $(this).append($(this).children().eq(counts).clone()); + counts++; + play(); + }); + }, interval); + } - var pause = function(){ - clearTimeout(timeout); - } + var pause = function(){ + clearTimeout(timeout); + } - banner.on('mouseenter', pause).on('mouseleave', play) - .children('.loading').hide().end() - .children('.container').show() - .children('.feed').append(fragment); + banner.on('mouseenter', pause).on('mouseleave', play) + .children('.loading').hide().end() + .children('.container').show() + .children('.feed').append(fragment); - play(); - }); - } + play(); + }); + } + }; })(jQuery);
\ No newline at end of file |