Merge branch 'archweb' into archweb-generic2

9 files changed, 24 insertions, 17 deletions

diff --git a/templates/packages/details.html b/templates/packages/details.html
index 36c422b2..07406fa2 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -229,7 +229,9 @@
         </div>
     </div>
 </div>
+{% endblock %}
 
+{% block script_block %}
 {% load cdn %}{% jquery %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
diff --git a/templates/packages/details_depend.html b/templates/packages/details_depend.html
index 4aa739c2..b89ffbfa 100644
--- a/templates/packages/details_depend.html
+++ b/templates/packages/details_depend.html
@@ -1,5 +1,4 @@
-{% load package_extras %}{% spaceless %}<li>
-{% ifequal depend.pkg None %}
+{% load package_extras %}<li>{% ifequal depend.pkg None %}
 {% if depend.providers %}{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} <span class="virtual-dep">({% multi_pkg_details depend.providers %})</span>
 {% else %}{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} <span class="virtual-dep">(virtual)</span>
 {% endif %}{% else %}
@@ -11,4 +10,4 @@
 {% endif %}{% if depend.dep.deptype == 'M' %} <span class="make-dep"> (make)</span>
 {% endif %}{% if depend.dep.deptype == 'C' %} <span class="check-dep"> (check)</span>
 {% endif %}{% if depend.dep.description %} - <span class="dep-desc">{{ depend.dep.description }}</span>
-{% endif %}</li>{% endspaceless %}
+{% endif %}</li>
diff --git a/templates/packages/details_requiredby.html b/templates/packages/details_requiredby.html
index e8c713ac..504a322f 100644
--- a/templates/packages/details_requiredby.html
+++ b/templates/packages/details_requiredby.html
@@ -1,8 +1,8 @@
-{% load package_extras %}{% spaceless %}<li>{% pkg_details_link req.pkg %}
+{% load package_extras %}<li>{% pkg_details_link req.pkg %}
 {% if req.name != pkg.pkgname %}<span class="virtual-dep"> (requires {{ req.name }})</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.deptype == 'O' %}<span class="opt-dep"> (optional)</span>
 {% endif %}{% if req.deptype == 'M' %}<span class="make-dep"> (make)</span>
 {% endif %}{% if req.deptype == 'C' %}<span class="check-dep"> (check)</span>
-{% endif %}</li>{% endspaceless %}
+{% endif %}</li>
diff --git a/templates/packages/differences.html b/templates/packages/differences.html
index 38a94775..1a1bf260 100644
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -5,7 +5,6 @@
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
-{% if differences %}
 <div class="box">
     <h2>Package Differences by Architecture</h2>
     <div class="filter-criteria">
@@ -93,7 +92,9 @@
     </table>
 
 </div>
+{% endblock %}
 
+{% block script_block %}
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
@@ -109,5 +110,4 @@ $(document).ready(function() {
     filter_packages();
 });
 </script>
-{% endif %}
 {% endblock %}
diff --git a/templates/packages/groups.html b/templates/packages/groups.html
index 95b1283c..c8f4aa5c 100644
--- a/templates/packages/groups.html
+++ b/templates/packages/groups.html
@@ -29,6 +29,9 @@
         </tbody>
     </table>
 </div>
+{% endblock %}
+
+{% block script_block %}
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
diff --git a/templates/packages/packages_list.html b/templates/packages/packages_list.html
index f10f26be..110634b6 100644
--- a/templates/packages/packages_list.html
+++ b/templates/packages/packages_list.html
@@ -40,6 +40,9 @@
         </tbody>
     </table>
 </div>
+{% endblock %}
+
+{% block script_block %}
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
diff --git a/templates/packages/search.html b/templates/packages/search.html
index 77e59813..b5b08268 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -69,8 +69,7 @@
                 </tr>
             </thead>
             <tbody>
-            {% for pkg in package_list %}
-                {% spaceless %}<tr class="{% cycle 'odd' 'even' %}">
+                {% for pkg in package_list %}<tr class="{% cycle 'odd' 'even' %}">
                     {% if perms.main.change_package %}
                     <td><input type="checkbox" name="pkgid" value="{{ pkg.id }}" /></td>
                     {% endif %}
@@ -85,8 +84,7 @@
                     <td class="wrap">{{ pkg.pkgdesc }}</td>
                     <td>{{ pkg.last_update|date }}</td>
                     <td>{{ pkg.flag_date|date }}</td>
-                </tr>
-            {% endspaceless %}{% endfor %}
+                </tr>{% endfor %}
             </tbody>
         </table>
         {% include "packages/search_paginator.html" %}
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index c3e75ae2..a159e998 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -50,9 +50,7 @@
             </tr>
         </thead>
         <tbody id="tbody_signoffs">
-            {% for group in signoff_groups %}
-            <tr class="{% cycle 'odd' 'even' %} {{ group.arch.name }} {{ group.target_repo|lower }}">
-                {% spaceless %}
+            {% for group in signoff_groups %}<tr class="{% cycle 'odd' 'even' %} {{ group.arch.name }} {{ group.target_repo|lower }}">
                 <td>{% pkg_details_link group.package %} {{ group.version }}</td>
                 <td>{{ group.arch.name }}</td>
                 <td>{{ group.target_repo }}</td>
@@ -75,12 +73,13 @@
                     {% endcomment %}{% if spec.known_bad %}Package is known to be bad<br/>{% endif %}{% comment %}
                     {% endcomment %}{{ spec.comments|default:""|linebreaksbr }}
                 {% endwith %}{% endif %}</td>
-                {% endspaceless %}
-            </tr>
-            {% endfor %}
+            </tr>{% endfor %}
         </tbody>
     </table>
 </div>
+{% endblock %}
+
+{% block script_block %}
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html
index c24715cd..233b2835 100644
--- a/templates/packages/stale_relations.html
+++ b/templates/packages/stale_relations.html
@@ -107,6 +107,9 @@
     </form>
 
 </div>
+{% endblock %}
+
+{% block script_block %}
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">