From fa38fa74d4d4186647b6e8f5c0e9661ad65d2957 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 18 Oct 2011 10:55:06 -0500
Subject: Add architecture to package details and files page titles

And remove the not totally necessary "Package Details" text as that
seems like a reasonable assumption for the base page.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/details.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/packages/details.html')

diff --git a/templates/packages/details.html b/templates/packages/details.html
index 1016b43a..2998592f 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -2,7 +2,7 @@
 {% load cache %}
 {% load package_extras %}
 
-{% block title %}Arch Linux - {{ pkg.pkgname }} {{ pkg.full_version }} - Package Details{% endblock %}
+{% block title %}Arch Linux - {{ pkg.pkgname }} {{ pkg.full_version }} ({{ pkg.arch.name }}){% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% load package_extras %}
-- 
cgit v1.2.3-54-g00ecf


From f43a33ed8696d7bcb987d4878c6411c5d16846d6 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 17 Nov 2011 13:32:42 -0600
Subject: Display package URLs unquoted if possible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Example: kbd-ru-keymaps.

Before: http://wiki.archlinux.org/index.php/%D0%98%D0%BD%D1%82%D0%B5%D1%80%D0%BD%D0%B0%D1%86%D0%B8%D0%BE%D0%BD%D0%B0%D0%BB%D0%B8%D0%B7%D0%B0%D1%86%D0%B8%D1%8F
After:  http://wiki.archlinux.org/index.php/Интернационализация

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 packages/templatetags/package_extras.py | 13 ++++++++++++-
 templates/packages/details.html         |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'templates/packages/details.html')

diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index 01bf7510..67c7fbbc 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -1,4 +1,4 @@
-from urllib import urlencode, quote as urlquote
+from urllib import urlencode, quote as urlquote, unquote
 try:
     from urlparse import parse_qs
 except ImportError:
@@ -13,6 +13,17 @@ def link_encode(url, query, doseq=False):
     data = urlencode(query, doseq).replace('&', '&amp;')
     return "%s?%s" % (url, data)
 
+@register.filter
+def url_unquote(original_url):
+    try:
+        url = original_url
+        if isinstance(url, unicode):
+            url = url.encode('ascii')
+        url = unquote(url).decode('utf-8')
+        return url
+    except UnicodeError:
+        return original_url
+
 class BuildQueryStringNode(template.Node):
     def __init__(self, sortfield):
         self.sortfield = sortfield
diff --git a/templates/packages/details.html b/templates/packages/details.html
index 2998592f..a9908012 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -108,7 +108,7 @@ <h4>Versions Elsewhere</h4>
         </tr><tr>
             <th>Upstream URL:</th>
             <td>{% if pkg.url %}<a href="{{ pkg.url }}"
-                    title="Visit the website for {{ pkg.pkgname }}">{{ pkg.url }}</a>{% endif %}</td>
+                    title="Visit the website for {{ pkg.pkgname }}">{{ pkg.url|url_unquote }}</a>{% endif %}</td>
         </tr><tr>
             <th>License(s):</th>
             <td>{{ pkg.licenses.all|join:", " }}</td>
-- 
cgit v1.2.3-54-g00ecf


From 8ceb83e52897c1c0bccc6322cffb0e864664afd1 Mon Sep 17 00:00:00 2001
From: Johannes Krampf <johannes.krampf@gmail.com>
Date: Fri, 2 Dec 2011 19:46:36 +0100
Subject: Fix download link. Solution looks a bit unclean to me.

---
 packages/templatetags/package_extras.py | 12 ++++++++++++
 templates/packages/details.html         |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'templates/packages/details.html')

diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index bcbda210..c31990d7 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -72,6 +72,18 @@ def userpkgs(user):
         )
     return ''
 
+@register.simple_tag
+def get_download_link(package):
+    parts = {
+        "repo": package.repo.name.lower(),
+        "arch": package.arch.name,
+        "pkgfile": package.filename
+    }
+    if parts["arch"] == "any":
+        parts["arch"] = "i686"
+    linkbase = "https://repo.parabolagnulinux.org/%(repo)s/os/%(arch)s/%(pkgfile)s"
+    return linkbase % parts
+
 @register.simple_tag
 def get_wiki_link(package):
     url = "https://wiki.parabolagnulinux.org/index.php"
diff --git a/templates/packages/details.html b/templates/packages/details.html
index ef501c83..4570627f 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -39,7 +39,7 @@ <h4>Package Actions</h4>
                     onclick="return !window.open('/packages/flaghelp/','FlagHelp',
                     'height=350,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');">(?)</a></li>
                 {% endif %}
-                <li><a href="download/" rel="nofollow" title="Download {{ pkg.pkgname }} from mirror">Download From Mirror</a></li>
+                <li><a href="{% get_download_link pkg %}" rel="nofollow" title="Download {{ pkg.pkgname }} from mirror">Download From Mirror</a></li>
             </ul>
 
             {% if perms.main.change_package %}
-- 
cgit v1.2.3-54-g00ecf