Merge branch 'master' of git://parabolagnulinux.org/parabolaweb

8 files changed, 11 insertions, 12 deletions

diff --git a/templates/packages/details.html b/templates/packages/details.html
index 4570627f..d0e60ab2 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -132,7 +132,7 @@
             {% with pkg.maintainers as maints %}
             <td>{% if maints %}
                 {% for m in maints %}
-                {% userpkgs m %}<br/>
+                {% maintainer_link m %}<br/>
                 {% endfor %}
                 {% else %}Orphan{% endif %}
             </td>
@@ -145,7 +145,7 @@
             <td>{{ pkg.installed_size|filesizeformat }}</td>
         </tr><tr>
             <th>Last Packager:</th>
-            <td>{% with pkg.packager as pkgr %}{% if pkgr %}{% userpkgs pkgr %}{% else %}{{ pkg.packager_str }}{% endif %}{% endwith %}</td>
+            <td>{% with pkg.packager as pkgr %}{% if pkgr %}{% packager_link pkgr %}{% else %}{{ pkg.packager_str }}{% endif %}{% endwith %}</td>
         </tr><tr>
             <th>Signed:</th>
             <td>{{ pkg.is_signed|yesno|capfirst }}</td>
diff --git a/templates/packages/differences.html b/templates/packages/differences.html
index f0d596bd..0412f8c2 100644
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -87,7 +87,7 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.js"></script>
+<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="/media/archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
diff --git a/templates/packages/files.html b/templates/packages/files.html
index 78a40def..8cf6738d 100644
--- a/templates/packages/files.html
+++ b/templates/packages/files.html
@@ -8,9 +8,9 @@
     <h2>Package File List: {{ pkg.pkgname }} {{ pkg.full_version }}</h2>
     <div id="metadata">
         <p><a href="{{ pkg.get_absolute_url }}">Back to Package</a></p>
-        {% include "packages/files-list.html" %}
+        <p>Package has {{ files_count }} file{{ files_count|pluralize }} and {{ dir_count }} director{{ dir_count|pluralize:"y,ies" }}.</p>
+        {% include "packages/files_list.html" %}
     </div>
 
 </div>
 {% endblock %}
-
diff --git a/templates/packages/files-list.html b/templates/packages/files_list.html
index 95a85d24..156d8588 100644
--- a/templates/packages/files-list.html
+++ b/templates/packages/files_list.html
@@ -5,9 +5,8 @@ of the package; it may be out of date.</p>
 {% if pkg.files_last_update %}
 {% if files|length %}
 <ul>
-    {% for file in files %}
-    <li>{{ file.directory }}{{ file.filename|default:'' }}</li>
-    {% endfor %}
+{% for file in files %}
+<li>{{ file.directory }}{{ file.filename|default:'' }}</li>{% endfor %}
 </ul>
 {% else %}
 <p class="message">Package has no files.</p>
diff --git a/templates/packages/groups.html b/templates/packages/groups.html
index d2b09de0..941ec8de 100644
--- a/templates/packages/groups.html
+++ b/templates/packages/groups.html
@@ -28,7 +28,7 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.js"></script>
+<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0], [0,0]]});
diff --git a/templates/packages/packages_list.html b/templates/packages/packages_list.html
index 0467b0eb..ed376705 100644
--- a/templates/packages/packages_list.html
+++ b/templates/packages/packages_list.html
@@ -40,7 +40,7 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.js"></script>
+<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $(".results").tablesorter({widgets: ['zebra'], sortList: [[2,0]]});
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index 4ed26a40..c24774a9 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -79,7 +79,7 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.js"></script>
+<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="/media/archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html
index 674a846e..6cff8d3d 100644
--- a/templates/packages/stale_relations.html
+++ b/templates/packages/stale_relations.html
@@ -106,7 +106,7 @@
 
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.js"></script>
+<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="/media/archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {