Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

21 files changed, 344 insertions, 0 deletions

diff --git a/zurb-F5-basic/templates/analytics.html b/zurb-F5-basic/templates/analytics.html
new file mode 100644
index 0000000..4de2c86
--- /dev/null
+++ b/zurb-F5-basic/templates/analytics.html
@@ -0,0 +1,12 @@
+{% if GOOGLE_ANALYTICS %}
+    <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', '{{GOOGLE_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 %}
\ No newline at end of file
diff --git a/zurb-F5-basic/templates/archives.html b/zurb-F5-basic/templates/archives.html
new file mode 100644
index 0000000..357246f
--- /dev/null
+++ b/zurb-F5-basic/templates/archives.html
@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+{% block content %}
+
+<h3>Archives</h3>
+
+<table class="table-archive">
+    <tbody>
+    {% for article in dates %}
+        <tr>
+        <td>{{ article.locale_date }}</td>
+        <td><a href='{{ article.url }}'>{{ article.title }}</a></td>
+        </tr>
+    {% endfor %}
+    </tbody>
+</table>
+
+{% endblock %}
diff --git a/zurb-F5-basic/templates/article.html b/zurb-F5-basic/templates/article.html
new file mode 100644
index 0000000..04ecaa2
--- /dev/null
+++ b/zurb-F5-basic/templates/article.html
@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+{% block title %}{{ article.title|striptags }}{% endblock %}
+{% block content %}
+<article>
+    <header>
+        <h3 class="article-title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
+        title="Permalink to {{ article.title|striptags }}">{{ article.title}}</a></h3>
+        {% include 'twitter.html' %}
+    </header>
+
+    {% include 'article_infos.html' %}
+    {{ article.content }}
+    {% include 'article_infos_bottom.html' %}
+
+    {% if DISQUS_SITENAME and SITEURL and article.status != "draft" %}
+	<h4>Comments</h4>
+    {% include 'disqus_script.html' %}
+    {% endif %}
+</article>
+{% endblock %}
\ No newline at end of file
diff --git a/zurb-F5-basic/templates/article_infos.html b/zurb-F5-basic/templates/article_infos.html
new file mode 100644
index 0000000..24c4a15
--- /dev/null
+++ b/zurb-F5-basic/templates/article_infos.html
@@ -0,0 +1,9 @@
+<h6 class="subheader" title="{{ article.date.isoformat() }}">{{ article.locale_date }}
+    {# {% if article.author %}
+    By <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
+    {% endif %} #}
+</h6>
+
+{% import 'translations.html' as translations with context %}
+{{ translations.translations_for(article) }}
+
diff --git a/zurb-F5-basic/templates/article_infos_bottom.html b/zurb-F5-basic/templates/article_infos_bottom.html
new file mode 100644
index 0000000..dd0c8a2
--- /dev/null
+++ b/zurb-F5-basic/templates/article_infos_bottom.html
@@ -0,0 +1,15 @@
+<p class="subheader">Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
+
+{% if article.tags %}
+    Tagged: 
+    {% for tag in article.tags %}
+    <a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }} </a>
+    {% endfor %}
+{% endif %}
+</p>
+
+{% if PDF_PROCESSOR %}<p><a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">PDF</a></p>{% endif %}
+
+{% import 'translations.html' as translations with context %}
+{{ translations.translations_for(article) }}
+
diff --git a/zurb-F5-basic/templates/author.html b/zurb-F5-basic/templates/author.html
new file mode 100644
index 0000000..0b37290
--- /dev/null
+++ b/zurb-F5-basic/templates/author.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ author }}{% endblock %}
diff --git a/zurb-F5-basic/templates/authors.html b/zurb-F5-basic/templates/authors.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/zurb-F5-basic/templates/authors.html
diff --git a/zurb-F5-basic/templates/base.html b/zurb-F5-basic/templates/base.html
new file mode 100644
index 0000000..757c86b
--- /dev/null
+++ b/zurb-F5-basic/templates/base.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html>

+<head>

+    <meta charset="utf-8" />

+    <!-- Set the viewport width to device width for mobile -->

+    <meta name="viewport" content="width=device-width" />

+

+    <title>{% block title %}{{ SITENAME }}{%endblock%}</title>

+

