From a10b6d884f4f102f5216f4b341f35bb341cee176 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 1 Dec 2011 23:55:27 -0500 Subject: Normalize the URI scheme used for inbound links. Don't use one when possible, else use https --- README | 2 +- packages/templatetags/package_extras.py | 8 ++++---- public/views.py | 2 +- settings.py | 2 +- templates/base.html | 12 ++++++------ templates/packages/flag.html | 2 +- templates/packages/flaghelp.html | 4 ++-- templates/packages/search.html | 2 +- templates/public/about.html | 2 +- templates/public/donate.html | 2 +- templates/public/download.html | 16 ++++++++-------- templates/public/feeds.html | 4 ++-- templates/public/https.html | 5 ++--- templates/public/index.html | 18 +++++++++--------- templates/public/svn.html | 2 +- 15 files changed, 41 insertions(+), 42 deletions(-) diff --git a/README b/README index 0e9d19af..acd8b8f9 100644 --- a/README +++ b/README @@ -94,7 +94,7 @@ for your install. 10. To optionally populate the database with real data: - $ wget http://repo.parabolagnulinux.org/core/os/i686/core.db.tar.gz + $ wget https://repo.parabolagnulinux.org/core/os/i686/core.db.tar.gz $ ./manage.py reporead i686 core.db.tar.gz $ ./manage.py syncisos diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py index 01d9afd6..c8c88ca7 100644 --- a/packages/templatetags/package_extras.py +++ b/packages/templatetags/package_extras.py @@ -74,7 +74,7 @@ def userpkgs(user): @register.simple_tag def get_wiki_link(package): - url = "https://wiki.parabolagnulinux.org/index.php" + url = "//wiki.parabolagnulinux.org/index.php" data = { 'title': "Special:Search", 'search': package.pkgname, @@ -92,7 +92,7 @@ def svn_trunk(package): @register.simple_tag def bugs_list(package): - url = "https://bugs.parabolagnulinux.org/bugs/issue?" + url = "//bugs.parabolagnulinux.org/bugs/issue?" data = { '@action': 'search', 'title': package.pkgname, @@ -101,7 +101,7 @@ def bugs_list(package): @register.simple_tag def bug_report(package): - url = "https://bugs.parabolagnulinux.org/bugs/issue?" + url = "//bugs.parabolagnulinux.org/bugs/issue?" data = { '@template': 'item', 'keyword': 'packages', @@ -118,5 +118,5 @@ def flag_unfree(package): 'priority': 'critical', 'title': '[%s] Please put your reasons here (register first if you haven\'t)' % package.pkgname, } - return "https://bugs.parabolagnulinux.org/bugs/issue?%s" % urlencode(data) + return "//bugs.parabolagnulinux.org/bugs/issue?%s" % urlencode(data) # vim: set ts=4 sw=4 et: diff --git a/public/views.py b/public/views.py index bb9cd454..43b46b12 100644 --- a/public/views.py +++ b/public/views.py @@ -52,7 +52,7 @@ def donate(request): return direct_to_template(request, 'public/donate.html', context) def download(request): - return redirect('http://wiki.parabolagnulinux.org/get', permanent=True) + return redirect('//wiki.parabolagnulinux.org/get', permanent=True) def feeds(request): context = { diff --git a/settings.py b/settings.py index e1fc45d5..ed12bbec 100644 --- a/settings.py +++ b/settings.py @@ -132,6 +132,6 @@ if DEBUG_TOOLBAR: INSTALLED_APPS = list(INSTALLED_APPS) + [ 'debug_toolbar' ] # URL to fetch a current list of available ISOs -ISO_LIST_URL = 'http://repo.parabolagnulinux.org/isos/' +ISO_LIST_URL = 'https://repo.parabolagnulinux.org/isos/' # vim: set ts=4 sw=4 et: diff --git a/templates/base.html b/templates/base.html index b537c603..746c6cf4 100644 --- a/templates/base.html +++ b/templates/base.html @@ -19,10 +19,10 @@ @@ -32,14 +32,14 @@ {% if user.is_authenticated %} diff --git a/templates/public/donate.html b/templates/public/donate.html index ef7f252d..c6e055f5 100644 --- a/templates/public/donate.html +++ b/templates/public/donate.html @@ -18,7 +18,7 @@ anything, because we are a really small community of hackers.

If you want, we have a pretty nice TODO list you can check to help us by donating some of your time. That will be very much appreciated by us :)

diff --git a/templates/public/download.html b/templates/public/download.html index 207414dc..2e1024b0 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -23,14 +23,14 @@
  • Resources:
  • Instructions: @@ -42,7 +42,7 @@

    If you are an Arch user, there is no need to download the ISO to update your existing system to Parabola. You can just follow the instructions in our wiki to convert your existing Arch system into a free - as in freedom one. More here.

    BitTorrent Download (recommended)

    @@ -68,12 +68,12 @@ - Download - Download @@ -94,10 +94,10 @@ Core Image - Download - Download -

    Go to the Parabola ISOs directory.

    {%endwith%} diff --git a/templates/public/feeds.html b/templates/public/feeds.html index da70e6ee..69789150 100644 --- a/templates/public/feeds.html +++ b/templates/public/feeds.html @@ -17,10 +17,10 @@ the Parabola staff.

    The Parabola Wiki: Recent changes feed is also available to track document changes from the - Parabola Wiki.

    Package Feeds

    diff --git a/templates/public/https.html b/templates/public/https.html index 7cfe44e9..e53dc8e9 100644 --- a/templates/public/https.html +++ b/templates/public/https.html @@ -19,9 +19,8 @@

    I just want to get the ISOs

    You can proceed to our ISOs download page on our wiki (which isn't secured - yet, sadly).

    + href="https://wiki.parabolagnulinux.org/get">ISOs download page on our wiki.

    I want to do this the right way

    diff --git a/templates/public/index.html b/templates/public/index.html index 044b586f..188c572f 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -112,22 +112,22 @@

    Documentation

    Community

    @@ -152,9 +152,9 @@ title="View/search the package repository database">Packages
  • Package Groups
    • -
  • Projects in Git
    • -
  • Issue Tracker
  • Todo Lists
    • @@ -166,7 +166,7 @@
  • About Parabola
  • Download Parabola
    • -
  • Media Appearances
  • Logos & Artwork
  • News Archives
    • diff --git a/templates/public/svn.html b/templates/public/svn.html index 80367eaf..4321f7c2 100644 --- a/templates/public/svn.html +++ b/templates/public/svn.html @@ -4,7 +4,7 @@

    SVN Repositories

    Parabola doesn't use any SVN repositories. But you can find our Projects on git!

    -- cgit v1.1-4-g5e80