Show latest planet post on main page and add link for older annoucements.

diff --git a/www/templates/index.html b/www/templates/index.html
index dfeda5411576330721941075a305c060bd9b5fb1..18fc1373a6233f0c76957ef34f189596a8ad0dde 100644 (file)
--- a/www/templates/index.html
+++ b/www/templates/index.html
@@ -141,4 +141,19 @@
        {% for item in latest_news %}
                {{ modules.NewsItem(item, announcement=True) }}
        {% end %}
+
+       <div class="row">
+               <div class="span12">
+                       <hr>
+                       <a class="pull-right" href="/news">
+                               <i class="icon-inbox"></i>
+                               {{ _("Show older announcements") }}
+                       </a>
+
+                       <span class="label label-info"><i class="icon-globe icon-white"></i> {{ _("Planet news") }}</span>
+                       {% for entry in latest_planets %}
+                               {{ _("%(name)s talks about %(what)s.") % { "name" : entry.author.givenName, "what" : """<a href="http://planet.ipfire.org/post/%s">%s</a>""" % (entry.slug, entry.title) } }}
+                       {% end %}
+               </div>
+       </div>
 {% end block %}

diff --git a/www/translations/de_DE/LC_MESSAGES/webapp.po b/www/translations/de_DE/LC_MESSAGES/webapp.po
index 3ac40b4f10d121ba5688ad21e827f213880e4b4f..33ba16accefad0f9f8e7d0f8a2c9a71f656db388 100644 (file)
--- a/www/translations/de_DE/LC_MESSAGES/webapp.po
+++ b/www/translations/de_DE/LC_MESSAGES/webapp.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-15 11:01+0200\n"
+"POT-Creation-Date: 2012-07-25 20:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -77,7 +77,7 @@ msgstr "Mirrorstatistiken"
 msgid "Ancient downloads"
 msgstr "Veraltete Downloads"
 
-#: templates/downloads-older.html:10 templates/downloads-all.html:10
+#: templates/downloads-older.html:9 templates/downloads-all.html:9
 msgid ""
 "These are the ancient downloads of IPFire. They are just saved for "
 "historical reasons and should not be used in a productive environment."
@@ -85,7 +85,7 @@ msgstr ""
 "Dieses sind veraltete Downloads von IPFire. Sie wurden hier archiviert und "
 "sollten nicht in produktiven Umgebungen eingesetzt werden."
 
-#: templates/downloads-older.html:14
+#: templates/downloads-older.html:13
 msgid ""
 "Beware that these releases could lack possible security-fixes\tand so it is "
 "recommended to use the <em>latest</em> version."
@@ -93,16 +93,16 @@ msgstr ""
 "Achtung! Diese Releases könnten potentielle Sicherheitsprobleme aufweisen. "
 "Daher wird empfohlen die <em>neueste</em> Version einzusetzen."
 
-#: templates/downloads-older.html:18 templates/downloads-all.html:14
+#: templates/downloads-older.html:17 templates/downloads-all.html:13
 msgid "Go back to latest stable downloads."
 msgstr "Zurück zu den neuesten stabilen Downloads."
 
-#: templates/downloads-older.html:26 templates/tracker-torrent-detail.html:12
+#: templates/downloads-older.html:25 templates/tracker-torrent-detail.html:12
 #: templates/tracker-torrents.html:31
 msgid "Release"
 msgstr "Release"
 
-#: templates/downloads-older.html:27
+#: templates/downloads-older.html:26
 msgid "Published on"
 msgstr "Veröffentlicht am"
 
@@ -132,15 +132,15 @@ msgstr "Nicht synchronisiert"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: templates/mirrors-item.html:22 templates/downloads-mirrors.html:51
+#: templates/mirrors-item.html:22 templates/downloads-mirrors.html:50
 #: templates/stasy-profile-detail.html:231
-#: templates/download-mirror-detail.html:21 templates/admin-mirrors.html:15
+#: templates/download-mirror-detail.html:20 templates/admin-mirrors.html:15
 msgid "Last update"
 msgstr "Letztes Update"
 
-#: templates/mirrors-item.html:26 templates/downloads-mirrors.html:48
+#: templates/mirrors-item.html:26 templates/downloads-mirrors.html:47
 #: templates/admin-mirrors-create.html:20
-#: templates/download-mirror-detail.html:17
+#: templates/download-mirror-detail.html:16
 #: templates/admin-mirrors-details.html:21
 msgid "Owner"
 msgstr "Eigentümer"
