From 640e0f58645a7fd07f3c6185d9583b4d218e2468 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 25 Apr 2012 01:32:57 -0500
Subject: Finish django countries implementation

* Add a migration to drop the old countries field.
* Update all templates/views/utility methods to point at the new country
  field and dereference it as necessary.
* Add the flags images to a few views where it makes sense.
* Cleanup the download page layout quite a bit.
* Bump the mirror status JSON version to 3; add country_code attribute.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 sitestatic/archweb.css | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'sitestatic')

diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css
index a7fe6cac..1df05071 100644
--- a/sitestatic/archweb.css
+++ b/sitestatic/archweb.css
@@ -588,25 +588,6 @@ table#download-torrents .cpu-arch {
     text-align: center;
 }
 
-table#download-mirrors {
-    width: auto;
-    margin-bottom: 1em;
-}
-
-    table#download-mirrors td.mirror-country {
-        padding-top: 1em;
-    }
-
-    table#download-mirrors td.mirror-server {
-        padding-right: 1em;
-    }
-
-    table#download-mirrors a {
-        display: block;
-        float: right;
-        width: 4em;
-    }
-
 /* pkglists/devlists */
 table.results {
     font-size: 0.846em;
-- 
cgit v1.2.3-54-g00ecf


From 2cfd0be715b93632a85608092726c5df926ed9ae Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 25 Apr 2012 01:52:19 -0500
Subject: Mirror status page cleanup

Remove the 'last sync' column; it is not totally useless but mostly
covered by the average delay column, and we are running out of usable
real estate here. Also tweak a few columns so wrapping is permissible.
Thank you to "Macedonia, The Former Yugoslav Republic of" for this.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 sitestatic/archweb.css              |  5 +++++
 templates/mirrors/status.html       | 14 +++++---------
 templates/mirrors/status_table.html |  4 +---
 3 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'sitestatic')

diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css
index 1df05071..fdc356ff 100644
--- a/sitestatic/archweb.css
+++ b/sitestatic/archweb.css
@@ -797,6 +797,11 @@ form#flag-pkg-form input[type=text] {
     padding-top: 1em;
 }
 
+/* mirror stuff */
+table td.country {
+    white-space: normal;
+}
+
 /* dev/TU biographies */
 div#arch-bio-toc {
     width: 75%;
diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html
index 8f814448..c04aa204 100644
--- a/templates/mirrors/status.html
+++ b/templates/mirrors/status.html
@@ -18,10 +18,6 @@ <h2>Mirror Status</h2>
     <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 @@ <h3>Mirror Syncing Error Log</h3>
             {% spaceless %}<tr class="{% cycle 'odd' 'even' %}">
                 <td>{{ log.url__url }}</td>
                 <td>{{ log.url__protocol__protocol }}</td>
-                <td>{% if log.country %}<img src="{{ log.country.flag }}"/> {% endif %}{{ log.country.name }}</td>
-                <td>{{ log.error }}</td>
+                <td class="country">{% if log.country %}<img src="{{ log.country.flag }}"/> {% 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 @@ <h3>Mirror Syncing Error Log</h3>
 <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 3a20c068..71a21fe8 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>{% if m_url.real_country %}<img src="{{ m_url.real_country.flag }}"/> {% endif %}{{ m_url.real_country.name }}</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 }}"/> {% 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>
-- 
cgit v1.2.3-54-g00ecf


From 952eba9625c5222e1eee77f711ecb3996998bafb Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 25 Apr 2012 02:20:45 -0500
Subject: Clean up mirrorlist generation form a bit

Rename template since it really isn't an index of mirrors at all, and
convert the form to use multiple checkboxes for both ftp/http and
ipv4/ipv6 selection.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 mirrors/views.py                           | 18 ++++++++++--
 sitestatic/archweb.css                     | 10 +++++++
 templates/mirrors/index.html               | 44 ------------------------------
 templates/mirrors/mirrorlist_generate.html | 44 ++++++++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 47 deletions(-)
 delete mode 100644 templates/mirrors/index.html
 create mode 100644 templates/mirrors/mirrorlist_generate.html

