sr-rolando/rolandjesse.de
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Tag and pagination support

Browse source 
Bug fix: don’t include js for share buttons if not in the post page.
This commit is contained in:
Panos Sakkos 2015-07-16 01:21:35 +02:00
parent ddce0d9ede
commit b80d292d41
20 changed files with 319 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

86
_includes/js.html
View file

@ -21,47 +21,51 @@
</script>
{% endif %}
{% if page.section-type == "post" %}
<!-- Share buttons -->
{% if site.twitter-share %}
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
{% endif %}
{% if site.fb-share %}
<div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.3";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
{% endif %}
<!-- Disqus -->
{% if site.disqus-shortname %}
<script type="text/javascript">
var disqus_shortname = '{{ site.disqus-shortname }}';
(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>
<!-- Comments counter -->
<script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = '{{ site.disqus-shortname }}'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */
(function () {
var s = document.createElement('script'); s.async = true;
s.type = 'text/javascript';
s.src = '//' + disqus_shortname + '.disqus.com/count.js';
(document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
}());
</script>
{% if site.twitter-share %}
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
{% endif %}
{% if site.fb-share %}
<div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.3";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
{% endif %}
<!-- Disqus -->
{% if site.disqus-shortname %}
<script type="text/javascript">
var disqus_shortname = '{{ site.disqus-shortname }}';
(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>
<!-- Comments counter -->
<script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = '{{ site.disqus-shortname }}'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */
(function () {
var s = document.createElement('script'); s.async = true;
s.type = 'text/javascript';
s.src = '//' + disqus_shortname + '.disqus.com/count.js';
(document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
}());
</script>
{% endif %}
{% endif %}

2
_includes/blog.html → _includes/latest-post.html
View file

@ -14,7 +14,7 @@
{{ post.content | truncatewords: site.post-preview-words | markdownify }}
<a href="/blog.html"><h4><strong>View more posts</strong></h4></a>
<a href="/blog/index.html"><h4><strong>View more posts</strong></h4></a>
</div>
</div>

27
_includes/navigation.html
View file

@ -5,7 +5,7 @@
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
<i class="fa fa-bars"></i>
</button>
{% if page.name == "index.html" %}
{% if page.section-type == "index" %}
<a class="navbar-brand page-scroll" href="#page-top">
{% else %}
<a class="navbar-brand page-scroll" href="/index.html#page-top">
@ -20,32 +20,37 @@
<li class="hidden">
<a href="#page-top"></a>
</li>
{% for p in site.pages_list %}
{% if page.name == "index.html" %}
<!-- Go to section for each page in index -->
{% if page.section-type == "index" %}
<!-- Scroll to section for each page in index -->
{% for p in site.pages_list %}
<li>
<a class="page-scroll" href="#{{ p[1] }}"> {{ p[0] }} </a>
</li>
{% else %}
{% if page.name == 'blog.html' and p[0] == "Blog" %}
{% endfor %}
{% else %}
<!-- Blog, Post, Tag pages-->
{% for p in site.pages_list %}
{% if page.section-type == "blog" and p[0] == "Blog" %}
<!-- Blog button in blog.html doesn't refresh the page -->
<li>
<a class="page-scroll" href="#blog"> {{ p[0] }} </a>
</li>
{% elsif p[0] == "Blog" %}
<li>
<a class="page-scroll" href="/blog.html"> {{ p[0] }} </a>
<a class="page-scroll" href="/blog/index.html"> {{ p[0] }} </a>
</li>
{% else %}
<li>
<a class="page-scroll" href="/index.html#{{ p[1] }}"> {{ p[0] }} </a>
</li>
{% endif %}
{% endif %}
{% endfor %}
{% endfor %}
{% endif %}
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container -->
</nav>