Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

3 files changed, 89 insertions, 6 deletions

diff --git a/gum/templates/article.html b/gum/templates/article.html
index 15188d0..e6f1288 100644
--- a/gum/templates/article.html
+++ b/gum/templates/article.html
@@ -41,10 +41,64 @@
               </script>
             </div>
             {% endif %}
+            {% if JUVIA_ID %}
+            <h3>Comments</h3>
+            <div id="comments"></div>
+            <script type="text/javascript" class="juvia">
+               (function() {
+                   var options = {
+                       container   : '#comments',
+                       site_key    : '{{ JUVIA_ID }}',
+                       topic_key   : location.pathname,
+                       topic_url   : location.href,
+                       topic_title : '{{article.title}}',
+                       comment_order: 'earliest-first',
+                       include_base: !window.Juvia,
+                       include_css : !window.Juvia
+                   };
+
+                   function makeQueryString(options) {
+                       var key, params = [];
+                       for (key in options) {
+                           params.push(
+                               encodeURIComponent(key) +
+                               '=' +
+                               encodeURIComponent(options[key]));
+                       }
+                       return params.join('&');
+                   }
+
+                   function makeApiUrl(options) {
+                       // Makes sure that each call generates a unique URL, otherwise
+                       // the browser may not actually perform the request.
+                       if (!('_juviaRequestCounter' in window)) {
+                           window._juviaRequestCounter = 0;
+                       }
+
+                       // or use '//{{ JUVIA_URL }}/api/show_topic.js'
+                       // for dynamic switching between http and https
+                       var result =
+                          '//{{ JUVIA_URL }}/api/show_topic.js' +
+                           '?_c=' + window._juviaRequestCounter +
+                           '&' + makeQueryString(options);
+                       window._juviaRequestCounter++;
+                       return result;
+                   }
+
+                   var s       = document.createElement('script');
+                   s.async     = true;
+                   s.type      = 'text/javascript';
+                   s.className = 'juvia';
+                   s.src       = makeApiUrl(options);
+                   (document.getElementsByTagName('head')[0] ||
+                    document.getElementsByTagName('body')[0]).appendChild(s);
+               })();
+            </script>
+            {% endif %}
 
 
         </div><!-- /.eleven.columns -->
-        
+
      {% include 'sidebar.html' %}
  </div><!-- /.row -->
 
diff --git a/gum/templates/base.html b/gum/templates/base.html
index afae24d..55feaaa 100644
--- a/gum/templates/base.html
+++ b/gum/templates/base.html
@@ -54,8 +54,21 @@
               </script>
           {% endif %}
 
-
-
+          {% if PIWIK_URL%}
+            <script type="text/javascript">
+                var _paq = _paq || [];
+                    _paq.push(['trackPageView']);
+                _paq.push(['enableLinkTracking']);
+                    (function() {
+                     var u=(("https:" == document.location.protocol) ? "https" : "http") + "://{{ PIWIK_URL }}/";
+                     _paq.push(['setTrackerUrl', u+'piwik.php']);
+                     _paq.push(['setSiteId', {{ PIWIK_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);
+                 })();
+            </script>
+            <noscript><p><img src="http://{{ PIWIK_URL }}/piwik.php?idsite={{ PIWIK_ID }}" style="border:0;" alt="" /></p></noscript>
+          {% endif %}
 
         {% endblock head %}
 </head>
@@ -68,14 +81,14 @@
         <div class="row">
 
           <header id="banner" class="body">
-                  <h1><a href="{{ SITEURL }}">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>
+                  <h1><a href="{{ SITEURL }}/">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>
           </header><!-- /#banner -->
 
             <div id="navigation" class="navbar row">
               <a href="#" gumby-trigger="#navigation &gt; ul" class="toggle"><i class="icon-menu"></i></a>
              
               <ul class="columns">
-                <li><a href="{{ SITEURL }}">Home</a></li>
+                <li><a href="{{ SITEURL }}/">Home</a></li>
 
             {% for title, link in MENUITEMS %}
                 <li><a href="{{ link }}">{{ title }}</a></li>
@@ -147,9 +160,9 @@
 
 
 {% include 'disqus_script.html' %}
+{% include 'piwik.html' %}
   <script src="{{ SITEURL }}/theme/js/libs/jquery-1.9.1.min.js"></script>
   <script src="{{ SITEURL }}/theme/js/libs/gumby.min.js"></script>
   <script src="{{ SITEURL }}/theme/js/plugins.js"></script>
-
 </body>
 </html>
diff --git a/gum/templates/piwik.html b/gum/templates/piwik.html
new file mode 100755
index 0000000..ff459af
--- /dev/null
+++ b/gum/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