Merge branch 'master' of /srv/git/repositories/parabolaweb

Conflicts:
	media/admin_media

10 files changed, 175 insertions, 81 deletions

diff --git a/README b/README
index 9cf699b3..d95574b7 100644
--- a/README
+++ b/README
@@ -15,12 +15,16 @@ See AUTHORS file.
 # Dependencies
 
 - python2
-- python2-virtualenv
+- python2-virtualenv (if using pip to manage dependencies)
 
 # Python dependencies
 
 We're going to use pip to handle python dependencies, m'kay?
 Worry about that in step 3.
+
+If you really want to manage dependencies using something other than
+pip, look at `requirements.txt`, and at the comments on other
+dependiencies in step 3.
  
 # Testing Installation
 
@@ -30,76 +34,75 @@ main server, it's in `/srv/http/web'. Wherever you see this in a
 command, know that you should just replace it with the correct path
 for your install.
 
-1. Run `virtualenv2`.
+1.  Run `virtualenv2`.
 
         $ cd /path/to/parabolaweb && virtualenv2 `pwd`-env
 
-   Here I just had you use `pwd` to choose the environment
-   directory. You can use anything, but it is recommended that it not
-   be the same directory as the install.
+    Here I just had you use `pwd` to choose the environment
+    directory. You can use anything, but it is recommended that it not
+    be the same directory as the install.
 
-2. Activate the virtualenv.
+2.  Activate the virtualenv.
 
         $ source `pwd`-env/bin/activate
 
-3. Fix symlink to the environment
+3.  Fix symlink to the environment
 
         (parabolaweb-env) $ ln -sf ../../parabolaweb-env/lib/python2.7/site-packages/django/contrib/admin/media media/admin_media
 
-   Of course change `../../parabolaweb-env` to the relative path to
-   your environment. Keep in mind that the path is relative from
-   inside the `media/` directory, not the current directory.
+    Of course change `../../parabolaweb-env` to the relative path to
+    your environment. Keep in mind that the path is relative from
+    inside the `media/` directory, not the current directory.
+
+4.  Install dependencies through `pip`.
 
-4. Install dependencies through `pip`.
+    To install base dependencies, run
 
-   To install base dependencies, run
         (parabolweb-env) $ pip install -r requirements.txt
 
-   After that you will need to install a database engine for python.
-   This means `MySQL-python==1.2.3`, `pysqlite` or `psycopg2` for PostgreSQL.
-   Eg:
+    After that you will need to install a database engine for python
+    This means `MySQL-python==1.2.3`, `pysqlite` or `psycopg2` for
+    PostgreSQL. Eg:
+
         (parabolweb-env) $ pip install MySQL-python==1.2.3
 
-   You may also want to install memcached
+    You may also want to install memcached
+
         (parabolweb-env) $ pip install python-memcached==1.47
 
-   Alternately, to have MySQL and memcached installed automatically, run
+    Alternately, to have MySQL and memcached installed automatically,
+    run
+
         (parabolweb-env) $ pip install -r requirements_prod.txt
 
-5. Copy `local_settings.py.example` to `local_settings.py` and modify.
-   Make sure to uncomment the appropriate db section (either sqlite or mysql).
+5.  Copy `local_settings.py.example` to `local_settings.py` and modify.
+    Make sure to uncomment the appropriate db section.
 
-6. Sync the database to create it.
+6.  Sync the database to create it.
 
         (parabolaweb-env) $ ./manage.py syncdb
 
-7. Migrate changes.
+7.  Migrate changes.
 
         (parabolaweb-env) $ ./manage.py migrate
 
