add iframe player on right index column, change world image

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 377e95e5e197e5e2a7dfd311f885bee1d84ec455..5a2903a345fad25bbb09a2d234f799c22cf2cbf3 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -846,7 +846,7 @@ a.image-link {
 }
 
 .home-content .module {
-    width: 338px;
+    width: 400px;
 }
 
 .home-description {

diff --git a/telemeta/htdocs/images/world2.png b/telemeta/htdocs/images/world2.png
new file mode 100644 (file)
index 0000000..39c3171
Binary files /dev/null and b/telemeta/htdocs/images/world2.png differ

diff --git a/telemeta/htdocs/images/world_full.png b/telemeta/htdocs/images/world_full.png
new file mode 100644 (file)
index 0000000..8f9861b
Binary files /dev/null and b/telemeta/htdocs/images/world_full.png differ

diff --git a/telemeta/templates/telemeta_default/index.html b/telemeta/templates/telemeta_default/index.html
index 312bdcdad43c9aae91f6d9fc0d62261ed443a5c1..7c0be01318d1f39c572c0a3caac6886829c3182b 100644 (file)
--- a/telemeta/templates/telemeta_default/index.html
+++ b/telemeta/templates/telemeta_default/index.html
@@ -11,20 +11,16 @@
     <h3><img src="{% url telemeta-images "module_world.png" %}" alt="world" style="vertical-align:middle" />
     {% trans "Geo Navigator" %}</h3>
     <a class="image-link" href="{% url telemeta-geo-continents %}">
-    <img class="map-thumbnail" src="{% url telemeta-images "map_thumbnail.png" %}" alt="{% trans "Open the geographic navigator" %}" /></a>
+    <img class="map-thumbnail" src="{% url telemeta-images "world2.png" %}" alt="{% trans "Open the geographic navigator" %}" style="width:398px" /></a>
 </div>
 
 <div id="module" class="module">
     <h3><img src="{% url telemeta-images "module_playlist.png" %}" alt="playlist" style="vertical-align:middle" />
     {% trans "Musical selection" %}</h3>
     <ul class="playlist">
-    {% for item in items %}
-    <li>
-        <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><a href="{% url telemeta-item-detail sound_pub_item.public_id %}"><b>{{ sound_pub_item }}</b></a>{% if sound_pub_item.alt_title %} ({{ sound_pub_item.alt_title }}){% endif %}<br /><span style="font-size: 90%">{{ sound_pub_item.location.fullnames|to_string }}</span><br />
+<iframe width='376' height='215' frameborder='0' scrolling='no' marginheight='0' marginwidth='0' src='/items/{{sound_pub_item.public_id }}/player/362x130/'></iframe>
     </li>
-    {% endfor %}
     </ul>
 </div>
 

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 7411394a754580530c2f7dc5538ba93f1b665cbc..2f4f0aa78f01f2061b37acd3d3924eebf51f9221 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -184,14 +184,17 @@ class GeneralView(object):
                 if get_public_access(item.public_access,  str(item.recorded_from_date).split('-')[0], 
                                                 str(item.recorded_to_date).split('-')[0]):
                     sound_pub_items.append(item)
+            
+            sound_pub_item = sound_pub_items[0]
             random.shuffle(sound_pub_items)
             if len(sound_pub_items) >= 2:
                 sound_pub_items = sound_pub_items[0:2]
             
-            revisions = get_revisions(3)
+            revisions = get_revisions(4)
             context = RequestContext(request, {
                         'page_content': pages.get_page_content(request, 'home', ignore_slash_issue=True),
-                        'items': items, 'revisions': revisions,  'sound_items': sound_pub_items})
+                        'items': items, 'revisions': revisions,  'sound_items': sound_pub_items, 
+                        'sound_pub_item': sound_pub_item })
             return HttpResponse(template.render(context))
         else:
             template='telemeta/home.html'