A bunch of whitespace or .example/whatever changes

to reduce stupid differences between us and upstream archweb

8 files changed, 885 insertions, 201 deletions

diff --git a/TODO b/TODO
new file mode 100644
index 00000000..608d8470
--- /dev/null
+++ b/TODO
@@ -0,0 +1,4 @@
+TODO:
+    - refactor stats by templates in dashboard, maybe a templatetag
+
+
diff --git a/local_settings.py.example b/local_settings.py.example
new file mode 100644
index 00000000..bad03921
--- /dev/null
+++ b/local_settings.py.example
@@ -0,0 +1,59 @@
+### Django settings for archlinux project.
+
+## Debug settings
+DEBUG = False
+TEMPLATE_DEBUG = True
+DEBUG_TOOLBAR = True
+
+## For django debug toolbar
+INTERNAL_IPS = ('127.0.0.1',)
+
+## Notification admins
+ADMINS = (
+   # ('Joe Admin', 'joeadmin@example.com'),
+)
+
+## MySQL Database settings
+DATABASES = {
+    'default': {
+        'ENGINE'  : 'django.db.backends.mysql',
+        'NAME'    : 'archlinux',
+        'USER'    : 'archlinux',
+        'PASSWORD': 'archlinux',
+        'HOST'    : '',
+        'PORT'    : '',
+        'OPTIONS' : {'init_command': 'SET storage_engine=InnoDB'},
+    },
+}
+
+## Define cache settings
+CACHES = {
+    'default': {
+        'BACKEND' : 'django.core.cache.backends.dummy.DummyCache',
+        #'BACKEND' : 'django.core.cache.backends.memcached.MemcachedCache',
+        #'LOCATION': '127.0.0.1:11211',
+    }
+}
+CACHE_MIDDLEWARE_KEY_PREFIX = 'arch'
+CACHE_MIDDLEWARE_SECONDS = 300
+
+## Use secure session cookies? Make this true if you want all
+## logged-in actions to take place over HTTPS only. If developing
+## locally, you will want to use False.
+SESSION_COOKIE_SECURE = False
+
+## location for saving dev pictures
+MEDIA_ROOT = '/srv/example.com/img/'
+
+## web url for serving image files
+MEDIA_URL = 'http://example.com/img/'
+
+## Make this unique, and don't share it with anybody.
+SECRET_KEY = '00000000000000000000000000000000000000000000000'
+
+## CDN settings
+CDN_ENABLED = False
+# Scheme-relative URL, should work for both http/https
+CDN_PATH = '//example.com/path/'
+
+# vim: set ts=4 sw=4 et:
diff --git a/media/archnavbar/archnavbar.css b/media/archnavbar/archnavbar.css
index 6b82cb92..f83b8544 100644
--- a/media/archnavbar/archnavbar.css
+++ b/media/archnavbar/archnavbar.css
@@ -7,11 +7,9 @@
  */
 
 /* container for the entire bar */
-#archnavbar { height: 40px !important; padding: 10px 15px !important;
-background: #000 !important; border-bottom: 5px #787DAB solid !important; }
+#archnavbar { height: 40px !important; padding: 10px 15px !important; background: #000 !important; border-bottom: 5px #787DAB solid !important; }
 
-#archnavbarlogo { float: left !important; margin: 0 !important; padding: 0
-!important; height: 50px !important; width: 397px !important; }
+#archnavbarlogo { float: left !important; margin: 0 !important; padding: 0 !important; height: 50px !important; width: 397px !important; }
 /* and use a proper PNG for all other modern browsers */
 html > body #archnavbarlogo { background: url('parabolabw.png') no-repeat !important; }
 
@@ -20,8 +18,7 @@ html > body #archnavbarlogo { background: url('parabolabw.png') no-repeat !impor
 #archnavbarlogo h1 { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; }
 
 /* make the link the same size as the logo */
-#archnavbarlogo a { display: block !important; height: 50px !important; width:
-397px !important; }
+#archnavbarlogo a { display: block !important; height: 50px !important; width: 397px !important; }
 
 /* display the list inline, float it to the right and style it */
 #archnavbar ul { display: inline !important; float: right !important; list-style: none !important; margin: 0 !important; padding: 0 !important; }
diff --git a/media/archweb.css b/media/archweb.css
index 85fdb610..0cb1c6ac 100644
--- a/media/archweb.css
+++ b/media/archweb.css
@@ -13,262 +13,886 @@
 @import url('archnavbar/archnavbar.css');
 
 /* simple reset */
-* { margin: 0; padding: 0; line-height: 1.4; }
+* {
+    margin: 0;
+    padding: 0;
+    line-height: 1.4;
+}
 
 /* general styling */
