From b519c40e0af5b86ba660cf9d9cfc53a66fd8bef8 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 20 Apr 2013 11:11:04 -0500
Subject: Remove {% spaceless %} tag from a few more places

This tag is simply not worth the time it takes to do what it does.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/mirrors/status.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'templates/mirrors/status.html')

diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html
index 8d32d3fa..26e81e79 100644
--- a/templates/mirrors/status.html
+++ b/templates/mirrors/status.html
@@ -87,16 +87,14 @@ <h3>Mirror Syncing Error Log</h3>
             </tr>
         </thead>
         <tbody>
-            {% for log in error_logs %}
-            {% spaceless %}<tr class="{% cycle 'odd' 'even' %}">
+            {% for log in error_logs %}<tr class="{% cycle 'odd' 'even' %}">
                 <td>{{ log.url__url }}</td>
                 <td>{{ log.url__protocol__protocol }}</td>
                 <td class="country">{% country_flag log.country %}{{ log.country.name }}</td>
                 <td class="wrap">{{ log.error|linebreaksbr }}</td>
                 <td>{{ log.last_occurred|date:'Y-m-d H:i' }}</td>
                 <td>{{ log.error_count }}</td>
-            </tr>
-            {% endspaceless %}{% endfor %}
+            </tr>{% endfor %}
         </tbody>
     </table>
 
-- 
cgit v1.2.3-54-g00ecf


From 3e085183bf39c59fdcd0b9e67b5a02653a51d30e Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 20 Apr 2013 11:28:12 -0500
Subject: Move all script blocks into {% script_block %} section

I added this a while back, but didn't roll it out to all templates.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/devel/clock.html              | 3 +++
 templates/devel/index.html              | 2 ++
 templates/devel/packages.html           | 3 +++
 templates/devel/profile.html            | 2 ++
 templates/mirrors/mirror_details.html   | 3 +++
 templates/mirrors/status.html           | 3 +++
 templates/packages/details.html         | 2 ++
 templates/packages/differences.html     | 2 ++
 templates/packages/groups.html          | 3 +++
 templates/packages/packages_list.html   | 3 +++
 templates/packages/signoffs.html        | 3 +++
 templates/packages/stale_relations.html | 3 +++
 templates/public/keys.html              | 2 ++
 templates/registration/login.html       | 2 ++
 templates/releng/iso_overview.html      | 3 +++
 templates/releng/release_list.html      | 2 ++
 templates/releng/result_list.html       | 3 +++
 templates/todolists/list.html           | 3 +++
 templates/todolists/view.html           | 3 +++
 templates/visualize/index.html          | 2 ++
 20 files changed, 52 insertions(+)

(limited to 'templates/mirrors/status.html')

diff --git a/templates/devel/clock.html b/templates/devel/clock.html
index 83fbb70b..2c5bfacf 100644
--- a/templates/devel/clock.html
+++ b/templates/devel/clock.html
@@ -56,6 +56,9 @@ <h2>Developer World Clocks</h2>
         </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/devel/index.html b/templates/devel/index.html
