From 352965e0445417584f6c3fb3e8fef5d87db4f37f Mon Sep 17 00:00:00 2001 From: Daan Debie Date: Thu, 21 Aug 2014 18:45:11 +0200 Subject: Updated pelican-bootstrap3 to the latest version --- pelican-bootstrap3/templates/archives.html | 11 +- pelican-bootstrap3/templates/article.html | 47 ++++++ pelican-bootstrap3/templates/article_list.html | 22 +++ pelican-bootstrap3/templates/author.html | 20 +-- pelican-bootstrap3/templates/authors.html | 26 ++-- pelican-bootstrap3/templates/base.html | 66 +++++---- pelican-bootstrap3/templates/category.html | 6 +- pelican-bootstrap3/templates/includes/aboutme.html | 9 ++ pelican-bootstrap3/templates/includes/addthis.html | 16 ++- .../templates/includes/article_info.html | 18 +-- .../templates/includes/cc-license.html | 2 +- .../templates/includes/comment_count.html | 2 +- .../templates/includes/comments.html | 18 ++- .../templates/includes/disqus_script.html | 2 + pelican-bootstrap3/templates/includes/ga.html | 14 ++ .../templates/includes/github-js.html | 2 + .../templates/includes/liquid_tags_nb_header.html | 157 +++++++++++++++++++++ .../templates/includes/pagination.html | 54 ++++--- pelican-bootstrap3/templates/includes/piwik.html | 28 ++-- pelican-bootstrap3/templates/includes/sidebar.html | 22 ++- .../templates/includes/twitter_cards.html | 27 ++++ .../templates/includes/twitter_timeline.html | 10 ++ pelican-bootstrap3/templates/index.html | 19 +-- pelican-bootstrap3/templates/page.html | 37 +++++ pelican-bootstrap3/templates/tag.html | 8 +- 25 files changed, 522 insertions(+), 121 deletions(-) create mode 100644 pelican-bootstrap3/templates/article_list.html create mode 100644 pelican-bootstrap3/templates/includes/aboutme.html create mode 100644 pelican-bootstrap3/templates/includes/liquid_tags_nb_header.html create mode 100644 pelican-bootstrap3/templates/includes/twitter_cards.html create mode 100644 pelican-bootstrap3/templates/includes/twitter_timeline.html (limited to 'pelican-bootstrap3/templates') 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 %}

Archives for {{ SITENAME }}

- -

{{ article.locale_date }}: {{ article.title }}

{% 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 %} + + {% else %} + + {% endif %} + {% if article.tags %} + + {% endif %} + {% if article.summary %} + + {% endif %} +{% endblock %} +{% block opengraph %} + {% if OPEN_GRAPH_FB_APP_ID %} + + + + + + + + {% if article.category %} + + {% endif %} + {% for tag in article.tags %} + + {% endfor %} + {% if article.author %} + + {% elif AUTHOR %} + + {% endif %} + {% if article.og_image %} + + {% elif OPEN_GRAPH_IMAGE %} + + {% endif %} + {% endif %} +{% endblock %} + +{% block canonical_rel %} + +{% 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) %} +

+ {% if DISPLAY_ARTICLE_INFO_ON_INDEX %} +

+ {% include "includes/article_info.html" %} +

+ {% endif %} +

{{ article.summary }} + {% include 'includes/comment_count.html' %} + more ... +