-body { min-width: 650px; background: #f6f9fc; color: #222; font: normal 100% sans-serif; text-align: center; }
-p { margin: .33em 0 1em; }
-ol, ul { margin-bottom: 1em; padding-left: 2em; }
-ul { list-style: square; }
-code { font: 1.2em monospace; background: #ffd; padding: 0.15em 0.25em; }
-pre { font: 1.2em monospace; border: 1px solid #bdb; background: #dfd; padding: 0.5em; margin: 0.25em 2em; }
-pre code { display: block; background: none; }
-blockquote { margin: 1.5em 2em; }
-input { vertical-align: middle; }
-select[multiple] { padding-top: 1px; padding-bottom: 1px; }
-select[multiple] option { padding-left: 0.3em; padding-right: 0.5em; }
-input[type=submit] { padding-left: 0.6em; padding-right: 0.6em; }
-.clear { clear: both; }
-hr { border: none; border-top: 1px solid #888; }
-img { border: 0; }
+body {
+    min-width: 650px;
+    background: #f6f9fc;
+    color: #222;
+    font: normal 100% sans-serif;
+    text-align: center;
+}
+
+p {
+    margin: .33em 0 1em;
+}
+
+ol,
+ul {
+    margin-bottom: 1em;
+    padding-left: 2em;
+}
+
+    ul {
+        list-style: square;
+    }
+
+code {
+    font: 1.2em monospace;
+    background: #ffd;
+    padding: 0.15em 0.25em;
+}
+
+pre {
+    font: 1.2em monospace;
+    border: 1px solid #bdb;
+    background: #dfd;
+    padding: 0.5em;
+    margin: 0.25em 2em;
+}
+
+    pre code {
+        display: block;
+        background: none;
+    }
+
+blockquote {
+    margin: 1.5em 2em;
+}
+
+input {
+    vertical-align: middle;
+}
+
+select[multiple] {
+    padding-top: 1px;
+    padding-bottom: 1px;
+}
+
+    select[multiple] option {
+        padding-left: 0.3em;
+        padding-right: 0.5em;
+    }
+
+input[type=submit] {
+    padding-left: 0.6em;
+    padding-right: 0.6em;
+}
+
+.clear {
+    clear: both;
+}
+
+hr {
+    border: none;
+    border-top: 1px solid #888;
+}
+
+img {
+    border: 0;
+}
 
 /* scale fonts down to a sane default (16 * .812 = 13px) */
-#content { font-size: 0.812em; }
+#content {
+    font-size: 0.812em;
+}
 
 /* link style */
-a { text-decoration: none; }
-a:link, th a:visited { color: #07b; }
-a:visited { color: #666; }
-a:hover { text-decoration: underline; color: #666; }
-a:active { color: #e90; }
+a {
+    text-decoration: none;
+}
+
+    a:link,
+    th a:visited {
+        color: #07b;
+    }
+
+    a:visited {
+        color: #666;
+    }
+
+    a:hover {
+        text-decoration: underline;
+        color: #666;
+    }
+
+    a:active {
+        color: #e90;
+    }
 
 /* headings */
-h2 { font-size: 1.5em; margin-bottom: 0.5em; border-bottom: 1px solid #888; }
-h3 { font-size: 1.25em; margin-top: 1em; }
-h4 { font-size: 1.15em; margin-top: 1em; }
-h5 { font-size: 1em; margin-top: 1em; }
+h2 {
+    font-size: 1.5em;
+    margin-bottom: 0.5em;
+    border-bottom: 1px solid #888;
+}
+
+h3 {
+    font-size: 1.25em;
+    margin-top: 1em;
+}
+
+h4 {
+    font-size: 1.15em;
+    margin-top: 1em;
+}
+
+h5 {
+    font-size: 1em;
+    margin-top: 1em;
+}
 
 /* general layout */
-div#content { width: 95%; margin: 0 auto; text-align: left; } 
-div#content-left-wrapper { float: left; width: 100%; } /* req to keep content above sidebar in source code */ 
-div#content-left { margin: 0 340px 0 0; }
-div#content-right { float: left; width: 300px; margin-left: -300px; }
-div.box { margin-bottom: 1.5em; padding: 0.65em; background: #ecf2f5; border: 1px solid #bcd; }
-div#footer { clear: both; margin: 2em 0 1em; }
-div#footer p { margin: 0; text-align: center; font-size: 0.85em; }
+div#content {
+    width: 95%;
+    margin: 0 auto;
+    text-align: left;
+}
+
+div#content-left-wrapper {
+    float: left;
+    width: 100%; /* req to keep content above sidebar in source code */
+}
+
+div#content-left {
+    margin: 0 340px 0 0;
+}
+
+div#content-right {
+    float: left;
+    width: 300px;
+    margin-left: -300px;
+}
+
+div.box {
+    margin-bottom: 1.5em;
+    padding: 0.65em;
+    background: #ecf2f5;
+    border: 1px solid #bcd;
+}
+
+div#footer {
+    clear: both;
+    margin: 2em 0 1em;
+}
+
+    div#footer p {
+        margin: 0;
+        text-align: center;
+        font-size: 0.85em;
+    }
 
 /* alignment */
-div.center, table.center, img.center { width: auto; margin-left: auto; margin-right: auto; }
-p.center, td.center, th.center { text-align: center; }
+div.center,
+table.center,
+img.center {
+    width: auto;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+p.center,
+td.center,
+th.center {
+    text-align: center;
+}
 
 /* table generics */
-table { width: 100%; border-collapse: collapse; }
-table .wrap { white-space: normal; }
-th, td { white-space: nowrap; text-align: left; }
-th { vertical-align: middle; font-weight: bold; }
-td { vertical-align: top; }
+table {
+    width: 100%;
+    border-collapse: collapse;
+}
+
+    table .wrap {
+        white-space: normal;
+    }
+
+th,
+td {
+    white-space: nowrap;
+    text-align: left;
+}
+
+    th {
+        vertical-align: middle;
+        font-weight: bold;
+    }
+
+    td {
+        vertical-align: top;
+    }
 
 /* table pretty styles */
-table.pretty1 { width: auto; margin-top: 0.25em; margin-bottom: 0.5em; border-collapse: collapse; border: 1px solid #bcd; }
-table.pretty1 th { padding: 0.35em; background: #e4eeff; border: 1px solid #bcd; }
-table.pretty1 td { padding: 0.35em; border: 1px dotted #bcd; }
-table.pretty2 { width: auto; margin-top: 0.25em; margin-bottom: 0.5em; border-collapse: collapse; border: 1px solid #bbb; }
-table.pretty2 th { padding: 0.35em; background: #eee; border: 1px solid #bbb; }
-table.pretty2 td { padding: 0.35em; border: 1px dotted #bbb; }
+table.pretty1 {
+    width: auto;
+    margin-top: 0.25em;
+    margin-bottom: 0.5em;
+    border-collapse: collapse;
+    border: 1px solid #bcd;
+}
+
+    table.pretty1 th {
+        padding: 0.35em;
+        background: #e4eeff;
+        border: 1px solid #bcd;
+    }
+
+    table.pretty1 td {
+        padding: 0.35em;
+        border: 1px dotted #bcd;
+    }
+
+table.pretty2 {
+    width: auto;
+    margin-top: 0.25em;
+    margin-bottom: 0.5em;
+    border-collapse: collapse;
+    border: 1px solid #bbb;
+}
+
+    table.pretty2 th {
+        padding: 0.35em;
+        background: #eee;
+        border: 1px solid #bbb;
+    }
+
+    table.pretty2 td {
+        padding: 0.35em;
+        border: 1px dotted #bbb;
+    }
 
 /* forms and input styling */
-form p { margin: 0.5em 0; }
-fieldset { border: 0; }
-label { width: 12em; vertical-align: top; display: inline-block; font-weight: bold; }
-input[type=text], input[type=password], textarea { padding: 0.10em; }
-form.general-form label, form.general-form .form-help { width: 10em; vertical-align: top; display: inline-block; }
-form.general-form input[type=text], form.general-form textarea { width: 45%; }
+form p {
+    margin: 0.5em 0;
+}
+
+fieldset {
+    border: 0;
+}
+
+label {
+    width: 12em;
+    vertical-align: top;
+    display: inline-block;
+    font-weight: bold;
+}
+
+input[type=text],
+input[type=password],
+textarea {
+    padding: 0.10em;
+}
+
+form.general-form label,
+form.general-form .form-help {
+    width: 10em;
+    vertical-align: top;
+    display: inline-block;
+}
+
+form.general-form input[type=text],
+form.general-form textarea {
+    width: 45%;
+}
 
 /* archdev navbar */
-div#archdev-navbar { margin: 1.5em 0; }
-div#archdev-navbar ul { list-style: none; margin: -0.5em 0; padding: 0; }
-div#archdev-navbar li { display: inline; margin: 0; padding: 0; font-size: 0.9em; }
-div#archdev-navbar li a { padding: 0 0.5em; color: #07b; }
+div#archdev-navbar {
+    margin: 1.5em 0;
+}
+
+    div#archdev-navbar ul {
+        list-style: none;
+        margin: -0.5em 0;
+        padding: 0;
+    }
+
+    div#archdev-navbar li {
+        display: inline;
+        margin: 0;
+        padding: 0;
+        font-size: 0.9em;
+    }
+
+        div#archdev-navbar li a {
+            padding: 0 0.5em;
+            color: #07b;
+        }
 
 /* error/info messages (x pkg is already flagged out-of-date, etc) */
-#sys-message { width: 35em; text-align: center; margin: 1em auto; padding: 0.5em; background: #fff; border: 1px solid #f00; }
-#sys-message p { margin: 0; }
-
-ul.errorlist { color: red; }
-
-/*
+#sys-message {
+    width: 35em;
+    text-align: center;
+    margin: 1em auto;
+    padding: 0.5em;
+    background: #fff;
+    border: 1px solid #f00;
+}
+
+    #sys-message p {
+        margin: 0;
+    }
+
+ul.errorlist {
+    color: red;
+}
+
+/**
  *  PAGE SPECIFIC STYLES
  */
 
 /* home: introduction */
-#intro p.readmore { margin: -0.5em 0 0 0; font-size: .9em; text-align: right; }
+#intro p.readmore {
+    margin: -0.5em 0 0 0;
+    font-size: .9em;
+    text-align: right;
+}
 
 /* home: news */
-#news { margin-top: 1.5em; }
-#news h3 { border-bottom: 1px solid #888; }
-#news div { margin-bottom: 1em; }
-#news div p { margin-bottom: 0.5em; }
-#news .more { font-weight: normal; }
-#news .rss-icon { float: right; margin: -1.6em 0.4em 0 0; }
-#news h4 { font-size: 1em; margin-top: 1.5em; border-bottom: 1px dotted #bbb; }
-#news .timestamp { float: right; font-size: 0.85em; margin: -1.8em 0.5em 0 0; }
+#news {
+    margin-top: 1.5em;
+}
+
+    #news h3 {
+        border-bottom: 1px solid #888;
+    }
+
+    #news div {
+        margin-bottom: 1em;
+    }
+
+        #news div p {
+            margin-bottom: 0.5em;
+        }
+
+    #news .more {
+        font-weight: normal;
+    }
+
+    #news .rss-icon {
+        float: right;
+        margin: -1.6em 0.4em 0 0;
+    }
+
+    #news h4 {
+        font-size: 1em;
+        margin-top: 1.5em;
+        border-bottom: 1px dotted #bbb;
+    }
+
+    #news .timestamp {
+        float: right;
+        font-size: 0.85em;
+        margin: -1.8em 0.5em 0 0;
+    }
 
 /* home: pkgsearch box */
