From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 28 Jan 2011 11:29:02 +0000 (+0100)
Subject: www: Show latest entry from the planet on the index page.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57a8624074050a64ef4919a18d868ae7108dd70f;p=ipfire.org.git

www: Show latest entry from the planet on the index page.
---

diff --git a/www/templates/index.html b/www/templates/index.html
index 025075be..3b6d3ca3 100644
--- a/www/templates/index.html
+++ b/www/templates/index.html
@@ -118,13 +118,17 @@
 		{{ modules.NewsItem(item) }}
 	{% end %}
 
-	<h4>{{ _("Recent news") }}:</h4>
-	<ul class="news">
-	{% for item in recent_news %}
-		<li>{{ modules.NewsLine(item) }}</li>
+	<div class="line"></div>
+
+	{% for item in recent_planets %}
+		<strong>{{ _("Have you already seen?") }}</strong>
+		<a href="http://planet.ipfire.org/user/{{ item.author.uid }}">{{ item.author.cn }}</a>
+		{{ _("talks about") }}
+		<a href="http://planet.ipfire.org/post/{{ item.slug }}">{{ item.title }}</a>
+		{{ _("on the IPFire planet.") }}
 	{% end %}
-	</ul>
 
+	<br class="clear" />
 	<br class="clear" />
 
 	<p class="right">
diff --git a/www/translations/de_DE.csv b/www/translations/de_DE.csv
index 89f1133b..348c3c3f 100644
--- a/www/translations/de_DE.csv
+++ b/www/translations/de_DE.csv
@@ -263,3 +263,6 @@
 "See a breakdown of the CPU cores that are installed on the IPFire systems.","Hier ist eine Übersicht über die Anzahl der CPU-Kerne, die in den IPFire-Systemen installiert sind."
 "CPU cores counter","CPU-Kerne"
 "All together, there are <strong>%s bogomips</strong> out there.","Insgesamt bringen es alle Systeme auf <strong>%s bogomips</strong>."
+"Have you already seen?","Schon gesehen?"
+"talks about","redet über"
+"on the IPFire planet.","auf dem IPFire planet."
diff --git a/www/webapp/handlers.py b/www/webapp/handlers.py
index 2a9c7590..f88e383d 100644
--- a/www/webapp/handlers.py
+++ b/www/webapp/handlers.py
@@ -56,10 +56,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)
-		recent_news = self.news.get_latest(limit=3, locale=self.locale, offset=1)
+		recent_planets = self.planet.get_entries(limit=1)
 
 		return self.render("index.html",
-			latest_news=latest_news, recent_news=recent_news)
+			latest_news=latest_news, recent_planets=recent_planets)
 
 
 class StaticHandler(BaseHandler):