From 77f38be3625395a5502cab7403c8e010171ce3f8 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 8 Feb 2012 17:06:21 -0600
Subject: Factor out requiredby details into a template

This is similar to the previous commit doing the same for depends. We
also add a '(staging)' text for use down the road.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/details.html            | 8 +-------
 templates/packages/details_depend.html     | 1 +
 templates/packages/details_requiredby.html | 7 +++++++
 3 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 templates/packages/details_requiredby.html

(limited to 'templates/packages')

diff --git a/templates/packages/details.html b/templates/packages/details.html
index fd7bea4d..091e57ec 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -185,13 +185,7 @@
             <h3 title="Packages that require {{ pkg.pkgname }}">
                 Required By ({{rqdby|length}})</h3>
             {% if rqdby %}<ul>
-                {% for req in rqdby %}
-                <li>{% pkg_details_link req.pkg %}
-                {% if req.depname != pkg.pkgname %}<span class="virtual-dep">(requires {{ req.depname }})</span>{% endif %}
-                {% if req.pkg.repo.testing %}<span class="testing-dep">(testing)</span>{% endif %}
-                {% if req.optional %}<span class="opt-dep">(optional)</span>{% endif %}
-                </li>
-                {% endfor %}
+                {% for req in rqdby %}{% include "packages/details_requiredby.html" %}{% endfor %}
             </ul>{% endif %}
         </div>
         {% endwith %}
diff --git a/templates/packages/details_depend.html b/templates/packages/details_depend.html
index 0226dd25..8b6e85c9 100644
--- a/templates/packages/details_depend.html
+++ b/templates/packages/details_depend.html
@@ -9,6 +9,7 @@
 {% else %}
 {% pkg_details_link depend.pkg %}{{ depend.dep.depvcmp|default:"" }}
 {% if depend.pkg.repo.testing %} <span class="testing-dep">(testing)</span>{% endif %}
+{% if depend.pkg.repo.staging %} <span class="staging-dep">(staging)</span>{% endif %}
 {% endifequal %}
 {% if depend.dep.optional %} <span class="opt-dep">(optional)</span>{% endif %}
 {% if depend.dep.description %}- <span class="dep-desc">{{ depend.dep.description }}</span>{% endif %}
diff --git a/templates/packages/details_requiredby.html b/templates/packages/details_requiredby.html
new file mode 100644
index 00000000..c7697289
--- /dev/null
+++ b/templates/packages/details_requiredby.html
@@ -0,0 +1,7 @@
+{% load package_extras %}
+<li>{% pkg_details_link req.pkg %}
+{% if req.depname != pkg.pkgname %}<span class="virtual-dep">(requires {{ req.depname }})</span>{% endif %}
+{% if req.pkg.repo.testing %}<span class="testing-dep">(testing)</span>{% endif %}
+{% if req.pkg.repo.staging %}<span class="staging-dep">(staging)</span>{% endif %}
+{% if req.optional %}<span class="opt-dep">(optional)</span>{% endif %}
+</li>
-- 
cgit v1.2.3-2-g168b


From 8fb6581c7ace21e36ea65de84b42f9f41826d9a7 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 23 Feb 2012 10:00:26 -0600
Subject: Remove template caching from package details

Now that we do user-specific stuff, this is more hassle than it is
worth to ensure we keep the right bits around.

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

(limited to 'templates/packages')

diff --git a/templates/packages/details.html b/templates/packages/details.html
index 091e57ec..e12a65ea 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load cache %}
 {% load package_extras %}
 
 {% block title %}Arch Linux - {{ pkg.pkgname }} {{ pkg.full_version }} ({{ pkg.arch.name }}){% endblock %}
@@ -12,7 +11,6 @@
     <h2>Package Details: {{ pkg.pkgname }} {{ pkg.full_version }}</h2>
 
     <div id="detailslinks" class="listing">
-
         <div id="actionlist">
         <h4>Package Actions</h4>
             <ul class="small">
@@ -70,10 +68,8 @@
             </ul>
         </div>
         {% endif %}{% endwith %}
-
     </div>
 
-    {% cache 300 package-details-pkginfo pkg.id %}
     <table id="pkginfo">
         <tr>
             <th>Architecture:</th>
@@ -201,7 +197,6 @@
         </div>
 
     </div>
-    {% endcache %}
 
 </div>
 
-- 
cgit v1.2.3-2-g168b