-#pkgsearch { padding: 1em 0.75em; background: #3ad; color: #fff; border: 1px solid #08b; } 
-#pkgsearch label { width: auto; padding: 0.1em 0; }
-#pkgsearch input { width: 10em; float: right; font-size: 1em; color: #000; background: #fff; border: 1px solid #09c; }
+#pkgsearch {
+    padding: 1em 0.75em;
+    background: #3ad;
+    color: #fff;
+    border: 1px solid #08b;
+}
+
+    #pkgsearch label {
+        width: auto;
+        padding: 0.1em 0;
+    }
+
+    #pkgsearch input {
+        width: 10em;
+        float: right;
+        font-size: 1em;
+        color: #000;
+        background: #fff;
+        border: 1px solid #09c;
+    }
 
 /* home: recent pkg updates */
-#pkg-updates h3 { margin: 0 0 0.3em; }
-#pkg-updates .more { font-weight: normal; }
-#pkg-updates .rss-icon { float: right; margin: -2em 0 0 0; }
-#pkg-updates table { margin: 0; }
-#pkg-updates td.pkg-name { white-space: normal; }
-#pkg-updates td.pkg-arch { text-align: right; }
-#pkg-updates span.testing, #pkg-updates span.community-testing, span.multilib-testing { font-style: italic; }
-#pkg-updates span.staging, #pkg-updates span.community-staging, span.multilib-staging { font-style: italic; color: #ff8040; }
+#pkg-updates h3 {
+    margin: 0 0 0.3em;
+}
+
+    #pkg-updates .more {
+        font-weight: normal;
+    }
+
+    #pkg-updates .rss-icon {
+        float: right;
+        margin: -2em 0 0 0;
+    }
+
+    #pkg-updates table {
+        margin: 0;
+    }
+
+    #pkg-updates td.pkg-name {
+        white-space: normal;
+    }
+
+    #pkg-updates td.pkg-arch {
+        text-align: right;
+    }
+
+    #pkg-updates span.testing,
+    #pkg-updates span.community-testing,
+    span.multilib-testing {
+        font-style: italic;
+    }
+
+    #pkg-updates span.staging,
+    #pkg-updates span.community-staging,
+    span.multilib-staging {
+        font-style: italic;
+        color: #ff8040;
+    }
 
 /* home: sidebar navigation */
