From 13cfd9affc5da8700a37bf65b3d41f08a9092a7a Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Thu, 5 May 2011 15:42:34 +0200
Subject: [PATCH] add vox icon to home, make a revision module template, add 3
 revisions to home

---
 telemeta/htdocs/css/telemeta.css              |  11 ++++-
 telemeta/htdocs/images/rss_red.png            | Bin 0 -> 557 bytes
 telemeta/htdocs/images/vox.png                | Bin 0 -> 777 bytes
 .../telemeta/inc/module_revisions.html        |   1 +
 telemeta/templates/telemeta_default/home.html |  42 +-----------------
 .../inc/module_revisions.html                 |  40 +++++++++++++++++
 .../templates/telemeta_default/index.html     |   3 ++
 telemeta/web/base.py                          |  11 ++---
 8 files changed, 60 insertions(+), 48 deletions(-)
 create mode 100644 telemeta/htdocs/images/rss_red.png
 create mode 100644 telemeta/htdocs/images/vox.png
 create mode 100644 telemeta/templates/telemeta/inc/module_revisions.html
 create mode 100644 telemeta/templates/telemeta_default/inc/module_revisions.html

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 5688e033..33860d9e 100644
--- 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
index 0000000000000000000000000000000000000000..5596219f9d34534eddb6942e30714d2f72a8bf53
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA0n$lCK~z}7?Uy}B0$~`(|7sA|a)+&wEjfCt
zEeb)Cqy;s4rYV6_(H5Cht`S5;kYx8d7Ey+iVA#?@5b0=3Uu&UD;vlx@(dkuZ-X&5G
zyl^~s-2L9?>;ImvR;$&}Mbo3p_7Bi?fIc~AYCVe7+J@>Mb4J2&uC7RYI=L<g8TvKb
z@ou%!11V@Wi^C28c*^BbE*5_uU?G!k@x4AgqL9rZcbY`*Ecs&qMK#czH#r#Mn?oUc
z*>(*m0-zYCCG-}D9ky8xtlI^OrU3vK+dDW~Tv8w4E29_&-gpdF*8~7SAPEp(;P<+q
zTr6U5Y8u2J1OV7L54d<t-ATAxtw`2lCJmdHlRP8vL;}IOUD}P}5r-Yz!9JF6t}!@l
zmO$i_=Kz42txfd+LWX{E5q}VO^=db<))olf7eKjGg3&yrC<<*yK;Q|s#>T~PQ#6hF
zlVeFuH0A<3>Cz?z%{e!*R!L0=hos)B4sGRF;E9-yQLjhzHwKc?JfseQGZGd%z!?ck
z?p^T-u`o3|kbKneW<Bpj2UHtGN|dxCfYf?a_F4^7tOXRqV1S|Va{nN^%ePVq&$qd6
v&k(AMQO_UA^q;kz7AE&z-T%Mgp9gpcKgrhS!<Xz!00000NkvXXu0mjfpD*gN

literal 0
HcmV?d00001

diff --git a/telemeta/htdocs/images/vox.png b/telemeta/htdocs/images/vox.png
new file mode 100644
index 0000000000000000000000000000000000000000..eead37c93d45996ca845d22a4ca59c44b166e1af
GIT binary patch
literal 777
zcmV+k1NQuhP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA0<K9!K~z}7?N>2K8&Mek3?*<~@=)j$G*o(H
zU$9u}a%V%G3W<u28k8&<M50b@rHHjtX^3&iP$)UaI5a0tLgX?91i8x?q2x4c<lW+p
zuY*m%nwY!9>f$%vJKp==_x<mC|LfzNb37nCcwjsdxHAH$S`q8RBFgIi{Szpw`>1F|
z)T<_PiB;H^b$<kEMj6?K7;MHc5Ew$eYNC)zJD-5}fJ?^s*2pN2d%S$5{~0f&(md|*
z^0>##&vnDm96c$ZEW}XL4FG`67|wMAG!g~?>?KzJuLVcjJ23L<wQr@Y0y-InKnN;Y
z5hZ1}<2-%cB;l!6L^3qda?Bs3pph^RHZ~y;f-k=-5PZJ7Q^2+?WTt1^7o~3CDIxF&
zDQw1Yu(5f!3VeO_y6Jm62!tT|^9M3hGXQ`@;SeumsdokTR@OQ$-Y7`@mx?#hc>q9e
zWvzD$O3JRQ^Igg+7>mw9AOtntz|r<j_ZHNQGLoSQ*o?WV7g3f#CnLxuRv{3Ak0;0I
z9~yM0fNfb&7Gtg#2Y`xJgg|@{WeGN8$hF7@kDIXR2D!u<-hW;P02p}{r&`fDfmUJT
z`q(lCBd;Q~ymYmp#n`p+C%1)7&S9K(LLrsLhm&JmG7DqTxz0ssTNXY&7rXNP-#idy
z3H~6(SakkI0k&13n~HCMM#7+zVfZP9pT6w)|1|;^<{2uQ=D6q@yA#LdW-}66UTT|q
zw-UH8&#*Nz3IGT#FSQLFe~@DK`?nj5?EOu<fk42OVod`5LxT`y2}WMUC9^;ySJ$dI
zE;Z#`9~M!snh*%N5mbd#8lo(<^x5%cbYY$$Gd<IChmDibxCt9ETd$fZWfcg7AW=AU
z<a<vo*|~1;<lA@6)+_Gu^32o>uUE~k+Pc2Sr`aQchbHg`Mw0ZzFg?9*00000NkvXX
Hu0mjfWlvXV

literal 0
HcmV?d00001

diff --git a/telemeta/templates/telemeta/inc/module_revisions.html b/telemeta/templates/telemeta/inc/module_revisions.html
new file mode 100644
index 00000000..2b8503fb
--- /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 2eb6be14..72f46cd3 100644
--- 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
index 00000000..0996f6b0
--- /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 5b01bce3..3a818beb 100644
--- 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 71e1715a..5127b905 100644
--- 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:
-- 
2.39.5