Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

12 files changed, 347 insertions, 0 deletions

diff --git a/notebook/templates/archives.html b/notebook/templates/archives.html
new file mode 100644
index 0000000..352ecd9
--- /dev/null
+++ b/notebook/templates/archives.html
@@ -0,0 +1,23 @@
+{% extends "base.html" %}
+{% block head %}
+{{ super() }}
+<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}">
+<meta name="twitter:url" content="{{ SITEURL }}/archives.html">
+<meta name="twitter:title" content="{{ SITENAME }} ~ Archives">
+<meta name="twitter:description" content="{{ SITENAME }} ~ Archives du site">
+
+<!-- Facebook Meta Data -->
+<meta property="og:title" content="{{ SITENAME }} ~ Archives" />
+<meta property="og:description" content="{{ SITENAME }} ~ Archives" />
+<meta property="og:image" content="{{ AVATAR }}" />
+{% endblock head %}
+{% block content %}
+<h1>Archives</h1>
+
+<dl>
+{% for article in dates %}
+    <dt>{{ article.locale_date }}</dt>
+    <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
+{% endfor %}
+</dl>
+{% endblock %}
diff --git a/notebook/templates/article.html b/notebook/templates/article.html
new file mode 100644
index 0000000..2fa83c2
--- /dev/null
+++ b/notebook/templates/article.html
@@ -0,0 +1,67 @@
+{% extends "base.html" %}
+{% block head %}
+{{ super() }}
+<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}">
+<meta name="twitter:url" content="{{ SITEURL }}/{{ article.url }}">
+<meta name="twitter:title" content="{{ SITENAME }} ~ {{ article.title }}">
+<meta name="twitter:description" content="{{ article.summary }}">
+
+<!-- Facebook Meta Data -->
+<meta property="og:title" content="{{ SITENAME }} ~ {{ article.title }}" />
+<meta property="og:description" content="{{ article.summary }}" />
+<meta property="og:image" content="{{ AVATAR }}" />
+{% endblock head %}
+{% block title %}{{ article.title }}{% endblock %}
+{% block content %}
+<section id="content">
+    <article>
+        <header class="post_list">
+            <h2 class="post_title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title }}</a></h2>
+            <span>Par </span>
+            <a href="{{ SITEURL }}/{{ article.author.url }}">@{{ article.author }}</a>
+            <span> dans </span>
+            <span class="post_category"><a href="{{ SITEURL }}/{{ article.category.url }}" rel="bookmark" title="Permalink to {{ article.category|striptags }}">[ {{ article.category }} ]</a></span>
+            <span> le </span>
+            <span class="post_date">{{ article.locale_date }}</span>
+            <div><span>Tags : </span>
+                {% if article.tags %}
+                {% for tag in article.tags %}
+                <span><a href="{{ SITEURL }}/{{ tag.url }}">#{{ tag }}, </a></span>
+                {% endfor %}
+                {% endif %}
+            </div>
+
+            <div class="entry-social">
+                <span class="twitter"><a target="_blank" rel="nofollow" onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=400,width=700');return false;" title="Twitter" href="https://twitter.com/share?url={{ SITEURL }}/{{ article.url }}&text={{ article.title }}&via={{TWITTER_USERNAME}}">Twitter</a></span>
+
+                <span class="gplus"><a target="_blank" title="Google +" href="https://plus.google.com/share?url={{ SITEURL }}/{{article.url}}&hl=fr" rel="nofollow" onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=450,width=650');return false;">Google+</a></span>
+
+                <span class="facebook"><a target="_blank" title="Facebook" rel="nofollow" onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=500,width=700');return false;" href="https://www.facebook.com/sharer.php?u={{ SITEURL }}/{{article.url}}&t={{ article.title }}">Facebook</a></span>
+
+                <a  target="_blank" title="Linkedin" href="https://www.linkedin.com/shareArticle?mini=true&url=<{{ SITEURL }}/{{ article.url }}&title={{ article.title }}" rel="nofollow" onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=450,width=650');return false;">Linkedin</a>
+
+                <span class="mail"><a href="mailto:?subject={{ article.title }}&amp;body=Viens découvrir un article à propos de [{{ article.title }}] sur le site de {{ AUTHOR }}. {{ SITEURL }}/{{article.url}}" title="Share by Email" target="_blank">Mail</a></span>
+            </div>
+        </header>
+        <div class="entry-content">
+            {{ article.content }}
+        </div>
+        {% if DISQUS_SITENAME %}
+        <div class="comments">
+            <h2>Comments !</h2>
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+            var disqus_identifier = "{{ article.url }}";
+            (function() {
+                var dsq = document.createElement('script');
+                dsq.type = 'text/javascript'; dsq.async = true;
+                dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+                (document.getElementsByTagName('head')[0] ||
+                 document.getElementsByTagName('body')[0]).appendChild(dsq);
+            })();
+            </script>
+        </div>
+        {% endif %}
+    </article>
+</section>
+{% endblock %}
\ No newline at end of file
diff --git a/notebook/templates/author.html b/notebook/templates/author.html
new file mode 100644
index 0000000..624ac82
--- /dev/null
+++ b/notebook/templates/author.html
@@ -0,0 +1,14 @@
+{% extends "index.html" %}
+{% block head %}
+{{ super() }}
+<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}">
+<meta name="twitter:url" content="{{ SITEURL }}/{{ author.url }}">
+<meta name="twitter:title" content="{{ SITENAME }} ~ {{ author }}">
+<meta name="twitter:description" content="Articles de {{ author }}">
+
+<!-- Facebook Meta Data -->
+<meta property="og:title" content="{{ SITENAME }} ~ {{ author }}" />
+<meta property="og:description" content="Articles de {{ author }}" />
+<meta property="og:image" content="{{ AVATAR }}" />
+{% endblock head %}
+{% block title %}{{ SITENAME }} - {{ author }}{% endblock %}
\ No newline at end of file
diff --git a/notebook/templates/base.html b/notebook/templates/base.html
new file mode 100644
index 0000000..5483e93
--- /dev/null
+++ b/notebook/templates/base.html
@@ -0,0 +1,103 @@
+<!doctype html>
+<html lang="{{ DEFAULT_LANG }}">
+<head>
+  {% block head %}
+  <meta charset="utf-8">
+  <!-- Site Meta Data -->
+  <title>{% block title %}{{ SITENAME }}{% endblock %}</title>
+  <meta name="description" content="">
+  <meta name="author" content="{{ AUTHOR }}">
+
+  <!-- Style Meta Data -->
+  <link rel="stylesheet" href="{{ SITEURL }}/theme/css/notebook.css" type="text/css" />
+  <link rel="shortcut icon" href="{{ SITEURL }}/{{ AVATAR}}">
+
+  <!-- Feed Meta Data -->
+  <link href="{{ SITEURL }}/{{ FEED }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
+  {% if FEED_RSS %}
+  <link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+  {% endif %}
+
+  <!-- Twitter Feed -->
+  <meta name="twitter:card" content="summary">
+  <meta name="twitter:site" content="{{ TWITTER_USERNAME }}">
+  <meta name="twitter:image" content="{{ SITEURL }}/{{ AVATAR }}">
+  {% endblock %}
+</head>
+
+<body>
+  <!-- Sidebar -->
+  <aside>
+    <p><a href="{{ SITEURL }}"><img id="avatar" src="{{ SITEURL }}/{{ AVATAR }}"></a></p>
+    <h1>{{ SITENAME }}</h1>
+    <p>{{ SIDEBAR_DIGEST }}</p>
+    <hr>
+    <h2>Social</h2>
+    <ul class="social">
+      {% for name, link in SOCIAL %}
+      <li style="list-style-image : url({{ SITEURL }}/theme/images/icons/{{ name|lower }}.png);"><a href="{{ link }}">{{ name }}</a></li>
+      {% endfor %}
+      <li style="list-style-image : url({{ SITEURL }}/theme/images/icons/rss.png);"><a href="{{ SITEURL }}/{{ FEED_ATOM }}" rel="alternate"><i class="icon-bookmark icon-large"></i>Atom feed</a></li>
+      {% if FEED_RSS %}
+      <li style="list-style-image : url({{ SITEURL }}/theme/images/icons/rss.png);"><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">RSS feed</a></li>
+      {% endif %}
+    </ul>
+    {% for title, link in MENUITEMS %}
+    <li><a href="{{ link }}">{{ title }}</a></li>
+    {% endfor %}
+    {% if DISPLAY_PAGES_ON_MENU and PAGES %}
+    <h2>Pages</h2>
+    <ul class="navbar">
+      {% for p in PAGES %}
+      <li><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
+      {% endfor %}
+    </ul>
+    {% endif %}
+    {% if categories %}
+    <h2>Categories</h2>
+    <ul class="navbar">
+      {% for cat, null in categories %}
+      <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
+      {% endfor %}
+    </ul> 
+    {% endif %}
+  </aside>
+
+  <!-- Content -->
+  <article>
+    {% block content %}
+    {% endblock %}
+  </article>
+
+  <!-- Footer -->
+  <footer>
+    <address id="about" class="vcard body">
+      {% if FIREFOX_BANNERS %}
+      <div align="center">
+        {% for id, img, alt in FIREFOX_BANNERS %}
+        <a href="http://affiliates.mozilla.org/link/banner/{{ id }}" target="_blank"><img src="{{ img }}" alt="{{ alt }}"/></a>
+        {% endfor %}
+      </div>
+      {% endif %}
+      Blog powered by <a href="http://getpelican.com/">Pelican</a>, 
+      which takes great advantage of <a href="http://python.org">Python</a>.
+      Theme <a href="https://github.com/quack1/notebook/">Notebook</a> by <a href="https://twitter.com/_Quack1">@Quack1</a>.
+    </address>
+  </footer>
+
+  {% if GOOGLE_ANALYTICS %}
+  <!-- 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 %}
+
+</body>
+</html>
\ No newline at end of file
diff --git a/notebook/templates/categories.html b/notebook/templates/categories.html
new file mode 100644
index 0000000..e24fd40
--- /dev/null
+++ b/notebook/templates/categories.html
@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{% block head %}
+{{ super() }}
+<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}">
+<meta name="twitter:url" content="{{ SITEURL }}/categories.html">
+<meta name="twitter:title" content="{{ SITENAME }} ~ Catégories">
+<meta name="twitter:description" content="{{ SITENAME }} ~ Catégories du site">
+
+<!-- Facebook Meta Data -->
+<meta property="og:title" content="{{ SITENAME }} ~ Catégories" />
+<meta property="og:description" content="{{ SITENAME }} ~ Catégories" />
+<meta property="og:image" content="{{ AVATAR }}" />
+{% endblock head %}
+{% block content %}
+<h2>Categories</h2>
+<ul class="category_folder">
+{% 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/notebook/templates/category.html b/notebook/templates/category.html
new file mode 100644
index 0000000..ccbbeab
--- /dev/null
+++ b/notebook/templates/category.html
@@ -0,0 +1,14 @@
+{% extends "index.html" %}
+{% block head %}
+{{ super() }}
+<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}">
+<meta name="twitter:url" content="{{ SITEURL }}/{{ category.url }}">
+<meta name="twitter:title" content="{{ SITENAME }} ~ {{ category }}">
+<meta name="twitter:description" content="Articles de {{ category }}">
+
+<!-- Facebook Meta Data -->
+<meta property="og:title" content="{{ SITENAME }} ~ {{ category }}" />
+<meta property="og:description" content="Articles de {{ category }}" />
+<meta property="og:image" content="{{ AVATAR }}" />
+{% endblock head %}
+{% block title %}{{ SITENAME }} - {{ category }}{% endblock %}
\ No newline at end of file
diff --git a/notebook/templates/index.html b/notebook/templates/index.html
new file mode 100644
index 0000000..fced918
--- /dev/null
+++ b/notebook/templates/index.html
@@ -0,0 +1,35 @@
+{% extends "base.html" %}
+{% block head %}
+{{ super() }}
+<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}">
+<meta name="twitter:url" content="{{ SITEURL }}">
+<meta name="twitter:title" content="{{ SITENAME }}">
+<meta name="twitter:description" content="{{ SIDEBAR_DIGEST }}">
+
+<!-- Facebook Meta Data -->
+<meta property="og:title" content="{{ SITENAME }}" />
+<meta property="og:description" content="{{ SIDEBAR_DIGEST }}" />
+<meta property="og:image" content="{{ AVATAR }}" />
+{% endblock head %}
+{% block content_title %}{% endblock %}
+{% block content %}
+{% if articles %}
+<ol>
+	{% for article in (articles_page.object_list if articles_page else articles) %}
+	<li class="post_list"><p class="post_entry">
+		<h2 class="post_title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
+		<a href="{{ SITEURL }}/{{ article.author.url }}">@{{ article.author }}</a>
+		<span> dans </span>
+		<span class="post_category"><a href="{{ SITEURL }}/{{ article.category.url }}" rel="bookmark" title="Permalink to {{ article.category|striptags }}">[ {{ article.category }} ]</a></span>
+		<span> le </span>
+		<span class="post_date">{{ article.locale_date }}</span>
+	</li>
+	{% endfor %}
+</ol>
+{% endif %}
+
+{% if articles_page and articles_paginator.num_pages > 1 %}
+{% include 'pagination.html' %}
+{% endif %}
+
+{% endblock content %}
\ No newline at end of file
diff --git a/notebook/templates/page.html b/notebook/templates/page.html
new file mode 100644
index 0000000..223b52c
--- /dev/null
+++ b/notebook/templates/page.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+{% block title %}{{ page.title }}{% endblock %}
+{% block content %}
+<section id="content" class="body">
+        <h1 class="entry-title">{{ page.title }}</h1>
+        {% if PDF_PROCESSOR %}
+                <a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">
+                        get the pdf
+                </a>
+        {% endif %}
+        {{ page.content }}
+</section>
+{% endblock %}
diff --git a/notebook/templates/pagination.html b/notebook/templates/pagination.html
new file mode 100644
index 0000000..b01bfc9
--- /dev/null
+++ b/notebook/templates/pagination.html
@@ -0,0 +1,16 @@
+{% if DEFAULT_PAGINATION %}
+<p class="paginator">
+    {% if articles_page.has_previous() %}
+        {% if articles_page.previous_page_number() == 1 %}
+            <a href="{{ SITEURL }}/{{ page_name }}.html">~:)</a>
+        {% else %}
+            <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html">~:)</a>
+        {% endif %}
+    {% endif %}
+     {{ articles_page.number }} ~ {{ articles_paginator.num_pages }} 
+    {% if articles_page.has_next() %}
+        <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">(:~</a>
+    {% endif %}
+</p>
+{% endif %}
+
diff --git a/notebook/templates/tag.html b/notebook/templates/tag.html
new file mode 100644
index 0000000..c0b8d77
--- /dev/null
+++ b/notebook/templates/tag.html
@@ -0,0 +1,14 @@
+{% extends "index.html" %}
+{% block head %}
+{{ super() }}
+<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}">
+<meta name="twitter:url" content="{{ SITEURL }}/{{ tag.url }}">
+<meta name="twitter:title" content="{{ SITENAME }} ~ {{ tag }}">
+<meta name="twitter:description" content="Articles de {{ tag }}">
+
+<!-- Facebook Meta Data -->
+<meta property="og:title" content="{{ SITENAME }} ~ {{ tag }}" />
+<meta property="og:description" content="Articles de {{ tag }}" />
+<meta property="og:image" content="{{ AVATAR }}" />
+{% endblock head %}
+{% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}
\ No newline at end of file
diff --git a/notebook/templates/tags.html b/notebook/templates/tags.html
new file mode 100644
index 0000000..90bfc19
--- /dev/null
+++ b/notebook/templates/tags.html
@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{% block head %}
+{{ super() }}
+<meta name="twitter:creator" content="{{ TWITTER_USERNAME }}">
+<meta name="twitter:url" content="{{ SITEURL }}/tags.html">
+<meta name="twitter:title" content="{{ SITENAME }} ~ Tags">
+<meta name="twitter:description" content="{{ SITENAME }} ~ Tags du site">
+
+<!-- Facebook Meta Data -->
+<meta property="og:title" content="{{ SITENAME }} ~ Tags" />
+<meta property="og:description" content="{{ SITENAME }} ~ Tags" />
+<meta property="og:image" content="{{ AVATAR }}" />
+{% endblock head %}
+{% block content %}
+<h2>Tags</h2>
+<ul>
+{% for tag, articles in tags %}
+    <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</li>
+{% endfor %}
+</ul>
+{% endblock %}
diff --git a/notebook/templates/translations.html b/notebook/templates/translations.html
new file mode 100644
index 0000000..25e7ca0
--- /dev/null
+++ b/notebook/templates/translations.html
@@ -0,0 +1,6 @@
+{% if article.translations %}
+<span class="label">Langues</span>
+{% for translation in article.translations %}
+	<a href="{{ SITEURL }}/{{ translation.url }}"><i class="icon-edit"></i>{{ translation.lang }}</a>
+{% endfor %}
+{% endif %}
\ No newline at end of file