-div#nav-sidebar ul { list-style: none; margin: 0.5em 0 0.5em 1em; padding: 0; }
+div#nav-sidebar ul {
+    list-style: none;
+    margin: 0.5em 0 0.5em 1em;
+    padding: 0;
+}
 
 /* home: sponsor banners */
-div#arch-sponsors img { padding: 0.3em 0; }
+div#arch-sponsors img {
+    padding: 0.3em 0;
+}
 
 /* home: sidebar components (navlist, sponsors, pkgsearch, etc) */
-div.widget { margin-bottom: 1.5em; }
+div.widget {
+    margin-bottom: 1.5em;
+}
 
 /* feeds page */
-#rss-feeds .rss { padding-right: 20px; background: url(rss.png) top right no-repeat; }
+#rss-feeds .rss {
+    padding-right: 20px;
+    background: url(rss.png) top right no-repeat;
+}
 
 /* artwork: logo images */
-#artwork img.inverted { background: #333; padding: 0; }
-#artwork div.imagelist img { display: inline; margin: 0.75em; }
+#artwork img.inverted {
+    background: #333;
+    padding: 0;
+}
+
+#artwork div.imagelist img {
+    display: inline;
+    margin: 0.75em;
+}
 
 /* news: article list */
-.news-nav { float: right; margin-top: -2.2em; }
-.news-nav .prev, .news-nav .next { margin-left: 1em; margin-right: 1em; }
+.news-nav {
+    float: right;
+    margin-top: -2.2em;
+}
+
+    .news-nav .prev,
+    .news-nav .next {
+        margin-left: 1em;
+        margin-right: 1em;
+    }
 
 /* news: article pages */