(limited to 'sitestatic')

diff --git a/mirrors/views.py b/mirrors/views.py
index 349c17d1..6c08f712 100644
--- a/mirrors/views.py
+++ b/mirrors/views.py
@@ -2,6 +2,7 @@
 from operator import attrgetter, itemgetter
 
 from django import forms
+from django.forms.widgets import CheckboxSelectMultiple
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db.models import Q
 from django.http import Http404, HttpResponse
@@ -19,9 +20,11 @@
 
 class MirrorlistForm(forms.Form):
     country = forms.MultipleChoiceField(required=False)
-    protocol = forms.MultipleChoiceField(required=False)
+    protocol = forms.MultipleChoiceField(required=False,
+            widget=CheckboxSelectMultiple)
     ip_version = forms.MultipleChoiceField(required=False,
-            label="IP version", choices=(('4','IPv4'), ('6','IPv6')))
+            label="IP version", choices=(('4','IPv4'), ('6','IPv6')),
+            widget=CheckboxSelectMultiple)
     use_mirror_status = forms.BooleanField(required=False)
 
     def __init__(self, *args, **kwargs):
@@ -47,6 +50,15 @@ def get_countries(self):
         countries = [(code, COUNTRY_LOOKUP[code]) for code in country_codes]
         return sorted(countries, key=itemgetter(1))
 
+    def as_div(self):
+        "Returns this form rendered as HTML <divs>s."
+        return self._html_output(
+            normal_row = u'<div%(html_class_attr)s>%(label)s %(field)s%(help_text)s</div>',
+            error_row = u'%s',
+            row_ender = '</div>',
+            help_text_html = u' <span class="helptext">%s</span>',
+            errors_on_separate_row = True)
+
 
 @csrf_exempt
 def generate_mirrorlist(request):
@@ -63,7 +75,7 @@ def generate_mirrorlist(request):
     else:
         form = MirrorlistForm()
 
-    return direct_to_template(request, 'mirrors/index.html',
+    return direct_to_template(request, 'mirrors/mirrorlist_generate.html',
             {'mirrorlist_form': form})
 
 
diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css
index fdc356ff..407156f8 100644
--- a/sitestatic/archweb.css
+++ b/sitestatic/archweb.css
@@ -802,6 +802,16 @@ table td.country {
     white-space: normal;
 }
 
+form#list-generator div ul {
+    list-style: none;
+    display: inline;
+    padding-left: 0;
+}
+
+    form#list-generator div ul li {
+        display: inline;
+    }
+
 /* dev/TU biographies */
 div#arch-bio-toc {
     width: 75%;