@@ -419,18 +419,18 @@ msgstr "Mirrorserver"
 msgid "IPFire Mirrors"
 msgstr "IPFire Mirrors"
 
-#: templates/downloads-mirrors.html:49 templates/admin-mirrors-create.html:12
-#: templates/download-mirror-detail.html:13 templates/admin-mirrors.html:14
+#: templates/downloads-mirrors.html:48 templates/admin-mirrors-create.html:12
+#: templates/download-mirror-detail.html:12 templates/admin-mirrors.html:14
 #: templates/admin-mirrors-details.html:13
 msgid "Hostname"
 msgstr "Hostname"
 
-#: templates/downloads-mirrors.html:50 templates/admin-mirrors-create.html:24
+#: templates/downloads-mirrors.html:49 templates/admin-mirrors-create.html:24
 #: templates/admin-mirrors-details.html:25
 msgid "Location"
 msgstr "Standort"
 
-#: templates/downloads-mirrors.html:64
+#: templates/downloads-mirrors.html:63
 msgid "details"
 msgstr "Details"
 
@@ -755,11 +755,11 @@ msgstr "Peripheriegeräte"
 msgid "Signature images"
 msgstr "Signaturbilder"
 
-#: templates/download-mirror-detail.html:25
+#: templates/download-mirror-detail.html:24
 msgid "Number of files"
 msgstr "Anzahl von Dateien"
 
-#: templates/download-mirror-detail.html:33
+#: templates/download-mirror-detail.html:32
 msgid "View list of all mirror servers."
 msgstr "Liste aller Mirrorserver."
 
@@ -1190,6 +1190,19 @@ msgstr "Flexibilität"
 msgid "Open Source"
 msgstr "Open Source"
 
+#: templates/index.html:150
+msgid "Show older announcements"
+msgstr "Ältere Ankündigungen"
+
+#: templates/index.html:153
+msgid "Planet news"
+msgstr "Planet News"
+
+#: templates/index.html:155
+#, python-format
+msgid "%(name)s talks about %(what)s."
+msgstr "%(name)s schreibt über %(what)s."
+
 #: templates/admin-mirrors-details.html:8
 msgid "All mirrors"
 msgstr "Alle Mirrors"
@@ -1259,11 +1272,15 @@ msgstr "Vor mehr als einem Tag"
 msgid "Profile not found"
 msgstr "Profil nicht gefunden"
 
-#: webapp/handlers_news.py:44 webapp/ui_modules.py:70
+#: templates/news-item.html:7
+msgid "Show all news entries"
+msgstr ""
+
+#: webapp/handlers_news.py:44 webapp/ui_modules.py:54
 msgid "Unknown author"
 msgstr "Unbekannter Autor"
 
-#: webapp/ui_modules.py:217
+#: webapp/ui_modules.py:201
 #, python-format
 msgid "%s to %s"
 msgstr "%s nach %s"

diff --git a/www/translations/webapp.pot b/www/translations/webapp.pot
index 7a85296f1f83796dd83da0667151f8e6b7a98e0f..9015277eb46b81a5f5cdad375756b257f8fb761a 100644 (file)
--- a/www/translations/webapp.pot
+++ b/www/translations/webapp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-15 11:01+0200\n"
+"POT-Creation-Date: 2012-07-25 20:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -77,28 +77,28 @@ msgstr ""
 msgid "Ancient downloads"
 msgstr ""
 
-#: templates/downloads-older.html:10 templates/downloads-all.html:10
+#: templates/downloads-older.html:9 templates/downloads-all.html:9
 msgid ""
 "These are the ancient downloads of IPFire. They are just saved for "
 "historical reasons and should not be used in a productive environment."
 msgstr ""
 
-#: templates/downloads-older.html:14
+#: templates/downloads-older.html:13
 msgid ""
 "Beware that these releases could lack possible security-fixes\tand so it is "
 "recommended to use the <em>latest</em> version."
 msgstr ""
 
-#: templates/downloads-older.html:18 templates/downloads-all.html:14
+#: templates/downloads-older.html:17 templates/downloads-all.html:13
 msgid "Go back to latest stable downloads."
 msgstr ""
 
-#: templates/downloads-older.html:26 templates/tracker-torrent-detail.html:12
+#: templates/downloads-older.html:25 templates/tracker-torrent-detail.html:12
 #: templates/tracker-torrents.html:31
 msgid "Release"
 msgstr ""
 