-8. Load the fixtures to prepopulate some data. If you don't want some of the
-   provided data, adjust the file glob accordingly.
-
-        (parabolaweb-env) $ for file in */fixtures/*.json; do \
-                               ./manage.py loaddata $file; \
-                            done
+8.  Load the fixtures to prepopulate some data. If you don't want some
+    of the provided data, adjust the file glob accordingly.
 
-   The reason we use a loop instead of just calling them with a glob
-   is that groups.json is expected to fail, and this way it won't
-   prevent others from loading. 
+        (parabolaweb-env) $ ./manage.py loaddata */fixtures/*.json
 
-9. Use the following commands to start a service instance
+9.  Use the following commands to start a service instance
 
         (parabolaweb-env) $ ./manage.py runserver
 
-10. To optionally populate the database with real data:
+10.  To optionally populate the database with real data:
 
         $ wget https://repo.parabolagnulinux.org/core/os/i686/core.db.tar.gz
         $ ./manage.py reporead i686 core.db.tar.gz
         $ ./manage.py syncisos
 
-Alter architecture and repo to get x86\_64 and packages from other repos if
-needed.
+     Alter architecture and repo to get x86\_64 and packages from
+     other repos if needed.
 
 # Production Installation
 
diff --git a/media/admin_media b/media/admin_media
index 4579f7fc..585cf837 120000
--- a/media/admin_media
+++ b/media/admin_media
@@ -1 +1 @@
-/usr/lib/python2.7/site-packages/django/contrib/admin/media/
\ No newline at end of file
+/usr/lib/python2.7/site-packages/django/contrib/admin/media
\ No newline at end of file
diff --git a/media/archweb.css b/media/archweb.css
index 0cb1c6ac..bfb712f8 100644
--- a/media/archweb.css
+++ b/media/archweb.css
@@ -53,7 +53,7 @@ pre {
     border: 1px solid #bdb;
     background: #dfd;
     padding: 0.5em;
-    margin: 0.25em 2em;
+    margin: 1em;
 }
 
     pre code {
@@ -70,18 +70,15 @@ input {
 }
 
 select[multiple] {
-    padding-top: 1px;
-    padding-bottom: 1px;
+    padding: 1px 0;
 }
 
     select[multiple] option {
-        padding-left: 0.3em;
-        padding-right: 0.5em;
+        padding: 0 0.5em 0 0.3em;
     }
 
 input[type=submit] {
-    padding-left: 0.6em;
-    padding-right: 0.6em;
+    padding: 0 0.6em;
 }
 
 .clear {
@@ -134,7 +131,7 @@ h2 {
 
 h3 {
     font-size: 1.25em;
-    margin-top: 1em;
+    margin-top: .5em;
 }
 
 h4 {
@@ -266,6 +263,25 @@ table.pretty2 {
         border: 1px dotted #bbb;
     }
 
+/* definition lists */
+dl {
+    clear: both;
+}
+
+    dl dt,
+    dl dd {
+        margin-bottom: 4px;
+        padding: 8px 0px 4px;
+        font-weight: bold;
+        border-top: 1px dotted #bbb;
+    }
+
+    dl dt {
+        color: #333;
+        float:left;
+        padding-right:15px;
+    }
+
 /* forms and input styling */
 form p {
     margin: 0.5em 0;
@@ -358,7 +374,8 @@ ul.errorlist {
 }
 
     #news h3 {
-        border-bottom: 1px solid #888;
+        float: left;
+        padding-bottom: .5em
     }
 
     #news div {
@@ -375,10 +392,11 @@ ul.errorlist {
 
     #news .rss-icon {
         float: right;
-        margin: -1.6em 0.4em 0 0;
+        margin-top: 1em;
     }
 
     #news h4 {
+        clear: both;
         font-size: 1em;
         margin-top: 1.5em;
         border-bottom: 1px dotted #bbb;
@@ -390,10 +408,35 @@ ul.errorlist {
         margin: -1.8em 0.5em 0 0;
     }
 
