netboot: Allow booting multiple architectures

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

diff --git a/webapp/__init__.py b/webapp/__init__.py
index de574b9113e887d55e9dc7b6594a269f0ddd6390..a6d380baf082e8a06ef7d216b8c527acc8b74ade 100644 (file)
--- a/webapp/__init__.py
+++ b/webapp/__init__.py
@@ -37,6 +37,7 @@ class Application(tornado.web.Application):
                                "Advertisement"        : AdvertisementModule,
                                "DonationBox"          : DonationBoxModule,
                                "DonationButton"       : DonationButtonModule,
+                               "DonationInputBox"     : DonationInputBoxModule,
                                "DownloadButton"       : DownloadButtonModule,
                                "LanguageName"         : LanguageNameModule,
                                "Map"                  : MapModule,
@@ -61,6 +62,7 @@ class Application(tornado.web.Application):
                                "FireinfoDeviceAndGroupsTable" : FireinfoDeviceAndGroupsTableModule,
                                "FireinfoGeoTable"        : FireinfoGeoTableModule,
                                "TalkCallLog"          : TalkCallLogModule,
+                               "TalkLines"            : TalkLinesModule,
                                "TalkOngoingCalls"     : TalkOngoingCallsModule,
                                "TrackerPeerList"      : TrackerPeerListModule,
                                "Wish"                 : WishModule,
@@ -96,14 +98,14 @@ class Application(tornado.web.Application):
                        (r"/news/(.*)", NewsItemHandler),
 
                        # Download sites
-                       (r"/download", tornado.web.RedirectHandler, { "url" : "http://downloads.ipfire.org/latest" }),
-                       (r"/downloads", tornado.web.RedirectHandler, { "url" : "http://downloads.ipfire.org/latest" }),
+                       (r"/download", DownloadHandler),
+                       (r"/downloads", tornado.web.RedirectHandler, { "url" : "/download" }),
 
                        # 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),
@@ -216,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 }),
                ])
 
@@ -255,7 +258,6 @@ 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