diff --git a/templates/mirrors/index.html b/templates/mirrors/index.html
deleted file mode 100644
index 49907b8f..00000000
--- a/templates/mirrors/index.html
+++ /dev/null
@@ -1,44 +0,0 @@
-{% extends "base.html" %}
-{% load package_extras %}
-{% block title %}Arch Linux - Pacman Mirrorlist Generator{% endblock %}
-
-{% block content %}
-<div id="mirrorlist-gen" class="box">
-
-    <h2>Pacman Mirrorlist Generator</h2>
-
-    <p>This page generates the most up-to-date mirrorlist possible for Arch
-    Linux. The data used here comes straight from the developers' internal
-    mirror database used to track mirror availability and tiering. There are
-    two main options: get a mirrorlist with every available mirror, or get a
-    mirrorlist tailored to your geography.</p>
-
-    <h3>Mirrorlist with all available mirrors</h3>
-
-    <p>An up-to-date mirrorlist is available containing all currently active
-    mirrors, optionally filtering by protocol. These URLs requires no GET or
-    POST parameters so they can be fetched from the command line if desired.<p>
-
-    <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>
-    </ul>
-
-    <h3>Customized by country mirrorlist</h3>
-
-    <p>The following form can generate a custom up-to-date
-    <a href="https://wiki.archlinux.org/index.php/Pacman"
-        title="ArchWiki: Pacman">pacman</a> mirrorlist based on geography and
-    desired protocol(s).  Simply replace the contents of
-    <code>/etc/pacman.d/mirrorlist</code> with your generated list.
-    Additionally, the mirror status data can be incorporated into the generated
-    mirror list and used to pre-order the mirrors.</p>
-
-    <form id="list-generator" method="get">
-        {{ mirrorlist_form.as_p }}
-        <p><label></label> <input type="submit" value="Generate List" /></p>
-    </form>
-</div>
-{% endblock %}
-
diff --git a/templates/mirrors/mirrorlist_generate.html b/templates/mirrors/mirrorlist_generate.html
new file mode 100644
index 00000000..e6f5e28c
--- /dev/null
+++ b/templates/mirrors/mirrorlist_generate.html
@@ -0,0 +1,44 @@
+{% extends "base.html" %}
+{% load package_extras %}
+{% block title %}Arch Linux - Pacman Mirrorlist Generator{% endblock %}
+
+{% block content %}
+<div id="mirrorlist-gen" class="box">
+
+    <h2>Pacman Mirrorlist Generator</h2>
+
+    <p>This page generates the most up-to-date mirrorlist possible for Arch
+    Linux. The data used here comes straight from the developers' internal
+    mirror database used to track mirror availability and tiering. There are
+    two main options: get a mirrorlist with every available mirror, or get a
+    mirrorlist tailored to your geography.</p>
+
+    <h3>Mirrorlist with all available mirrors</h3>
+
+    <p>An up-to-date mirrorlist is available containing all currently active
+    mirrors, optionally filtering by protocol. These URLs requires no GET or
+    POST parameters so they can be fetched from the command line if desired.<p>
+
+    <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>
+    </ul>
+
+    <h3>Customized by country mirrorlist</h3>
+
+    <p>The following form can generate a custom up-to-date
+    <a href="https://wiki.archlinux.org/index.php/Pacman"
+        title="ArchWiki: Pacman">pacman</a> mirrorlist based on geography and
+    desired protocol(s).  Simply replace the contents of
+    <code>/etc/pacman.d/mirrorlist</code> with your generated list.
+    Additionally, the mirror status data can be incorporated into the generated
+    mirror list and used to pre-order the mirrors.</p>
+
+    <form id="list-generator" method="get">
+        {{ mirrorlist_form.as_div }}
+        <p><label></label> <input type="submit" value="Generate List" /></p>
+    </form>
+</div>
+{% endblock %}
+
-- 
cgit v1.2.3-54-g00ecf


From 5f22f4266cd978b4fd80cafb2201e39acaeef3fc Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 26 Apr 2012 14:17:03 -0500
Subject: Developer list styles updates

* Make the developer name more prominent in dividing the blocks
* Reduce the in-your-faceness of the <th> elements in every section
* Other small tweaks

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 sitestatic/archweb.css               | 49 +++++++++++++++++++++++-------------
 templates/public/developer_list.html |  4 +--
 2 files changed, 32 insertions(+), 21 deletions(-)

(limited to 'sitestatic')

diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css
index 407156f8..95663008 100644
--- a/sitestatic/archweb.css
+++ b/sitestatic/archweb.css
@@ -823,33 +823,46 @@ div#arch-bio-toc {
         white-space: nowrap;
     }
 
