diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:40:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:40:34 -0400 |
| commit | ea00a099dffd7157c93af54b5817734348d2bbc6 (patch) | |
| tree | 89fa4ba0c0ac19a4286ba4c4cb64f77536b1a098 /templates/mirrors | |
| parent | 1a1fd4a3d6aa7f6b2338f7751f5f97a30a059a04 (diff) | |
| parent | 0f0ce18109f8104d7b2abe9024ef26fa07ff0292 (diff) | |
Merge branch 'archweb' into archweb-generic
Conflicts:
templates/public/download.html
templates/public/index.html
Diffstat (limited to 'templates/mirrors')
| -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 |
4 files changed, 18 insertions, 6 deletions
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> |