netboot: Allow booting multiple architectures

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

diff --git a/webapp/ui_modules.py b/webapp/ui_modules.py
index 4b4e9c9c86504aff4b91ab11ac5506c78f2eae77..514688fa3e1a513a686b18fe46f8a8881615b523 100644 (file)
--- a/webapp/ui_modules.py
+++ b/webapp/ui_modules.py
@@ -178,18 +178,19 @@ class MirrorsTableModule(UIModule):
 
 
 class NetBootMenuConfigModule(UIModule):
-       def render(self, release):
-               return self.render_string("netboot/menu-config.cfg", release=release)
+       def render(self, release, arch=None, platform=None):
+               return self.render_string("netboot/menu-config.cfg", release=release,
+                       arch=arch, platform=platform)
 
 
 class NetBootMenuHeaderModule(UIModule):
-       def render(self, title, releases):
+       def render(self, title, releases, arch=None, platform=None):
                id = unicodedata.normalize("NFKD", unicode(title)).encode("ascii", "ignore")
                id = re.sub(r"[^\w]+", " ", id)
                id = "-".join(id.lower().strip().split())
 
                return self.render_string("netboot/menu-header.cfg", id=id,
-                       title=title, releases=releases)
+                       title=title, releases=releases, arch=arch, platform=platform)
 
 
 class NetBootMenuSeparatorModule(UIModule):
@@ -217,7 +218,10 @@ class NewsItemModule(UIModule):
                # Render text
                item.text = textile.textile(item.text.decode("utf8"))
 
-               return self.render_string("modules/news-item.html", item=item,
+               # Find a release if one exists
+               release = self.releases.get_by_news_id(item.uuid)
+
+               return self.render_string("modules/news-item.html", item=item, release=release,
                        uncut=uncut, announcement=announcement, show_heading=show_heading)
 
 
@@ -244,10 +248,7 @@ class NewsYearNavigationModule(UIModule):
 
 class PlanetSearchBoxModule(UIModule):
        def render(self, query=None):
-               years = self.planet.get_years()
-
-               return self.render_string("modules/planet/search-box.html",
-                       query=query, years=years)
+               return self.render_string("modules/planet/search-box.html", query=query)
 
 
 class SidebarItemModule(UIModule):
@@ -478,7 +479,6 @@ class DonationButtonModule(UIModule):
                                return locale
 
                        lang, delimiter, country_code = locale.partition("_")
-                       print locale, "TEST", country_code
 
                        if country_code and country_code in self.COUNTRIES:
                                return country_code
@@ -491,3 +491,11 @@ class DonationButtonModule(UIModule):
 
                # If anything goes wrong, fall back to GB
                return "GB"
+
+
+class DonationInputBoxModule(DonationButtonModule):
+       def render(self):
+               currencies = ("EUR", "USD", "GBP", "CHF", "AUD", "NZD", "CAD")
+
+               return self.render_string("modules/donation-input-box.html",
+                       currencies=currencies, lc=self.lc)