+    <link rel="stylesheet" href="{{ SITEURL }}/theme/css/normalize.css" />

+    <link rel="stylesheet" href="{{ SITEURL }}/theme/css/foundation.min.css" />

+    <link rel="stylesheet" href="{{ SITEURL }}/theme/css/style.css" />

+    <link rel="stylesheet" href="{{ SITEURL }}/theme/css/pygments.css" />	

+    <script src="{{ SITEURL }}/theme/js/custom.modernizr.js"></script>

+</head>

+

+<body>

+

+<!-- Nav Bar -->

+<nav>

+<div class="top-bar">

+<div class="row">

+    <div class="large-9 large-centered columns">

+	    <h1><a href="{{ SITEURL }}">{{ SITENAME }}</a></h1>

+    </div>

+</div>

+</div>

+

+<!-- Show menu items and pages -->

+<div class="row">

+<div class="large-9 columns">

+    <ul class="button-group navigation">

+	{% for title, link in MENUITEMS %}

+    <li><a href="{{ link }}" class="button secondary small">{{ title }}</a></li>

+    {% endfor %}

+

+    {% if DISPLAY_PAGES_ON_MENU %}

+        {% for page in PAGES %}

+            <li><a href="{{ SITEURL }}/{{ page.url }}" class="button secondary small">{{ page.title }}</a></li>

+        {% endfor %}

+    {% endif %}

+    </ul>

+</div>

+</div>

+</nav>

+<!-- End Nav -->

+

+

+<!-- Main Page Content and Sidebar -->

+<div class="row">

+

+    <!-- Main Blog Content -->

+    <div class="large-9 columns">

+    {% block content %}{% endblock %}

+    </div>

+    <!-- End Main Content -->

+

+    <!-- Sidebar -->

+    <aside class="large-3 columns">

+        <h5 class="sidebar-title">Site</h5>

+        <ul class="side-nav">

+            <li><a href="{{ SITEURL }}/archives.html">Archives</a>

+            <li><a href="{{ SITEURL }}/tags.html">Tags</a>

+            {% if FEED_RSS %}

+            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" rel="alternate">Atom feed</a></li>

+            {% endif %}

+            {% if FEED_RSS %}

+            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" rel="alternate">RSS feed</a></li>

+            {% endif %}

+        </ul>

+

+        {% if categories %}		

+        <h5 class="sidebar-title">Categories</h5>

+        <ul class="side-nav">

+        {% for cat, null in categories %}

+            <li><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>

+        {% endfor %}   

+        </ul>

+        {% endif %}

+

+        {% if LINKS %}

+        <h5 class="sidebar-title">Links</h5>

+        <ul class="side-nav">

+        {% for name, link in LINKS %}

+            <li><a href="{{ link }}">{{ name }}</a></li>

+        {% endfor %}

+        </ul>

+        {% endif %}

+		

+        {% if SOCIAL %}

+        <h5 class="sidebar-title">Social</h5>

+        <ul class="side-nav">

+        {% for name, link in SOCIAL %}

+            <li><a href="{{ link }}">{{ name }}</a></li>

+        {% endfor %}

+        </ul>

+        {% endif %}

+

+    </aside> <!-- End Sidebar -->

+

+</div> <!-- End Main Content and Sidebar -->

+

+

+<!-- Footer -->

+<footer class="row">

+    <div class="large-12 columns">

+        <hr />

+        <div class="row">

+            <div class="large-6 columns">

+              <!--                  <p>{{ SITENAME }} by {{ AUTHOR }}</p> -->

+            </div>

+            </div>

+    </div>

+</footer>

diff --git a/zurb-F5-basic/templates/categories.html b/zurb-F5-basic/templates/categories.html
new file mode 100644
index 0000000..c213fdb
--- /dev/null
+++ b/zurb-F5-basic/templates/categories.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}

+{% block content %}

+<ul class="circle">

+{% for category, articles in categories %}

+	<li><a href="{{ category.url }}">{{ category }}</a></li>

+{% endfor %}

+</ul>

