Permalink
Browse files

update jekyll

  • Loading branch information...
1 parent 4195071 commit 62a6cab03e7cfa6e9c6ae5e8fb157b39bf673e93 Andrei Neculau committed Mar 29, 2013
@@ -1,3 +0,0 @@
-<a class="twitter-timeline" href="https://twitter.com/andreineculau/apish" data-widget-id="283576315959971841">Tweets from @andreineculau/apish</a>
-<a class="twitter-timeline" href="https://twitter.com/andreineculau" data-widget-id="283572982620766208">Tweets by @andreineculau</a>
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
@@ -0,0 +1,5 @@
+{% if page.url == '/index.html' %}
+ <a class="twitter-timeline" href="https://twitter.com/andreineculau/apish" data-widget-id="283576315959971841">Tweets from @andreineculau/apish</a>
+ <a class="twitter-timeline" href="https://twitter.com/andreineculau" data-widget-id="283572982620766208">Tweets by @andreineculau</a>
+ <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+{% endif %}
@@ -0,0 +1,20 @@
+<div id="post-comments">
+ {% if site.comments.twitter and site.comments.twitter.enabled == true and page_author.twitter %}
+ <a href="https://twitter.com/intent/tweet?screen_name={{ page_author.twitter }}&amp;text=re:&amp;url={{ site_pages_url | escape }}{{ page.url | escape }}">{{ text.leave_a_comment_on_twitter_to }} @{{ page_author.twitter }}</a>
+ <br><br>
+ {% endif %}
+
+ {% if page_comments_github_enabled %}
+ <!-- http://ivanzuzak.info/2011/02/18/github-hosted-comments-for-github-hosted-blogs.html -->
+ <a id="post-comments-url" href="https://github.com/{{ site.comments.github.author }}/{{ site.comments.github.repo }}/issues/{{ page_comments_github_id }}">{{ text.leave_a_comment_on_github }}</a>
+ <div id="post-comments-placeholder"></div>
+ <br><br>
+ {% endif %}
+
+ {% if page_comments_disqus_enabled %}
+ {{ text.leave_a_comment_on_disqus }}
+ <div id="disqus_thread"></div>
+ <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+ <a href="http://disqus.com" class="dsq-brlink">{{ text.comments_powered_by_disqus }}<span class="logo-disqus">Disqus</span></a>
+ {% endif %}
+</div>
@@ -0,0 +1,58 @@
+{% if page_comments_disqus_enabled %}
+ <script>
+ var disqus_shortname = '{{ site.comments.disqus.shortname }}',
+ disqus_identifier = '{{ page_comments_disqus_identifier }}',
+ disqus_url = '{{ page_comment_disqus_url }}';
+
+ /* * * DON'T EDIT BELOW THIS LINE * * */
+ (function() {
+ var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ })();
+ </script>
+
+{% endif %}
+
+{% if page_comments_github_enabled %}
+ <script src="//cdnjs.cloudflare.com/ajax/libs/datejs/1.0/date.min.js"></script>
+ <script src="{{ site.base_url }}/assets/strap-jekyll/js/strap-jekyll-comments-github.js"></script>
+ <script>
+ $.ajax('https://api.github.com/repos/{{ site.comments.github.author }}/{{ site.comments.github.repo }}/issues/{{ page_comments_github_id }}/comments', {
+ headers: {
+ accept: 'application/vnd.github.full+json'
+ },
+ dataType: 'json',
+ success: loadGithubComments
+ });
+ </script>
+{% endif %}
+
+{% if site.annotator %}
+ <script>
+ window._annotatorConfig = {
+ auth: {
+ tokenUrl: "http://annotateit.org/api/token"
+ },
+ store: {
+ prefix: "http://annotateit.org/api"
+ },
+ tags: !0
+ }
+ </script>
+ <script src="http://assets.annotateit.org/bookmarklet/bootstrap.js"></script>
+{% endif %}
+
+{% if site.analytics and site.analytics.enabled == true and site.analytics.google.enabled == true %}
+ <script>
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', '{{ site.analytics.google.tracking_id }}']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+ </script>
+{% endif %}
@@ -9,64 +9,7 @@
<script src="//cdnjs.cloudflare.com/ajax/libs/rainbow/1.1.8/js/rainbow.min.js"></script>
<script src="{{ site.base_url }}/assets/strap-jekyll-default-custom.js"></script>
- {% if site.comments.disqus and page_commentDisqusId %}
- <script>
- var disqus_shortname = '{{ site_author.github }}{{ site.repo }}',
- disqus_identifier = '{{ page.url }}',
- disqus_url = '{{ page_commentDisqusId }}';
-
- /* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
- dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
- })();
- </script>
-
- {% endif %}
-
- {% if site.comments.github and page.commentIssueId %}
- <script src="//cdnjs.cloudflare.com/ajax/libs/datejs/1.0/date.min.js"></script>
- <script src="{{ site.base_url }}/assets/strap-jekyll/js/strap-jekyll-comments-github.js"></script>
- <script>
- $.ajax('https://api.github.com/repos/{{ site.author }}/{{ site.repo }}/issues/{{ page.commentIssueId }}/comments', {
- headers: {
- accept: 'application/vnd.github.full+json'
- },
- dataType: 'json',
- success: loadGithubComments
- });
- </script>
- {% endif %}
-
- {% if page_annotator %}
- <script>
- window._annotatorConfig = {
- auth: {
- tokenUrl: "http://annotateit.org/api/token"
- },
- store: {
- prefix: "http://annotateit.org/api"
- },
- tags: !0
- }
- </script>
- <script src="http://assets.annotateit.org/bookmarklet/bootstrap.js"></script>
- {% endif %}
-
- {% if page_analytics %}
- <script>
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', '{{ page_analytics }}']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
- </script>
- {% endif %}
+ {% include strap-jekyll/default/footer-tools.html %}
{% include strap-jekyll-default-footer-custom.html %}
@@ -5,33 +5,36 @@
<h5>{{ site.posts[0].date | date: '%Y %b' }}</h5>
<ul class="posts unstyled">
{% for post in site.posts %}
- <li class="post">
- <a href="{{ site.base_url }}{{ post.url }}" title="{{ post.date | date_to_string }}">{{ post.title }}</a>
+ <li class="post" data-toggle="tooltip" data-original-title="{{ post.date | date_to_string }}" data-placement="right">
+ <a href="{{ site.base_url }}{{ post.url }}">{{ post.title }}</a>
<span class="post-meta">
{% capture category_size %}{{ post.categories | size }}{% endcapture %}
{% if category_size != '0' %}
<span class="post-categories">
+ <div class="btn-group">
{% for category in post.categories %}
- <div class="btn-group">
- <button class="btn btn-mini btn-inverse">
- {{ category }}
- </button>
- </div>
+ <button class="btn btn-mini btn-inverse">
+ {{ category }}
+ </button>
{% endfor %}
+ </div>
</span>
{% endif %}
{% capture tag_size %}{{ post.tags | size }}{% endcapture %}
{% if tag_size != '0' %}
<span class="post-tags">
+ <div class="btn-group">
{% for tag in post.tags %}
- <div class="btn-group">
- <button class="btn btn-mini">
- {{ tag }}
- </button>
- </div>
+ <button class="btn btn-mini">
+ {{ tag }}
+ </button>
{% endfor %}
+ </div>
</span>
{% endif %}
+ <span class="post-date muted">
+ {{ post.date | date: '%d' }}
+ </span>
</span>
</li>
@@ -15,9 +15,9 @@
{% if category_size != '0' %}
<div class="post-categories">
<span>{{ text.categories }}</span>
+ <div class="btn-group">
{% for category in page.categories %}
{% capture category_size %}{{ site.categories[category] | size }}{% endcapture %}
- <div class="btn-group">
{% if category_size == '0' or category_size == '1' %}
<button class="btn btn-mini btn-inverse">
{{ category }}
@@ -35,17 +35,17 @@
{% endfor %}
</ul>
{% endif %}
- </div>
{% endfor %}
+ </div>
</div>
{% endif %}
{% capture tag_size %}{{ page.tags | size }}{% endcapture %}
{% if tag_size != '0' %}
<div class="post-tags">
<span>{{ text.tags }}</span>
+ <div class="btn-group">
{% for tag in page.tags %}
{% capture tag_size %}{{ site.tags[tag] | size }}{% endcapture %}
- <div class="btn-group">
{% if tag_size == '0' or tag_size == '1' %}
<button class="btn btn-mini">
{{ tag }}
@@ -63,37 +63,22 @@
{% endfor %}
</ul>
{% endif %}
- </div>
{% endfor %}
+ </div>
</div>
{% endif %}
</div>
{{ content }}
-</div>
-
-<div id="post-comments">
- {% if site.comments.twitter and page_author.twitter %}
- <a href="https://twitter.com/intent/tweet?screen_name={{ page_author.twitter }}&amp;text=re:&amp;url={{ site_pages_url | escape }}{{ page.url | escape }}">{{ text.leave_a_comment_on_twitter_to }} @{{ page_author.twitter }}</a>
- <br><br>
- {% endif %}
- {% if site.comments.github and page.commentIssueId %}
- <!-- http://ivanzuzak.info/2011/02/18/github-hosted-comments-for-github-hosted-blogs.html -->
- <a id="post-comments-url" href="https://github.com/{{ site.author }}/{{ site.repo }}/issues/{{ page.commentIssueId }}">{{ text.leave_a_comment_on_github }}</a>
- <div id="post-comments-placeholder"></div>
- <br><br>
- {% endif %}
-
- {% if site.comments.disqus and page_commentDisqusId %}
- {{ text.leave_a_comment_on_disqus }}
- <div id="disqus_thread"></div>
- <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
- <a href="http://disqus.com" class="dsq-brlink">{{ text.comments_powered_by_disqus }}<span class="logo-disqus">Disqus</span></a>
+ {% if page_comments_enabled == true %}
+ <h2 id="comments">{{ text.comments }}</h2>
+ {% include strap-jekyll/default/content-comments.html %}
{% endif %}
</div>
+
<!--<script type="text/javascript">
$("#post p,#post li").each( function(index) {
if (index > 0 && $.trim($(this).text()).length > 0) {
@@ -6,7 +6,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
- <a id="title" class="brand" href="{{ site.base_url }}/index.html" title="{{ site.description }}">{{ site.name }}</a>
+ <a id="title" class="brand" href="{{ site.base_url }}/index.html" data-toggle="tooltip" data-original-title="{{ site.description }}" data-placement="bottom">{{ site.name }}</a>
<div class="btn-group pull-right hidden-phone">
{% include strap-jekyll-default-navbar-right-custom.html %}
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
@@ -52,7 +52,7 @@
</li>
{% for item in header.items %}
- <li class="{% if item.url == page.url %} active{% endif %}"><a href="{{ site.base_url }}{{ item.url }}">{{ item.title }}</a></li>
+ <li class="{% if item.url == page.url %} active{% endif %}"><a href="{{ site.base_url }}{{ item.url }}">&middot; {{ item.title }}</a></li>
{% endfor %}
{% endfor %}
</ul>
@@ -1,34 +1,33 @@
<footer id="sidebar-footer">
+ {% include strap-jekyll-default-sidebar-footer-custom.html %}
<hr>
{% if text.maintained_by %}
<div class="btn-group" id="author">
- <button class="btn disabled">
+ <button class="btn btn-mini disabled">
{{ text.maintained_by }}
</button>
- <button class="btn{% if site_author.url == null %} disabled{% endif %}"{% if site_author.url %} data-href="{{ site_author.url }}{% endif %}">
+ <button class="btn btn-mini{% if site_author.url == null %} disabled{% endif %}"{% if site_author.url %} data-href="{{ site_author.url }}{% endif %}">
{{ site_author.display_name }}
</button>
- </div>
- <br>
- {% endif %}
- {% if text.contact %}
- <div class="btn-group" id="author-contact">
- <button class="btn disabled">
- {{ text.contact }}
- </button>
{% if site_author.email %}
- <button class="btn" data-href="mailto:{{ site_author.email }}">
+ <button class="btn btn-mini" data-href="mailto:{{ site_author.email }}">
+ <i class="icon-envelope"></i>
{{ site_author.email }}
</button>
{% endif %}
{% if site_author.twitter %}
- <button class="btn" data-href="http://twitter.com/{{ site_author.twitter }}">
- <img src="{{ site.base_url }}/assets/strap-jekyll/img/icon-twitter.png" alt="Twitter"> on Twitter
+ <button class="btn btn-mini" data-href="http://twitter.com/{{ site_author.twitter }}">
+ <i class="icon-twitter"></i>
+ </button>
+ {% endif %}
+ {% if site_author.linkedin %}
+ <button class="btn btn-mini" data-href="http://linkedin.com/in/{{ site_author.linkedin }}">
+ <i class="icon-linkedin"></i>
</button>
{% endif %}
{% if site_author.github %}
- <button class="btn" data-href="http://github.com/{{ site_author.github }}">
- <img src="{{ site.base_url }}/assets/strap-jekyll/img/icon-github.png" alt="GitHub"> on GitHub
+ <button class="btn btn-mini" data-href="http://github.com/{{ site_author.github }}">
+ <i class="icon-github"></i>
</button>
{% endif %}
</div>
Oops, something went wrong.

0 comments on commit 62a6cab

Please sign in to comment.