-div.news-article .article-info { margin: 0; color: #999; }
+div.news-article .article-info {
+    margin: 0;
+    color: #999;
+}
 
 /* news: add/edit article */
-form#newsform { width: 60em; }
-form#newsform input[type=text], form#newsform textarea  { width: 75%; }
+form#newsform {
+    width: 60em;
+}
+
+    form#newsform input[type=text],
+    form#newsform textarea {
+        width: 75%;
+    }
 
 /* donate: donor list */
-div#donor-list ul { width: 100%; }
-/* max 4 columns, but possibly fewer if screen size doesn't allow for more */
-div#donor-list li { float: left; width: 25%; min-width: 20em; }
+div#donor-list ul {
+    width: 100%;
+}
+    /* max 4 columns, but possibly fewer if screen size doesn't allow for more */
+    div#donor-list li {
+        float: left;
+        width: 25%;
+        min-width: 20em;
+    }
 
 /* download page */
-#arch-downloads h3 { border-bottom: 1px dotted #aaa; }
-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; }
+#arch-downloads h3 {
+    border-bottom: 1px dotted #aaa;
+}
+
+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; border-top: 1px dotted #999; border-bottom: 1px dotted #999; }
-table.results th { padding: 0.5em 1em 0.25em 0.25em; border-bottom: 1px solid #999; white-space: nowrap; background-color:#fff; }
-table.results td { padding: .3em 1em .3em 3px; }
-table.results tr.odd { background: #fff; }
-table.results tr.even { background: #e4eeff; }
-/* additional styles for JS sorting */
-table.results th.header { padding-right: 20px; background-image: url(nosort.gif); background-repeat: no-repeat; background-position: center right; cursor: pointer; }
-table.results th.headerSortDown { background-color: #e4eeff; background-image: url(desc.gif); }
-table.results th.headerSortUp { background-color: #e4eeff; background-image: url(asc.gif); }
-table.results .flagged { color: red; }
+table.results {
+    font-size: 0.846em;
+    border-top: 1px dotted #999;
+    border-bottom: 1px dotted #999;
+}
+
+    table.results th {
+        padding: 0.5em 1em 0.25em 0.25em;
+        border-bottom: 1px solid #999;
+        white-space: nowrap;
+        background-color:#fff;
+    }
+
+    table.results td {
+        padding: .3em 1em .3em 3px;
+    }
+
+    table.results tr.odd {
+        background: #fff;
+    }
+
+    table.results tr.even {
+        background: #e4eeff;
+    }
+
+        /* additional styles for JS sorting */
+        table.results th.header {
+            padding-right: 20px;
+            background-image: url(nosort.gif);
+            background-repeat: no-repeat;
+            background-position: center right;
+            cursor: pointer;
+        }
+
+        table.results th.headerSortDown {
+            background-color: #e4eeff;
+            background-image: url(desc.gif);
+        }
+
+        table.results th.headerSortUp {
+            background-color: #e4eeff;
+            background-image: url(asc.gif);
+        }
+
+    table.results .flagged {
+        color: red;
+    }
 
 /* pkglist: layout */
-div#pkglist-about { margin-top: 1.5em; }
+div#pkglist-about {
+    margin-top: 1.5em;
+}
 
 /* pkglist: results navigation */
-#pkglist-stats-top, #pkglist-stats-bottom { font-size: 0.85em; }
-#pkglist-results .pkglist-nav { float: right; margin-top: -2.2em; }
-.pkglist-nav .prev { margin-right: 1em; }
-.pkglist-nav .next { margin-right: 1em; }
+#pkglist-stats-top,
+#pkglist-stats-bottom {
+    font-size: 0.85em;
+}
+
+#pkglist-results .pkglist-nav {
+    float: right;
+    margin-top: -2.2em;
+}
+
+.pkglist-nav .prev {
+    margin-right: 1em;
+}
+
+.pkglist-nav .next {
+    margin-right: 1em;
+}
 
 /* search fields  and other filter selections */
-.filter-criteria h3 { font-size: 1em; margin-top:0; }
-.filter-criteria div { float: left; margin-right: 1.65em; font-size: 0.85em; }
-.filter-criteria legend { display: none; }
-.filter-criteria label { width: auto; display: block; font-weight: normal; }
+.filter-criteria h3 {
+    font-size: 1em;
+    margin-top:0;
+}
+
+.filter-criteria div {
+    float: left;
+    margin-right: 1.65em;
+    font-size: 0.85em;
+}
+
+.filter-criteria legend {
+    display: none;
+}
+
+.filter-criteria label {
+    width: auto;
+    display: block;
+    font-weight: normal;
+}
 
 /* pkgdetails: details links that float on the right */
-#pkgdetails #detailslinks { float: right; }
-#pkgdetails #detailslinks h4 { margin-top: 0; margin-bottom: 0.25em; }
-#pkgdetails #detailslinks ul { list-style: none; padding: 0; margin-bottom: 0; font-size: 0.846em; }
-#pkgdetails #detailslinks > div { padding: 0.5em; margin-bottom: 1em; background: #eee; border: 1px solid #bbb; }
-#pkgdetails #actionlist .flagged { color: red; font-size: 0.9em; font-style: italic; }
+#pkgdetails #detailslinks {
+    float: right;
+}
+
+    #pkgdetails #detailslinks h4 {
+        margin-top: 0;
+        margin-bottom: 0.25em;
+    }
+
+    #pkgdetails #detailslinks ul {
+        list-style: none;
+        padding: 0;
+        margin-bottom: 0;
+        font-size: 0.846em;
+    }
+
+    #pkgdetails #detailslinks > div {
+        padding: 0.5em;
+        margin-bottom: 1em;
+        background: #eee;
+        border: 1px solid #bbb;
+    }
+
+#pkgdetails #actionlist .flagged {
+    color: red;
+    font-size: 0.9em;
+    font-style: italic;
+}
 
 /* pkgdetails: pkg info */
