fix rst img style, add current year to base template

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 470337b1aad6d3e93f0ca24fbcc737b1db04d4fc..5688e033e09778028c64b25da585be046d93dc9e 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -814,13 +814,17 @@ table td.error {
 }
 
 .rst-content img.align-left {
-    margin-right: 1em;
+    float: left;
+    margin-right: 2ex;
     margin-top: 0.6ex;
+    margin-bottom: 2ex;
 }
 
 .rst-content img.align-right {
-    margin-left: 1em;
+    float: left;
+    margin-left: 2ex;
     margin-top: 0.6ex;
+    margin-bottom: 2ex;
 }
 
 #content .rst-content ul,  #content .rst-content ol {

diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html
index a45475506556fc0fd120a24a30fff1b59e3fae58..00e4396b5e5ca4eae82b51332587aba63beeb517 100644 (file)
--- a/telemeta/templates/telemeta_default/base.html
+++ b/telemeta/templates/telemeta_default/base.html
@@ -113,7 +113,7 @@
    </td>
    <td>
     <p class="right">
-    Copyright &copy; 2011 Parisson<br />
+    Copyright &copy; {% current_year %} {% organization %}<br />
     <a href="{% url telemeta-flatpage "legal_notices" %}">{% trans "Legal notices" %}</a>
     </p>
    </td>

diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py
index 7f278809641dd0f733fa937eb0d72ab8758fa507..f429aa44e3cb09d74c8718908c6ad3f12007a335 100644 (file)
--- a/telemeta/templatetags/telemeta_utils.py
+++ b/telemeta/templatetags/telemeta_utils.py
@@ -12,6 +12,7 @@ from django.utils.encoding import smart_str, force_unicode
 from django.utils.safestring import mark_safe
 from django import db
 import re
+import datetime
 from django.conf import settings
 
 register = template.Library()
@@ -291,3 +292,7 @@ def set_var(parser, token):
         raise template.TemplateSyntaxError("'set' tag must be of the form:  {% set <var_name>  = <var_value> %}")
     return SetVarNode(parts[1], parts[3])
  
+@register.simple_tag
+def current_year():
+    return datetime.datetime.now().strftime("%Y")
+