diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:43:56 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:43:56 -0400 |
commit | 355087ebe2e3fbd5f860e4655888a89d9df52e34 (patch) | |
tree | d01f6206a2f2d054d4d1931019f5ba2a248fe982 /templates | |
parent | ae785343076fd1fe8b89f69ca370f7fcd0cdcbd4 (diff) | |
parent | ea00a099dffd7157c93af54b5817734348d2bbc6 (diff) |
Merge branch 'archweb-generic' into master-nomake
Conflicts:
templates/public/download.html
templates/public/feeds.html
templates/public/index.html
urls.py
Diffstat (limited to 'templates')
-rw-r--r-- | templates/admin/index.html | 6 | ||||
-rw-r--r-- | templates/mirrors/mirror_details.html | 8 | ||||
-rw-r--r-- | templates/mirrors/status.html | 4 | ||||
-rw-r--r-- | templates/mirrors/status_table.html | 6 | ||||
-rw-r--r-- | templates/mirrors/url_details.html | 6 | ||||
-rw-r--r-- | templates/public/index.html | 6 |
6 files changed, 23 insertions, 13 deletions
diff --git a/templates/admin/index.html b/templates/admin/index.html index fddd55e5..89ee1df1 100644 --- a/templates/admin/index.html +++ b/templates/admin/index.html @@ -5,7 +5,7 @@ {% block coltype %}colMS{% endblock %} -{% block bodyclass %}dashboard{% endblock %} +{% block bodyclass %}{{ block.super }} dashboard{% endblock %} {% block breadcrumbs %}{% endblock %} @@ -34,9 +34,7 @@ <div class="app-{{ app.app_label }} module"> <table> <caption> - <a href="{{ app.app_url }}" class="section" title="{% blocktrans with name=app.name %}Models in the {{ name }} application{% endblocktrans %}"> - {% blocktrans with name=app.name %}{{ name }}{% endblocktrans %} - </a> + <a href="{{ app.app_url }}" class="section" title="{% blocktrans with name=app.name %}Models in the {{ name }} application{% endblocktrans %}">{{ app.name }}</a> </caption> {% for model in app.models %} <tr class="model-{{ model.object_name|lower }}"> diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index 2ae89880..bd302d61 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -47,6 +47,10 @@ <td>{{ mirror.created }}</td> </tr> <tr> + <th>Last Modified:</th> + <td>{{ mirror.last_modified }}</td> + </tr> + <tr> <th>Rsync IPs:</th> <td class="wrap">{{mirror.rsync_ips.all|join:', '}}</td> </tr> @@ -102,8 +106,8 @@ <th>Last Sync</th> <th>Completion %</th> <th>μ Delay (hh:mm)</th> - <th>μ Duration (secs)</th> - <th>σ Duration (secs)</th> + <th>μ Duration (s)</th> + <th>σ Duration (s)</th> <th>Score</th> <th>Details</th> </tr> diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html index 4d75cd8e..250d9bad 100644 --- a/templates/mirrors/status.html +++ b/templates/mirrors/status.html @@ -80,7 +80,9 @@ <script type="text/javascript" src="{% static "archweb.js" %}"></script> <script type="text/javascript"> $(document).ready(function() { - var headers = { 4: { sorter: 'duration' }, 5: { sorter: 'mostlydigit' }, 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' } }; + var headers = { 4: { sorter: 'duration' }, 5: { sorter: 'mostlydigit' }, + 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' }, + 8: { sorter: false } }; $("#outofsync_mirrors:has(tbody tr)").tablesorter( {widgets: ['zebra'], sortList: [[4,0]], headers: headers }); $("#successful_mirrors:has(tbody tr)").tablesorter( diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html index 00b9c1df..83538303 100644 --- a/templates/mirrors/status_table.html +++ b/templates/mirrors/status_table.html @@ -8,9 +8,10 @@ <th>Country</th> <th>Completion %</th> <th>μ Delay (hh:mm)</th> - <th>μ Duration (secs)</th> - <th>σ Duration (secs)</th> + <th>μ Duration (s)</th> + <th>σ Duration (s)</th> <th>Mirror Score</th> + <th></th> </tr> </thead> <tbody> @@ -23,6 +24,7 @@ <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.get_absolute_url }}">details</a></td> </tr>{% endfor %} </tbody> </table> diff --git a/templates/mirrors/url_details.html b/templates/mirrors/url_details.html index 54960a0d..557a1b79 100644 --- a/templates/mirrors/url_details.html +++ b/templates/mirrors/url_details.html @@ -18,6 +18,10 @@ <td>{% if url.protocol.is_download %}<a href="{{ url.url }}">{{ url.url }}</a>{% else %}{{ url.url }}{% endif %}</td> </tr> <tr> + <th>Mirror:</th> + <td><a href="../">{{ url.mirror.name }}</a></td> + </tr> + <tr> <th>Protocol:</th> <td>{{ url.protocol }}</td> </tr> @@ -63,7 +67,7 @@ <th>Check IP</th> <th>Last Sync</th> <th>Delay (hh:mm)</th> - <th>Duration (secs)</th> + <th>Duration (s)</th> <th>Success?</th> <th>Error Message</th> </tr> diff --git a/templates/public/index.html b/templates/public/index.html index b97c7909..6ef6b4bf 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -114,9 +114,9 @@ <ul> <li><a href="{% wiki_url %}" title="Community documentation">Wiki</a></li> - <li><a href="{% wiki_url 'Installation Guide' %}" + <li><a href="{% wiki_url 'Installation_guide' %}" title="Installation guide">Installation Guide</a></li> - <li><a href="{% wiki_url "Beginners'_Guide" %}" + <li><a href="{% wiki_url "Beginners'_guide" %}" title="A good place to start for beginners">Beginners' Guide</a></li> <li><a href="{% wiki_url 'Migration' %}" title="Free your Arch installation">Migration from Arch Linux</a></li> @@ -127,7 +127,7 @@ <ul> <li><a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/" title="Community and developer mailing lists">Mailing Lists</a></li> - <li><a href="{% wiki_url 'IRC_Channels' %}" + <li><a href="{% wiki_url 'IRC_channels' %}" title="Official and regional IRC communities">IRC Channels</a></li> <li><a href="https://identi.ca/group/parabola" title="Parabola at identi.ca">Identi.ca group</a></li> |