From ba43a892f73a6b68bccdef23bf9d28ac49557e4f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 25 Apr 2018 13:49:36 +0200 Subject: [PATCH] Make all absolute links use https:// instead of http:// Signed-off-by: Michael Tremer --- templates/admin-planet.html | 2 +- templates/base.html | 20 ++++++++++---------- templates/download-splash.html | 4 ++-- templates/downloads-mirrors.html | 2 +- templates/fireinfo/profile-notfound.html | 2 +- templates/geoip/index.html | 2 +- templates/index.html | 6 +++--- templates/modules/menu.html | 4 ++-- templates/modules/news-item.html | 2 +- templates/modules/sidebar-banner.html | 2 +- templates/news.html | 2 +- templates/planet/modules/author-box.html | 2 +- templates/static/artwork.html | 2 +- templates/static/features.html | 24 ++++++++++++------------ templates/static/get-involved.html | 14 +++++++------- templates/static/get-started.html | 8 ++++---- templates/static/hardware.html | 20 ++++++++++---------- templates/static/legal.html | 6 +++--- webapp/__init__.py | 8 ++++---- webapp/handlers_rss.py | 2 +- 20 files changed, 67 insertions(+), 67 deletions(-) diff --git a/templates/admin-planet.html b/templates/admin-planet.html index c40118d1..6c3ab5bc 100644 --- a/templates/admin-planet.html +++ b/templates/admin-planet.html @@ -20,7 +20,7 @@ {{ entry.author.name }} - {{ entry.title }} + {{ entry.title }} {% if entry.is_draft() %} {{ _("Draft") }} {% end %} diff --git a/templates/base.html b/templates/base.html index 411dabb6..18940de4 100644 --- a/templates/base.html +++ b/templates/base.html @@ -79,7 +79,7 @@ @@ -98,10 +98,10 @@ @@ -111,16 +111,16 @@ @@ -130,7 +130,7 @@ @@ -151,7 +151,7 @@
- + diff --git a/templates/download-splash.html b/templates/download-splash.html index e92cf19c..4ed6d62d 100644 --- a/templates/download-splash.html +++ b/templates/download-splash.html @@ -18,7 +18,7 @@
- +

{{ _("Get Support") }}

diff --git a/templates/downloads-mirrors.html b/templates/downloads-mirrors.html index fd80eb14..61a2c912 100644 --- a/templates/downloads-mirrors.html +++ b/templates/downloads-mirrors.html @@ -20,7 +20,7 @@ diff --git a/templates/fireinfo/profile-notfound.html b/templates/fireinfo/profile-notfound.html index 23f0cc14..e6aa1ace 100644 --- a/templates/fireinfo/profile-notfound.html +++ b/templates/fireinfo/profile-notfound.html @@ -19,7 +19,7 @@

If this is your own profile, you can - enable + enable the submission on the web user interface.

diff --git a/templates/geoip/index.html b/templates/geoip/index.html index ea44a67d..72053e5c 100644 --- a/templates/geoip/index.html +++ b/templates/geoip/index.html @@ -42,7 +42,7 @@
    {% for mirror in mirrors %}
  • - + {{ mirror.hostname }} diff --git a/templates/index.html b/templates/index.html index c01cee7b..61aab0a9 100644 --- a/templates/index.html +++ b/templates/index.html @@ -104,7 +104,7 @@

    {{ _("Trusted by thousands") }}

    IPFire is developed in Europe and used all over the world - in hundreds of countries + in hundreds of countries by hundreds of thousands of users every day.

@@ -155,7 +155,7 @@ {{ item.title }} {% elif type == "planet" %} - + {{ item.title }} {% end %} @@ -233,7 +233,7 @@

- Lightning Wire Labs offer + Lightning Wire Labs offer IPFire hardware appliances for enterprises, large businesses and SOHO. Deploying one of these on your network will provide you with the greatest reliability, stability and performance. diff --git a/templates/modules/menu.html b/templates/modules/menu.html index 09ccb398..302290a9 100644 --- a/templates/modules/menu.html +++ b/templates/modules/menu.html @@ -37,7 +37,7 @@ {% elif hostname in ("downloads.ipfire.org", "download.ipfire.org") %}

