Changeset 549

Timestamp:

02/12/10 22:54:03 (6 months ago)

Author:

olivier

Message:

fix conflict between home modules and rst content image ; properly rewrite img urls when using rst object substitution ; fix build_query_string template tag

Location:

trunk/telemeta

Files:

• htdocs/css/telemeta.css (modified) (1 diff)
• templates/telemeta_default/index.html (modified) (2 diffs)
• templatetags/telemeta_utils.py (modified) (3 diffs)

trunk/telemeta/htdocs/css/telemeta.css

@@ -630 +630 @@
 }
 
-.rst-content img.align-left {
+.rst-content img.align-left, .rst-content img.align-right {
     margin-left: 0;
-    clear: left;
-}
-
-.rst-content img.align-right {
-    margin-right: 0;
+    margin-top: 0.6ex;
+}
+
+.module-set {
+    float: right;
     clear: right;
 }
 
 .module {
-    float: right;
     border: 1px dotted #999;
     background: #EEE;
     padding: 1em;
     margin: 0 0 1.5em 1.5em;
-    clear: right;
 }
 

trunk/telemeta/templates/telemeta_default/index.html

@@ -5 +5 @@
 {% block content %}
 <div class="home-content">
+<div class="module-set">
 <div class="module">
     <h3>{% trans "Geographic Navigator" %}</h3>
@@ -18 +19 @@
         <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">

trunk/telemeta/templatetags/telemeta_utils.py

@@ -12 +12 @@
 from django.utils.encoding import smart_str, force_unicode
 from django.utils.safestring import mark_safe
+from django import db
 import re
 
@@ -75 +76 @@
       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))
@@ -226 +229 @@
 
     for line in content:
-        match = re.match('^(\.\. *(?:_[^:]*:|image::) *)([^ ]+) *$', line)
+        match = re.match('^(\.\. *(?:_[^:]*:|(?:\|\w+\|)? *image::) *)([^ ]+) *$', line)
         if match:
             directive, urlname = match.groups()