+{% endblock %}
\ No newline at end of file
diff --git a/zurb-F5-basic/templates/category.html b/zurb-F5-basic/templates/category.html
new file mode 100644
index 0000000..56f8e93
--- /dev/null
+++ b/zurb-F5-basic/templates/category.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ category }}{% endblock %}
diff --git a/zurb-F5-basic/templates/comments.html b/zurb-F5-basic/templates/comments.html
new file mode 100644
index 0000000..348f425
--- /dev/null
+++ b/zurb-F5-basic/templates/comments.html
@@ -0,0 +1 @@
+{% if DISQUS_SITENAME %}<p><a href="{{ SITEURL }}/{{ article.url }}#disqus_thread">comments</a></p>{% endif %}
diff --git a/zurb-F5-basic/templates/disqus_script.html b/zurb-F5-basic/templates/disqus_script.html
new file mode 100644
index 0000000..f19d527
--- /dev/null
+++ b/zurb-F5-basic/templates/disqus_script.html
@@ -0,0 +1,15 @@
+{% if DISQUS_SITENAME %}
+    <div id="disqus_thread"></div>
+    <script type="text/javascript">
+        var disqus_shortname = '{{ DISQUS_SITENAME }}'
+        var disqus_identifier = "{{ article.url }}";
+        var disqus_url = "{{ SITEURL }}/{{ article.url }}";
+
+        (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>
+    <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+{% endif %}
diff --git a/zurb-F5-basic/templates/github.html b/zurb-F5-basic/templates/github.html
new file mode 100644
index 0000000..75592ac
--- /dev/null
+++ b/zurb-F5-basic/templates/github.html
@@ -0,0 +1,9 @@
+{% if GITHUB_URL %}
+<a href="{{ GITHUB_URL }}">
+{% if GITHUB_POSITION != "left" %}
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+{% else %}
+<img style="position: absolute; top: 0; left: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_left_white_ffffff.png" alt="Fork me on GitHub" />
+{% endif %}
+</a>
+{% endif %}
diff --git a/zurb-F5-basic/templates/index.html b/zurb-F5-basic/templates/index.html
new file mode 100644
index 0000000..6e632dc
--- /dev/null
+++ b/zurb-F5-basic/templates/index.html
@@ -0,0 +1,49 @@
+{% extends "base.html" %}
+{% block content_title %}{% endblock %}
+{% block content %}        
+{% if articles %}
+    {% for article in articles_page.object_list %}        
+
+        {# First item #}
+        {% if loop.first and not articles_page.has_previous() %}
+            <article>
+                <a href="{{ SITEURL }}/{{ article.url }}"><h3 class="article-title">{{ article.title }}</h3></a>
+                {% include 'article_infos.html' %}{{ article.content }}{% include 'article_infos_bottom.html' %}{% include 'comments.html' %}
+            </article>
+
+            {% if loop.length == 1 %}
+                {% include 'pagination.html' %}
+            {% endif %}
+
+            {% if loop.length > 1 %}
+                <hr  class="gradient"/>
+            {% endif %}
+
+        {# other items #}
+        {% else %}
+
+            <article>
+                <a href="{{ SITEURL }}/{{ article.url }}"><h3 class="article-title">{{ article.title }}</h3></a>
+                {% include 'article_infos.html' %}{{ article.summary }}{% include 'article_infos_bottom.html' %}{% include 'comments.html' %}
+                <a class="button radius secondary small right" href="{{ SITEURL }}/{{ article.url }}">Read More</a>
+                <hr  class="gradient"/>
+            </article>
+        {% endif %}
+
+        {% if loop.last %}
+            <!-- /#posts-list -->
+            {% if loop.last and (articles_page.has_previous() or not articles_page.has_previous() and loop.length > 1) %}
+                {% include 'pagination.html' %}
+            {% endif %}
+        {% endif %}
+    {% endfor %}
+
+{% else %}
+
+    <h3>Pages</h3>
+    {% for page in PAGES %}
+        <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
+    {% endfor %}
+
+{% endif %}
+{% endblock content %}
diff --git a/zurb-F5-basic/templates/page.html b/zurb-F5-basic/templates/page.html
new file mode 100644
index 0000000..6c40e4b
--- /dev/null
+++ b/zurb-F5-basic/templates/page.html
@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+{% block title %}{{ page.title }}{% endblock %}
+{% block content %}        
+    <h3>{{ page.title }}</h3>
+    {% import 'translations.html' as translations with context %}
+    {{ translations.translations_for(page) }}
+    {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">PDF</a>{% endif %}
+    {{ page.content }}
+{% endblock %}
diff --git a/zurb-F5-basic/templates/pagination.html b/zurb-F5-basic/templates/pagination.html
new file mode 100644
index 0000000..4f06408
--- /dev/null
+++ b/zurb-F5-basic/templates/pagination.html
@@ -0,0 +1,19 @@
+{% if DEFAULT_PAGINATION %}

+<div class="pagination-centered">

+<h6 class="subheader">Page {{ articles_page.number }} of {{ articles_paginator.num_pages }}</h6>

+

+<p>

+    {% if articles_page.has_previous() %}

+        {% if articles_page.previous_page_number() == 1 %}

+            <a href="{{ SITEURL }}/{{ page_name }}.html">&laquo; Prev</a>

+        {% else %}

+            <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html">&laquo; Prev</a>

+        {% endif %}

+    {% endif %}

+

+    {% if articles_page.has_next() %}

+        <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">Next &raquo;</a>

+    {% endif %}

+</p>

+</div>

+{% endif %}

diff --git a/zurb-F5-basic/templates/piwik.html b/zurb-F5-basic/templates/piwik.html
new file mode 100644
index 0000000..ff459af
--- /dev/null
+++ b/zurb-F5-basic/templates/piwik.html
@@ -0,0 +1,16 @@
+{% if PIWIK_URL and PIWIK_SITE_ID %}
+    <script type="text/javascript">
+    {% if PIWIK_SSL_URL %}
+        var pkBaseURL = (("https:" == document.location.protocol) ? "https://{{ PIWIK_SSL_URL }}/" : "http://{{ PIWIK_URL }}/");
+    {% else %}
+        var pkBaseURL = (("https:" == document.location.protocol) ? "https://{{ PIWIK_URL }}/" : "http://{{ PIWIK_URL }}/");
+    {% endif %}
+    document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+    </script><script type="text/javascript">
+    try {
+    var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", {{ PIWIK_SITE_ID }});
+    piwikTracker.trackPageView();
+    piwikTracker.enableLinkTracking();
+    } catch( err ) {}
+    </script><noscript><p><img src="http://{{ PIWIK_URL }}/piwik.php?idsite={{ PIWIK_SITE_ID }}" style="border:0" alt="" /></p></noscript>
+{% endif %}
\ No newline at end of file
diff --git a/zurb-F5-basic/templates/tag.html b/zurb-F5-basic/templates/tag.html
new file mode 100644
index 0000000..68cdcba
--- /dev/null
+++ b/zurb-F5-basic/templates/tag.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}
diff --git a/zurb-F5-basic/templates/tags.html b/zurb-F5-basic/templates/tags.html
new file mode 100644
index 0000000..9cba867
--- /dev/null
+++ b/zurb-F5-basic/templates/tags.html
@@ -0,0 +1,15 @@
+{% extends "base.html" %}

+{% block content %}

+

+<ul class="circle">

+    {% for tag, articles in tags|sort %}

+	<li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li>

+	<ul class="square">

+	{% for article in articles|sort %}

+	<li><a href="{{ SITEURL }}/{{ article.url }}"><small>{{ article.title }}</small></li>

+	{% endfor %}

+	</ul>

+    {% endfor %}

+</ul>

+

+{% endblock %}
\ No newline at end of file
diff --git a/zurb-F5-basic/templates/translations.html b/zurb-F5-basic/templates/translations.html
new file mode 100644
index 0000000..ca03a2c
--- /dev/null
+++ b/zurb-F5-basic/templates/translations.html
@@ -0,0 +1,8 @@
+{% macro translations_for(article) %}
+{% if article.translations %}
+Translations: 
+    {% for translation in article.translations %}
+        <a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
+    {% endfor %}
+{% endif %}
+{% endmacro %}
diff --git a/zurb-F5-basic/templates/twitter.html b/zurb-F5-basic/templates/twitter.html
new file mode 100644
index 0000000..c6b159f
--- /dev/null
+++ b/zurb-F5-basic/templates/twitter.html
@@ -0,0 +1,3 @@
+{% if TWITTER_USERNAME %}
+<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+{% endif %}
\ No newline at end of file