{% elif hostname == "fireinfo.ipfire.org" %} diff --git a/templates/modules/news-item.html b/templates/modules/news-item.html index c8ae423f..ab36de27 100644 --- a/templates/modules/news-item.html +++ b/templates/modules/news-item.html @@ -5,7 +5,7 @@ {% if announcement %} {{ _("Announcement") }}: {% end %} - {{ item.title }} + {{ item.title }} {% end %} diff --git a/templates/modules/sidebar-banner.html b/templates/modules/sidebar-banner.html index c1958946..f15a4c29 100644 --- a/templates/modules/sidebar-banner.html +++ b/templates/modules/sidebar-banner.html @@ -1,6 +1,6 @@ {% if item %}

{{ item.caption }}

- + {{ _( {% end %} diff --git a/templates/news.html b/templates/news.html index eadeaedc..ac67531b 100644 --- a/templates/news.html +++ b/templates/news.html @@ -25,7 +25,7 @@

You can get the latest IPFire news directly to your mailbox by subscribing to the - ipfire-announce + ipfire-announce mailing list.

diff --git a/templates/planet/modules/author-box.html b/templates/planet/modules/author-box.html index 9a27605d..ed9de653 100644 --- a/templates/planet/modules/author-box.html +++ b/templates/planet/modules/author-box.html @@ -16,7 +16,7 @@ {% if author.is_talk_enabled() %}

  • - diff --git a/templates/static/artwork.html b/templates/static/artwork.html index 132e398c..f522ccd1 100644 --- a/templates/static/artwork.html +++ b/templates/static/artwork.html @@ -40,7 +40,7 @@

    These artworks have been designed by - elricco media services. + elricco media services.

    diff --git a/templates/static/features.html b/templates/static/features.html index c31f3203..a52acf94 100644 --- a/templates/static/features.html +++ b/templates/static/features.html @@ -201,20 +201,20 @@

    Web User-Interface screenshots

    -
  • @@ -63,7 +63,7 @@ documented, improved, or rewritten? Sign up and get it done!

    - {{ _("IPFire Wiki") }} + {{ _("IPFire Wiki") }}
    @@ -89,7 +89,7 @@ today.

    - {{ _("Submit Patches") }} + {{ _("Submit Patches") }} {{ _("Pakfire Build Service") }} @@ -103,8 +103,8 @@ reports.

    - {{ _("IPFire Bugzilla") }} - {{ _("Dealing with bug reports") }} + {{ _("IPFire Bugzilla") }} + {{ _("Dealing with bug reports") }}
    @@ -116,7 +116,7 @@ appreciates your support.

    - {{ _("Host a mirror") }} + {{ _("Host a mirror") }}
    diff --git a/templates/static/get-started.html b/templates/static/get-started.html index eab81370..daf36496 100644 --- a/templates/static/get-started.html +++ b/templates/static/get-started.html @@ -21,7 +21,7 @@

    IPFire is a free software distribution that you can install on - any hardware that fits the requirements + any hardware that fits the requirements and is best for your environment's needs.

    @@ -38,7 +38,7 @@

    {{ _("Installation") }}

    - The installation handbook + The installation handbook on the IPFire wiki will guide you through the entire installation process from the beginning to the end.

    @@ -47,7 +47,7 @@ {{ _("Download") }} - + {{ _("Installation Handbook") }} @@ -60,7 +60,7 @@

    IPFire is easy to set up and use. The IPFire wiki - has great documentation + has great documentation about all features and answers almost any question.

    diff --git a/templates/static/hardware.html b/templates/static/hardware.html index 773059d2..f3b3d5f8 100644 --- a/templates/static/hardware.html +++ b/templates/static/hardware.html @@ -19,7 +19,7 @@

    IPFire Premium/Professional Appliance {{ _("by") }} - Lightning Wire Labs + Lightning Wire Labs

    @@ -36,8 +36,8 @@

    - The IPFire Premium Appliance and IPFire Professional Appliance - by Lightning Wire Labs integrate well in every infrastructure of any company. + The IPFire Premium Appliance and IPFire Professional Appliance + by Lightning Wire Labs integrate well in every infrastructure of any company. They are reliable and deliver the performance that is needed at all times.

    @@ -98,7 +98,7 @@

    IPFire Eco Appliance {{ _("by") }} - Lightning Wire Labs + Lightning Wire Labs

    @@ -136,8 +136,8 @@

    - The IPFire Eco Appliance - by Lightning Wire Labs brings all the features
    + The IPFire Eco Appliance + by Lightning Wire Labs brings all the features
    IPFire has to offer at a small form-factor and with great power-efficiency.

    @@ -148,7 +148,7 @@

    IPFire Duo Box - {{ _("by") }} Fountain Networks + {{ _("by") }} Fountain Networks

    @@ -198,14 +198,14 @@

    The IPFire Duo Box - by Fountain Networks + by Fountain Networks is a great system for starters who are searching for something small but still powerful.

    @@ -216,7 +216,7 @@

    You can find more example configurations, recommended hardware and information about individual components like the best network controllers and more in the - hardware section on the IPFire wiki. + hardware section on the IPFire wiki.

    {% end block %} diff --git a/templates/static/legal.html b/templates/static/legal.html index f9767f10..a51d4753 100644 --- a/templates/static/legal.html +++ b/templates/static/legal.html @@ -21,7 +21,7 @@
    • - +
    • @@ -41,7 +41,7 @@
      • - +
      • @@ -61,7 +61,7 @@
        • - +
        • diff --git a/webapp/__init__.py b/webapp/__init__.py index 9e953fd1..0a241d17 100644 --- a/webapp/__init__.py +++ b/webapp/__init__.py @@ -112,8 +112,8 @@ class Application(tornado.web.Application): (r"/release/([\w\.\-]*)", DownloadsReleaseHandler), (r"/older", DownloadsOlderHandler), (r"/development", DownloadsDevelopmentHandler), - (r"/mirrors", tornado.web.RedirectHandler, { "url" : "http://mirrors.ipfire.org/" }), - (r"/source", tornado.web.RedirectHandler, { "url" : "http://source.ipfire.org/" }), + (r"/mirrors", tornado.web.RedirectHandler, { "url" : "https://mirrors.ipfire.org/" }), + (r"/source", tornado.web.RedirectHandler, { "url" : "https://source.ipfire.org/" }), (r"/download-splash", DownloadSplashHandler), ] + static_handlers + [ (r"/(iso|torrent)/(.*)", DownloadCompatHandler), @@ -186,7 +186,7 @@ class Application(tornado.web.Application): # boot.ipfire.org BOOT_STATIC_PATH = os.path.join(self.settings["static_path"], "netboot") self.add_handlers(r"boot(\.dev)?\.ipfire\.org", [ - (r"/", tornado.web.RedirectHandler, { "url" : "http://www.ipfire.org/download" }), + (r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/download" }), # Configurations (r"/premenu.cfg", PremenuCfgHandler), @@ -256,7 +256,7 @@ class Application(tornado.web.Application): # ipfire.org self.add_handlers(r".*", [ - (r".*", tornado.web.RedirectHandler, { "url" : "http://www.ipfire.org" }) + (r".*", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org" }) ]) logging.info("Successfully initialied application") diff --git a/webapp/handlers_rss.py b/webapp/handlers_rss.py index e3755fdf..0ea9b4d8 100644 --- a/webapp/handlers_rss.py +++ b/webapp/handlers_rss.py @@ -68,7 +68,7 @@ class RSSNewsHandler(RSSHandler): "title" : n.title, "author" : n.author, "published" : n.published, - "url" : "http://www.ipfire.org/news/%s" % n.slug, + "url" : "https://www.ipfire.org/news/%s" % n.slug, "markup" : n.text, }) items.append(item) -- 2.39.2