Break out available URLs into Jinja2 template

Signed-off-by: Dan McGee <dan@archlinux.org>

4 files changed, 38 insertions, 40 deletions

diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index e4ae55b4..64009380 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -93,43 +93,7 @@
     </table>
 
     <h3>Available URLs</h3>
-
-    <table id="available_urls" class="results">
-        <thead>
-            <tr>
-                <th>Mirror URL</th>
-                <th>Protocol</th>
-                <th>Country</th>
-                <th>IPv4</th>
-                <th>IPv6</th>
-                <th>Last Sync</th>
-                <th>Completion %</th>
-                <th>μ Delay (hh:mm)</th>
-                <th>μ Duration (s)</th>
-                <th>σ Duration (s)</th>
-                <th>Score</th>
-                <th>Details</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for m_url in urls %}
-            <tr class="{% cycle 'odd' 'even' %}">
-                <td>{% if m_url.protocol.is_download %}<a href="{{ m_url.url }}">{{ m_url.url }}</a>{% else %}{{ m_url.url }}{% endif %}</td>
-                <td>{{ m_url.protocol }}</td>
-                <td class="country">{% country_flag m_url.country %}{{ m_url.country.name }}</td>
-                <td>{{ m_url.has_ipv4|yesno|capfirst }}</td>
-                <td>{{ m_url.has_ipv6|yesno|capfirst }}</td>
-                <td>{{ m_url.last_sync|date:'Y-m-d H:i'|default:'unknown' }}</td>
-                <td>{{ m_url.completion_pct|percentage:1 }}</td>
-                <td>{{ m_url.delay|duration|default:'unknown' }}</td>
-                <td>{{ m_url.duration_avg|floatvalue:2 }}</td>
-                <td>{{ m_url.duration_stddev|floatvalue:2 }}</td>
-                <td>{{ m_url.score|floatvalue:1|default:'∞' }}</td>
-                <td><a href="{{ m_url.id }}/">Details</a></td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
+    {% include "mirrors/mirror_details_urls.html.jinja" %}
 
     <h3>Error Log</h3>
     {% include "mirrors/error_table.html.jinja" %}
diff --git a/templates/mirrors/mirror_details_urls.html.jinja b/templates/mirrors/mirror_details_urls.html.jinja
new file mode 100644
index 00000000..7ab1548b
--- /dev/null
+++ b/templates/mirrors/mirror_details_urls.html.jinja
@@ -0,0 +1,36 @@
+<table id="available_urls" class="results">
+    <thead>
+        <tr>
+            <th>Mirror URL</th>
+            <th>Protocol</th>
+            <th>Country</th>
+            <th>IPv4</th>
+            <th>IPv6</th>
+            <th>Last Sync</th>
+            <th>Completion %</th>
+            <th>μ Delay (hh:mm)</th>
+            <th>μ Duration (s)</th>
+            <th>σ Duration (s)</th>
+            <th>Score</th>
+            <th>Details</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for m_url in urls %}
+        <tr class="{{ loop.cycle('odd', 'even') }}">
+            <td>{% if m_url.protocol.is_download %}<a href="{{ m_url.url }}">{{ m_url.url }}</a>{% else %}{{ m_url.url }}{% endif %}</td>
+            <td>{{ m_url.protocol }}</td>
+            <td class="country">{{ country_flag(m_url.country) }}{{ m_url.country.name }}</td>
+            <td>{{ m_url.has_ipv4|yesno|capfirst }}</td>
+            <td>{{ m_url.has_ipv6|yesno|capfirst }}</td>
+            <td>{{ m_url.last_sync|date('Y-m-d H:i')|default('unknown') }}</td>
+            <td>{{ m_url.completion_pct|percentage(1) }}</td>
+            <td>{{ m_url.delay|duration|default('unknown') }}</td>
+            <td>{{ m_url.duration_avg|floatvalue(2) }}</td>
+            <td>{{ m_url.duration_stddev|floatvalue(2) }}</td>
+            <td>{{ m_url.score|floatvalue(1)|default('∞') }}</td>
+            <td><a href="{{ m_url.id }}/">Details</a></td>
+        </tr>
+        {% endfor %}
+    </tbody>
+</table>
diff --git a/templates/mirrors/url_details.html b/templates/mirrors/url_details.html
index 8b7646b8..b61033cd 100644
--- a/templates/mirrors/url_details.html
+++ b/templates/mirrors/url_details.html
@@ -56,8 +56,8 @@
         {% endif %}
     </table>
 
+    <h3>Check Logs</h3>
     {% include "mirrors/url_details_logs.html.jinja" %}
-
 </div>
 {% endblock %}
 
diff --git a/templates/mirrors/url_details_logs.html.jinja b/templates/mirrors/url_details_logs.html.jinja
index 09742f76..58f179d8 100644
--- a/templates/mirrors/url_details_logs.html.jinja
+++ b/templates/mirrors/url_details_logs.html.jinja
@@ -1,5 +1,3 @@
-<h3>Check Logs</h3>
-
 <table id="check_logs" class="results">
     <thead>
         <tr>