-#pkgdetails #pkginfo { width: auto; }
-#pkgdetails #pkginfo td { padding: 0.25em 0 0.25em 1.5em; }
+#pkgdetails #pkginfo {
+    width: auto;
+}
+
+    #pkgdetails #pkginfo td {
+        padding: 0.25em 0 0.25em 1.5em;
+    }
 
 /* pkgdetails: flag package */
-form#flag-pkg-form label { width: 10em; }
-form#flag-pkg-form textarea, form#flag-pkg-form input[type=text] { width: 45%; } 
+form#flag-pkg-form label {
+    width: 10em;
+}
+
+form#flag-pkg-form textarea,
+form#flag-pkg-form input[type=text] {
+    width: 45%;
+}
 
 /* pkgdetails: deps, required by and file lists */
-#pkgdetails #metadata h3 { background: #555; color: #fff; font-size: 1em; margin-bottom: 0.5em; padding: 0.2em 0.35em; }
-#pkgdetails #metadata ul { list-style: none; margin: 0; padding: 0; }
-#pkgdetails #metadata li { padding-left: 0.5em; }
-#pkgdetails #metadata p { padding-left: 0.5em; }
-#pkgdetails #metadata .message { font-style: italic; }
-#pkgdetails #metadata br { clear: both; }
-#pkgdetails #pkgdeps { float: left; width: 48%; margin-right: 2%; }
-#pkgdetails #metadata .virtual-dep { font-style: italic; }
-#pkgdetails #metadata .testing-dep { font-style: italic; }
-#pkgdetails #metadata .opt-dep { font-style: italic; }
-#pkgdetails #metadata .dep-desc { font-style: italic; }
-#pkgdetails #pkgreqs { float: left; width: 50%; }
-#pkgdetails #pkgfiles { clear: left; padding-top: 1em; }
+#pkgdetails #metadata h3 {
+    background: #555;
+    color: #fff;
+    font-size: 1em;
+    margin-bottom: 0.5em;
+    padding: 0.2em 0.35em;
+}
+
+#pkgdetails #metadata ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+#pkgdetails #metadata li {
+    padding-left: 0.5em;
+}
+
+#pkgdetails #metadata p {
+    padding-left: 0.5em;
+}
+
+#pkgdetails #metadata .message {
+    font-style: italic;
+}
+
+#pkgdetails #metadata br {
+    clear: both;
+}
+
+#pkgdetails #pkgdeps {
+    float: left;
+    width: 48%;
+    margin-right: 2%;
+}
+
+#pkgdetails #metadata .virtual-dep,
+#pkgdetails #metadata .testing-dep,
+#pkgdetails #metadata .opt-dep,
+#pkgdetails #metadata .dep-desc {
+    font-style: italic;
+}
+#pkgdetails #pkgreqs {
+    float: left;
+    width: 50%;
+}
+
+#pkgdetails #pkgfiles {
+    clear: left;
+    padding-top: 1em;
+}
 
 /* dev/TU biographies */
