summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-06-23 13:44:31 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-06-23 13:44:31 -0600
commit532ea5509c32d4cd1c234b1dee3799fbe550e3ef (patch)
treeea5f0db8973e3b266c12b7ea0ada9a52996727aa /templates
parent5bfa5b7eee551c14ecee616f1830dc4603497311 (diff)
parent0aa246b85159bf627873308868cf169868cba569 (diff)
Merge branch 'archweb-generic2'
Diffstat (limited to 'templates')
-rw-r--r--templates/mirrors/error_table.html23
-rw-r--r--templates/mirrors/mirror_details.html11
-rw-r--r--templates/mirrors/mirrorlist_generate.html2
-rw-r--r--templates/mirrors/status.html32
-rw-r--r--templates/mirrors/status_table.html3
-rw-r--r--templates/todolists/view.html2
6 files changed, 39 insertions, 34 deletions
diff --git a/templates/mirrors/error_table.html b/templates/mirrors/error_table.html
new file mode 100644
index 00000000..6054814f
--- /dev/null
+++ b/templates/mirrors/error_table.html
@@ -0,0 +1,23 @@
+{% load flags mirror_status %}
+<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>
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 98755ad2..f2202e38 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -2,6 +2,7 @@
{% load static from staticfiles %}
{% load mirror_status %}
{% load flags %}
+{% load admin_urls %}
{% block title %}{{ BRANDING_DISTRONAME }} - {{ mirror.name }} - Mirror Details{% endblock %}
@@ -9,9 +10,14 @@
{% block content %}
<div class="box">
-
<h2>Mirror Details: {{ mirror.name }}</h2>
+ {% if perms.mirrors.change_mirror %}
+ <ul class="admin-actions">
+ <li><a href="{% url 'admin:mirrors_mirror_change' mirror.pk %}" title="Edit mirror">Edit Mirror</a></li>
+ </ul>
+ {% endif %}
+
<table class="compact">
<tr>
<th>Name:</th>
@@ -106,6 +112,9 @@
{% endfor %}
</tbody>
</table>
+
+ <h3>Error Log</h3>
+ {% include "mirrors/error_table.html" %}
</div>
<div class="box">
diff --git a/templates/mirrors/mirrorlist_generate.html b/templates/mirrors/mirrorlist_generate.html
index e141ae3d..c2a79fa8 100644
--- a/templates/mirrors/mirrorlist_generate.html
+++ b/templates/mirrors/mirrorlist_generate.html
@@ -22,10 +22,8 @@
<ul>
<li><a href="all/">All mirrors</a></li>
- <li><a href="all/ftp/">All mirrors, FTP only</a></li>
<li><a href="all/http/">All mirrors, HTTP only</a></li>
<li><a href="all/https/">All mirrors, HTTPS only</a></li>
- <li><a href="all/smart/">All mirrors, Smart protocols</a>: this link only includes FTP mirrors if an HTTP mirror is not available in a given country.</li>
</ul>
<h3>Customized by country mirrorlist</h3>
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 %}
diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html
index e848a9c9..28175420 100644
--- a/templates/mirrors/status_table.html
+++ b/templates/mirrors/status_table.html
@@ -1,5 +1,4 @@
-{% load mirror_status %}
-{% load flags %}
+{% load flags mirror_status %}
<table id="{{ table_id }}" class="results">
<thead>
<tr>
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index e0cd4007..28ce8580 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -68,6 +68,7 @@
<th>Staging Version</th>
<th>Maintainers</th>
<th>Status</th>
+ <th>Last Touched By</th>
</tr>
</thead>
<tbody>
@@ -95,6 +96,7 @@
<span class="{{ pkg.status_css_class }}">{{ pkg.get_status_display }}</span>
{% endif %}
</td>
+ <td>{{ pkg.user|default:"" }}</td>
</tr>
{% endfor %}
</tbody>