Website update.

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

diff --git a/www/webapp/__init__.py b/www/webapp/__init__.py
index dff381951169d39ee6f4d030b143115f0a10e29f..a8656d0ffc1e70f2ded9ba267f517b2179269ace 100644 (file)
--- a/www/webapp/__init__.py
+++ b/www/webapp/__init__.py
@@ -5,9 +5,10 @@ import os.path
 import simplejson
 import tornado.httpserver
 import tornado.locale
-import tornado.options
 import tornado.web
 
+from tornado.options import options
+
 import backend
 
 from handlers import *
@@ -15,19 +16,22 @@ from ui_modules import *
 
 BASEDIR = os.path.join(os.path.dirname(__file__), "..")
 
-tornado.locale.load_translations(os.path.join(BASEDIR, "translations"))
+# Load translations.
+tornado.locale.load_gettext_translations(os.path.join(BASEDIR, "translations"), "webapp")
 
 class Application(tornado.web.Application):
        def __init__(self):
                settings = dict(
                        cookie_secret = "aXBmaXJlY29va2llc2VjcmV0Cg==",
-                       debug = False,
+                       debug = options.debug,
                        gzip = True,
                        login_url = "/login",
                        template_path = os.path.join(BASEDIR, "templates"),
                        ui_modules = {
+                               "DownloadButton" : DownloadButtonModule,
                                "Menu"           : MenuModule,
                                "MirrorItem"     : MirrorItemModule,
+                               "MirrorsTable"   : MirrorsTableModule,
                                "NewsItem"       : NewsItemModule,
                                "NewsLine"       : NewsLineModule,
                                "PlanetEntry"    : PlanetEntryModule,
@@ -35,7 +39,9 @@ class Application(tornado.web.Application):
                                "SidebarBanner"  : SidebarBannerModule,
                                "SidebarRelease" : SidebarReleaseModule,
                                "StasyTable"     : StasyTableModule,
+                               "StasyCPUCoreTable" : StasyCPUCoreTableModule,
                                "StasyDeviceTable" : StasyDeviceTableModule,
+                               "StasyGeoTable"  : StasyGeoTableModule,
                                "TrackerPeerList": TrackerPeerListModule,
                        },
                        xsrf_cookies = True,
@@ -61,7 +67,15 @@ class Application(tornado.web.Application):
                        (r"/author/(.*)", NewsAuthorHandler),
 
                        # Download sites
-                       (r"/downloads?", DownloadHandler),
+                       (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"/donate", tornado.web.RedirectHandler, { "url" : "/donation" }),
 
                        # RSS feed
                        (r"/news.rss", RSSNewsHandler),
@@ -75,7 +89,7 @@ class Application(tornado.web.Application):
                ])
 
                # downloads.ipfire.org
-               self.add_handlers(r"downloads?\.ipfire\.org", [
+               self.add_handlers(r"downloads\.ipfire\.org", [
                        (r"/", DownloadsIndexHandler),
                        (r"/latest", DownloadsLatestHandler),
                        (r"/release/([0-9]+)", DownloadsReleaseHandler),
@@ -83,10 +97,14 @@ class Application(tornado.web.Application):
                        (r"/development", DownloadsDevelopmentHandler),
                        (r"/mirrors", tornado.web.RedirectHandler, { "url" : "http://mirrors.ipfire.org/" }),
                        (r"/source", tornado.web.RedirectHandler, { "url" : "http://source.ipfire.org/" }),
+                       (r"/download-splash", DownloadSplashHandler),
                ] + static_handlers + [
                        (r"/(iso|torrent)/(.*)", DownloadCompatHandler),
                        (r"/(.*)", DownloadFileHandler),
                ])
+               self.add_handlers(r"download\.ipfire\.org", [
+                       (r".*", tornado.web.RedirectHandler, { "url" : "http://downloads.ipfire.org" })
+               ])
 
                # mirrors.ipfire.org
                self.add_handlers(r"mirrors\.ipfire\.org", [
@@ -106,7 +124,7 @@ class Application(tornado.web.Application):
                ] + static_handlers)
 
                # stasy.ipfire.org
-               self.add_handlers(r"(fireinfo|stasy)\.ipfire\.org", [
+               self.add_handlers(r"fireinfo\.ipfire\.org", [
                        (r"/", StasyIndexHandler),
                        (r"/profile/([a-z0-9]{40})", StasyProfileDetailHandler),
                        (r"/vendor/(pci|usb)/([0-9a-f]{4})", StasyStatsVendorDetail),
@@ -136,6 +154,12 @@ class Application(tornado.web.Application):
                        (r"/torrent/([0-9a-f]+)", TrackerDetailHandler),
                ] + static_handlers)
 
+               # nopaste.ipfire.org
+               self.add_handlers(r"nopaste\.ipfire\.org", [
+                       (r"/", NopasteIndexHandler),
+                       (r"/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", NopasteEntryHandler),
+               ] + static_handlers)
+
                # admin.ipfire.org
                self.add_handlers(r"admin\.ipfire\.org", [
                        (r"/", AdminIndexHandler),
@@ -158,6 +182,10 @@ class Application(tornado.web.Application):
                        (r"/mirrors/update", AdminMirrorsUpdateHandler),
                        # Fireinfo
                        (r"/fireinfo/stats", AdminFireinfoStatsHandler),
+                       # Downloads
+                       (r"/downloads", AdminDownloadsHandler),
+                       (r"/downloads/mirrors", AdminDownloadsMirrorsHandler),
+                       (r"/downloads/test", AdminDownloadsGraphHandler),
                        # API
                        (r"/api/planet/render", AdminApiPlanetRenderMarkupHandler)
                ] + static_handlers)