-#: templates/downloads-older.html:27
+#: templates/downloads-older.html:26
 msgid "Published on"
 msgstr ""
 
@@ -128,15 +128,15 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: templates/mirrors-item.html:22 templates/downloads-mirrors.html:51
+#: templates/mirrors-item.html:22 templates/downloads-mirrors.html:50
 #: templates/stasy-profile-detail.html:231
-#: templates/download-mirror-detail.html:21 templates/admin-mirrors.html:15
+#: templates/download-mirror-detail.html:20 templates/admin-mirrors.html:15
 msgid "Last update"
 msgstr ""
 
-#: templates/mirrors-item.html:26 templates/downloads-mirrors.html:48
+#: templates/mirrors-item.html:26 templates/downloads-mirrors.html:47
 #: templates/admin-mirrors-create.html:20
-#: templates/download-mirror-detail.html:17
+#: templates/download-mirror-detail.html:16
 #: templates/admin-mirrors-details.html:21
 msgid "Owner"
 msgstr ""
@@ -411,18 +411,18 @@ msgstr ""
 msgid "IPFire Mirrors"
 msgstr ""
 
-#: templates/downloads-mirrors.html:49 templates/admin-mirrors-create.html:12
-#: templates/download-mirror-detail.html:13 templates/admin-mirrors.html:14
+#: templates/downloads-mirrors.html:48 templates/admin-mirrors-create.html:12
+#: templates/download-mirror-detail.html:12 templates/admin-mirrors.html:14
 #: templates/admin-mirrors-details.html:13
 msgid "Hostname"
 msgstr ""
 
-#: templates/downloads-mirrors.html:50 templates/admin-mirrors-create.html:24
+#: templates/downloads-mirrors.html:49 templates/admin-mirrors-create.html:24
 #: templates/admin-mirrors-details.html:25
 msgid "Location"
 msgstr ""
 
-#: templates/downloads-mirrors.html:64
+#: templates/downloads-mirrors.html:63
 msgid "details"
 msgstr ""
 
@@ -747,11 +747,11 @@ msgstr ""
 msgid "Signature images"
 msgstr ""
 
-#: templates/download-mirror-detail.html:25
+#: templates/download-mirror-detail.html:24
 msgid "Number of files"
 msgstr ""
 
-#: templates/download-mirror-detail.html:33
+#: templates/download-mirror-detail.html:32
 msgid "View list of all mirror servers."
 msgstr ""
 
@@ -1182,6 +1182,19 @@ msgstr ""
 msgid "Open Source"
 msgstr ""
 
+#: templates/index.html:150
+msgid "Show older announcements"
+msgstr ""
+
+#: templates/index.html:153
+msgid "Planet news"
+msgstr ""
+
+#: templates/index.html:155
+#, python-format
+msgid "%(name)s talks about %(what)s."
+msgstr ""
+
 #: templates/admin-mirrors-details.html:8
 msgid "All mirrors"
 msgstr ""
@@ -1251,11 +1264,15 @@ msgstr ""
 msgid "Profile not found"
 msgstr ""
 
-#: webapp/handlers_news.py:44 webapp/ui_modules.py:70
+#: templates/news-item.html:7
+msgid "Show all news entries"
+msgstr ""
+
+#: webapp/handlers_news.py:44 webapp/ui_modules.py:54
 msgid "Unknown author"
 msgstr ""
 
-#: webapp/ui_modules.py:217
+#: webapp/ui_modules.py:201
 #, python-format
 msgid "%s to %s"
 msgstr ""

diff --git a/www/webapp/handlers.py b/www/webapp/handlers.py
index 5f922df33b0f05eb1d1ef41f3a538319e26e738b..67e42e0d86c5c8fadaf2bb463779affde201e4be 100644 (file)
--- a/www/webapp/handlers.py
+++ b/www/webapp/handlers.py
@@ -57,8 +57,10 @@ class IndexHandler(BaseHandler):
        def get(self):
                # Get a list of the most recent news items and put them on the page.            
                latest_news = self.news.get_latest(limit=1, locale=self.locale)
+               latest_planets = self.planet.get_entries(limit=1)
 
-               return self.render("index.html", latest_news=latest_news)
+               return self.render("index.html", latest_news=latest_news,
+                       latest_planets=latest_planets)
 
 
 class StaticHandler(BaseHandler):