--- a/web/blinkster/__init__.py Thu May 19 17:23:05 2011 +0200
+++ b/web/blinkster/__init__.py Thu May 19 17:36:52 2011 +0200
@@ -1,3 +1,3 @@
-VERSION = (0, 30)
+VERSION = (0, 31)
VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION)))
--- a/web/blinkster/templates/base.html Thu May 19 17:23:05 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title>{% block title %}Blinkster{% endblock %}</title>
- {% block js_import %}
- {% endblock %}
- {% block css_import %}
- <link rel="stylesheet" href="{{STATIC_URL}}blinkster/css/style.css" />
- {% endblock %}
-</head>
-<body>
- <div id="header">
- {% block header %}
- <table width="100%">
- <tr>
- <td id="header_left"><a href="http://www.blinkster.eu"><img style="margin-right: 10px;" src="{{STATIC_URL}}blinkster/img/logo_blinkster.png" /></a><a href="http://www.blinkster.eu">Blinkster</a></td>
- </tr>
- </table>
- <div >
-
- </div>
- {% endblock %}
- </div>
- <div id="content">
- {% block content %}{% endblock %}
- </div>
- <div id="footer">
- {% block footer %}
- <div class="footer_img">
- <a href="http://www.iri.centrepompidou.fr"><img src="{{STATIC_URL}}blinkster/img/logo_IRI_footer.png" alt="Logo IRI" /></a>
- </div>
- <div class="version" id="version"><a>{{VERSION}}</a></div>
- <div style="float: right;" class="small">©2010 <a style="text-decoration: none; color: #4F5155;" href="http://www.iri.centrepompidou.fr">IRI / Centre Pompidou</a></div>
- {% endblock %}
- </div>
-
- {% include "google_analytics.html" %}
-</body>
-</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/blinkster/templates/base_blinkster.html Thu May 19 17:36:52 2011 +0200
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>{% block title %}Blinkster{% endblock %}</title>
+ {% block js_import %}
+ {% endblock %}
+ {% block css_import %}
+ <link rel="stylesheet" href="{{STATIC_URL}}blinkster/css/style.css" />
+ {% endblock %}
+</head>
+<body>
+ <div id="header">
+ {% block header %}
+ <table width="100%">
+ <tr>
+ <td id="header_left"><a href="http://www.blinkster.eu"><img style="margin-right: 10px;" src="{{STATIC_URL}}blinkster/img/logo_blinkster.png" /></a><a href="http://www.blinkster.eu">Blinkster</a></td>
+ </tr>
+ </table>
+ <div >
+
+ </div>
+ {% endblock %}
+ </div>
+ <div id="content">
+ {% block content %}{% endblock %}
+ </div>
+ <div id="footer">
+ {% block footer %}
+ <div class="footer_img">
+ <a href="http://www.iri.centrepompidou.fr"><img src="{{STATIC_URL}}blinkster/img/logo_IRI_footer.png" alt="Logo IRI" /></a>
+ </div>
+ <div class="version" id="version"><a>{{VERSION}}</a></div>
+ <div style="float: right;" class="small">©2010 <a style="text-decoration: none; color: #4F5155;" href="http://www.iri.centrepompidou.fr">IRI / Centre Pompidou</a></div>
+ {% endblock %}
+ </div>
+
+ {% include "google_analytics.html" %}
+</body>
+</html>
--- a/web/blinkster/templates/segment_detail.html Thu May 19 17:23:05 2011 +0200
+++ b/web/blinkster/templates/segment_detail.html Thu May 19 17:36:52 2011 +0200
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base_blinkster.html" %}
{% block title %}Blinkster : Détail d'un segment{% endblock %}