Changeset 557

Timestamp:

02/15/10 21:14:48 (5 months ago)

Author:

olivier

Message:

fix the lists of countries for a given continent ; fix a layout alignment bug in the geonav raw list

Location:

trunk/telemeta

Files:

• htdocs/css/telemeta.css (modified) (1 diff)
• models/query.py (modified) (1 diff)
• templates/telemeta_default/geo_continents.html (modified) (2 diffs)

trunk/telemeta/htdocs/css/telemeta.css

@@ -152 +152 @@
 ul.continents { margin: 1em 0; }
 ul.continents ul {margin-left: 0; margin-bottom: 0.9em; padding: 0 1em 1em 0;}
-ul.continents li.name { width: 460px; float: left; margin-right: 30px;}
+ul.continents li.name { width: 460px; float: left; clear: left; margin-right: 30px;}
+ul.continents li.odd { clear: none;}
 ul.continents li.name b { font-size: 120%; font-weight: bold; }
 ul.continents ul li { display: inline; padding-right: 2em;}

trunk/telemeta/models/query.py

@@ -330 +330 @@
         "Return the number of collections by continents and countries as a tree"
 
+        from telemeta.models.media import MediaItem
+        from telemeta.models.location import Location
+
         countries = []
         for lid in MediaItem.objects.filter(location__isnull=False).values_list('location', flat=True).distinct():

trunk/telemeta/templates/telemeta_default/geo_continents.html

@@ -26 +26 @@
 <ul class="continents">
 {% for group in continents %}
-  <li class="name"><b><a href="{% url telemeta-geo-countries group.continent.flatname %}">{{ group.continent }}</a></b>
+  <li class="name {% if not forloop.counter0|divisibleby:"2" %}odd{% endif %}"><b><a href="{% url telemeta-geo-countries group.continent.flatname %}">{{ group.continent }}</a></b>
     <ul>
     {% for country in group.countries %}
@@ -38 +38 @@
       </li>
     {% endfor %}
-    {% if group.countries.10 %}
-    <li><a href="{% url telemeta-geo-countries group.continent.flatname %}">More..</a></li>
-    {% endif %}
     </ul>
   </li>