move favico and logo, re-add piwik

6e3aabd1 · Anton Akhmerov · 7f5a1809 · 6e3aabd1 · 6e3aabd1 · 6e3aabd1
Commit 6e3aabd1 authored 9 years ago by Anton Akhmerov
--- a/conf.py
+++ b/conf.py
@@ -262,15 +262,15 @@ COMPILERS = {
 # Nikola supports logo display.  If you have one, you can put the URL here.
 # Final output is <img src="LOGO_URL" id="logo" alt="BLOG_TITLE">.
 # The URL may be relative to the site root.
-# LOGO_URL = ''
+LOGO_URL = '/kwant_logo.png'

 # If you want to hide the title of your website (for example, if your logo
 # already contains the text), set this to False.
-# SHOW_BLOG_TITLE = True
+SHOW_BLOG_TITLE = False

 # Writes tag cloud data in form of tag_cloud_data.json.
 # Warning: this option will change its default value to False in v8!
-WRITE_TAG_CLOUD = True
+WRITE_TAG_CLOUD = False

 # Paths for different autogenerated bits. These are combined with the
 # translation paths.
@@ -607,10 +607,8 @@ IMAGE_FOLDERS = {'images': 'images'}
 # FAVICONS contains (name, file, size) tuples.
 # Used to create favicon link like this:
 # <link rel="name" href="file" sizes="size"/>
-# FAVICONS = (
-#     ("icon", "/favicon.ico", "16x16"),
-#     ("icon", "/icon_128x128.png", "128x128"),
-# )
+FAVICONS = (
+     ("icon", "/kwant_icon.png", "32x32"),)

 # Show only teasers in the index pages? Defaults to False.
 # INDEX_TEASERS = False
@@ -907,7 +905,25 @@ COPY_SOURCES = False
 # Google Analytics or whatever else you use. Added to the bottom of <body>
 # in the default template (base.tmpl).
 # (translatable)
-# BODY_END = ""
+BODY_END = """<!-- Piwik -->
+<script type="text/javascript">
+  var _paq = _paq || [];
+  _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
+  _paq.push(["setCookieDomain", "*.kwant-project.org"]);
+  _paq.push(["trackPageView"]);
+  _paq.push(["enableLinkTracking"]);
+
+  (function() {
+    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.kwant-project.org/";
+    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+    _paq.push(["setSiteId", "1"]);
+    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><img src="http://piwik.kwant-project.org/piwik.php?idsite=1&amp;rec=1" style="border:0" alt="" /></noscript>
+<!-- End Piwik Code: Analytics are used by us to improve the site, and not sent to anyone. -->
+"""

 # The possibility to extract metadata from the filename by using a
 # regular expression.

--- a/content/common/kwant_icon.png
+++ b/content/common/kwant_icon.png
--- a/content/common/kwant_logo.png
+++ b/content/common/kwant_logo.png
--- a/templates/base.mako
+++ b/templates/base.mako
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<link href="/common/kwant.css" rel="stylesheet" type="text/css" />
-<title><%block name="title">Kwant: quantum transport simulation package</%block></title>
-<link rel="icon" href="/common/kwant_icon.png" type="image/png" />
-<%block name="extra_head" />\
-</head>
-
-<body>
-<div class="padding">
-<div id="header" class="meta">
-  <a href="/"><img alt="kwant_logo.png" src="/common/kwant_logo.png" /></a>
-<h3 class="hidden_structure">Navigation</h3>
-<ul class="navigation">
-  <li><a href="/">home</a></li>
-  <li><a href="/install.html">install</a></li>
-  <li><a href="/doc/">documentation</a></li>
-  <li><a href="/community.html">community</a></li>
-  <li><a href="/authors.html">authors</a></li>
-  <li><a href="/citing.html">citing</a></li>
-</ul>
-</div>
-
-${next.body()}\
-<%block name="tail"></%block>\
-</div>
-
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-  _paq.push(["setCookieDomain", "*.kwant-project.org"]);
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.kwant-project.org/";
-    _paq.push(["setTrackerUrl", u+"piwik.php"]);
-    _paq.push(["setSiteId", "1"]);
-    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><img src="http://piwik.kwant-project.org/piwik.php?idsite=1&amp;rec=1" style="border:0" alt="" /></noscript>
-<!-- End Piwik Code: Analytics are used by us to improve the site, and not sent to anyone. -->
-</body>
-</html>
--- a/templates/default.mako
+++ b/templates/default.mako
-<%inherit file="base.mako"/>\
-<%block name="title">${meta['title']} - Kwant</%block>\
-${body}\