From 16346a5a0533105d923dd85fc11c94d8744a1032 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Tue, 26 Jul 2011 12:12:04 +0200
Subject: Added support of GA, EI and Jappix in the basic theme

---
 basic/static/css/style.css | 39 ---------------------------------------
 basic/templates/base.html  | 32 +++++++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 42 deletions(-)
 delete mode 100644 basic/static/css/style.css

(limited to 'basic')

diff --git a/basic/static/css/style.css b/basic/static/css/style.css
deleted file mode 100644
index bf027af..0000000
--- a/basic/static/css/style.css
+++ /dev/null
@@ -1,39 +0,0 @@
-body {
-  font-family: monospace;
-  font-size: 100%;
-  background-color: white;
-  color: #111;
-  width: 80%;
-  min-width: 400px;
-  min-height: 200px;
-  padding: 1em;
-  margin: 5% 10%;
-  border: thin solid gray;
-  border-radius: 5px;
-  display: block;
-}
-
-a:link    { color: blue; text-decoration: none;      }
-a:hover   { color: blue; text-decoration: underline; }
-a:visited { color: blue;                             }
-
-h1 a { color: inherit !important }
-h2 a { color: inherit !important }
-h3 a { color: inherit !important }
-h4 a { color: inherit !important }
-h5 a { color: inherit !important }
-h6 a { color: inherit !important }
-
-#menu li {
-    display: inline;
-}
-
-#post-list {
-    margin-bottom: 1em;
-    margin-top: 1em;
-}
-
-pre {
-    margin: 2em 1em 2em 4em;
-}
-
diff --git a/basic/templates/base.html b/basic/templates/base.html
index 8055530..861b4d7 100644
--- a/basic/templates/base.html
+++ b/basic/templates/base.html
@@ -1,6 +1,32 @@
 {% extends "!simple/base.html" %}
 
-{% block head %}
+{%- block head %}
 {{ super() }}
-       <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/style.css" />
-{% endblock %}
+        <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" />
+        <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 -%}
+        <!--[if IE]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+        {% if GOOGLE_ANALYTICS %}
+        <script type="text/javascript">
+        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+        </script>
+        <script type="text/javascript">
+        try {
+          var pageTracker = _gat._getTracker("{{ GOOGLE_ANALYTICS }}");
+          pageTracker._trackPageview();
+        } catch(err) {}
+        </script>
+        {% endif %}
+        {% if JABBER_CHATROOM %}
+        <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
+        <script type="text/javascript" src="https://static.jappix.com/php/get.php?l=fr&amp;t=js&amp;g=mini.xml"></script>
+        <script type="text/javascript">
+        jQuery(document).ready(function() {
+            MINI_GROUPCHATS = ["{{ JABBER_CHATROOM }}"];
+            MINI_ANIMATE = true;
+            launchMini(false, true, "anonymous.jappix.com");
+        });
+        </script>
+        {% endif %}
+{% endblock -%}
-- 
cgit v1.1