+/* home: arrowed headings */
+#news h3 a {
+    display: block;
+    background: #787DAB;
+    font-size: 15px;
+    padding: 2px 10px;
+    color: white;
+}
+
+    #news a:active {
+        color: white;
+    }
+
+h3 span.arrow {
+    display: block;
+    width: 0px;
+    height: 0px;
+    border-left: 6px solid transparent;
+    border-right: 6px solid transparent;
+    border-top: 6px solid #787DAB;
+    margin: 0 auto;
+    font-size: 0px;
+    line-height: 0px;
+}
+
 /* home: pkgsearch box */
 #pkgsearch {
     padding: 1em 0.75em;
-    background: #3ad;
+    background: #787DAB;
     color: #fff;
     border: 1px solid #08b;
 }
@@ -493,8 +536,7 @@ div.widget {
 
     .news-nav .prev,
     .news-nav .next {
-        margin-left: 1em;
-        margin-right: 1em;
+        margin: 0 1em;
     }
 
 /* news: article pages */
@@ -526,7 +568,7 @@ div#donor-list ul {
 
 /* download page */
 #arch-downloads h3 {
-    border-bottom: 1px dotted #aaa;
+    border-bottom: 1px dotted #bbb;
 }
 
 table#download-torrents .cpu-arch {
@@ -566,18 +608,6 @@ table.results {
         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;
@@ -597,6 +627,18 @@ table.results {
             background-image: url(asc.gif);
         }
 
+    table.results td {
+        padding: .3em 1em .3em 3px;
+    }
+
+    table.results tr.odd {
+        background: #fff;
+    }
+
+    table.results tr.even {
+        background: #e4eeff;
+    }
+
     table.results .flagged {
         color: red;
     }
@@ -697,6 +739,10 @@ form#flag-pkg-form input[type=text] {
 }
 
 /* pkgdetails: deps, required by and file lists */
+#pkgdetails #metadata {
+    clear: both;
+}
+
 #pkgdetails #metadata h3 {
     background: #555;
     color: #fff;
@@ -756,6 +802,10 @@ div#arch-bio-toc {
     text-align: center;
 }
 
+    div#arch-bio-toc a {
+        white-space: nowrap;
+    }
+
 table.arch-bio-entry td.pic {
     vertical-align: top;
     padding-right: 15px;
@@ -784,7 +834,6 @@ table.arch-bio-entry table.bio {
     }
 
 /* dev: login/out */
-p.login-error {}
 table#dev-login {
     width: auto;
 }
@@ -795,7 +844,7 @@ form#dash-pkg-notify {
     padding: 1em 0 0;
     margin-top: 1em;
     font-size: 0.85em;
-    border-top: 1px dotted #aaa;
+    border-top: 1px dotted #bbb;
 }
 
     form#dash-pkg-notify label {
@@ -850,24 +899,31 @@ ul.admin-actions {
 }
 
 /* dev: signoff page */
-#dev-signoffs ul {
+#dev-signoffs tr:hover {
+    background: #ffd;
+}
+
+ul.signoff-list {
     list-style: none;
     margin: 0;
     padding: 0;
 }
 
-#dev-signoffs .signoff-yes {
+.signoff-yes {
     color: green;
     font-weight: bold;
 }
 
-#dev-signoffs .signoff-no {
+.signoff-no {
     color: red;
 }
 
-#dev-signoffs .signed-username {
-    color: #888;
-    margin-left: 0.5em;
+.signoff-bad {
+    color: darkorange;
+}
+
+.signoff-disabled {
+    color: gray;
 }
 
 /* iso testing feedback form */
@@ -886,8 +942,15 @@ ul.admin-actions {
 }
 
 #releng-feedback ul+.helptext {
-    position: relative;
-    top: -0.9em;
+    position: relative; top: -0.9em;
+}
+
+#releng-result .success-yes {
+    color: green;
+}
+
+#releng-result .success-no {
+    color: red;
 }
 
 /* highlight current website in the navbar */
@@ -896,3 +959,30 @@ ul.admin-actions {
 #archnavbar.anb-download ul li#anb-download a {
     color: white !important;
 }
