From 546012c8e0d9e757e4670dd14e41acb83eb4e997 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 3 Dec 2011 13:27:12 -0600
Subject: Show files and directory count in standalone package files view

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

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

diff --git a/templates/packages/files.html b/templates/packages/files.html
index 50ab6e83..a564f726 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>
+        <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 %}
-
-- 
cgit v1.2.3-54-g00ecf


From ae00d10ff48a604e9cc9dd327046661e52ff2749 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 3 Dec 2011 13:29:06 -0600
Subject: Rename files list template for consistency

We use underscores in all other templates.

Also remove some of the generated whitespace in the template which is
noticeable in very large package lists.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 packages/views/__init__.py         |  2 +-
 templates/packages/files-list.html | 17 -----------------
 templates/packages/files.html      |  2 +-
 templates/packages/files_list.html | 16 ++++++++++++++++
 4 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 100644 templates/packages/files-list.html
 create mode 100644 templates/packages/files_list.html

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

diff --git a/packages/views/__init__.py b/packages/views/__init__.py
index b420ce60..13ad0c71 100644
--- a/packages/views/__init__.py
+++ b/packages/views/__init__.py
@@ -179,7 +179,7 @@ def files(request, name, repo, arch):
     }
     template = 'packages/files.html'
     if request.is_ajax():
-        template = 'packages/files-list.html'
+        template = 'packages/files_list.html'
     return direct_to_template(request, template, context)
 
 def details_json(request, name, repo, arch):
diff --git a/templates/packages/files-list.html b/templates/packages/files-list.html
deleted file mode 100644
index 95a85d24..00000000
--- a/templates/packages/files-list.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% if pkg.last_update > pkg.files_last_update %}
-<p class="message">Note: This file list was generated from a previous version
-of the package; it may be out of date.</p>
-{% endif %}
-{% if pkg.files_last_update %}
-{% if files|length %}
-<ul>
-    {% for file in files %}
-    <li>{{ file.directory }}{{ file.filename|default:'' }}</li>
-    {% endfor %}
-</ul>
-{% else %}
-<p class="message">Package has no files.</p>
-{% endif %}
-{% else %}
-<p class="message">No file list available.</p>
-{% endif %}
diff --git a/templates/packages/files.html b/templates/packages/files.html
index a564f726..6524fe93 100644
--- a/templates/packages/files.html
+++ b/templates/packages/files.html
@@ -9,7 +9,7 @@ <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>
         <p>Package has {{ files_count }} file{{ files_count|pluralize }} and {{ dir_count }} director{{ dir_count|pluralize:"y,ies" }}.</p>
-        {% include "packages/files-list.html" %}
+        {% include "packages/files_list.html" %}
     </div>
 
 </div>
diff --git a/templates/packages/files_list.html b/templates/packages/files_list.html
new file mode 100644
index 00000000..156d8588
--- /dev/null
+++ b/templates/packages/files_list.html
@@ -0,0 +1,16 @@
+{% if pkg.last_update > pkg.files_last_update %}
+<p class="message">Note: This file list was generated from a previous version
+of the package; it may be out of date.</p>
+{% endif %}
+{% if pkg.files_last_update %}
+{% if files|length %}
+<ul>
+{% for file in files %}
+<li>{{ file.directory }}{{ file.filename|default:'' }}</li>{% endfor %}
+</ul>
+{% else %}
+<p class="message">Package has no files.</p>
+{% endif %}
+{% else %}
+<p class="message">No file list available.</p>
+{% endif %}
-- 
cgit v1.2.3-54-g00ecf