From 88b67c19eb2416b50c9f4c8b4ca8d9d54e4df62a Mon Sep 17 00:00:00 2001
From: olivier <>
Date: Mon, 15 Feb 2010 20:14:48 +0000
Subject: [PATCH] fix the lists of countries for a given continent ; fix a
 layout alignment bug in the geonav raw list

---
 telemeta/htdocs/css/telemeta.css                        | 3 ++-
 telemeta/models/query.py                                | 3 +++
 telemeta/templates/telemeta_default/geo_continents.html | 5 +----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index a5c3b638..a93c9e17 100644
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -151,7 +151,8 @@ a img { border: none; }
 ul.continents, ul.continents ul { list-style: none; margin: 0; padding: 0;}
 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;}
 ul.continents ul li a { line-height: 1.8em; }
diff --git a/telemeta/models/query.py b/telemeta/models/query.py
index c46f31d4..67d83560 100644
--- a/telemeta/models/query.py
+++ b/telemeta/models/query.py
@@ -329,6 +329,9 @@ class MediaCollectionManager(CoreManager):
     def stat_continents(self, only_continent=None):      
         "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():
             location = Location.objects.get(pk=lid)
diff --git a/telemeta/templates/telemeta_default/geo_continents.html b/telemeta/templates/telemeta_default/geo_continents.html
index fbe544ee..bbb14663 100644
--- a/telemeta/templates/telemeta_default/geo_continents.html
+++ b/telemeta/templates/telemeta_default/geo_continents.html
@@ -25,7 +25,7 @@ var resourceMap = new ResourceMap('.continents', {
 {% if continents %}
 <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 %}
       <li id="resource-{{country.id}}" class="country_name resourcemap-element">
@@ -37,9 +37,6 @@ var resourceMap = new ResourceMap('.continents', {
         {% endif %}
       </li>
     {% endfor %}
-    {% if group.countries.10 %}
-    <li><a href="{% url telemeta-geo-countries group.continent.flatname %}">More..</a></li>
-    {% endif %}
     </ul>
   </li>
 {% endfor %}
-- 
2.39.5