Merge branch 'archweb' into archweb-generic2

1 files changed, 3 insertions, 29 deletions

diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html
index de2c3d5c..5a275e33 100644
--- a/templates/mirrors/status.html
+++ b/templates/mirrors/status.html
@@ -59,45 +59,19 @@
 
     <a name="outofsync" id="outofsync"></a>
     <h3>Out of Sync Mirrors</h3>
-    {% with bad_urls as urls %}
-    {% with 'outofsync_mirrors' as table_id %}
+    {% with urls=bad_urls  table_id='outofsync_mirrors' %}
     {% include "mirrors/status_table.html" %}
     {% endwith %}
-    {% endwith %}
 
     <a name="successful" id="successful"></a>
     <h3>Successfully Syncing Mirrors</h3>
-    {% with good_urls as urls %}
-    {% with 'successful_mirrors' as table_id %}
+    {% with urls=good_urls table_id='successful_mirrors' %}
     {% include "mirrors/status_table.html" %}
     {% endwith %}
-    {% endwith %}
 
     <a name="errorlog" id="errorlog"></a>
     <h3>Mirror Syncing Error Log</h3>
-    <table id="errorlog_mirrors" class="results">
-        <thead>
-            <tr>
-                <th>Mirror URL</th>
-                <th>Protocol</th>
-                <th>Country</th>
-                <th>Error Message</th>
-                <th>Last Occurred</th>
-                <th>Occurrences (last {{ cutoff|hours }})</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% 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>{% endfor %}
-        </tbody>
-    </table>
-
+    {% include "mirrors/error_table.html" %}
 </div>
 {% endblock %}