Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

10 files changed, 361 insertions, 0 deletions

diff --git a/foundation-default-colours/templates/analytics.html b/foundation-default-colours/templates/analytics.html
new file mode 100644
index 0000000..911935b
--- /dev/null
+++ b/foundation-default-colours/templates/analytics.html
@@ -0,0 +1,14 @@
+{% if GOOGLE_ANALYTICS %}
+{% if FOUNDATION_NEW_ANALYTICS %}
+<script>
+  (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}}', '{{ FOUNDATION_ANALYTICS_DOMAIN }}');
+  ga('send', 'pageview');
+</script>
+{% else %}
+<script>var _gaq=[['_setAccount','{{GOOGLE_ANALYTICS}}'],['_trackPageview']];(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.src='//www.google-analytics.com/ga.js';s.parentNode.insertBefore(g,s)}(document,'script'))</script>
+{% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/foundation-default-colours/templates/archives.html b/foundation-default-colours/templates/archives.html
new file mode 100644
index 0000000..3268c62
--- /dev/null
+++ b/foundation-default-colours/templates/archives.html
@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+
+{% block content %}
+	<div class="row">
+		<div class="small-10 columns small-centered">
+			{% for year, date_year in dates|groupby( 'date.year' )|sort(reverse=True) %}
+				<div class="row archive-year">
+					<div class="small-2 columns text-right">
+						<h3>{{ year }}</h3>
+					</div>
+				</div>
+				{% for month, articles in date_year|groupby('date.month') %}
+					{% for article in articles %}
+					<div class="row archive-entry">
+						<div class="small-2 columns text-right">
+							<h5>{{ article.date.strftime('%b %d') }}</h5>
+						</div>
+						<div class="small-10 columns">
+							<h5><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h5>
+						</div>
+					</div>
+					{% endfor %}
+				{% endfor %}
+			{% endfor %}
+		</div>
+	</div>
+{% endblock %}
+
+{% set pagetitle = 'Archives' %}
diff --git a/foundation-default-colours/templates/article.html b/foundation-default-colours/templates/article.html
new file mode 100644
index 0000000..1528309
--- /dev/null
+++ b/foundation-default-colours/templates/article.html
@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+
+{% block content %}
+<article>
+	<h2>{{ article.title }}</h2>
+	{{ article.content }}
+	<hr/>
+	<h6>Written by <a href="{{ SITEURL }}/author/{{ article.author|lower|replace(' ', '-') }}.html">{{ article.author }}</a> {% if article.category %}in <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category}}</a> {% endif %}on {{ article.locale_date }}.{% if article.tags|count > 0 %} Tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>, {% endfor %}{% endif %}</h6>
+</article>
+
+<hr/>
+{% if DISQUS_SITENAME %}
+<div class="row">
+	<div class="small-12 columns">
+		<h3>Comments</h3>
+		<div id="disqus_thread"></div>
+		<script type="text/javascript">
+			var disqus_shortname = '{{ DISQUS_SITENAME }}';
+			(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>
+		<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+	</div>
+</div>
+{% endif %}
+{% endblock %}
diff --git a/foundation-default-colours/templates/base.html b/foundation-default-colours/templates/base.html
new file mode 100644
index 0000000..26241a2
--- /dev/null
+++ b/foundation-default-colours/templates/base.html
@@ -0,0 +1,202 @@
+<!doctype html>
+<html class="no-js" lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+		<title>{% block windowtitle %}{{ SITENAME }}{% endblock %}</title>
+		<meta name="description" content="">
+		<meta name="author" content="{{ AUTHOR }}">
+
+		<link rel="stylesheet" href="{{ SITEURL }}/theme/css/foundation.css" />
+		{% if not FOUNDATION_PYGMENT_THEME %}
+		{% set FOUNDATION_PYGMENT_THEME = 'monokai' %}
+		{% endif %}
+		<link rel="stylesheet" href="{{ SITEURL }}/theme/css/pygment/{{ FOUNDATION_PYGMENT_THEME }}.css" />
+		<link rel="stylesheet" href="{{ SITEURL }}/theme/css/custom.css" />
+
+		{% if FOUNDATION_ALTERNATE_FONTS %}
+		<!-- GOOGLE WEB FONTS -->
+		<link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono|Droid+Serif:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
+		<link rel="stylesheet" href="{{ SITEURL }}/theme/css/alt-fonts.css" />
+		{% endif %}
+
+		<script src="{{ SITEURL }}/theme/js/modernizr.js"></script>
+
+		<!-- Feeds -->
+		{% 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 %}
+
+		{% include "analytics.html" %}
+
+		<!-- mathjax config similar to math.stackexchange -->
+		<script type="text/x-mathjax-config">
+		MathJax.Hub.Config({
+			jax: ["input/TeX", "output/HTML-CSS"],
+			tex2jax: {
+				inlineMath: [ ['$', '$'] ],
+				displayMath: [ ['$$', '$$']],
+				processEscapes: true,
+				skipTags: ['script', 'noscript', 'style', 'textarea', 'pre', 'code']
+			},
+			messageStyle: "none",
+			"HTML-CSS": { preferredFont: "TeX", availableFonts: ["STIX","TeX"] }
+		});
+		</script>
+		<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+	</head>
+	<body>
+		<div class="off-canvas-wrap">
+			<div class="inner-wrap">
+				<!-- mobile top bar to activate nav -->
+				<nav class="tab-bar show-for-small">
+					<section class="left-small">
+						<a class="left-off-canvas-toggle menu-icon" ><span></span></a>
+					</section>
+
+					<section class="middle tab-bar-section">
+						<h1 class="title">{{ SITENAME|replace(' ', '&nbsp;') }}</h1>
+					</section>
+				</nav>
+
+				<!-- mobile side bar nav -->
+				<aside class="left-off-canvas-menu">
+					<ul class="off-canvas-list">
+						<li><a href="{{ SITEURL }}">Home</a></li>
+						<li><label>Categories</label></li>
+						{% for cat, articles in categories %}
+							<li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
+						{% endfor %}
+
+						<li><label>Places</label></li>
+							{% for name, link in LINKS %}
+							<li><a href="{{ link }}">{{ name }}</a></li>
+							{% endfor %}
+
+						{% if FOUNDATION_TAGS_IN_MOBILE_SIDEBAR %}
+						<li><label>Tags</label></li>
+							{% for tag, articles in tags|sort %}
+							<li><a href="{{ SITEURL }}/{{ tag.url|replace(' ', '-') }}">{{ tag }}</a></li>
+							{% endfor %}
+						{% endif %}
+
+						{% if MONTH_ARCHIVE_SAVE_AS %}
+						<li><label>Monthly Archives</label></li>
+							{% for year, date_year in dates|groupby( 'date.year' )|sort(reverse=True) %}
+								{% for month, articles in date_year|groupby( 'date.month' )|sort(reverse=True) %}
+									<li><a href="/{{ MONTH_ARCHIVE_SAVE_AS.format(date=articles[0].date) }}">{{ articles[0].date.strftime('%B') }} {{ year }} ({{ articles|count }})</a></li>
+								{% endfor %}
+							{% endfor %}
+						{% endif %}
+
+						<li><label>Links</label></li>
+							{% for name, link in SOCIAL|sort %}
+							<li><a href="{{ link }}">{{ name }}</a></li>
+							{% endfor %}
+					</ul>	
+				</aside>
+
+				<!-- top bar nav -->
+				<nav class="top-bar hide-for-small-only" data-topbar>
+					<ul class="title-area">
+						<li class="name">
+							<h1><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1>
+						</li>
+					</ul>
+
+					<section class="top-bar-section">
+						<ul class="left">
+							{% for cat, articles in categories %}
+								<li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
+							{% endfor %}
+						</ul>
+					</section>
+				</nav>
+
+				<!-- Main Page Content and Sidebar -->
+				<section class="main-section">
+					<div class="row">
+						<!-- Main Content -->
+						<div class="medium-9 small-12 columns" role="content">
+							{% if pagetitle is defined %}
+							<div class="row">
+								<div class="small-12 columns">
+									<h2>{{ pagetitle }}</h2>
+								</div>
+							</div>
+							{% endif %}
+							{% block content %}{% endblock %}
+						</div>
+						<!-- End Main Content -->
+						<!-- Sidebar -->
+						<aside class="medium-3 hide-for-small-only columns">
+							<div class="panel">
+								<h5>Places</h5>
+								<ul class="side-nav">
+									{% for name, link in LINKS %}
+									<li><a href="{{ link }}">{{ name }}</a></li>
+									{% endfor %}
+								</ul>
+							</div>
+
+							<div class="panel">
+								<h5>Tags</h5>
+								<ul class="tag-cloud">
+									{% for tag in tag_cloud %}
+										<li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0 }}</a></li>
+									{% endfor %}
+								</ul>
+							</div>
+
+							{% if MONTH_ARCHIVE_SAVE_AS %}
+							<div class="panel">
+								<h5>Monthly Archives</h5>
+								<ul class="side-nav">
+									{% for year, date_year in dates|groupby( 'date.year' )|sort(reverse=True) %}
+										{% for month, articles in date_year|groupby( 'date.month' )|sort(reverse=True) %}
+											<li><a href="/{{ MONTH_ARCHIVE_SAVE_AS.format(date=articles[0].date) }}">{{ articles[0].date.strftime('%B') }} {{ year }} ({{ articles|count }})</a></li>
+										{% endfor %}
+									{% endfor %}
+								</ul>
+							</div>
+							{% endif %}
+
+							<div class="panel">
+								<h5>Links</h5>
+								<ul class="side-nav">
+									{% for name, link in SOCIAL|sort %}
+									<li><a href="{{ link }}">{{ name }}</a></li>
+									{% endfor %}
+								</ul>
+							</div>
+						</aside>
+						<!-- End Sidebar -->
+					</div>
+
+					<!-- Footer -->
+					<footer class="row">
+						<div class="medium-9 small-12">
+							<hr/>
+							{% if not FOUNDATION_FOOTER_TEXT %}
+							{% set FOUNDATION_FOOTER_TEXT = 'Powered by <a href="http://getpelican.com">Pelican</a> and <a href="http://foundation.zurb.com/">Zurb Foundation</a>. Theme by <a href="http://hamaluik.com">Kenton Hamaluik</a>.' %}
+							{% endif %}
+							<p class="text-center">{{ FOUNDATION_FOOTER_TEXT }}</p>
+						</div>
+					</footer>
+					<!-- End Footer -->
+				</section>
+				<a class="exit-off-canvas"></a>
+			</div><!--off-canvas inner-->
+		</div><!--off-canvas wrap-->
+
+		<script src="{{ SITEURL }}/theme/js/jquery.js"></script>
+		<script src="{{ SITEURL }}/theme/js/foundation.min.js"></script>
+		<script>
+			$(document).foundation();
+		</script>
+	</body>
+</html>
diff --git a/foundation-default-colours/templates/categories.html b/foundation-default-colours/templates/categories.html
new file mode 100644
index 0000000..f2f055e
--- /dev/null
+++ b/foundation-default-colours/templates/categories.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} <small>[categories]</small>{% endblock %}
+
+{% block content %}
+	<ul>
+	{% for category, articles in categories %}
+		<li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
+	{% endfor %}
+	</ul>
+{% endblock %}
diff --git a/foundation-default-colours/templates/category.html b/foundation-default-colours/templates/category.html
new file mode 100644
index 0000000..0790851
--- /dev/null
+++ b/foundation-default-colours/templates/category.html
@@ -0,0 +1,3 @@
+{% extends "index.html" %}
+
+{% set pagetitle = 'Category: ' ~ category %}
\ No newline at end of file
diff --git a/foundation-default-colours/templates/index.html b/foundation-default-colours/templates/index.html
new file mode 100644
index 0000000..4b85e2d
--- /dev/null
+++ b/foundation-default-colours/templates/index.html
@@ -0,0 +1,47 @@
+{% extends "base.html" %}
+{% block content %}
+
+{# show summaries of the latest articles #}
+{% if articles %}
+{% for article in (articles_page.object_list if articles_page else articles) %}
+<article>
+	<h3><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h3>
+	<h6>Written by <a href="{{ SITEURL }}/author/{{ article.author|lower|replace(' ', '-') }}.html">{{ article.author }}</a> {% if article.category %}in <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category}}</a> {% endif %}on {{ article.locale_date }}.{% if article.tags|count > 0 %} Tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>, {% endfor %}{% endif %}</h6>
+	{{ article.content if FOUNDATION_FRONT_PAGE_FULL_ARTICLES else article.summary }}
+	{% if not FOUNDATION_FRONT_PAGE_FULL_ARTICLES %}
+		{# add a 'Continue reading' link if we're displaying summaries #}
+		<p class="continue"><a href="{{ SITEURL }}/{{ article.url }}">Continue reading &raquo;</a></p>
+	{% endif %}
+</article>
+<hr />
+{% endfor %}
+{%endif%}
+
+{# deal with pagination #}
+{% if articles_page and articles_paginator.num_pages > 1 %}
+<div class="row" style="margin-bottom: -1.25em;">
+	<div class="small-12 columns text-center">
+		<div class="pagination-centered">
+			<ul class="pagination">
+			{% if articles_page.has_previous() %}
+				{% set num = articles_page.previous_page_number() %}
+				<li class="arrow"><a href="{{ SITEURL }}/{{ page_name }}{{ num if num > 1 else '' }}.html">&larr; Previous</a></li>
+			{% else %}
+				<li class="arrow unavailable"><a href="#">&larr; Previous</a></li>
+			{% endif %}
+			{% for num in range( 1, 1 + articles_paginator.num_pages ) %}
+				<li class="{{ 'current' 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="arrow"><a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">Next &rarr;</a></li>
+			{% else %}
+				<li class="arrow unavailable"><a href="#">&rarr; Next</a></li>
+			{% endif %}
+			</ul>
+		</div>
+	</div>
+</div>
+{% endif %}
+
+{% endblock %}
+
diff --git a/foundation-default-colours/templates/page.html b/foundation-default-colours/templates/page.html
new file mode 100644
index 0000000..7c14405
--- /dev/null
+++ b/foundation-default-colours/templates/page.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div class="row">
+	<div class="small-12 columns">
+		{{ page.content }}
+	</div>
+</div>
+{% endblock %}
+
+{% set pagetitle = page.title %}
\ No newline at end of file
diff --git a/foundation-default-colours/templates/tag.html b/foundation-default-colours/templates/tag.html
new file mode 100644
index 0000000..5daf6ba
--- /dev/null
+++ b/foundation-default-colours/templates/tag.html
@@ -0,0 +1,3 @@
+{% extends "index.html" %}
+
+{% set pagetitle = "Posts Tagged With '" ~ tag ~ "'" %}
\ No newline at end of file
diff --git a/foundation-default-colours/templates/tags.html b/foundation-default-colours/templates/tags.html
new file mode 100644
index 0000000..7b517d3
--- /dev/null
+++ b/foundation-default-colours/templates/tags.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} <small>[tags]</small>{% endblock %}
+
+{% block content %}
+	<ul>
+	{% for tag, articles in tags %}
+		<li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li>
+	{% endfor %}
+	</ul>
+{% endblock %}
\ No newline at end of file