index 6d304409..c067b69b 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -294,7 +294,9 @@ <h2>Stats by Developer</h2>
     </table>
 </div>{# #dash-by-developer #}
 {% endcache %}
+{% 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/devel/packages.html b/templates/devel/packages.html
index a62ae1ab..0e6b1752 100644
--- a/templates/devel/packages.html
+++ b/templates/devel/packages.html
@@ -73,6 +73,9 @@ <h3>Filter Packages</h3>
         </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/devel/profile.html b/templates/devel/profile.html
index 9806552a..acdc22a9 100644
--- a/templates/devel/profile.html
+++ b/templates/devel/profile.html
@@ -24,7 +24,9 @@ <h2>Developer Profile</h2>
     </form>
 
 </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/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 1c9a970e..d3e85b00 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -117,6 +117,9 @@ <h2>Mirror Status Charts</h2>
 
     <div id="charts-container"></div>
 </div>
+{% endblock %}
+
+{% block script_block %}
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "d3-3.0.6.min.js" %}"></script>
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html
index 26e81e79..283ff681 100644
--- a/templates/mirrors/status.html
+++ b/templates/mirrors/status.html
@@ -99,6 +99,9 @@ <h3>Mirror Syncing Error Log</h3>
     </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/details.html b/templates/packages/details.html
index 0a47217c..bfa2de16 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -229,7 +229,9 @@ <h3 title="Complete list of files contained within this package">
         </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/differences.html b/templates/packages/differences.html
index 61906fef..3d3f6edf 100644
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -93,7 +93,9 @@ <h2>Multilib Differences to Main Packages</h2>
     </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/groups.html b/templates/packages/groups.html
index 66110637..c135791f 100644
--- a/templates/packages/groups.html
+++ b/templates/packages/groups.html
@@ -29,6 +29,9 @@ <h2>Package Groups Overview{% if arch %} - {{ arch }}{% endif %}</h2>
         </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 37fd2c1c..3dcc03dc 100644
--- a/templates/packages/packages_list.html
+++ b/templates/packages/packages_list.html
@@ -40,6 +40,9 @@ <h2>{{ list_title }} - {{ name }} ({{ arch.name }})</h2>
         </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/signoffs.html b/templates/packages/signoffs.html
index 2879c30b..6fbbd00e 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -77,6 +77,9 @@ <h3>Filter Displayed Signoffs</h3>
         </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 cb7799d4..14fac397 100644
--- a/templates/packages/stale_relations.html
+++ b/templates/packages/stale_relations.html
@@ -107,6 +107,9 @@ <h3>Maintainers with Wrong Permissions ({{ wrong_permissions|length }})</h3>
     </form>
 
 </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/public/keys.html b/templates/public/keys.html
index 91b53075..c7272db3 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -132,7 +132,9 @@ <h2 id="cross-sigs">Developer Cross-Signatures</h2>
         </tbody>
     </table>
 </div>
+{% endblock %}
 
+{% block script_block %}
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "d3-3.0.6.min.js" %}"></script>
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
diff --git a/templates/registration/login.html b/templates/registration/login.html
index edbb77ea..82f74f58 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -21,7 +21,9 @@ <h2>Developer Login</h2>
     </form>
 
 </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/releng/iso_overview.html b/templates/releng/iso_overview.html
index 196f0c0a..1a35ead4 100644
--- a/templates/releng/iso_overview.html
+++ b/templates/releng/iso_overview.html
@@ -36,6 +36,9 @@ <h2>Failures and Successes for Testing ISOs</h2>
         </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/releng/release_list.html b/templates/releng/release_list.html
index 5f248264..7197cc8d 100644
--- a/templates/releng/release_list.html
+++ b/templates/releng/release_list.html
@@ -39,7 +39,9 @@ <h2>Releases</h2>
         </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/releng/result_list.html b/templates/releng/result_list.html
index 67e5934d..281df083 100644
--- a/templates/releng/result_list.html
+++ b/templates/releng/result_list.html
@@ -33,6 +33,9 @@ <h2>Results for:
         </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/todolists/list.html b/templates/todolists/list.html
index 5f7e333d..56f9874d 100644
--- a/templates/todolists/list.html
+++ b/templates/todolists/list.html
@@ -46,6 +46,9 @@ <h2>Package Todo Lists</h2>
         </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/todolists/view.html b/templates/todolists/view.html
index a96297cf..fc4b29ea 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -100,6 +100,9 @@ <h3>Filter Todo List Packages</h3>
         </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/visualize/index.html b/templates/visualize/index.html
index 2b79d601..446bdebe 100644
--- a/templates/visualize/index.html
+++ b/templates/visualize/index.html
@@ -23,7 +23,9 @@ <h2>Visualization of Package Data</h2>
     </div>
     <div id="visualize-archrepo" class="visualize-chart"></div>
 </div>
+{% endblock %}
 
+{% block script_block %}
 {% load cdn %}{% jquery %}
 <script type="text/javascript" src="{% static "d3-3.0.6.min.js" %}"></script>
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
-- 
cgit v1.2.3-54-g00ecf