fix the lists of countries for a given continent ; fix a layout alignment bug in...

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index a5c3b6382f28d92b4b785306431ed35041e6b763..a93c9e17b63efa4607d24a819847349fdd449626 100644 (file)
--- 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;}\r
 ul.continents { margin: 1em 0; }\r
 ul.continents ul {margin-left: 0; margin-bottom: 0.9em; padding: 0 1em 1em 0;}\r
-ul.continents li.name { width: 460px; float: left; margin-right: 30px;}\r
+ul.continents li.name { width: 460px; float: left; clear: left; margin-right: 30px;}\r
+ul.continents li.odd { clear: none;}\r
 ul.continents li.name b { font-size: 120%; font-weight: bold; }\r
 ul.continents ul li { display: inline; padding-right: 2em;}\r
 ul.continents ul li a { line-height: 1.8em; }\r

diff --git a/telemeta/models/query.py b/telemeta/models/query.py
index c46f31d46eca609e5a4d284545f770082d6fb3fa..67d835601d82ebd66b22249624034c437d0f4f63 100644 (file)
--- 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 fbe544ee0e2cce7e3913a4bbc91dd634c124edff..bbb14663c56b3c84dff47aa3b13befd20b8e062e 100644 (file)
--- 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 %}