Merge branch 'master' of ssh://gparabola/parabolaweb

Conflicts:
	local_settings.py.example
	media/archweb.css
	packages/templatetags/package_extras.py
	public/views.py
	templates/packages/details.html
	templates/packages/flag.html
	templates/packages/flag_confirmed.html
	templates/packages/flagged.html
	templates/packages/search.html
	templates/public/download.html
	templates/todolists/view.html

1 files changed, 12 insertions, 10 deletions

diff --git a/templates/packages/search.html b/templates/packages/search.html
index 8bf63a15..bb5c1c8b 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -1,10 +1,12 @@
 {% extends "base.html" %}
 {% load package_extras %}
+{% load adminmedia %}
+
 {% block title %}Parabola - Package Database{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block head %}
-<link rel="stylesheet" type="text/css" href="/media/admin_media/css/widgets.css" />
+<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/widgets.css" />
 {% endblock %}
 
 {% block content %}
@@ -104,7 +106,8 @@
                     {% endif %}
                     <td>{{ pkg.arch.name }}</td>
                     <td>{{ pkg.repo.name|capfirst }}</td>
-                    <td>{% pkg_details_link pkg %}</td>
+                    <td><a href="{{ pkg.get_absolute_url }}"
+                            title="Package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
                     {% if pkg.flag_date %}
                     <td><span class="flagged">{{ pkg.full_version }}</span></td>
                     {% else %}
@@ -153,21 +156,20 @@
 </div><!-- #pkglist-results -->
 {% else %}
 <div class="box">
-	<p>We couldn't find any packages matching your query. Try searching again
-	using different criteria.</p>
+    <p>We couldn't find any packages matching your query. Try searching again
+    using different criteria.</p>
 </div>
 {% endif %}
 
 <div id="pkglist-about" class="box">
-    <p>You are browsing the Parabola package database. From here you can
-    find detailed information about packages located in the official
-    supported repositories. If you need the sourceball from where a
-    package is built, you can look at our <a
-        href='http://repo.parabolagnulinux.org/sources/packages'
+    <p>You are browsing the Parabola package database. From here you can find
+    detailed information about packages located in the official supported repositories.
+    If you need the sourceball from where a package is built, you can look at our <a
+        href='//repo.parabolagnulinux.org/sources/packages'
         title='Sourceballed packages'>sources repo</a>.</p> </div>
 
 <script type="text/javascript" src="/jsi18n/"></script>
-{% load adminmedia %}<script type="text/javascript" src="{% admin_media_prefix %}js/core.js"></script>
 <script type="text/javascript">window.__admin_media_prefix__ = "{% filter escapejs %}{% admin_media_prefix %}{% endfilter %}";</script>
+<script type="text/javascript" src="{% admin_media_prefix %}js/core.js"></script>
 {{search_form.media}}
 {% endblock %}