From b3057a729b9e8c87370f249ff0a895cac1793d77 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 18 Jul 2018 18:54:33 +0100 Subject: [PATCH] Drop more unused code Signed-off-by: Michael Tremer --- src/templates/modules/builds.html | 15 --- src/templates/modules/donation-box.html | 45 ------- src/templates/modules/donation-button.html | 16 --- src/templates/modules/donation-input-box.html | 38 ------ src/templates/modules/planet/search-box.html | 14 -- src/templates/modules/sidebar-banner.html | 6 - src/templates/modules/sidebar-item.html | 2 - src/templates/modules/sidebar-release.html | 12 -- src/templates/modules/stasy-table.html | 12 -- src/web/__init__.py | 10 +- src/web/ui_modules.py | 127 ------------------ 11 files changed, 3 insertions(+), 294 deletions(-) delete mode 100644 src/templates/modules/builds.html delete mode 100644 src/templates/modules/donation-box.html delete mode 100644 src/templates/modules/donation-button.html delete mode 100644 src/templates/modules/donation-input-box.html delete mode 100644 src/templates/modules/planet/search-box.html delete mode 100644 src/templates/modules/sidebar-banner.html delete mode 100644 src/templates/modules/sidebar-item.html delete mode 100644 src/templates/modules/sidebar-release.html delete mode 100644 src/templates/modules/stasy-table.html diff --git a/src/templates/modules/builds.html b/src/templates/modules/builds.html deleted file mode 100644 index 5b24269b..00000000 --- a/src/templates/modules/builds.html +++ /dev/null @@ -1,15 +0,0 @@ - - - IPFire - - -  
- {{ build.release }} ({{ build.arch }})
- {{ build.date }} - - -  
- {{ build.iso }} | {{ build.size }}
- {{ build.pxe }}  - - diff --git a/src/templates/modules/donation-box.html b/src/templates/modules/donation-box.html deleted file mode 100644 index c5ae877d..00000000 --- a/src/templates/modules/donation-box.html +++ /dev/null @@ -1,45 +0,0 @@ -
-
-

{{ _("Donate with PayPal") }}

- -
- {% module DonationButton(reason_for_transfer=reason_for_transfer) %} - -
- -
    - {% for currency in ("USD", "GBP", "CHF", "AUD", "NZD", "CAD") %} -
  • - {% module DonationButton(reason_for_transfer=reason_for_transfer, currency=currency) %} -
    • - {% end %} -
-
-
- -
-

{{ _("Donate by Bank Transfer") }}

- -
-
{{ _("IBAN") }}
-
DE76 3605 0105 1010 8206 84
- -
{{ _("BIC-/SWIFT-Code") }}
-
SPESDE3EXXX
- - {% if reason_for_transfer %} -
{{ _("Reason for transfer") }}
-
{{ reason_for_transfer }}
- {% end %} -
- -

- - The IPFire project is not a registered non-profit organisation. -
- Hence we are not able to issue a tax-deductible contribution receipt - for your donation. - -

-
-
diff --git a/src/templates/modules/donation-button.html b/src/templates/modules/donation-button.html deleted file mode 100644 index 2c229540..00000000 --- a/src/templates/modules/donation-button.html +++ /dev/null @@ -1,16 +0,0 @@ -
- - - - - - - - - - {% if primary %} - - {% else %} - - {% end %} -
diff --git a/src/templates/modules/donation-input-box.html b/src/templates/modules/donation-input-box.html deleted file mode 100644 index d56e7e6d..00000000 --- a/src/templates/modules/donation-input-box.html +++ /dev/null @@ -1,38 +0,0 @@ -
- - - - - - - - - -
- -
-
- -
- - -
- - -
-
diff --git a/src/templates/modules/planet/search-box.html b/src/templates/modules/planet/search-box.html deleted file mode 100644 index 3fc3f67b..00000000 --- a/src/templates/modules/planet/search-box.html +++ /dev/null @@ -1,14 +0,0 @@ -
-
-
-
- - - -
-
-
-
diff --git a/src/templates/modules/sidebar-banner.html b/src/templates/modules/sidebar-banner.html deleted file mode 100644 index f15a4c29..00000000 --- a/src/templates/modules/sidebar-banner.html +++ /dev/null @@ -1,6 +0,0 @@ -{% if item %} -

{{ item.caption }}

