planet: Slight face-lift and add hottest posts

[ipfire.org.git] / webapp / __init__.py

diff --git a/webapp/__init__.py b/webapp/__init__.py
index 752b3b4d5812b0d2b8a678ef790b3bb42b5b1f25..de574b9113e887d55e9dc7b6594a269f0ddd6390 100644 (file)
--- a/webapp/__init__.py
+++ b/webapp/__init__.py
@@ -36,6 +36,7 @@ class Application(tornado.web.Application):
                        ui_modules = {
                                "Advertisement"        : AdvertisementModule,
                                "DonationBox"          : DonationBoxModule,
+                               "DonationButton"       : DonationButtonModule,
                                "DownloadButton"       : DownloadButtonModule,
                                "LanguageName"         : LanguageNameModule,
                                "Map"                  : MapModule,
@@ -49,6 +50,7 @@ class Application(tornado.web.Application):
                                "NewsLine"             : NewsLineModule,
                                "NewsTable"            : NewsTableModule,
                                "NewsYearNavigation"   : NewsYearNavigationModule,
+                               "PlanetAuthorBox"      : PlanetAuthorBoxModule,
                                "PlanetEntry"          : PlanetEntryModule,
                                "PlanetSearchBox"      : PlanetSearchBoxModule,
                                "ProgressBar"          : ProgressBarModule,
@@ -92,7 +94,6 @@ class Application(tornado.web.Application):
                        (r"/news", NewsIndexHandler),
                        (r"/news/year/([0-9]*)", NewsYearHandler),
                        (r"/news/(.*)", NewsItemHandler),
-                       (r"/author/(.*)", NewsAuthorHandler),
 
                        # Download sites
                        (r"/download", tornado.web.RedirectHandler, { "url" : "http://downloads.ipfire.org/latest" }),
@@ -145,6 +146,7 @@ class Application(tornado.web.Application):
                # planet.ipfire.org
                self.add_handlers(r"planet(\.dev)?\.ipfire\.org", [
                        (r"/", PlanetMainHandler),
+                       (r"/hottest", PlanetHotEntriesHandler),
                        (r"/post/([A-Za-z0-9_-]+)", PlanetPostingHandler),
                        (r"/user/([a-z0-9_-]+)", PlanetUserHandler),
                        (r"/search", PlanetSearchHandler),
@@ -256,6 +258,11 @@ class Application(tornado.web.Application):
                        (r"/trunks", TalkTrunksHandler),
                ] + authentication_handlers + static_handlers)
 
+               # accounts.ipfire.org
+               self.add_handlers(r"accounts(\.dev)?\.ipfire\.org", [
+                       (r"/avatar/(\w+)\.jpg", AccountsAvatarHandler),
+               ] + static_handlers)
+
                # admin.ipfire.org
                self.add_handlers(r"admin(\.dev)?\.ipfire\.org", [
                        (r"/", AdminIndexHandler),
@@ -303,7 +310,8 @@ class Application(tornado.web.Application):
                        if not configfile:
                                raise RuntimeException("Could not find configuration file")
 
-                       self.__backend = backend.Backend(configfile=configfile)
+                       self.__backend = backend.Backend(configfile=configfile,
+                               debug=self.settings.get("debug", False))
 
                return self.__backend