Merge tag 'release_2012-04-26'parabolaweb-2012-12-12

CSS and display related tweaks

Conflicts:
	public/views.py
	requirements.txt
	requirements_prod.txt
	templates/public/download.html

1 files changed, 44 insertions, 0 deletions

diff --git a/templates/mirrors/mirrorlist_generate.html b/templates/mirrors/mirrorlist_generate.html
new file mode 100644
index 00000000..35d84ddc
--- /dev/null
+++ b/templates/mirrors/mirrorlist_generate.html
@@ -0,0 +1,44 @@
+{% extends "base.html" %}
+{% load package_extras %}
+{% block title %}Parabola - 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
+    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>
+
+    <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.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
+    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 %}
+