-div#arch-bio-toc { width: 75%; margin: 0 auto; text-align: center; }
-table.arch-bio-entry td.pic { vertical-align: top; padding-right: 15px; padding-top: 10px; }
-table.arch-bio-entry td.pic img { padding: 4px; border: 1px solid #ccc; }
-table.arch-bio-entry table.bio { margin-bottom: 2em; }
-table.arch-bio-entry table.bio th { text-align: left; padding-right: 0.5em; vertical-align: top; white-space: nowrap; }
-table.arch-bio-entry table.bio td { width: 100%; padding-bottom: 0.25em; }
+div#arch-bio-toc {
+    width: 75%;
+    margin: 0 auto;
+    text-align: center;
+}
+
+table.arch-bio-entry td.pic {
+    vertical-align: top;
+    padding-right: 15px;
+    padding-top: 10px;
+}
+
+    table.arch-bio-entry td.pic img {
+        padding: 4px;
+        border: 1px solid #ccc;
+    }
+
+table.arch-bio-entry table.bio {
+    margin-bottom: 2em;
+}
+
+    table.arch-bio-entry table.bio th {
+        text-align: left;
+        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 */
 p.login-error {}
-table#dev-login { width: auto; } 
+table#dev-login {
+    width: auto;
+}
 
 /* dev dashboard: flagged packages */
-form#dash-pkg-notify { text-align: right; padding: 1em 0 0; margin-top: 1em; font-size: 0.85em; border-top: 1px dotted #aaa; }
-form#dash-pkg-notify label { width: auto; font-weight: normal; }
-form#dash-pkg-notify input { vertical-align: middle; margin: 0 0.25em; }
-form#dash-pkg-notify input[type=submit] { margin-top: -0.25em; }
-form#dash-pkg-notify p { margin: 0; }
-
-table.dash-stats .key { width: 50%; } 
+form#dash-pkg-notify {
+    text-align: right;
+    padding: 1em 0 0;
+    margin-top: 1em;
+    font-size: 0.85em;
+    border-top: 1px dotted #aaa;
+}
+
+    form#dash-pkg-notify label {
+        width: auto;
+        font-weight: normal;
+    }
+
+    form#dash-pkg-notify input {
+        vertical-align: middle;
+        margin: 0 0.25em;
+    }
+
+        form#dash-pkg-notify input[type=submit] {
+            margin-top: -0.25em;
+        }
+
+    form#dash-pkg-notify p {
+        margin: 0;
+    }
+
+table.dash-stats .key {
+    width: 50%;
+}
 
 /* dev dashboard: admin actions (add news items, todo list, etc) */
-ul.admin-actions { float: right; list-style: none; margin-top: -2.5em; }
-ul.admin-actions li { display: inline; padding-left: 1.5em; }
+ul.admin-actions {
+    float: right;
+    list-style: none;
+    margin-top: -2.5em;
+}
+
+    ul.admin-actions li {
+        display: inline;
+        padding-left: 1.5em;
+    }
 
 /* todo lists (public and private) */
-.todo-table .complete { color: green; }
-.todo-table .incomplete { color: red; }
-.todo-info { margin: 0; color: #999; }
-.todo-list h4 { margin-top: 0; margin-bottom: 0.4em; }
+.todo-table .complete {
+    color: green;
+}
+
+.todo-table .incomplete {
+    color: red;
+}
+.todo-info {
+    margin: 0; color: #999;
+}
+
+.todo-list h4 {
+    margin-top: 0;
+    margin-bottom: 0.4em;
+}
 
 /* dev: signoff page */
-#dev-signoffs ul { list-style: none; margin: 0; padding: 0; }
-#dev-signoffs .signoff-yes { color: green; font-weight: bold; }
-#dev-signoffs .signoff-no { color: red; }
-#dev-signoffs .signed-username { color: #888; margin-left: 0.5em; }
+#dev-signoffs ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+#dev-signoffs .signoff-yes {
+    color: green;
+    font-weight: bold;
+}
+
+#dev-signoffs .signoff-no {
+    color: red;
+}
+
+#dev-signoffs .signed-username {
+    color: #888;
+    margin-left: 0.5em;
+}
 
 /* iso testing feedback form */