+
+/* visualizations page */
+.visualize-buttons {
+    margin: 0.5em 0.33em;
+}
+
+    .visualize-buttons button.active {
+        depressed: true;
+    }
+
+.visualize-chart {
+    position: relative;
+    height: 500px;
+    margin: 0.33em;
+}
+
+#visualize-archrepo .treemap-cell {
+    border: solid 1px white;
+    overflow: hidden;
+    position: absolute;
+}
+
+    #visualize-archrepo .treemap-cell span {
+        padding: 3px;
+        font-size: 0.85em;
+        line-height: 1em;
+    }
diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index 011e9cea..a2f2387e 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -123,6 +123,7 @@ def bug_report(package):
 
 @register.simple_tag
 def flag_unfree(package):
+    url = "//bugs.parabolagnulinux.org/bugs/issue"
     data = {
         '@template': 'item',
         'keyword': 'packages,unfree',
diff --git a/requirements_prod.txt b/requirements_prod.txt
index 47d37ce2..9c13492d 100644
--- a/requirements_prod.txt
+++ b/requirements_prod.txt
@@ -1,6 +1,6 @@
 Django==1.3.1
 Markdown==2.0.3
-MySQL-python==1.2.3
+psycopg2
 South==0.7.3
 pyinotify==0.9.2
 python-memcached==1.47
diff --git a/templates/mirrors/index.html b/templates/mirrors/index.html
index 7091229e..c77bf44d 100644
--- a/templates/mirrors/index.html
+++ b/templates/mirrors/index.html
@@ -7,8 +7,8 @@
 
     <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
+    <p>This page generates the most up-to-date mirrorlist possible for
+    Parabola. 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>
@@ -28,8 +28,8 @@
     <h3>Customized by country mirrorlist</h3>
 
     <p>The following form can generate a custom up-to-date
-    <a href="https://wiki.parabola.kiwwwi.org/index.php/Pacman"
-        title="ArchWiki: Pacman">pacman</a> mirrorlist based on geography and
+    <a href="//wiki.parabolagnulinux.org/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
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index bb6b274f..27ff73b0 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load package_extras %}
 
-{% block title %}Arch Linux - Flag Package - {{ package.pkgname }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %}
+{% block title %}Parabola - Flag Package - {{ package.pkgname }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %}
 {% block head %}<meta name="robots" content="noindex"/>{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
diff --git a/templates/packages/signoff_options.html b/templates/packages/signoff_options.html
index ee9b8b47..950c80c1 100644
--- a/templates/packages/signoff_options.html
+++ b/templates/packages/signoff_options.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Arch Linux - Package Signoff Options - {{ package.pkgbase }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %}
+{% block title %}Parabola - Package Signoff Options - {{ package.pkgbase }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %}
 {% block head %}<meta name="robots" content="noindex"/>{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
diff --git a/templates/public/keys.html b/templates/public/keys.html
index 2e7fcebe..20b91749 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -1,13 +1,13 @@
 {% extends "base.html" %}
 {% load pgp %}
 
-{% block title %}Arch Linux - Master Signing Keys{% endblock %}
+{% block title %}Parabola - Master Signing Keys{% endblock %}
 
 {% block content %}
 <div id="signing-keys" class="box">
     <h2>Master Signing Keys</h2>
 
-    <p>This page lists the Arch Linux Master Keys. This is a distributed set of
+    <p>This page lists the Parabola Master Keys. This is a distributed set of
     keys that are seen as "official" signing keys of the distribution. Each key
     is held by a different developer, and a revocation certificate for the key
     is held by a different developer. Thus, no one developer has absolute hold
diff --git a/templates/visualize/index.html b/templates/visualize/index.html
index 99525e69..cc4593d2 100644
--- a/templates/visualize/index.html
+++ b/templates/visualize/index.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Arch Linux - Visualizations{% endblock %}
+{% block title %}Parabola - Visualizations{% endblock %}
 
 {% block content %}
 <div class="box">