fireinfo: Shorten an other AMD APU processor

[people/shoehn/ipfire.org.git] / webapp / handlers.py

diff --git a/webapp/handlers.py b/webapp/handlers.py
index fea68d4859cae231d0981254e1f6409444efaab4..8a082b0f96baac1283593ee129fca4708b5a9995 100644 (file)
--- a/webapp/handlers.py
+++ b/webapp/handlers.py
@@ -15,17 +15,19 @@ import tornado.web
 
 import backend
 
+from handlers_accounts import *
 from handlers_admin import *
 from handlers_base import *
 from handlers_boot import *
 from handlers_download import *
+from handlers_fireinfo import *
 from handlers_iuse import *
 from handlers_mirrors import *
 from handlers_news import *
 from handlers_nopaste import *
 from handlers_planet import *
 from handlers_rss import *
-from handlers_stasy import *
+from handlers_talk import *
 from handlers_tracker import *
 from handlers_wishlist import *
 
@@ -57,13 +59,22 @@ 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_news = self.news.get_latest(limit=3, locale=self.locale)
+
+               # Get a list of the most recent planet posts.
+               planet_posts = self.planet.get_entries(limit=3)
 
                # Get the latest release.
                latest_release = self.releases.get_latest()
+               latest_release_unstable = self.releases.get_latest_unstable()
+
+               # Interesting items from the wishlist.
+               wishlist_items = self.wishlist.get_hot_wishes()
 
                return self.render("index.html", latest_news=latest_news,
-                       latest_release=latest_release)
+                       planet_posts=planet_posts, latest_release=latest_release,
+                       latest_release_unstable=latest_release_unstable,
+                       wishlist_items=wishlist_items)
 
 
 class StaticHandler(BaseHandler):
@@ -90,3 +101,32 @@ class StaticHandler(BaseHandler):
                        raise tornado.web.HTTPError(404)
 
                self.render("static/%s" % name, lang=self.locale.code[:2])
+
+
+class GeoIPHandler(BaseHandler):
+       def get_address(self):
+               addr = self.get_argument("addr", None)
+
+               if not addr:
+                       addr = self.get_remote_ip()
+
+               return addr
+
+       def get(self):
+               addr = self.get_address()
+
+               peer = self.geoip.get_all(addr)
+               if peer:
+                       peer["country_name"] = self.geoip.get_country_name(peer.country)
+
+               mirrors = self.mirrors.get_for_location(peer)
+
+               self.render("geoip/index.html", addr=addr, peer=peer, mirrors=mirrors)
+
+
+class DonateHandler(BaseHandler):
+       def get(self):
+               # Interesting items from the wishlist.
+               wishlist_items = self.wishlist.get_hot_wishes()
+
+               self.render("donate.html", wishlist_items=wishlist_items)