+ {% 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 @@ - - - - - - +{% extends "article_list.html" %} - - \ No newline at end of file +{% block title %}Articles by {{ author }} - {{ SITENAME }}{% endblock %} + +{% block breadcrumbs %} + {% if DISPLAY_BREADCRUMBS %} + + {% 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 @@ - - - - - - +{% extends "base.html" %} - - \ No newline at end of file +{% block title %}Authors - {{ SITENAME }}{% endblock %} + +{% block breadcrumbs %} + {% if DISPLAY_BREADCRUMBS %} + + {% endif %} +{% endblock %} + +{% block content %} +

Authors on {{ SITENAME }}

+ {% for author, articles in authors|sort %} +

{{ author }} ({{ articles|count }})

+ {% endfor %} +{% endblock %} diff --git a/pelican-bootstrap3/templates/base.html b/pelican-bootstrap3/templates/base.html index bfbaa62..29f3576 100644 --- a/pelican-bootstrap3/templates/base.html +++ b/pelican-bootstrap3/templates/base.html @@ -1,48 +1,61 @@ - + xmlns:fb="https://www.facebook.com/2008/fbml"{% endif %}> {% block title %}{{ SITENAME }}{% endblock %} - + + {% 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 %} {% endif %} + {% if FAVICON_IE %} + + {% endif %} + {% if TOUCHICON %} + + {% endif %} + + {% block canonical_rel %}{% endblock %} + + {% block meta %} + + {% endblock %} {# Open Graph tags #} {% if USE_OPEN_GRAPH is not defined %} {% set USE_OPEN_GRAPH = True %} {% endif %} {% if USE_OPEN_GRAPH %} + {% block opengraph %} {% if OPEN_GRAPH_FB_APP_ID %} {% endif %} - {% if article %} - - - - - {% elif page %} - - - - {% else %} - - - - - {% if OPEN_GRAPH_IMAGE %} + + + + + + {% if OPEN_GRAPH_IMAGE %} - {% endif %} + content="{{ SITEURL }}/{{ OPEN_GRAPH_IMAGE }}"/> {% endif %} + {% endblock %} {% endif %} + {# Twitter Cards tags #} + {% include 'includes/twitter_cards.html' %} + {% if BOOTSTRAP_THEME %} @@ -68,7 +81,7 @@ title="{{ SITENAME }} ATOM Feed"/> {% endif %} {% if FEED_ALL_RSS %} - {% endif %} @@ -97,7 +110,7 @@ {% if DISPLAY_PAGES_ON_MENU %} {% for p in PAGES %} - {{ p.title }} + {{ p.menulabel|default(p.title) }} {% endfor %} {% endif %} @@ -119,7 +132,7 @@

- {% if not HIDE_SIDEBAR %} + {% if not HIDE_SIDEBAR or SHOW_ABOUTME %}

{% else %}

@@ -130,6 +143,11 @@ {% block content %} {% endblock %}

+ {% if ABOUT_ME %} +

+ {% include 'includes/aboutme.html' %} +

+ {% endif %} {% if not HIDE_SIDEBAR %} {% include 'includes/footer.html' %} - + 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 %} + + +{% endblock %} {% block breadcrumbs %} {% if DISPLAY_BREADCRUMBS %}

+ +

+ About {{ AUTHOR }}
+ {{ ABOUT_ME }} +

- - - + {% if ADDTHIS_FACEBOOK_LIKE|default(true) %} + + {% endif %} + {% if ADDTHIS_TWEET|default(true) %} + + {% endif %} + {% if ADDTHIS_GOOGLE_PLUSONE|default(true) %} + + {% endif %}

Comments

+ {% 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 %} + + +{% endif %} +{% if GOOGLE_ANALYTICS_UNIVERSAL %} + + + {% 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 %} + + {% 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 @@ + + + + + + + + + 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 %} -

« -
«
{{ num }}
»
»

+ {% if USE_PAGER %} + + {% else %} +

« +
«
{{ num }}
»
»

+ {% 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 %} - - - + (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); + })(); + + {% 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 @@

Social

@@ -43,15 +47,20 @@ {{ cat }} - {% endfor %} + {% 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 %}

Latest Tweets

+ Tweets by {{TWITTER_USERNAME}} +

{{ article.summary }} - {% include 'includes/comment_count.html' %} - more ... -

{{ page.content }} + {% if page.comments == 'enabled' %} + {% include 'includes/comments.html' %} + {% endif %}

{% 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 %} + + +{% endblock %} {% block breadcrumbs %} {% if DISPLAY_BREADCRUMBS %} {% endif %} {% endblock %} -{% block title %}{{ tag }} - {{ SITENAME }}{% endblock %} -- cgit