netboot: Allow booting multiple architectures

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

diff --git a/webapp/__init__.py b/webapp/__init__.py
index 341c1a2fb0f15f8b3db62cefa382ac049d9fc0c3..a6d380baf082e8a06ef7d216b8c527acc8b74ade 100644 (file)
--- a/webapp/__init__.py
+++ b/webapp/__init__.py
@@ -36,6 +36,8 @@ class Application(tornado.web.Application):
                        ui_modules = {
                                "Advertisement"        : AdvertisementModule,
                                "DonationBox"          : DonationBoxModule,
+                               "DonationButton"       : DonationButtonModule,
+                               "DonationInputBox"     : DonationInputBoxModule,
                                "DownloadButton"       : DownloadButtonModule,
                                "LanguageName"         : LanguageNameModule,
                                "Map"                  : MapModule,
@@ -49,6 +51,7 @@ class Application(tornado.web.Application):
                                "NewsLine"             : NewsLineModule,
                                "NewsTable"            : NewsTableModule,
                                "NewsYearNavigation"   : NewsYearNavigationModule,
+                               "PlanetAuthorBox"      : PlanetAuthorBoxModule,
                                "PlanetEntry"          : PlanetEntryModule,
                                "PlanetSearchBox"      : PlanetSearchBoxModule,
                                "ProgressBar"          : ProgressBarModule,
@@ -59,6 +62,7 @@ class Application(tornado.web.Application):
                                "FireinfoDeviceAndGroupsTable" : FireinfoDeviceAndGroupsTableModule,
                                "FireinfoGeoTable"        : FireinfoGeoTableModule,
                                "TalkCallLog"          : TalkCallLogModule,
+                               "TalkLines"            : TalkLinesModule,
                                "TalkOngoingCalls"     : TalkOngoingCallsModule,
                                "TrackerPeerList"      : TrackerPeerListModule,
                                "Wish"                 : WishModule,
@@ -92,7 +96,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", DownloadHandler),
@@ -101,8 +104,8 @@ class Application(tornado.web.Application):
                        # Handle old pages that have moved elsewhere
                        (r"/screenshots", tornado.web.RedirectHandler, { "url" : "/about" }),
                        (r"/about", tornado.web.RedirectHandler, { "url" : "/features" }),
-                       (r"/support", tornado.web.RedirectHandler, { "url" : "/getinvolved" }),
                        (r"/features/.*", tornado.web.RedirectHandler, { "url" : "/features" }),
+                       (r"/getinvolved", tornado.web.RedirectHandler, { "url" : "/get-involved" }),
 
                        # Donate
                        (r"/donate", DonateHandler),
@@ -145,6 +148,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),
@@ -214,11 +218,12 @@ class Application(tornado.web.Application):
                        (r"/", tornado.web.RedirectHandler, { "url" : "http://www.ipfire.org/download" }),
 
                        # Configurations
+                       (r"/premenu.cfg", PremenuCfgHandler),
                        (r"/menu.gpxe", MenuGPXEHandler),
                        (r"/menu.cfg", MenuCfgHandler),
 
                        # Static files
-                       (r"/(boot\.png|premenu\.cfg|pxelinux\.0|menu\.c32|vesamenu\.c32)",
+                       (r"/(boot\.png|pxelinux\.0|menu\.c32|vesamenu\.c32)",
                                tornado.web.StaticFileHandler, { "path" : BOOT_STATIC_PATH }),
                ])
 
@@ -253,9 +258,13 @@ class Application(tornado.web.Application):
                        (r"/phonebook/(\w+)", TalkPhonebookAccountHandler),
                        (r"/phonebook", TalkPhonebookHandler),
                        (r"/profile", TalkProfileHandler),
-                       (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 +312,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