summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/devel/clock.html2
-rw-r--r--templates/mirrors/mirror_details.html2
-rw-r--r--templates/mirrors/mirrorlist.txt2
-rw-r--r--templates/mirrors/mirrorlist_generate.html (renamed from templates/mirrors/index.html)2
-rw-r--r--templates/mirrors/mirrorlist_status.txt3
-rw-r--r--templates/mirrors/mirrors.html16
-rw-r--r--templates/mirrors/status.html14
-rw-r--r--templates/mirrors/status_table.html4
-rw-r--r--templates/packages/details.html2
-rw-r--r--templates/packages/files.html8
-rw-r--r--templates/packages/files_list.html2
-rw-r--r--templates/public/developer_list.html8
12 files changed, 29 insertions, 36 deletions
diff --git a/templates/devel/clock.html b/templates/devel/clock.html
index f906800a..0cad9d1b 100644
--- a/templates/devel/clock.html
+++ b/templates/devel/clock.html
@@ -32,7 +32,7 @@
<td><a href="mailto:{{ dev.email }}">{{ dev.get_full_name }}</a></td>
<td>{{ dev.username }}</td>
<td>{{ dev.userprofile.alias }}</td>
- <td>{{ dev.userprofile.location }}</td>
+ <td>{% if dev.userprofile.country %}<img src="{{ dev.userprofile.country.flag }}" alt="{{ dev.userprofile.country.name }}"/> {% endif %}{{ dev.userprofile.location }}</td>
<td>{{ dev.userprofile.time_zone }}</td>
<td>{{ utc_now|timezone:dev.userprofile.time_zone|date:"Y-m-d H:i T" }}</td>
</tr>
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 507b69bf..65f71cb7 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -21,7 +21,7 @@
</tr>
<tr>
<th>Country:</th>
- <td>{{ mirror.country }}</td>
+ <td>{% if mirror.country %}<img src="{{ mirror.country.flag }}" alt=""/> {% endif %}{{ mirror.country.name|default:'Worldwide' }}</td>
</tr>
<tr>
<th>Has ISOs:</th>
diff --git a/templates/mirrors/mirrorlist.txt b/templates/mirrors/mirrorlist.txt
index b91c52a2..3ea89417 100644
--- a/templates/mirrors/mirrorlist.txt
+++ b/templates/mirrors/mirrorlist.txt
@@ -8,6 +8,6 @@ content right, and then go back later to fix it all up.
## Generated on {% now "Y-m-d" %}
##{% for mirror_url in mirror_urls %}{% ifchanged %}
-## {{ mirror_url.real_country }}{% endifchanged %}
+## {{ mirror_url.real_country.name|default:'Worldwide' }}{% endifchanged %}
#Server = {{ mirror_url.url}}$repo/os/$arch{% endfor %}
{% endautoescape %}
diff --git a/templates/mirrors/index.html b/templates/mirrors/mirrorlist_generate.html
index 454fb201..35d84ddc 100644
--- a/templates/mirrors/index.html
+++ b/templates/mirrors/mirrorlist_generate.html
@@ -36,7 +36,7 @@
mirror list and used to pre-order the mirrors.</p>
<form id="list-generator" method="get">
- {{ mirrorlist_form.as_p }}
+ {{ mirrorlist_form.as_div }}
<p><label></label> <input type="submit" value="Generate List" /></p>
</form>
</div>
diff --git a/templates/mirrors/mirrorlist_status.txt b/templates/mirrors/mirrorlist_status.txt
index 5bf94287..34ed8fdc 100644
--- a/templates/mirrors/mirrorlist_status.txt
+++ b/templates/mirrors/mirrorlist_status.txt
@@ -7,7 +7,8 @@ content right, and then go back later to fix it all up.
## Parabola repository mirrorlist
## Sorted by mirror score from mirror status page
## Generated on {% now "Y-m-d" %}
+##
{% for mirror_url in mirror_urls %}
-## Score: {{ mirror_url.score|floatformat:1|default:'unknown' }}, {{ mirror_url.real_country }}
+## Score: {{ mirror_url.score|floatformat:1|default:'unknown' }}, {{ mirror_url.real_country.name|default:'Worldwide' }}
#Server = {{ mirror_url.url}}$repo/os/$arch{% endfor %}
{% endautoescape %}
diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html
index 50f50bde..241c3557 100644
--- a/templates/mirrors/mirrors.html
+++ b/templates/mirrors/mirrors.html
@@ -26,15 +26,15 @@
<tr class="{% cycle 'odd' 'even' %}">
<td><a href="{{ mirror.get_absolute_url }}"
title="Mirror details for {{ mirror.name }}">{{ mirror.name }}</a></td>
- <td>{{mirror.get_tier_display}}</td>
- <td>{{mirror.country}}</td>
- <td>{{mirror.isos|yesno|capfirst}}</td>
- <td class="wrap">{{mirror.supported_protocols|join:", "}}</td>
+ <td>{{ mirror.get_tier_display }}</td>
+ <td>{% if mirror.country %}<img src="{{ mirror.country.flag }}" alt=""/> {% endif %}{{ mirror.country.name }}</td>
+ <td>{{ mirror.isos|yesno|capfirst }}</td>
+ <td class="wrap">{{ mirror.supported_protocols|join:", " }}</td>
{% if user.is_authenticated %}
- <td>{{mirror.public|yesno|capfirst}}</td>
- <td>{{mirror.active|yesno|capfirst}}</td>
- <td>{{mirror.admin_email}}</td>
- <td class="wrap">{{mirror.notes|linebreaks}}</td>
+ <td>{{ mirror.public|yesno|capfirst }}</td>
+ <td>{{ mirror.active|yesno|capfirst }}</td>
+ <td>{{ mirror.admin_email }}</td>
+ <td class="wrap">{{ mirror.notes|linebreaks }}</td>
{% endif %}
</tr>
{% endfor %}
diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html
index cce6d983..e6861bfb 100644
--- a/templates/mirrors/status.html
+++ b/templates/mirrors/status.html
@@ -18,10 +18,6 @@
<ul>
<li><em>Mirror URL:</em> Mirrors are checked on a per-URL basis. If
both FTP and HTTP access are provided, both will be listed here.</li>
- <li><em>Last Sync:</em> The timestamp retrieved from the
- <tt>lastsync</tt> file on the mirror. If this file could not be
- retrieved or contained data we didn't recognize, this column will show
- 'unknown'.</li>
<li><em>Completion %:</em> The number of mirror checks that have
successfully connected and disconnected from the given URL. If this is
below 100%, the mirror may be unreliable.</li>
@@ -92,8 +88,8 @@
{% spaceless %}<tr class="{% cycle 'odd' 'even' %}">
<td>{{ log.url__url }}</td>
<td>{{ log.url__protocol__protocol }}</td>
- <td>{{ log.country }}</td>
- <td>{{ log.error }}</td>
+ <td class="country">{% if log.country %}<img src="{{ log.country.flag }}" alt=""/> {% endif %}{{ log.country.name }}</td>
+ <td class="wrap">{{ log.error }}</td>
<td>{{ log.last_occurred|date:'Y-m-d H:i' }}</td>
<td>{{ log.error_count }}</td>
</tr>
@@ -107,11 +103,11 @@
<script type="text/javascript" src="{% static "archweb.js" %}"></script>
<script type="text/javascript">
$(document).ready(function() {
- var headers = { 5: { sorter: 'duration' }, 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' }, 8: { sorter: 'mostlydigit' } };
+ var headers = { 4: { sorter: 'duration' }, 5: { sorter: 'mostlydigit' }, 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' } };
$("#outofsync_mirrors:has(tbody tr)").tablesorter(
- {widgets: ['zebra'], sortList: [[3,1]], headers: headers });
+ {widgets: ['zebra'], sortList: [[4,0]], headers: headers });
$("#successful_mirrors:has(tbody tr)").tablesorter(
- {widgets: ['zebra'], sortList: [[8,0]], headers: headers });
+ {widgets: ['zebra'], sortList: [[7,0]], headers: headers });
$("#errorlog_mirrors:has(tbody tr)").tablesorter(
{widgets: ['zebra'], sortList: [[4,1], [5,1]]});
});
diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html
index bd70115c..1961d222 100644
--- a/templates/mirrors/status_table.html
+++ b/templates/mirrors/status_table.html
@@ -5,7 +5,6 @@
<th>Mirror URL</th>
<th>Protocol</th>
<th>Country</th>
- <th>Last Sync</th>
<th>Completion %</th>
<th>μ Delay (hh:mm)</th>
<th>μ Duration (secs)</th>
@@ -18,8 +17,7 @@
{% spaceless %}<tr class="{% cycle 'odd' 'even' %}">
<td>{{ m_url.url }}</td>
<td>{{ m_url.protocol }}</td>
- <td>{{ m_url.real_country }}</td>
- <td>{{ m_url.last_sync|date:'Y-m-d H:i'|default:'unknown' }}</td>
+ <td class="country">{% if m_url.real_country %}<img src="{{ m_url.real_country.flag }}" alt=""/> {% endif %}{{ m_url.real_country.name }}</td>
<td>{{ m_url.completion_pct|percentage:1 }}</td>
<td>{{ m_url.delay|duration|default:'unknown' }}</td>
<td>{{ m_url.duration_avg|floatformat:2 }}</td>
diff --git a/templates/packages/details.html b/templates/packages/details.html
index 8e4b2bb0..0369aa96 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -10,7 +10,7 @@
{% block content %}
<div id="pkgdetails" class="box">
- <h2>Package Details: {{ pkg.pkgname }} {{ pkg.full_version }}</h2>
+ <h2>{{ pkg.pkgname }} {{ pkg.full_version }}</h2>
<div id="detailslinks" class="listing">
<div id="actionlist">
diff --git a/templates/packages/files.html b/templates/packages/files.html
index 8cf6738d..46553b25 100644
--- a/templates/packages/files.html
+++ b/templates/packages/files.html
@@ -5,12 +5,12 @@
{% block content %}
<div id="pkgdetails" class="box">
- <h2>Package File List: {{ pkg.pkgname }} {{ pkg.full_version }}</h2>
- <div id="metadata">
- <p><a href="{{ pkg.get_absolute_url }}">Back to Package</a></p>
+ <h2>{{ pkg.pkgname }} {{ pkg.full_version }} File List</h2>
+ <div id="metadata"><div id="pkgfiles">
<p>Package has {{ files_count }} file{{ files_count|pluralize }} and {{ dir_count }} director{{ dir_count|pluralize:"y,ies" }}.</p>
+ <p><a href="{{ pkg.get_absolute_url }}">Back to Package</a></p>
{% include "packages/files_list.html" %}
- </div>
+ </div></div>
</div>
{% endblock %}
diff --git a/templates/packages/files_list.html b/templates/packages/files_list.html
index 156d8588..93a2c847 100644
--- a/templates/packages/files_list.html
+++ b/templates/packages/files_list.html
@@ -6,7 +6,7 @@ of the package; it may be out of date.</p>
{% if files|length %}
<ul>
{% for file in files %}
-<li>{{ file.directory }}{{ file.filename|default:'' }}</li>{% endfor %}
+<li class="{% if file.is_directory %}d{% else %}f{% endif %}">{{ file.directory }}{{ file.filename|default:'' }}</li>{% endfor %}
</ul>
{% else %}
<p class="message">Package has no files.</p>
diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html
index 83c62952..376ab433 100644
--- a/templates/public/developer_list.html
+++ b/templates/public/developer_list.html
@@ -17,12 +17,10 @@
<img src="{{ prof.picture.url }}" height="125" width="125" alt="Image for {{ prof.alias }}"/>
</td>
<td>
- <a name="{{ dev.username }}"></a>
+ <h3>{{ dev.get_full_name }}{% if prof.latin_name %} ({{ prof.latin_name}}){% endif %}
+ <a class="headerlink" name="{{ dev.username }}" id="{{ dev.username }}" href="#{{ dev.username }}" title="Permalink">¶</a></h3>
<table class="bio bio-{{ dev.username }}">
<tr>
- <th>Name:</th>
- <td>{{ dev.get_full_name }}{% if prof.latin_name %} ({{ prof.latin_name}}){% endif %}</td>
- </tr><tr>
<th>Alias:</th>
<td>{{ prof.alias }}</td>
</tr><tr>
@@ -51,7 +49,7 @@
<td>{% if prof.yob %}{{ prof.yob }}{% endif %}</td>
</tr><tr>
<th>Location:</th>
- <td>{{ prof.location }}</td>
+ <td>{% if dev.userprofile.country %}<img src="{{ dev.userprofile.country.flag }}" alt="{{ dev.userprofile.country.name }}"/> {% endif %}{{ prof.location }}</td>
</tr><tr>
<th>Languages:</th>
<td>{{ prof.languages }}</td>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 10:47:39 +0000