-table.arch-bio-entry td.pic {
-    vertical-align: top;
-    padding-right: 15px;
-    padding-top: 10px;
+table.arch-bio-entry {
+    width: 75%;
+    min-width: 640px;
+    margin: 0 auto;
 }
 
-    table.arch-bio-entry td.pic img {
-        padding: 4px;
-        border: 1px solid #ccc;
+    table.arch-bio-entry td.pic {
+        vertical-align: top;
+        padding-right: 15px;
+        padding-top: 2.25em;
     }
 
-table.arch-bio-entry table.bio {
-    margin-bottom: 2em;
-}
+        table.arch-bio-entry td.pic img {
+            padding: 4px;
+            border: 1px solid #ccc;
+        }
 
-    table.arch-bio-entry table.bio th {
-        text-align: left;
-        padding-right: 0.5em;
-        vertical-align: top;
-        white-space: nowrap;
+    table.arch-bio-entry td h3 {
+        border-bottom: 1px dotted #ccc;
+        margin-bottom: 0.5em;
     }
 
-    table.arch-bio-entry table.bio td {
-        width: 100%;
-        padding-bottom: 0.25em;
+    table.arch-bio-entry table.bio {
+        margin-bottom: 2em;
     }
 
+        table.arch-bio-entry table.bio th {
+            color: #666;
+            font-weight: normal;
+            text-align: right;
+            padding-right: 0.5em;
+            vertical-align: top;
+            white-space: nowrap;
+        }
+
+        table.arch-bio-entry table.bio td {
+            width: 100%;
+            padding-bottom: 0.25em;
+        }
+
 /* dev: login/out */
 table#dev-login {
     width: auto;
diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html
index 37b35b82..00d93a50 100644
--- a/templates/public/developer_list.html
+++ b/templates/public/developer_list.html
@@ -18,11 +18,9 @@
         </td>
         <td>
             <a name="{{ dev.username }}"></a>
+            <h3>{{ dev.get_full_name }}{% if prof.latin_name %} ({{ prof.latin_name}}){% endif %}</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>
-- 
cgit v1.2.3-54-g00ecf


From eba4e32891f12bca2b922ee6d859513f67789f42 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 26 Apr 2012 14:43:18 -0500
Subject: Package files display tweaks

Slightly gray out the directories when displaying file lists, drawing
more attention to the file names instead.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 sitestatic/archweb.css             | 7 +++++++
 templates/packages/files.html      | 8 ++++----
 templates/packages/files_list.html | 2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'sitestatic')

diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css
index 95663008..bc666d74 100644
--- a/sitestatic/archweb.css
+++ b/sitestatic/archweb.css
@@ -797,6 +797,13 @@ form#flag-pkg-form input[type=text] {
     padding-top: 1em;
 }
 
+    #pkgdetails #pkgfiles li.d {
+        color: #666;
+    }
+
+    #pkgdetails #pkgfiles li.f {
+    }
+
 /* mirror stuff */
 table td.country {
     white-space: normal;
diff --git a/templates/packages/files.html b/templates/packages/files.html
index 6524fe93..ba3fba25 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 @@
 {% 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>
-- 
cgit v1.2.3-54-g00ecf


From fbbcc8534a25d3e78ef3a319c8aeb127bc5085f0 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 26 Apr 2012 14:44:52 -0500
Subject: Add hover header links to the developer profiles pages

This is a lot like you can see in the Python API documentation, and
makes it easy to copy a link to a given place on a page.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 sitestatic/archweb.css               | 10 ++++++++++
 templates/public/developer_list.html |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'sitestatic')

diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css
index bc666d74..dcf0276a 100644
--- a/sitestatic/archweb.css
+++ b/sitestatic/archweb.css
@@ -122,6 +122,16 @@ a {
         color: #e90;
     }
 
+/* special anchor elements */
+a.headerlink {
+    visibility: hidden;
+    padding-left: 0.5em;
+}
+
+h3:hover > a.headerlink {
+    visibility: visible;
+}
+
 /* headings */
 h2 {
     font-size: 1.5em;
diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html
index 00d93a50..376ab433 100644
--- a/templates/public/developer_list.html
+++ b/templates/public/developer_list.html
@@ -17,8 +17,8 @@
             <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 %}</h3>
+            <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>Alias:</th>
-- 
cgit v1.2.3-54-g00ecf