aboutsummaryrefslogtreecommitdiffstats
path: root/pelican-bootstrap3/templates
diff options
context:
space:
mode:
Diffstat (limited to 'pelican-bootstrap3/templates')
-rw-r--r--pelican-bootstrap3/templates/archives.html11
-rw-r--r--pelican-bootstrap3/templates/article.html47
-rw-r--r--pelican-bootstrap3/templates/article_list.html22
-rw-r--r--pelican-bootstrap3/templates/author.html20
-rw-r--r--pelican-bootstrap3/templates/authors.html26
-rw-r--r--pelican-bootstrap3/templates/base.html66
-rw-r--r--pelican-bootstrap3/templates/category.html6
-rw-r--r--pelican-bootstrap3/templates/includes/aboutme.html9
-rw-r--r--pelican-bootstrap3/templates/includes/addthis.html16
-rw-r--r--pelican-bootstrap3/templates/includes/article_info.html18
-rw-r--r--pelican-bootstrap3/templates/includes/cc-license.html2
-rw-r--r--pelican-bootstrap3/templates/includes/comment_count.html2
-rw-r--r--pelican-bootstrap3/templates/includes/comments.html18
-rw-r--r--pelican-bootstrap3/templates/includes/disqus_script.html2
-rw-r--r--pelican-bootstrap3/templates/includes/ga.html14
-rw-r--r--pelican-bootstrap3/templates/includes/github-js.html2
-rw-r--r--pelican-bootstrap3/templates/includes/liquid_tags_nb_header.html157
-rw-r--r--pelican-bootstrap3/templates/includes/pagination.html54
-rw-r--r--pelican-bootstrap3/templates/includes/piwik.html28
-rw-r--r--pelican-bootstrap3/templates/includes/sidebar.html22
-rw-r--r--pelican-bootstrap3/templates/includes/twitter_cards.html27
-rw-r--r--pelican-bootstrap3/templates/includes/twitter_timeline.html10
-rw-r--r--pelican-bootstrap3/templates/index.html19
-rw-r--r--pelican-bootstrap3/templates/page.html37
-rw-r--r--pelican-bootstrap3/templates/tag.html8
25 files changed, 522 insertions, 121 deletions
diff --git a/pelican-bootstrap3/templates/archives.html b/pelican-bootstrap3/templates/archives.html
index abfe51f..8875de0 100644
--- a/pelican-bootstrap3/templates/archives.html
+++ b/pelican-bootstrap3/templates/archives.html
@@ -12,12 +12,13 @@
{% block content %}
<section id="content">
<h1>Archives for {{ SITENAME }}</h1>
-
- <dl>
+ <div id="archives">
{% for article in dates %}
- <dt>{{ article.locale_date }}</dt>
- <dd><a href='{{ SITEURL }}/{{ article.url }}'>{{ article.title }}</a></dd>
+ <p>
+ <span class="categories-timestamp"><time datetime="{{ article.date.isoformat() }}">{{ article.locale_date }}</time></span>
+ <a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}{% if article.subtitle %} - {{ article.subtitle }}{% endif %}</a>
+ </p>
{% endfor %}
- </dl>
+ </div>
</section>
{% endblock %}
diff --git a/pelican-bootstrap3/templates/article.html b/pelican-bootstrap3/templates/article.html
index e1f7f00..2313521 100644
--- a/pelican-bootstrap3/templates/article.html
+++ b/pelican-bootstrap3/templates/article.html
@@ -1,5 +1,52 @@
{% extends "base.html" %}
{% block title %}{{ article.title|striptags }} - {{ SITENAME }}{% endblock %}
+{% block html_lang %}{{ article.lang }}{% endblock %}
+{% block meta %}
+ {% if article.author %}
+ <meta name="author" content="{{ article.author }}" />
+ {% else %}
+ <meta name="author" content="{{ AUTHOR }}" />
+ {% endif %}
+ {% if article.tags %}
+ <meta name="keywords" content="{{ article.tags|join(',')|striptags }}" />
+ {% endif %}
+ {% if article.summary %}
+ <meta name="description" content="{{ article.summary|striptags|escape }}" />
+ {% endif %}
+{% endblock %}
+{% block opengraph %}
+ {% if OPEN_GRAPH_FB_APP_ID %}
+ <meta property="fb:app_id" content="{{ OPEN_GRAPH_FB_APP_ID }}"/>
+ <meta property="og:site_name" content="{{ SITENAME }}" />
+ <meta property="og:type" content="article"/>
+ <meta property="og:title" content="{{ article.title|striptags|escape }}"/>
+ <meta property="og:url" content="{{ SITEURL }}/{{ article.url }}"/>
+ <meta property="og:description" content="{{ article.summary|striptags|escape }}"/>
+ <meta property="article:published_time" content="{{ article.date.strftime("%Y-%m-%d") }}" />
+ {% if article.category %}
+ <meta property="article:section" content="{{ article.category }}" />
+ {% endif %}
+ {% for tag in article.tags %}
+ <meta property="article:tag" content="{{ tag }}" />
+ {% endfor %}
+ {% if article.author %}
+ <meta property="article:author" content="{{ article.author }}" />
+ {% elif AUTHOR %}
+ <meta property="article:author" content="{{ AUTHOR }}" />
+ {% endif %}
+ {% if article.og_image %}
+ <meta property="og:image"
+ content="{{ SITEURL }}/{{ article.og_image }}"/>
+ {% elif OPEN_GRAPH_IMAGE %}
+ <meta property="og:image"
+ content="{{ SITEURL }}/{{ OPEN_GRAPH_IMAGE }}"/>
+ {% endif %}
+ {% endif %}
+{% endblock %}
+
+{% block canonical_rel %}
+<link rel="canonical" href="{{ SITEURL }}/{{ article.url }}">
+{% endblock %}
{% block breadcrumbs %}
{% if DISPLAY_BREADCRUMBS %}
diff --git a/pelican-bootstrap3/templates/article_list.html b/pelican-bootstrap3/templates/article_list.html
new file mode 100644
index 0000000..2d3c8cd
--- /dev/null
+++ b/pelican-bootstrap3/templates/article_list.html
@@ -0,0 +1,22 @@
+{% extends "base.html" %}
+{% block content %}
+ {% if articles %}
+ {% for article in (articles_page.object_list if articles_page else articles) %}
+ <article>
+ <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
+ {% if DISPLAY_ARTICLE_INFO_ON_INDEX %}
+ <div class="well well-sm">
+ {% include "includes/article_info.html" %}
+ </div>
+ {% endif %}
+ <div class="summary">{{ article.summary }}
+ {% include 'includes/comment_count.html' %}
+ <a class="btn btn-default btn-xs" href="{{ SITEURL }}/{{ article.url }}">more ...</a>
+ </div>
+ </article>
+ <hr/>
+ {% endfor %}
+ {% endif %}
+
+ {% include 'includes/pagination.html' %}
+{% endblock content %}
diff --git a/pelican-bootstrap3/templates/author.html b/pelican-bootstrap3/templates/author.html
index 25d941d..07dab6e 100644
--- a/pelican-bootstrap3/templates/author.html
+++ b/pelican-bootstrap3/templates/author.html
@@ -1,9 +1,13 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title></title>
-</head>
-<body>
+{% extends "article_list.html" %}
-</body>
-</html> \ No newline at end of file
+{% block title %}Articles by {{ author }} - {{ SITENAME }}{% endblock %}
+
+{% block breadcrumbs %}
+ {% if DISPLAY_BREADCRUMBS %}
+ <ol class="breadcrumb">
+ <li><a href="{{ SITEURL }}" title="{{ SITENAME }}"><i class="fa fa-home fa-lg"></i></a></li>
+ <li><a href="{{ SITEURL }}/{{ AUTHORS_URL|default('authors.html') }}" title="Authors">Authors</a></li>
+ <li class="active">{{ AUTHOR }}</li>
+ </ol>
+ {% endif %}
+{% endblock %}
diff --git a/pelican-bootstrap3/templates/authors.html b/pelican-bootstrap3/templates/authors.html
index 25d941d..9aa93ac 100644
--- a/pelican-bootstrap3/templates/authors.html
+++ b/pelican-bootstrap3/templates/authors.html
@@ -1,9 +1,19 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title></title>
-</head>
-<body>
+{% extends "base.html" %}
-</body>
-</html> \ No newline at end of file
+{% block title %}Authors - {{ SITENAME }}{% endblock %}
+
+{% block breadcrumbs %}
+ {% if DISPLAY_BREADCRUMBS %}
+ <ol class="breadcrumb">
+ <li><a href="{{ SITEURL }}" title="{{ SITENAME }}"><i class="fa fa-home fa-lg"></i></a></li>
+ <li class="active">Authors</li>
+ </ol>
+ {% endif %}
+{% endblock %}
+
+{% block content %}
+ <h1>Authors on {{ SITENAME }}</h1>
+ {% for author, articles in authors|sort %}
+ <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
+ {% endfor %}
+{% endblock %}
diff --git a/pelican-bootstrap3/templates/base.html b/pelican-bootstrap3/templates/base.html
index 200a9b0..070dad2 100644
--- a/pelican-bootstrap3/templates/base.html
+++ b/pelican-bootstrap3/templates/base.html
@@ -1,17 +1,35 @@
<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
+<html lang="{% block html_lang %}{{ DEFAULT_LANG }}{% endblock %}"
+ {% if USE_OPEN_GRAPH %}
xmlns:og="http://ogp.me/ns#"
- xmlns:fb="https://www.facebook.com/2008/fbml">
+ xmlns:fb="https://www.facebook.com/2008/fbml"{% endif %}>
<head>
<title>{% block title %}{{ SITENAME }}{% endblock %}</title>
<!-- Using the latest rendering mode for IE -->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
-
+
+ {% if 'liquid_tags.notebook' in PLUGINS %}
+ {% include 'includes/liquid_tags_nb_header.html' %}
+ {% endif %}
+
+ {# Favicons are a touchy subject. For reasoning for the following code, see: http://stackoverflow.com/a/23851464/872397 #}
{% if FAVICON %}
<link href="{{ SITEURL }}/{{ FAVICON }}" rel="icon">
{% endif %}
+ {% if FAVICON_IE %}
+ <!--[if IE]><link rel="shortcut icon" href="{{ SITEURL }}/{{ FAVICON_IE }}"><![endif]-->
+ {% endif %}
+ {% if TOUCHICON %}
+ <link rel="apple-touch-icon" href="{{ SITEURL }}/{{ TOUCHICON }}">
+ {% endif %}
+
+ {% block canonical_rel %}{% endblock %}
+
+ {% block meta %}
+ <meta name="author" content="{{ AUTHOR }}" />
+ {% endblock %}
<!-- Enable latex plugin -->
{% if article and article.latex %}
@@ -27,31 +45,26 @@
{% set USE_OPEN_GRAPH = True %}
{% endif %}
{% if USE_OPEN_GRAPH %}
+ {% block opengraph %}
<!-- Open Graph tags -->
{% if OPEN_GRAPH_FB_APP_ID %}
<meta property="fb:app_id" content="{{ OPEN_GRAPH_FB_APP_ID }}"/>
{% endif %}
- {% if article %}
- <meta property="og:type" content="article"/>
- <meta property="og:title" content="{{ article.title|striptags }}"/>
- <meta property="og:url" content="{{ SITEURL }}/{{ article.url }}"/>
- <meta property="og:description" content="{{ article.summary|striptags }}"/>
- {% elif page %}
- <meta property="og:type" content="article"/>
- <meta property="og:title" content="{{ page.title }}"/>
- <meta property="og:url" content="{{ SITEURL }}/{{ page.url }}"/>
- {% else %}
- <meta property="og:type" content="website"/>
- <meta property="og:title" content="{{ SITENAME }}"/>
- <meta property="og:url" content="{{ SITEURL }}"/>
- <meta property="og:description" content="{{ SITENAME }}"/>
- {% if OPEN_GRAPH_IMAGE %}
+ <meta property="og:site_name" content="{{ SITENAME }}" />
+ <meta property="og:type" content="website"/>
+ <meta property="og:title" content="{{ SITENAME }}"/>
+ <meta property="og:url" content="{{ SITEURL }}"/>
+ <meta property="og:description" content="{{ SITENAME }}"/>
+ {% if OPEN_GRAPH_IMAGE %}
<meta property="og:image"
- content="{{ SITEURL }}/static/{{ OPEN_GRAPH_IMAGE }}"/>
- {% endif %}
+ content="{{ SITEURL }}/{{ OPEN_GRAPH_IMAGE }}"/>
{% endif %}
+ {% endblock %}
{% endif %}
+ {# Twitter Cards tags #}
+ {% include 'includes/twitter_cards.html' %}
+
<!-- Bootstrap -->
{% if BOOTSTRAP_THEME %}
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/bootstrap.{{ BOOTSTRAP_THEME }}.min.css" type="text/css"/>
@@ -77,7 +90,7 @@
title="{{ SITENAME }} ATOM Feed"/>
{% endif %}
{% if FEED_ALL_RSS %}
- <link href="{{ SITEURL }}/{{ FEED_ALL_RSS }}" type="application/atom+xml" rel="alternate"
+ <link href="{{ SITEURL }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate"
title="{{ SITENAME }} RSS Feed"/>
{% endif %}
@@ -116,7 +129,7 @@
{% if DISPLAY_PAGES_ON_MENU %}
{% for p in PAGES %}
<li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">
- {{ p.title }}
+ {{ p.menulabel|default(p.title) }}
</a></li>
{% endfor %}
{% endif %}
@@ -138,7 +151,7 @@
<div class="container">
<div class="row">
- {% if not HIDE_SIDEBAR %}
+ {% if not HIDE_SIDEBAR or SHOW_ABOUTME %}
<div class="col-sm-9">
{% else %}
<div class="col-lg-12">
@@ -149,6 +162,11 @@
{% block content %}
{% endblock %}
</div>
+ {% if ABOUT_ME %}
+ <div class="col-sm-3" id="aboutme">
+ {% include 'includes/aboutme.html' %}
+ </div>
+ {% endif %}
{% if not HIDE_SIDEBAR %}
<div class="col-sm-3 well well-sm" id="sidebar">
{% include 'includes/sidebar.html' %}
@@ -158,7 +176,7 @@
</div>
{% include 'includes/footer.html' %}
-<script src="//code.jquery.com/jquery.js"></script>
+<script src="{{ SITEURL }}/theme/js/jquery.min.js"></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="{{ SITEURL }}/theme/js/bootstrap.min.js"></script>
diff --git a/pelican-bootstrap3/templates/category.html b/pelican-bootstrap3/templates/category.html
index 9cfa5ad..0eac7dd 100644
--- a/pelican-bootstrap3/templates/category.html
+++ b/pelican-bootstrap3/templates/category.html
@@ -1,5 +1,9 @@
-{% extends "index.html" %}
+{% extends "article_list.html" %}
{% block title %}{{ category }} - {{ SITENAME }}{% endblock %}
+{% block meta %}
+ <meta name="author" content="{{ AUTHOR }}" />
+ <meta name="keywords" content="{{ category }}" />
+{% endblock %}
{% block breadcrumbs %}
{% if DISPLAY_BREADCRUMBS %}
<ol class="breadcrumb">
diff --git a/pelican-bootstrap3/templates/includes/aboutme.html b/pelican-bootstrap3/templates/includes/aboutme.html
new file mode 100644
index 0000000..ba56070
--- /dev/null
+++ b/pelican-bootstrap3/templates/includes/aboutme.html
@@ -0,0 +1,9 @@
+{% if AVATAR %}
+ <p>
+ <img width="100%" class="img-thumbnail" src="{{ AVATAR }}"/>
+ </p>
+{% endif %}
+<p>
+ <strong>About {{ AUTHOR }}</strong><br/>
+ {{ ABOUT_ME }}
+</p>
diff --git a/pelican-bootstrap3/templates/includes/addthis.html b/pelican-bootstrap3/templates/includes/addthis.html
index 9f8fe50..12e2e8a 100644
--- a/pelican-bootstrap3/templates/includes/addthis.html
+++ b/pelican-bootstrap3/templates/includes/addthis.html
@@ -2,11 +2,19 @@
<hr />
<!-- AddThis Button BEGIN -->
<div class="addthis_toolbox addthis_default_style">
- <a class="addthis_button_facebook_like" fb:like:layout="button_count"></a>
- <a class="addthis_button_tweet"></a>
- <a class="addthis_button_google_plusone" g:plusone:size="medium"></a>
+ {% if ADDTHIS_FACEBOOK_LIKE|default(true) %}
+ <a class="addthis_button_facebook_like" fb:like:layout="button_count"></a>
+ {% endif %}
+ {% if ADDTHIS_TWEET|default(true) %}
+ <a class="addthis_button_tweet"></a>
+ {% endif %}
+ {% if ADDTHIS_GOOGLE_PLUSONE|default(true) %}
+ <a class="addthis_button_google_plusone" g:plusone:size="medium"></a>
+ {% endif %}
</div>
- <script type="text/javascript">var addthis_config = {"data_track_addressbar": true};</script>
+ {% if ADDTHIS_DATA_TRACK_ADDRESSBAR|default(true) %}
+ <script type="text/javascript">var addthis_config = {"data_track_addressbar": true};</script>
+ {% endif %}
<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid={{ ADDTHIS_PROFILE }}"></script>
<!-- AddThis Button END -->
{% endif %} \ No newline at end of file
diff --git a/pelican-bootstrap3/templates/includes/article_info.html b/pelican-bootstrap3/templates/includes/article_info.html
index abbf807..f13f4d1 100644
--- a/pelican-bootstrap3/templates/includes/article_info.html
+++ b/pelican-bootstrap3/templates/includes/article_info.html
@@ -3,15 +3,17 @@
<span class="published">
<i class="fa fa-calendar"></i><time datetime="{{ article.date.isoformat() }}"> {{ article.locale_date }}</time>
</span>
- {# Uncomment if you want the author shown #}
- {#{% if article.author %}#}
- {#<span class="label">By</span>#}
- {#<a href="{{ SITEURL }}/{{ article.author.url }}"><i class="fa fa-user"></i> {{ article.author }}</a>#}
- {#{% endif %}#}
+ {% if SHOW_ARTICLE_AUTHOR %}
+ {% if article.author %}
+ <span class="label label-default">By</span>
+ <a href="{{ SITEURL }}/{{ article.author.url }}"><i class="fa fa-user"></i> {{ article.author }}</a>
+ {% endif %}
+ {% endif %}
- {# Uncomment if you want to show Categories#}
- {#<span class="label label-default">Category</span>#}
- {#<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>#}
+ {% if SHOW_ARTICLE_CATEGORY %}
+ <span class="label label-default">Category</span>
+ <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
+ {% endif %}
{% if PDF_PROCESSOR %}
<span class="label label-default">
diff --git a/pelican-bootstrap3/templates/includes/cc-license.html b/pelican-bootstrap3/templates/includes/cc-license.html
index 5c44993..73c7720 100644
--- a/pelican-bootstrap3/templates/includes/cc-license.html
+++ b/pelican-bootstrap3/templates/includes/cc-license.html
@@ -52,7 +52,7 @@
{% set cc_title_suffix = cc_title_suffix ~ "-ShareAlike" %}
{% endif %}
{% endif %}
- {% set cc_title, cc_uri, cc_icon = ("Creative Commons Attribution 4.0 InternationalCCSUFFIX License","http://creativecommons.org/licenses/CCNAME/4.0/","http://i.creativecommons.org/l/CCNAME/4.0/80x15.png") %}
+ {% set cc_title, cc_uri, cc_icon = ("Creative Commons Attribution 4.0 InternationalCCSUFFIX License","http://creativecommons.org/licenses/CCNAME/4.0/","//i.creativecommons.org/l/CCNAME/4.0/80x15.png") %}
<a rel="license" href="{{ cc_uri|replace('CCNAME',cc_name) }}"><img alt="Creative Commons License" style="border-width:0" src="{{ cc_icon|replace('CCNAME',cc_name) }}" /></a>
{% if br_after_img %}<br/>{% endif %}
{% if attr_markup %}
diff --git a/pelican-bootstrap3/templates/includes/comment_count.html b/pelican-bootstrap3/templates/includes/comment_count.html
index 151c501..4b42dde 100644
--- a/pelican-bootstrap3/templates/includes/comment_count.html
+++ b/pelican-bootstrap3/templates/includes/comment_count.html
@@ -1 +1 @@
-{% if DISQUS_SITENAME and DISQUS_DISPLAY_COUNTS %}<p><small>There are <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread" {% if not DISQUS_NO_ID %}data-disqus-identifier="{{ article.date|strftime('%Y-%m-') ~ article.slug if DISQUS_ID_PREFIX_SLUG else article.slug }}"{% endif %}>comments</a>.</small></p>{% endif %} \ No newline at end of file
+{% if DISQUS_SITENAME and DISQUS_DISPLAY_COUNTS %}<p><small><a href="{{ SITEURL }}/{{ article.url }}#disqus_thread" {% if not DISQUS_NO_ID %}data-disqus-identifier="{{ article.date|strftime('%Y-%m-') ~ article.slug if DISQUS_ID_PREFIX_SLUG else article.slug }}"{% endif %}>View comments</a>.</small></p>{% endif %}
diff --git a/pelican-bootstrap3/templates/includes/comments.html b/pelican-bootstrap3/templates/includes/comments.html
index 94deef4..eade006 100644
--- a/pelican-bootstrap3/templates/includes/comments.html
+++ b/pelican-bootstrap3/templates/includes/comments.html
@@ -1,15 +1,25 @@
{% if DISQUS_SITENAME %}
- <hr />
+ <hr/>
<section class="comments" id="comments">
<h2>Comments</h2>
+
<div id="disqus_thread"></div>
<script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = '{{ DISQUS_SITENAME }}'; // required: replace example with your forum shortname
- {% if not DISQUS_NO_ID %}
- var disqus_identifier = '{{ article.date|strftime('%Y-%m-') ~ article.slug if DISQUS_ID_PREFIX_SLUG else article.slug }}';
+
+ {% if article %}
+ {% if not DISQUS_NO_ID %}
+ var disqus_identifier = '{{ article.date|strftime('%Y-%m-') ~ article.slug if DISQUS_ID_PREFIX_SLUG else article.slug }}';
+ {% endif %}
+ var disqus_url = '{{ SITEURL }}/{{ article.url }}';
+ {% elif page %}
+ {% if not DISQUS_NO_ID %}
+ var disqus_identifier = 'page-{{ page.slug }}';
+ {% endif %}
+ var disqus_url = '{{ SITEURL }}/{{ page.url }}';
{% endif %}
- var disqus_url = '{{ SITEURL }}/{{ article.url }}';
+
var disqus_config = function () {
this.language = "{{ DEFAULT_LANG }}";
};
diff --git a/pelican-bootstrap3/templates/includes/disqus_script.html b/pelican-bootstrap3/templates/includes/disqus_script.html
index 8dbb999..02570b3 100644
--- a/pelican-bootstrap3/templates/includes/disqus_script.html
+++ b/pelican-bootstrap3/templates/includes/disqus_script.html
@@ -1,4 +1,5 @@
{% if DISQUS_SITENAME %}
+ <!-- Disqus -->
<script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = '{{ DISQUS_SITENAME }}'; // required: replace example with your forum shortname
@@ -12,4 +13,5 @@
(document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
}());
</script>
+ <!-- End Disqus Code -->
{% endif %} \ No newline at end of file
diff --git a/pelican-bootstrap3/templates/includes/ga.html b/pelican-bootstrap3/templates/includes/ga.html
index 2f75571..8663e73 100644
--- a/pelican-bootstrap3/templates/includes/ga.html
+++ b/pelican-bootstrap3/templates/includes/ga.html
@@ -1,4 +1,5 @@
{% if GOOGLE_ANALYTICS %}
+ <!-- Google Analytics -->
<script type="text/javascript">
var _gaq = _gaq || [];
@@ -13,6 +14,19 @@
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
})();
+ </script>
+ <!-- End Google Analytics Code -->
+{% endif %}
+{% if GOOGLE_ANALYTICS_UNIVERSAL %}
+ <!-- Google Analytics Universal -->
+ <script type="text/javascript">
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+ })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+ ga('create', '{{ GOOGLE_ANALYTICS_UNIVERSAL }}', '{{ GOOGLE_ANALYTICS_UNIVERSAL_PROPERTY }}');
+ ga('send', 'pageview');
</script>
+ <!-- End Google Analytics Universal Code -->
{% endif %} \ No newline at end of file
diff --git a/pelican-bootstrap3/templates/includes/github-js.html b/pelican-bootstrap3/templates/includes/github-js.html
index f1b321f..85d9ae5 100644
--- a/pelican-bootstrap3/templates/includes/github-js.html
+++ b/pelican-bootstrap3/templates/includes/github-js.html
@@ -11,6 +11,7 @@
{% set GITHUB_SKIP_FORK = "false" %}
{% endif %}
{% endif %}
+ <!-- GitHub JS -->
<script type="text/javascript">
$(document).ready(function () {
if (!window.jXHR) {
@@ -30,4 +31,5 @@
});
</script>
<script src="{{ SITEURL }}/theme/js/github.js" type="text/javascript"></script>
+ <!-- End GitHub JS Code -->
{% endif %} \ No newline at end of file
diff --git a/pelican-bootstrap3/templates/includes/liquid_tags_nb_header.html b/pelican-bootstrap3/templates/includes/liquid_tags_nb_header.html
new file mode 100644
index 0000000..3d70df5
--- /dev/null
+++ b/pelican-bootstrap3/templates/includes/liquid_tags_nb_header.html
@@ -0,0 +1,157 @@
+
+
+
+<style type="text/css">
+
+/*some stuff for output/input prompts*/
+div.cell{border:1px solid transparent;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch}div.cell.selected{border-radius:4px;border:thin #ababab solid}
+div.cell.edit_mode{border-radius:4px;border:thin #008000 solid}
+div.cell{width:100%;padding:5px 5px 5px 0;margin:0;outline:none}
+div.prompt{min-width:11ex;padding:.4em;margin:0;font-family:monospace;text-align:right;line-height:1.21429em}
+@media (max-width:480px){div.prompt{text-align:left}}div.inner_cell{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
+div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;line-height:1.21429em}
+div.prompt:empty{padding-top:0;padding-bottom:0}
+div.input{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;}
+div.inner_cell{width:90%;}
+div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;}
+div.input_prompt{color:navy;border-top:1px solid transparent;}
+div.output_wrapper{margin-top:5px;position:relative;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;}
+div.output_scroll{height:24em;width:100%;overflow:auto;border-radius:4px;-webkit-box-shadow:inset 0 2px 8px rgba(0, 0, 0, 0.8);-moz-box-shadow:inset 0 2px 8px rgba(0, 0, 0, 0.8);box-shadow:inset 0 2px 8px rgba(0, 0, 0, 0.8);}
+div.output_collapsed{margin:0px;padding:0px;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;}
+div.out_prompt_overlay{height:100%;padding:0px 0.4em;position:absolute;border-radius:4px;}
+div.out_prompt_overlay:hover{-webkit-box-shadow:inset 0 0 1px #000000;-moz-box-shadow:inset 0 0 1px #000000;box-shadow:inset 0 0 1px #000000;background:rgba(240, 240, 240, 0.5);}
+div.output_prompt{color:darkred;}
+
+a.anchor-link:link{text-decoration:none;padding:0px 20px;visibility:hidden;}
+h1:hover .anchor-link,h2:hover .anchor-link,h3:hover .anchor-link,h4:hover .anchor-link,h5:hover .anchor-link,h6:hover .anchor-link{visibility:visible;}
+/* end stuff for output/input prompts*/
+
+
+.highlight-ipynb .hll { background-color: #ffffcc }
+.highlight-ipynb { background: #f8f8f8; }
+.highlight-ipynb .c { color: #408080; font-style: italic } /* Comment */
+.highlight-ipynb .err { border: 1px solid #FF0000 } /* Error */
+.highlight-ipynb .k { color: #008000; font-weight: bold } /* Keyword */
+.highlight-ipynb .o { color: #666666 } /* Operator */
+.highlight-ipynb .cm { color: #408080; font-style: italic } /* Comment.Multiline */
+.highlight-ipynb .cp { color: #BC7A00 } /* Comment.Preproc */
+.highlight-ipynb .c1 { color: #408080; font-style: italic } /* Comment.Single */
+.highlight-ipynb .cs { color: #408080; font-style: italic } /* Comment.Special */
+.highlight-ipynb .gd { color: #A00000 } /* Generic.Deleted */
+.highlight-ipynb .ge { font-style: italic } /* Generic.Emph */
+.highlight-ipynb .gr { color: #FF0000 } /* Generic.Error */
+.highlight-ipynb .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight-ipynb .gi { color: #00A000 } /* Generic.Inserted */
+.highlight-ipynb .go { color: #888888 } /* Generic.Output */
+.highlight-ipynb .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.highlight-ipynb .gs { font-weight: bold } /* Generic.Strong */
+.highlight-ipynb .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight-ipynb .gt { color: #0044DD } /* Generic.Traceback */
+.highlight-ipynb .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
+.highlight-ipynb .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
+.highlight-ipynb .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
+.highlight-ipynb .kp { color: #008000 } /* Keyword.Pseudo */
+.highlight-ipynb .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
+.highlight-ipynb .kt { color: #B00040 } /* Keyword.Type */
+.highlight-ipynb .m { color: #666666 } /* Literal.Number */
+.highlight-ipynb .s { color: #BA2121 } /* Literal.String */
+.highlight-ipynb .na { color: #7D9029 } /* Name.Attribute */
+.highlight-ipynb .nb { color: #008000 } /* Name.Builtin */
+.highlight-ipynb .nc { color: #0000FF; font-weight: bold } /* Name.Class */
+.highlight-ipynb .no { color: #880000 } /* Name.Constant */
+.highlight-ipynb .nd { color: #AA22FF } /* Name.Decorator */
+.highlight-ipynb .ni { color: #999999; font-weight: bold } /* Name.Entity */
+.highlight-ipynb .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+.highlight-ipynb .nf { color: #0000FF } /* Name.Function */
+.highlight-ipynb .nl { color: #A0A000 } /* Name.Label */
+.highlight-ipynb .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.highlight-ipynb .nt { color: #008000; font-weight: bold } /* Name.Tag */
+.highlight-ipynb .nv { color: #19177C } /* Name.Variable */
+.highlight-ipynb .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.highlight-ipynb .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight-ipynb .mf { color: #666666 } /* Literal.Number.Float */
+.highlight-ipynb .mh { color: #666666 } /* Literal.Number.Hex */
+.highlight-ipynb .mi { color: #666666 } /* Literal.Number.Integer */
+.highlight-ipynb .mo { color: #666666 } /* Literal.Number.Oct */
+.highlight-ipynb .sb { color: #BA2121 } /* Literal.String.Backtick */
+.highlight-ipynb .sc { color: #BA2121 } /* Literal.String.Char */
+.highlight-ipynb .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
+.highlight-ipynb .s2 { color: #BA2121 } /* Literal.String.Double */
+.highlight-ipynb .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+.highlight-ipynb .sh { color: #BA2121 } /* Literal.String.Heredoc */
+.highlight-ipynb .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+.highlight-ipynb .sx { color: #008000 } /* Literal.String.Other */
+.highlight-ipynb .sr { color: #BB6688 } /* Literal.String.Regex */
+.highlight-ipynb .s1 { color: #BA2121 } /* Literal.String.Single */
+.highlight-ipynb .ss { color: #19177C } /* Literal.String.Symbol */
+.highlight-ipynb .bp { color: #008000 } /* Name.Builtin.Pseudo */
+.highlight-ipynb .vc { color: #19177C } /* Name.Variable.Class */
+.highlight-ipynb .vg { color: #19177C } /* Name.Variable.Global */
+.highlight-ipynb .vi { color: #19177C } /* Name.Variable.Instance */
+.highlight-ipynb .il { color: #666666 } /* Literal.Number.Integer.Long */
+</style>
+
+<style type="text/css">
+/* Overrides of notebook CSS for static HTML export */
+div.entry-content {
+ overflow: visible;
+ padding: 8px;
+}
+.input_area {
+ padding: 0.2em;
+}
+
+a.heading-anchor {
+ white-space: normal;
+}
+
+.rendered_html
+code {
+ font-size: .8em;
+}
+
+pre.ipynb {
+ color: black;
+ background: #f7f7f7;
+ border: none;
+ box-shadow: none;
+ margin-bottom: 0;
+ padding: 0;
+ margin: 0px;
+ font-size: 13px;
+}
+
+/* remove the prompt div from text cells */
+div.text_cell .prompt {
+ display: none;
+}
+
+/* remove horizontal padding from text cells, */
+/* so it aligns with outer body text */
+div.text_cell_render {
+ padding: 0.5em 0em;
+}
+
+img.anim_icon{padding:0; border:0; vertical-align:middle; -webkit-box-shadow:none; -box-shadow:none}
+</style>
+
+<script src="https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" type="text/javascript"></script>
+<script type="text/javascript">
+init_mathjax = function() {
+ if (window.MathJax) {
+ // MathJax loaded
+ MathJax.Hub.Config({
+ tex2jax: {
+ inlineMath: [ ['$','$'], ["\\(","\\)"] ],
+ displayMath: [ ['$$','$$'], ["\\[","\\]"] ]
+ },
+ displayAlign: 'left', // Change this to 'center' to center equations.
+ "HTML-CSS": {
+ styles: {'.MathJax_Display': {"margin": 0}}
+ }
+ });
+ MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
+ }
+}
+init_mathjax();
+</script>
diff --git a/pelican-bootstrap3/templates/includes/pagination.html b/pelican-bootstrap3/templates/includes/pagination.html
index d34c853..9ae4285 100644
--- a/pelican-bootstrap3/templates/includes/pagination.html
+++ b/pelican-bootstrap3/templates/includes/pagination.html
@@ -1,21 +1,37 @@
{% if articles_page and articles_paginator.num_pages > 1 %}
- <ul class="pagination">
- {% if articles_page.has_previous() %}
- {% set num = articles_page.previous_page_number() %}
- <li class="prev"><a href="{{ SITEURL }}/{{ articles_previous_page.url }}">&laquo;</a>
- </li>
- {% else %}
- <li class="prev disabled"><a href="#">&laquo;</a></li>
- {% endif %}
- {% for num in range( 1, 1 + articles_paginator.num_pages ) %}
- <li class="{{ 'active' if num == articles_page.number else '' }}"><a
- href="{{ SITEURL }}/{{ page_name }}{{ num if num > 1 else '' }}.html">{{ num }}</a></li>
- {% endfor %}
- {% if articles_page.has_next() %}
- <li class="next"><a
- href="{{ SITEURL }}/{{ articles_next_page.url }}">&raquo;</a></li>
- {% else %}
- <li class="next disabled"><a href="#">&raquo;</a></li>
- {% endif %}
- </ul>
+ {% if USE_PAGER %}
+ <ul class="pager">
+ {% if articles_page.has_previous() %}
+ <li class="previous"><a href="{{ SITEURL }}/{{ articles_previous_page.url }}">&larr; Newer</a></li>
+ {% else %}
+ <li class="previous disabled"><a href="#">&larr; Newer</a></li>
+ {% endif %}
+ {% if articles_page.has_next() %}
+ <li class="next"><a
+ href="{{ SITEURL }}/{{ articles_next_page.url }}">Older &rarr;</a></li>
+ {% else %}
+ <li class="next disabled"><a href="#">Older &rarr;</a></li>
+ {% endif %}
+ </ul>
+ {% else %}
+ <ul class="pagination">
+ {% if articles_page.has_previous() %}
+ {% set num = articles_page.previous_page_number() %}
+ <li class="prev"><a href="{{ SITEURL }}/{{ articles_previous_page.url }}">&laquo;</a>
+ </li>
+ {% else %}
+ <li class="prev disabled"><a href="#">&laquo;</a></li>
+ {% endif %}
+ {% for num in range( 1, 1 + articles_paginator.num_pages ) %}
+ <li class="{{ 'active' if num == articles_page.number else '' }}"><a
+ href="{{ SITEURL }}/{{ page_name }}{{ num if num > 1 else '' }}.html">{{ num }}</a></li>
+ {% endfor %}
+ {% if articles_page.has_next() %}
+ <li class="next"><a
+ href="{{ SITEURL }}/{{ articles_next_page.url }}">&raquo;</a></li>
+ {% else %}
+ <li class="next disabled"><a href="#">&raquo;</a></li>
+ {% endif %}
+ </ul>
+ {% endif %}
{% endif %} \ No newline at end of file
diff --git a/pelican-bootstrap3/templates/includes/piwik.html b/pelican-bootstrap3/templates/includes/piwik.html
index 70c45c2..a386f2d 100644
--- a/pelican-bootstrap3/templates/includes/piwik.html
+++ b/pelican-bootstrap3/templates/includes/piwik.html
@@ -2,19 +2,19 @@
{% if PIWIK_SSL_URL is not defined %}
{% set PIWIK_SSL_URL = PIWIK_URL %}
{% endif %}
-<!-- Piwik -->
-<script type="text/javascript">
- var _paq = _paq || [];
- _paq.push(["trackPageView"]);
- _paq.push(["enableLinkTracking"]);
+ <!-- Piwik -->
+ <script type="text/javascript">
+ var _paq = _paq || [];
+ _paq.push(["trackPageView"]);
+ _paq.push(["enableLinkTracking"]);
- (function() {
- var u=(("https:" == document.location.protocol) ? "https://{{ PIWIK_SSL_URL }}/" : "http://{{ PIWIK_URL }}/");
- _paq.push(["setTrackerUrl", u+"piwik.php"]);
- _paq.push(["setSiteId", "{{ PIWIK_SITE_ID }}"]);
- var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
- g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
- })();
-</script>
-<!-- End Piwik Code -->
+ (function() {
+ var u=(("https:" == document.location.protocol) ? "https://{{ PIWIK_SSL_URL }}/" : "http://{{ PIWIK_URL }}/");
+ _paq.push(["setTrackerUrl", u+"piwik.php"]);
+ _paq.push(["setSiteId", "{{ PIWIK_SITE_ID }}"]);
+ var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+ g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+ })();
+ </script>
+ <!-- End Piwik Code -->
{% endif %} \ No newline at end of file
diff --git a/pelican-bootstrap3/templates/includes/sidebar.html b/pelican-bootstrap3/templates/includes/sidebar.html
index ebb4d8a..ef6768b 100644
--- a/pelican-bootstrap3/templates/includes/sidebar.html
+++ b/pelican-bootstrap3/templates/includes/sidebar.html
@@ -9,9 +9,13 @@
<li class="list-group-item"><h4><i class="fa fa-home fa-lg"></i><span class="icon-label">Social</span></h4>
<ul class="list-group" id="social">
{% for name, link in SOCIAL %}
- <li class="list-group-item"><a href="{{ link }}"><i
- class="fa fa-{{ name|lower|replace('+','-plus') }}-square fa-lg"></i> {{ name }}
- </a></li>
+ {% set name_sanitized = name|lower|replace('+','-plus')|replace(' ','-') %}
+ {% if name_sanitized in ['flickr', 'spotify', 'stack-overflow'] %}
+ {% set iconattributes = '"fa fa-' ~ name_sanitized ~ ' fa-lg"' %}
+ {% else %}
+ {% set iconattributes = '"fa fa-' ~ name_sanitized ~ '-square fa-lg"' %}
+ {% endif %}
+ <li class="list-group-item"><a href="{{ link }}"><i class={{ iconattributes }}></i> {{ name }}</a></li>
{% endfor %}
</ul>
</li>
@@ -43,15 +47,20 @@
<i class="fa fa-folder-open fa-lg"></i> {{ cat }}
</a>
</li>
- </ul>
{% endfor %}
+ </ul>
</li>
{% endif %}
{% if DISPLAY_TAGS_ON_SIDEBAR %}
+ {% if DISPLAY_TAGS_INLINE %}
+ {% set tags = tag_cloud | sort(attribute='0') %}
+ {% else %}
+ {% set tags = tag_cloud | sort(attribute='1') %}
+ {% endif %}
<li class="list-group-item"><a href="{{ SITEURL }}/{{ TAGS_URL }}"><h4><i class="fa fa-tags fa-lg"></i><span class="icon-label">Tags</span></h4></a>
- <ul class="list-group" id="tags">
- {% for tag in tag_cloud|sort(attribute='1') %}
+ <ul class="list-group {% if DISPLAY_TAGS_INLINE %}list-inline tagcloud{% endif %}" id="tags">
+ {% for tag in tags %}
<li class="list-group-item tag-{{ tag.1 }}">
<a href="{{ SITEURL }}/{{ tag.0.url }}">
{{ tag.0 }}
@@ -62,6 +71,7 @@
</li>
{% endif %}
{% include 'includes/github.html' %}
+ {% include 'includes/twitter_timeline.html' %}
{% include 'includes/links.html' %}
</ul>
diff --git a/pelican-bootstrap3/templates/includes/twitter_cards.html b/pelican-bootstrap3/templates/includes/twitter_cards.html
new file mode 100644
index 0000000..3145915
--- /dev/null
+++ b/pelican-bootstrap3/templates/includes/twitter_cards.html
@@ -0,0 +1,27 @@
+{% if TWITTER_CARDS and USE_OPEN_GRAPH %}
+ {# Do not include duplicates tag with og ones. #}
+ {# Twitter is able to infer them from og. #}
+ <meta name="twitter:card" content="summary">
+ {% if TWITTER_USERNAME %}
+ <meta name="twitter:site" content="@{{ TWITTER_USERNAME }}">
+ <meta name="twitter:creator" content="@{{ TWITTER_USERNAME }}">
+ {% endif %}
+ <meta name="twitter:domain" content="{{ SITEURL }}">
+ {% if article %}
+ {% if article.og_image %}
+ <meta property="twitter:image"
+ content="{{ SITEURL }}/{{ article.og_image }}"/>
+ {% elif OPEN_GRAPH_IMAGE %}
+ <meta property="twitter:image"
+ content="{{ SITEURL }}/{{ OPEN_GRAPH_IMAGE }}"/>
+ {% endif %}
+ {% elif page %}
+ {% if page.og_image %}
+ <meta property="twitter:image"
+ content="{{ SITEURL }}/{{ page.og_image }}"/>
+ {% elif OPEN_GRAPH_IMAGE %}
+ <meta property="twitter:image"
+ content="{{ SITEURL }}/{{ OPEN_GRAPH_IMAGE }}"/>
+ {% endif %}
+ {% endif %}
+{% endif %}
diff --git a/pelican-bootstrap3/templates/includes/twitter_timeline.html b/pelican-bootstrap3/templates/includes/twitter_timeline.html
new file mode 100644
index 0000000..ad1ce5d
--- /dev/null
+++ b/pelican-bootstrap3/templates/includes/twitter_timeline.html
@@ -0,0 +1,10 @@
+{% if TWITTER_WIDGET_ID %}
+
+ <li class="list-group-item"><h4><i class="fa fa-twitter fa-lg"></i><span class="icon-label">Latest Tweets</span></h4></li>
+ <div id="twitter_timeline">
+ <a class="twitter-timeline" data-chrome="noheader" href="https://twitter.com/{{ TWITTER_USERNAME }}" data-widget-id="{{TWITTER_WIDGET_ID}}">Tweets by {{TWITTER_USERNAME}}</a>
+ </div>
+
+<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 %} \ No newline at end of file
diff --git a/pelican-bootstrap3/templates/index.html b/pelican-bootstrap3/templates/index.html
index b38c0ee..29ba7d6 100644
--- a/pelican-bootstrap3/templates/index.html
+++ b/pelican-bootstrap3/templates/index.html
@@ -1,17 +1,4 @@
-{% extends "base.html" %}
-{% block content %}
- {% if articles %}
- {% for article in (articles_page.object_list if articles_page else articles) %}
- <article>
- <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
- <div class="summary">{{ article.summary }}
- {% include 'includes/comment_count.html' %}
- <a class="btn btn-default btn-xs" href="{{ SITEURL }}/{{ article.url }}">more ...</a>
- </div>
- </article>
- <hr/>
- {% endfor %}
- {% endif %}
+{% extends "article_list.html" %}
+
+{% block canonical_rel %}<link rel="canonical" href="{{ SITEURL }}">{% endblock %}
- {% include 'includes/pagination.html' %}
-{% endblock content %}
diff --git a/pelican-bootstrap3/templates/page.html b/pelican-bootstrap3/templates/page.html
index 179b2d7..f8757fa 100644
--- a/pelican-bootstrap3/templates/page.html
+++ b/pelican-bootstrap3/templates/page.html
@@ -1,11 +1,45 @@
{% extends "base.html" %}
{% block title %}{{ page.title }} - {{ SITENAME }}{% endblock %}
+{% block html_lang %}{{ page.lang }}{% endblock %}
+{% block meta %}
+ {% if page.author %}
+ <meta name="author" content="{{ page.author }}" />
+ {% else %}
+ <meta name="author" content="{{ AUTHOR }}" />
+ {% endif %}
+ {% if page.summary %}
+ <meta name="description" content="{{ page.summary|striptags|escape }}" />
+ {% endif %}
+{% endblock %}
+{% block opengraph %}
+ {% if OPEN_GRAPH_FB_APP_ID %}
+ <meta property="fb:app_id" content="{{ OPEN_GRAPH_FB_APP_ID }}"/>
+ {% endif %}
+ <meta property="og:site_name" content="{{ SITENAME }}" />
+ <meta property="og:type" content="article"/>
+ <meta property="og:title" content="{{ page.title|striptags|escape }}"/>
+ <meta property="og:url" content="{{ SITEURL }}/{{ page.url }}"/>
+ <meta property="og:description" content="{{ page.summary|striptags|escape }}" />
+ {% if page.og_image %}
+ <meta property="og:image"
+ content="{{ SITEURL }}/{{ page.og_image }}"/>
+ {% elif OPEN_GRAPH_IMAGE %}
+ <meta property="og:image"
+ content="{{ SITEURL }}/{{ OPEN_GRAPH_IMAGE }}"/>
+ {% endif %}
+{% endblock %}
+
+{% block canonical_rel %}
+<link rel="canonical" href="{{ SITEURL }}/{{ page.url }}">
+{% endblock %}
{% block breadcrumbs %}
{% if DISPLAY_BREADCRUMBS %}
<ol class="breadcrumb">
<li><a href="{{ SITEURL }}" title="{{ SITENAME }}"><i class="fa fa-home fa-lg"></i></a></li>
+ {% if page.url %}
<li class="active">{{ page.title }}</li>
+ {% endif %}
</ol>
{% endif %}
{% endblock %}
@@ -22,6 +56,9 @@
{% endif %}
<div class="entry-content">
{{ page.content }}
+ {% if page.comments == 'enabled' %}
+ {% include 'includes/comments.html' %}
+ {% endif %}
</div>
</section>
{% endblock %}
diff --git a/pelican-bootstrap3/templates/tag.html b/pelican-bootstrap3/templates/tag.html
index 9895705..aa9edc8 100644
--- a/pelican-bootstrap3/templates/tag.html
+++ b/pelican-bootstrap3/templates/tag.html
@@ -1,4 +1,9 @@
-{% extends "index.html" %}
+{% extends "article_list.html" %}
+{% block title %}{{ tag }} - {{ SITENAME }}{% endblock %}
+{% block meta %}
+ <meta name="author" content="{{ AUTHOR }}" />
+ <meta name="keywords" content="{{ tag }}" />
+{% endblock %}
{% block breadcrumbs %}
{% if DISPLAY_BREADCRUMBS %}
<ol class="breadcrumb">
@@ -8,4 +13,3 @@
</ol>
{% endif %}
{% endblock %}
-{% block title %}{{ tag }} - {{ SITENAME }}{% endblock %}