-#releng-feedback label { width: auto; display: inline; font-weight: normal; }
-#releng-feedback ul { padding-left: 1em; }
-#releng-feedback li { list-style: none; }
-#releng-feedback ul+.helptext { position: relative; top: -0.9em; }
+#releng-feedback label {
+    width: auto;
+    display: inline;
+    font-weight: normal;
+}
+
+#releng-feedback ul {
+    padding-left: 1em;
+}
+
+#releng-feedback li {
+    list-style: none;
+}
+
+#releng-feedback ul+.helptext {
+    position: relative;
+    top: -0.9em;
+}
 
 /* highlight current website in the navbar */
-#archnavbar.anb-home ul li#anb-home a { color: white !important; }
-#archnavbar.anb-packages ul li#anb-packages a { color: white !important; }
-#archnavbar.anb-download ul li#anb-download a { color: white !important; }
+#archnavbar.anb-home ul li#anb-home a,
+#archnavbar.anb-packages ul li#anb-packages a,
+#archnavbar.anb-download ul li#anb-download a {
+    color: white !important;
+}
diff --git a/public/views.py b/public/views.py
index 1aae2846..bb9cd454 100644
--- a/public/views.py
+++ b/public/views.py
@@ -31,11 +31,13 @@ USER_LISTS = {
 }
 
 def userlist(request, user_type='hackers'):
-    users = User.objects.order_by('username').select_related('userprofile')
+    users = User.objects.order_by(
+            'username').select_related('userprofile')
     if user_type == 'hackers':
         users = users.filter(is_active=True, groups__name="Hackers")
     elif user_type == 'fellows':
-        users = users.filter(is_active=False, groups__name__in=["Hackers"])
+        users = users.filter(is_active=False,
+                groups__name__in=["Hackers"])
     else:
         raise Http404
 
diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
index 4a9d1cdf..e33ba0f5 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -25,8 +25,7 @@
         <p>The message box portion of the flag utility is optional, and meant
         for short messages only. If you need more than 200 characters for your
         message, then file a bug report, email the maintainer directly, or send
-        an email to the <a target="_blank"
-            href="http://list.parabolagnulinux.org/listinfo.cgi/dev-parabolagnulinux.org"
+        an email to the <a target="_blank" href="http://list.parabolagnulinux.org/listinfo.cgi/dev-parabolagnulinux.org"
             title="Visit the parabola dev mailing list">parabola mailing list</a>
         with your additional text.</p>
 
diff --git a/templates/packages/search.html b/templates/packages/search.html
index 2a314853..4a61298e 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -156,16 +156,15 @@
 </div><!-- #pkglist-results -->
 {% else %}
 <div class="box">
-	<p>We couldn't find any packages matching your query. Try searching again
-	using different criteria.</p>
+    <p>We couldn't find any packages matching your query. Try searching again
+    using different criteria.</p>
 </div>
 {% endif %}
 
 <div id="pkglist-about" class="box">
-    <p>You are browsing the Parabola package database. From here you can
-    find detailed information about packages located in the official
-    supported repositories. If you need the sourceball from where a
-    package is built, you can look at our <a
+    <p>You are browsing the Parabola package database. From here you can find
+    detailed information about packages located in the official supported repositories.
+    If you need the sourceball from where a package is built, you can look at our <a
         href='http://repo.parabolagnulinux.org/sources/packages'
         title='Sourceballed packages'>sources repo</a>.</p> </div>
 
diff --git a/templates/releng/add.html b/templates/releng/add.html
index 428812c9..402ceac6 100644
--- a/templates/releng/add.html
+++ b/templates/releng/add.html
@@ -6,17 +6,17 @@
 <div class="box">
     <h2>Parabola Releng Testbuild Feedback Entry</h2>
 
-    <p>This page allows you to submit feedback after testing an Parabola
-    installation using a release engineering testbuild. Mark all the
-    options you used during the installation; at the end you can specify
-    whether everything went OK. Be sure to only denote a successful
-    install after having checked the installation properly.  Some options
-    require you to check several things (such as config files), this will
-    be mentioned alongside the option.</p> <p>There is also an overview of
-    all feedback on the <a href="{% url releng-test-overview %}">results
-        page</a>. Once we have builds that are properly tested (enough
-    successful feedback for all important features of the ISO or a
-    slightly earlier ISO), we can release new official media.</p>
+    <p>This page allows you to submit feedback after testing an Parabola installation
+    using a release engineering testbuild.  Mark all the options you used during the
+    installation; at the end you can specify whether everything went OK.  Be
+    sure to only denote a successful install after having checked the
+    installation properly.  Some options require you to check several things (such as
+    config files), this will be mentioned alongside the option.</p>
+    <p>There is also an overview of all feedback on the
+    <a href="{% url releng-test-overview %}">results page</a>.  Once we have
+    builds that are properly tested (enough successful feedback for all
+    important features of the ISO or a slightly earlier ISO), we can release new
+    official media.</p>
 
     <div id="releng-feedback"> <form action="" method="post">{% csrf_token %}
             {{ form.as_p }}