fix conflict between home modules and rst content image ; properly rewrite img urls...

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 526043dfe45f7334fe509831e7118ae71c787387..1e3a9516c45cbeb567687294662e886e5965dcfa 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -629,23 +629,21 @@ table.listing tbody tr:hover { background: #f7f8fa !important }
     margin: 1.5em;\r
 }\r
 \r
-.rst-content img.align-left {\r
+.rst-content img.align-left, .rst-content img.align-right {\r
     margin-left: 0;\r
-    clear: left;\r
+    margin-top: 0.6ex;\r
 }\r
 \r
-.rst-content img.align-right {\r
-    margin-right: 0;\r
+.module-set {\r
+    float: right;\r
     clear: right;\r
 }\r
 \r
 .module {\r
-    float: right;\r
     border: 1px dotted #999;\r
     background: #EEE;\r
     padding: 1em;\r
     margin: 0 0 1.5em 1.5em;\r
-    clear: right;\r
 }\r
 \r
 .module h3 {\r

diff --git a/telemeta/templates/telemeta_default/index.html b/telemeta/templates/telemeta_default/index.html
index 89cd2b472192a5626093ffae8d659c538bbb8127..e943e25019d21cd65e8388f5f551ee2e2380aef0 100644 (file)
--- a/telemeta/templates/telemeta_default/index.html
+++ b/telemeta/templates/telemeta_default/index.html
@@ -4,6 +4,7 @@
 
 {% block content %}
 <div class="home-content">
+<div class="module-set">
 <div class="module">
     <h3>{% trans "Geographic Navigator" %}</h3>
     <a class="image-link" href="{% url telemeta-geo-continents %}">
@@ -17,9 +18,10 @@
         <a href="{% url telemeta-item-detail item.public_id %}"><b>{{item}}</b></a>
         <br />
         <span class="info">{{item.computed_duration}} {{item.apparent_collector|prepend:' - '}} - {{item.country_or_continent}}</span>
-        </li>
+    </li>
     {% endfor %}
-    </div>
+    </ul>
+</div>    
 </div>
 <div class="home-description">
 {{ page_content|render_flatpage }}

diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py
index 15348021ebdb7aa26f8758f9c8918802bc3d641b..0c1c626a8517f0f6589ae15f0d957f588d5e8578 100644 (file)
--- a/telemeta/templatetags/telemeta_utils.py
+++ b/telemeta/templatetags/telemeta_utils.py
@@ -11,6 +11,7 @@ from django.utils.translation import ungettext
 from docutils.core import publish_parts
 from django.utils.encoding import smart_str, force_unicode
 from django.utils.safestring import mark_safe
+from django import db
 import re
 
 register = template.Library()
@@ -74,7 +75,9 @@ def build_query_string(vars):
       import urllib
       args = []
       for k, v in vars.iteritems():
-          if not isinstance(v, basestring):
+          if isinstance(v, db.models.Model):
+              v = v.pk
+          elif not isinstance(v, basestring):
               v = unicode(v)
           args.append(urlquote(k) + '=' + urlquote(v))
 
@@ -225,7 +228,7 @@ def render_flatpage(content):
         content = content.split("\n")
 
     for line in content:
-        match = re.match('^(\.\. *(?:_[^:]*:|image::) *)([^ ]+) *$', line)
+        match = re.match('^(\.\. *(?:_[^:]*:|(?:\|\w+\|)? *image::) *)([^ ]+) *$', line)
         if match:
             directive, urlname = match.groups()
             line = directive