- - {{ _( - -{% end %} diff --git a/src/templates/modules/sidebar-item.html b/src/templates/modules/sidebar-item.html deleted file mode 100644 index 7ebff073..00000000 --- a/src/templates/modules/sidebar-item.html +++ /dev/null @@ -1,2 +0,0 @@ -

{% block heading %}{{ item.heading }}{% end block %}

-{% block body %}{{ item.body }}{% end block %} diff --git a/src/templates/modules/sidebar-release.html b/src/templates/modules/sidebar-release.html deleted file mode 100644 index 8796240f..00000000 --- a/src/templates/modules/sidebar-release.html +++ /dev/null @@ -1,12 +0,0 @@ -{% if latest %} - -
-

{{ _("Latest release") }}

-

- {{ latest.name }} -

-

- {{ _("Download now") }} -

-
-{% end %} diff --git a/src/templates/modules/stasy-table.html b/src/templates/modules/stasy-table.html deleted file mode 100644 index e5b63fd0..00000000 --- a/src/templates/modules/stasy-table.html +++ /dev/null @@ -1,12 +0,0 @@ -
- {% for k, v in items %} -
{{ k }}
-
-
-
- {{ "%.2f" % v }}% -
-
-
- {% end %} -
diff --git a/src/web/__init__.py b/src/web/__init__.py index 686bbd21..d0189fa9 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -40,6 +40,8 @@ class Application(tornado.web.Application): "format_month_name" : self.format_month_name, }, "ui_modules" : { + "Menu" : MenuModule, + # Blog "BlogHistoryNavigation": blog.HistoryNavigationModule, "BlogList" : blog.ListModule, @@ -50,13 +52,9 @@ class Application(tornado.web.Application): "Map" : MapModule, # Old modules - "Advertisement" : AdvertisementModule, - "DonationBox" : DonationBoxModule, - "DonationButton" : DonationButtonModule, - "DonationInputBox" : DonationInputBoxModule, "DownloadButton" : DownloadButtonModule, "LanguageName" : LanguageNameModule, - "Menu" : MenuModule, + "MirrorItem" : MirrorItemModule, "MirrorsTable" : MirrorsTableModule, "NetBootMenuConfig" : NetBootMenuConfigModule, @@ -64,8 +62,6 @@ class Application(tornado.web.Application): "NetBootMenuSeparator" : NetBootMenuSeparatorModule, "ProgressBar" : ProgressBarModule, "ReleaseItem" : ReleaseItemModule, - "SidebarBanner" : SidebarBannerModule, - "SidebarRelease" : SidebarReleaseModule, "FireinfoDeviceTable" : FireinfoDeviceTableModule, "FireinfoDeviceAndGroupsTable" : FireinfoDeviceAndGroupsTableModule, "FireinfoGeoTable" : FireinfoGeoTableModule, diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py index b05440b5..c73a3956 100644 --- a/src/web/ui_modules.py +++ b/src/web/ui_modules.py @@ -24,10 +24,6 @@ class UIModule(tornado.web.UIModule): def accounts(self): return self.handler.accounts - @property - def advertisements(self): - return self.handler.advertisements - @property def banners(self): return self.handler.banners @@ -49,20 +45,6 @@ class UIModule(tornado.web.UIModule): return self.handler.talk -class AdvertisementModule(UIModule): - def render(self, where): - assert where in ("download-splash",), where - - ad = self.advertisements.get(where) - if not ad: - return "" - - # Mark that advert has been shown. - ad.update_impressions() - - return self.render_string("modules/ads/%s.html" % where, ad=ad) - - class FireinfoDeviceTableModule(UIModule): def render(self, devices): return self.render_string("fireinfo/modules/table-devices.html", @@ -190,17 +172,6 @@ class NetBootMenuSeparatorModule(UIModule): return self.render_string("netboot/menu-separator.cfg") -class SidebarItemModule(UIModule): - def render(self): - return self.render_string("modules/sidebar-item.html") - - -class SidebarReleaseModule(UIModule): - def render(self): - return self.render_string("modules/sidebar-release.html", - latest=self.releases.get_latest()) - - class ReleaseItemModule(UIModule): def render(self, release, latest=False): arches = ("x86_64", "i586", "arm") @@ -222,14 +193,6 @@ class ReleaseItemModule(UIModule): release=release, latest=latest, downloads=downloads) -class SidebarBannerModule(UIModule): - def render(self, item=None): - if not item: - item = self.banners.get_random() - - return self.render_string("modules/sidebar-banner.html", item=item) - - class DownloadButtonModule(UIModule): def render(self, release, text="Download now!"): best_image = None @@ -301,93 +264,3 @@ class TalkOngoingCallsModule(UIModule): return self.render_string("talk/modules/ongoing-calls.html", account=account, channels=channels, debug=debug) - - -class DonationBoxModule(UIModule): - def render(self, reason_for_transfer=None): - if reason_for_transfer: - reason_for_transfer = "IPFire.org - %s" % reason_for_transfer - - return self.render_string("modules/donation-box.html", - reason_for_transfer=reason_for_transfer) - - -class DonationButtonModule(UIModule): - # https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/Appx_websitestandard_htmlvariables/ - COUNTRIES = ( - "AU", - "AT", - "BE", - "BR", - "CA", - "CH", - "CN", - "DE", - "ES", - "GB", - "FR", - "IT", - "NL", - "PL", - "PT", - "RU", - "US", - ) - - LOCALES = ( - "da_DK", - "he_IL", - "id_ID", - "ja_JP", - "no_NO", - "pt_BR", - "ru_RU", - "sv_SE", - "th_TH", - "zh_CN", - "zh_HK", - "zh_TW", - ) - - def render(self, reason_for_transfer=None, currency="EUR"): - if not reason_for_transfer: - reason_for_transfer = "IPFire.org" - - primary = (currency == "EUR") - - return self.render_string("modules/donation-button.html", primary=primary, - reason_for_transfer=reason_for_transfer, currency=currency, lc=self.lc) - - @property - def lc(self): - """ - Returns the locale of the user - """ - try: - locale, delimiter, encoding = self.locale.code.partition(".") - - # Break for languages in specific countries - if locale in self.LOCALES: - return locale - - lang, delimiter, country_code = locale.partition("_") - - if country_code and country_code in self.COUNTRIES: - return country_code - - lang = lang.upper() - if lang in self.COUNTRIES: - return lang - except: - pass - - # 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) -- 2.47.2