Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

21 files changed, 301 insertions, 0 deletions

diff --git a/SoMA2/templates/analytics.html b/SoMA2/templates/analytics.html
new file mode 100644
index 0000000..4de2c86
--- /dev/null
+++ b/SoMA2/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/SoMA2/templates/archives.html b/SoMA2/templates/archives.html
new file mode 100644
index 0000000..f678494
--- /dev/null
+++ b/SoMA2/templates/archives.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+{% block content %}
+<section id="content" class="body">
+<h1>Archives for {{ SITENAME }}</h1>
+
+<dl>
+{% for article in dates %}
+    <dt>{{ article.locale_date }}</dt>
+    <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
+{% endfor %}
+</dl>
+</section>
+{% endblock %}
diff --git a/SoMA2/templates/article.html b/SoMA2/templates/article.html
new file mode 100644
index 0000000..70cfa9e
--- /dev/null
+++ b/SoMA2/templates/article.html
@@ -0,0 +1,37 @@
+{% extends "base.html" %}
+{% block title %}{{ article.title|striptags }}{% endblock %}
+{% block content %}
+<section id="content" >
+    <div class="body">
+      <article>
+        <header>
+          <h1 class="entry-title">
+            <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
+               title="Permalink to {{ article.title|striptags }}">{{ article.title}}</a></h1>
+
+        </header>
+
+        <div class="entry-content">
+          {% include 'article_infos.html' %}
+          {{ article.content }}
+        </div><!-- /.entry-content -->
+        {% include 'twitter.html' %}
+        {% if DISQUS_SITENAME %}
+        <div class="comments">
+
+          <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>
+    </div>
+</section>
+{% endblock %}
diff --git a/SoMA2/templates/article_infos.html b/SoMA2/templates/article_infos.html
new file mode 100644
index 0000000..d5c28c6
--- /dev/null
+++ b/SoMA2/templates/article_infos.html
@@ -0,0 +1,16 @@
+<div class="post-info">
+	<ul>
+	{% if article.author %}
+        <li class="vcard author">
+                 by&nbsp;<a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
+        </li>
+        {% endif %}
+        <li class="published" title="{{ article.date.isoformat() }}">
+          on&nbsp;{{ article.locale_date }}
+        </li>
+
+	</ul>
+{% include 'taglist.html' %}
+{% import 'translations.html' as translations with context %}
+{{ translations.translations_for(article) }}
+</div><!-- /.post-info -->
diff --git a/SoMA2/templates/author.html b/SoMA2/templates/author.html
new file mode 100644
index 0000000..0b37290
--- /dev/null
+++ b/SoMA2/templates/author.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ author }}{% endblock %}
diff --git a/SoMA2/templates/authors.html b/SoMA2/templates/authors.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/SoMA2/templates/authors.html
diff --git a/SoMA2/templates/base.html b/SoMA2/templates/base.html
new file mode 100644
index 0000000..c2a3f7b
--- /dev/null
+++ b/SoMA2/templates/base.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
+        <meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <link rel="shortcut icon" href="{{ SITEURL }}/theme/images/favicon.ico"/>
+        <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
+        {% if FEED_ALL_ATOM %}
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
+        {% endif %}
+        {% if FEED_ALL_RSS %}
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+        {% endif %}
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie.css"/>
+                <script src="{{ SITEURL }}/js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie6.css"/><![endif]-->
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8/jquery.min.js" type="text/javascript"></script>
+
+
+</head>
+
+<body id="index" class="home">
+{% include 'github.html' %}
+	
+  <!-- <header id="banner" class="body"> -->
+  <!--               <h1><a href="{{ SITEURL }}/"><img src="http://www.launchyard.com/images/logo.png" />{% if SITESUBTITLE %}<strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1> -->
+  <!--       </header> --> 
+
+  <div class="LaunchyardDetail">
+    <!-- <p> -->
+    <!-- <img src="{{ SITEURL }}/theme/images/blue-pin.png" width="100" height="100" alt="Graph icon"> -->
+    <!-- </p> -->
+    <p><a id="sitesubtitle" href="{{ SITEURL }}/">{% if SITESUBTITLE %}{{ SITESUBTITLE }}{% endif %}</a></p>
+    {% if SITETAGLINE %}<p id="sitetagline">{{ SITETAGLINE }}</p>{% endif %}
+    <p><a id="aboutlink" href="{{ SITEURL }}/pages/about.html">about</a></p>
+
+    <!-- <ul> -->
+    <!--   <li><a href="{{ SITEURL }}/pages/about.html">about</a></li> -->
+      <!-- <li><a href="{{ SITEURL }}/pages/about.html">articles</a></li> -->
+<!-- {% if articles %} -->
+<!--         <br/> -->
+<!--         <br/> -->
+<!--     {% for article in articles %} -->        
+<!--       <li><a href="">{{ article.title }}</a></li> -->
+<!--     {% endfor %} -->
+<!-- {% endif %} -->
+    <!-- </ul> -->
+
+    <!-- This belongs in the about page -->
+      <!-- {% for name, link in SOCIAL %} -->
+      <!-- <a href="{{ link }}">{{ name }}</a> -->
+      <!-- <br/> -->
+      <!-- {% endfor %} -->
+
+<!-- {% include 'categories.html' %} -->
+  </div>
+
+        {% block content %}
+        {% endblock %}
+        <section id="extras" >
+        
+        </section><!-- /#extras -->
+	
+        <footer id="contentinfo" >
+                <address id="about" class="vcard ">
+                Proudly powered by <a href="http://getpelican.com/" target="_blank">Pelican</a>, which takes
+                great advantage of <a href="http://python.org" target="_blank">Python</a>.
+		
+                </address><!-- /#about -->
+		
+
+                
+        </footer><!-- /#contentinfo -->
+
+{% include 'analytics.html' %}
+{% include 'piwik.html' %}
+{% include 'facebook_script.html' %}
+{% include 'disqus_script.html' %}
+</body>
+</html>
diff --git a/SoMA2/templates/categories.html b/SoMA2/templates/categories.html
new file mode 100644
index 0000000..c520511
--- /dev/null
+++ b/SoMA2/templates/categories.html
@@ -0,0 +1,7 @@
+{% block content %}
+<ul>
+{% for category, articles in categories %}
+	<li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
+{% endfor %}
+</ul>
+{% endblock %}
diff --git a/SoMA2/templates/category.html b/SoMA2/templates/category.html
new file mode 100644
index 0000000..56f8e93
--- /dev/null
+++ b/SoMA2/templates/category.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ category }}{% endblock %}
diff --git a/SoMA2/templates/comments.html b/SoMA2/templates/comments.html
new file mode 100644
index 0000000..bb033c0
--- /dev/null
+++ b/SoMA2/templates/comments.html
@@ -0,0 +1 @@
+{% if DISQUS_SITENAME %}<p>There are <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread">comments</a>.</p>{% endif %}
diff --git a/SoMA2/templates/disqus_script.html b/SoMA2/templates/disqus_script.html
new file mode 100644
index 0000000..c4f442c
--- /dev/null
+++ b/SoMA2/templates/disqus_script.html
@@ -0,0 +1,11 @@
+{% if DISQUS_SITENAME %}
+<script type="text/javascript">
+    var disqus_shortname = '{{ DISQUS_SITENAME }}';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+{% endif %}
diff --git a/SoMA2/templates/facebook_script.html b/SoMA2/templates/facebook_script.html
new file mode 100644
index 0000000..03e1a2a
--- /dev/null
+++ b/SoMA2/templates/facebook_script.html
@@ -0,0 +1,12 @@
+{% if FACEBOOK_APP_ID %}
+<div id="fb-root"></div>
+<script>
+  facebook_appId = '{{ FACEBOOK_APP_ID }}';
+  (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/all.js#xfbml=1&appId=" + facebook_appId;
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+{% endif %}
diff --git a/SoMA2/templates/github.html b/SoMA2/templates/github.html
new file mode 100644
index 0000000..75592ac
--- /dev/null
+++ b/SoMA2/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/SoMA2/templates/index.html b/SoMA2/templates/index.html
new file mode 100644
index 0000000..1a15916
--- /dev/null
+++ b/SoMA2/templates/index.html
@@ -0,0 +1,33 @@
+{% extends "base.html" %}
+{% block content_title %}{% endblock %}
+{% block content %}        
+{% if articles %}
+    {% for article in articles_page.object_list %}        
+
+        {# First item #}
+    
+            <aside id="featured">
+                <div class="body">
+                    <article>
+                        <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
+                        {% include 'article_infos.html' %}{{ article.summary }}
+                    </article>
+		{% if loop.last and (articles_page.has_previous() or not articles_page.has_previous() and loop.length > 1) %} 
+                    {% include 'pagination.html' %}
+                {% endif %}
+                </div>
+            </aside><!-- /#featured -->
+            
+        
+    {% endfor %}
+{% else %}
+<section id="content" >
+    <div class="body">
+    <h2>Pages</h2>
+        {% for page in PAGES %}
+            <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
+        {% endfor %}
+    </div>
+</section>
+{% endif %}
+{% endblock content %}
diff --git a/SoMA2/templates/page.html b/SoMA2/templates/page.html
new file mode 100644
index 0000000..60409d5
--- /dev/null
+++ b/SoMA2/templates/page.html
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+{% block title %}{{ page.title }}{% endblock %}
+{% block content %}        
+<section id="content" class="body">    
+    <h1 class="entry-title">{{ page.title }}</h1>
+    {% import 'translations.html' as translations with context %}
+    {{ translations.translations_for(page) }}
+    {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">get
+    the pdf</a>{% endif %}
+    {{ page.content }}
+</section>
+{% endblock %}
diff --git a/SoMA2/templates/pagination.html b/SoMA2/templates/pagination.html
new file mode 100644
index 0000000..b8553fd
--- /dev/null
+++ b/SoMA2/templates/pagination.html
@@ -0,0 +1,15 @@
+{% if DEFAULT_PAGINATION %}
+<div class="paginator">
+    {% if articles_page.has_previous() %}
+        {% if articles_page.previous_page_number() == 1 %}
+            <div class="navButton"> <a href="{{ SITEURL }}/{{ page_name }}.html" >Prev</a></div>
+        {% else %}
+            <div class="navButton"><a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html">Prev</a></div>
+        {% endif %}
+    {% endif %}
+    <div class="navButton">Page {{ articles_page.number }} / {{ articles_paginator.num_pages }}</div>
+    {% if articles_page.has_next() %}
+        <div class="navButton"><a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html" >Next</a></div>
+    {% endif %}
+</div>
+{% endif %}
diff --git a/SoMA2/templates/piwik.html b/SoMA2/templates/piwik.html
new file mode 100644
index 0000000..ff459af
--- /dev/null
+++ b/SoMA2/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/SoMA2/templates/tag.html b/SoMA2/templates/tag.html
new file mode 100644
index 0000000..68cdcba
--- /dev/null
+++ b/SoMA2/templates/tag.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}
diff --git a/SoMA2/templates/taglist.html b/SoMA2/templates/taglist.html
new file mode 100644
index 0000000..1617162
--- /dev/null
+++ b/SoMA2/templates/taglist.html
@@ -0,0 +1,2 @@
+{% if article.tags %}<p>Category: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}</p>{% endif %}
+{% if PDF_PROCESSOR %}<p><a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a></p>{% endif %}
diff --git a/SoMA2/templates/translations.html b/SoMA2/templates/translations.html
new file mode 100644
index 0000000..ca03a2c
--- /dev/null
+++ b/SoMA2/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/SoMA2/templates/twitter.html b/SoMA2/templates/twitter.html
new file mode 100644
index 0000000..b4328e9
--- /dev/null
+++ b/SoMA2/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><br/><br/>
+{% endif %}