add vox icon to home, make a revision module template, add 3 revisions to home

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 5688e033e09778028c64b25da585be046d93dc9e..33860d9eb382effc4d87313108cefb45df7e47d0 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -807,6 +807,7 @@ table td.error {
 }
 
 .rst-content {
+    padding-top: 5px;
 }
 
 .rst-content h1 {
@@ -817,14 +818,20 @@ table td.error {
     float: left;
     margin-right: 2ex;
     margin-top: 0.6ex;
-    margin-bottom: 2ex;
+    margin-bottom: 1ex;
 }
 
 .rst-content img.align-right {
     float: left;
     margin-left: 2ex;
     margin-top: 0.6ex;
-    margin-bottom: 2ex;
+    margin-bottom: 1ex;
+}
+
+img.align-left {
+    float: left;
+    padding-bottom: 1ex;
+    padding-right: 1ex;
 }
 
 #content .rst-content ul,  #content .rst-content ol {

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

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

diff --git a/telemeta/templates/telemeta/inc/module_revisions.html b/telemeta/templates/telemeta/inc/module_revisions.html
new file mode 100644 (file)
index 0000000..2b8503f
--- /dev/null
+++ b/telemeta/templates/telemeta/inc/module_revisions.html
@@ -0,0 +1 @@
+{% extends "telemeta_default/inc/module_revisions.html" %}

diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html
index 2eb6be1478fb6a1c88595e8016baf42cbaa4fcd3..72f46cd3d9f9faa1c51af2fc9311b247c8e8ede3 100644 (file)
--- a/telemeta/templates/telemeta_default/home.html
+++ b/telemeta/templates/telemeta_default/home.html
@@ -17,48 +17,8 @@
 {% block content %}
 
 <div class="module-set" style="width: 33%">
-
 {% block modules %}
-
-   <div id="module" class="module">
-    <h3><a href="{% url telemeta-rss %}">
-      <img src="{% url telemeta-images "rss.png" %}" style="vertical-align:middle" /></a>
-      {% trans "Last changes" %}</h3>
-      <a href="/rss" style="float:right" class="icon_rss">&nbsp;&nbsp;</a>
-    <table class="listing" bgcolor="#FFFFFF" style="width: 100%">
-      <tr>
-        <th class="highlight">{% trans "Date" %}</th>
-        <th>{% trans "Title" %}</th>
-        <th>{% trans "Type" %}</th>
-        <th>{% trans "User" %}</th>
-      </tr>
-    {% for r in revisions %}
-     <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
-        <td>{{ r.revision.time }}</td>
-        <td>
-        {% if r.element %}
-            {% if r.revision.element_type == "collection" %}
-            <a href="{% url telemeta-collection-detail r.element.public_id %}">{{ r.element.title }}</a>
-            {% endif %}
-            {% if r.revision.element_type == "item" %}
-            <a href="{% url telemeta-item-detail r.element.public_id %}">
-            {% if r.element.title != '' %}{{ r.element.title }}{% else %}{{ r.element.collection.title }} - {{ r.element.track }}{% endif %}</a>
-            {% endif %}
-            {% if r.revision.element_type == "marker" %}
-            <a href="{% url telemeta-item-detail-marker r.element.public_id %}">{{ r.element.title }}</a>
-            {% endif %}
-        {% else %}
-            {% trans "deleted" %}
-        {% endif %}
-        </td>
-        <td>{{ r.revision.element_type }}</td>
-        <td>{% if r.revision.user %}<a href="{% url telemeta-profile-detail r.revision.user.username %}">{{ r.revision.user.username }}</a>{% endif %}</td>
-        
-     </tr>
-    {% endfor %}
-    </table>
-   </div>
-
+{% include "telemeta/inc/module_revisions.html" %} 
 {% endblock %}
 </div>
 

diff --git a/telemeta/templates/telemeta_default/inc/module_revisions.html b/telemeta/templates/telemeta_default/inc/module_revisions.html
new file mode 100644 (file)
index 0000000..0996f6b
--- /dev/null
+++ b/telemeta/templates/telemeta_default/inc/module_revisions.html
@@ -0,0 +1,40 @@
+{% load telemeta_utils %}
+{% load i18n %}
+
+   <div id="module" class="module">
+    <h3><a href="{% url telemeta-rss %}">
+      <img src="{% url telemeta-images "rss.png" %}" style="vertical-align:middle" /></a>
+      {% trans "Last changes" %}</h3>
+      <a href="/rss" style="float:right" class="icon_rss">&nbsp;&nbsp;</a>
+    <table class="listing" bgcolor="#FFFFFF" style="width: 100%">
+      <tr>
+        <th class="highlight">{% trans "Date" %}</th>
+        <th>{% trans "Title" %}</th>
+        <th>{% trans "Type" %}</th>
+        <th>{% trans "User" %}</th>
+      </tr>
+    {% for r in revisions %}
+     <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
+        <td>{{ r.revision.time }}</td>
+        <td>
+        {% if r.element %}
+            {% if r.revision.element_type == "collection" %}
+            <a href="{% url telemeta-collection-detail r.element.public_id %}">{{ r.element.title }}</a>
+            {% endif %}
+            {% if r.revision.element_type == "item" %}
+            <a href="{% url telemeta-item-detail r.element.public_id %}">
+            {% if r.element.title != '' %}{{ r.element.title }}{% else %}{{ r.element.collection.title }} - {{ r.element.track }}{% endif %}</a>
+            {% endif %}
+            {% if r.revision.element_type == "marker" %}
+            <a href="{% url telemeta-item-detail-marker r.element.public_id %}">{{ r.element.title }}</a>
+            {% endif %}
+        {% else %}
+            {% trans "deleted" %}
+        {% endif %}
+        </td>
+        <td>{{ r.revision.element_type }}</td>
+        <td>{% if r.revision.user %}<a href="{% url telemeta-profile-detail r.revision.user.username %}">{{ r.revision.user.username }}</a>{% endif %}</td>
+      </tr>
+    {% endfor %}
+    </table>
+   </div>
\ No newline at end of file

diff --git a/telemeta/templates/telemeta_default/index.html b/telemeta/templates/telemeta_default/index.html
index 5b01bce33ba832210993728fa78a1fd933580c5c..3a818bebc204175f5b1da20dcf68833d3ce2b103 100644 (file)
--- a/telemeta/templates/telemeta_default/index.html
+++ b/telemeta/templates/telemeta_default/index.html
@@ -29,6 +29,8 @@
     </ul>
 </div>
 
+{% include "telemeta/inc/module_revisions.html" %}
+
 <!--
 {{ block.super }}
 <div id="module" class="module">
@@ -44,6 +46,7 @@
 </div>
 
 <div class="home-description">
+<img class="align-left" src="{% url telemeta-images "vox.png" %}" style="vertical-align:middle;" />
 {{ page_content|render_flatpage }}
 </div>
 

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 71e1715a382ad9498058ea09baeff3857fb280d8..5127b90588f88a6c49f02e8752e575ca54cc9bd8 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -112,20 +112,21 @@ class WebView(object):
             template = loader.get_template('telemeta/index.html')
             ids = [id for id in MediaItem.objects.all().values_list('id', flat=True).order_by('?')[0:3]]
             items = MediaItem.objects.enriched().filter(pk__in=ids)
+            revisions = self.get_revisions(request, 3)
             context = RequestContext(request, {
                         'page_content': pages.get_page_content(request, 'home', ignore_slash_issue=True),
-                        'items': items})
+                        'items': items, 'revisions': revisions})
             return HttpResponse(template.render(context))
         else:
             template='telemeta/home.html'
             playlists = self.get_playlists(request)
-            revisions = self.get_revisions(request)
+            revisions = self.get_revisions(request, 15)
             searches = Search.objects.filter(username=request.user)
             return render(request, template, {'playlists': playlists, 'searches': searches, 
                                               'revisions': revisions,})
   
-    def get_revisions(self, request):
-        last_revisions = Revision.objects.all().order_by('-time')[0:15]
+    def get_revisions(self, request, nb):
+        last_revisions = Revision.objects.all().order_by('-time')[0:nb]
         revisions = []
         for revision in last_revisions:
             if revision.element_type == 'item':
@@ -1038,7 +1039,7 @@ class WebView(object):
         subjects = settings.TELEMETA_SUBJECTS
         rss_host = request.META['HTTP_HOST']
         date_now = datetime.datetime.now()
-        revisions = self.get_revisions(request)
+        revisions = self.get_revisions(request, 50)
         tags = ['title', 'description', 'comment']
         
         for r in revisions: