Merge branch 'archweb-generic2'

Conflicts:
	README.BRANDING
	local_settings.py.example
	packages/templatetags/package_extras.py
	public/views.py
	releng/views.py
	settings.py
	sitestatic/archnavbar/archnavbar.css
	sitestatic/silhouette.png
	templates/base.html
	templates/packages/differences.html
	templates/packages/opensearch.xml
	templates/packages/search.html
	templates/public/donate.html
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	urls.py

5 files changed, 147 insertions, 44 deletions

diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html
index 376ab433..15a6c8bb 100644
--- a/templates/public/developer_list.html
+++ b/templates/public/developer_list.html
@@ -1,3 +1,4 @@
+{% load flags %}
 {% load pgp %}
 
 <div id="arch-bio-toc">
@@ -12,17 +13,24 @@
 <table class="arch-bio-entry">
     {% for dev in dev_list %}
     {% with dev.userprofile as prof %}
-    <tr>
+    <tr itemscope itemtype="http://schema.org/Person">
         <td class="pic pic-{{ dev.username }}">
-            <img src="{{ prof.picture.url }}" height="125" width="125" alt="Image for {{ prof.alias }}"/>
+            <img itemprop="image" src="{{ prof.picture.url }}" height="125" width="125" alt="Image for {{ prof.alias }}"/>
         </td>
         <td>
+            <meta itemprop="name" content="{{ dev.get_full_name|escape }}"/>
+            <meta itemprop="givenName" content="{{ dev.first_name|escape }}"/>
+            <meta itemprop="familyName" content="{{ dev.last_name|escape }}"/>
+            <meta itemprop="jobTitle" content="{{ user_title|escape }}"/>
+            <div style="display:none" itemprop="memberOf" itemscope itemtype="http://schema.org/Organization">
+                <meta itemprop="name" content="{{ BRANDING_DISTRONAME }}"/>
+            </div>
             <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>
-                    <td>{{ prof.alias }}</td>
+                    <td itemprop="additionalName">{{ prof.alias }}</td>
                 </tr><tr>
                     <th>Email:</th>
                     <td>{{ prof.public_email }}</td>
@@ -38,7 +46,7 @@
                     </td>
                 </tr><tr>
                     <th>Website:</th>
-                    <td>{% if prof.website %}<a href="{{ prof.website }}"
+                    <td>{% if prof.website %}<a itemprop="url" href="{{ prof.website }}"
                             title="Visit the website for {{ dev.get_full_name }}">
                             {{ prof.website }}</a>{% endif %}</td>
                 </tr><tr>
@@ -46,10 +54,10 @@
                     <td>{{ prof.occupation }}</td>
                 </tr><tr>
                     <th>YOB:</th>
-                    <td>{% if prof.yob %}{{ prof.yob }}{% endif %}</td>
+                    <td itemprop="birthDate">{% if prof.yob %}{{ prof.yob }}{% endif %}</td>
                 </tr><tr>
                     <th>Location:</th>
-                    <td>{% if dev.userprofile.country %}<img src="{{ dev.userprofile.country.flag }}" alt="{{ dev.userprofile.country.name }}"/> {% endif %}{{ prof.location }}</td>
+                    <td>{% country_flag dev.userprofile.country %}{{ prof.location }}</td>
                 </tr><tr>
                     <th>Languages:</th>
                     <td>{{ prof.languages }}</td>
diff --git a/templates/public/feeds.html b/templates/public/feeds.html
index 9fdd3162..70d8eee6 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -12,8 +12,8 @@
 
     <h3>News and Activity Feeds</h3>
 
-    <p>Grab the <a href="/feeds/news/" class="rss" title="{{ BRANDING_DISTRONAME }} News feed">news item feed</a>
-    to keep up-to-date with the latest news from the {{ BRANDING_DISTRONAME }} development staff.</p>
+    <p>Grab the <a href="/feeds/news/" class="rss" title="{{BRANDING_DISTRONAME}} news feed">news item feed</a>
+    to keep up-to-date with the latest news from the {{BRANDING_DISTRONAME}} development staff.</p>
 
     <p>The <a href="{% wiki_url 'Special:RecentChanges?feed=rss' %}"
     title="{{ BRANDING_WIKINAME }} Recent Changes feed" class="rss">{{ BRANDING_WIKINAME }}: Recent changes feed</a>
@@ -35,19 +35,26 @@
     <table class="pretty2">
         <thead>
             <tr>
-                <th>Architecture</th>
-                <th>All Repos</th>
-                {% for repo in repos %}
-                <th>{{ repo }}</th>
+                <th></th>
+                <th>All Arches</th>
+                {% for arch in arches %}
+                <th>{{ arch }}</th>
                 {% endfor %}
             </tr>
         </thead>
         <tbody>
-            {% for arch in arches %}
             <tr>
-                <td><strong>{{ arch }}</strong></td>
+                <td><strong>All Repos</strong></td>
+                <td><a href="/feeds/packages/" class="rss">Feed</a></td>
+                {% for arch in arches %}
                 <td><a href="/feeds/packages/{{ arch }}/" class="rss">Feed</a></td>
-                {% for repo in repos %}
+                {% endfor %}
+            </tr>
+            {% for repo in repos %}
+            <tr>
+                <td><strong>{{ repo }}</strong></td>
+                <td><a href="/feeds/packages/all/{{ repo|lower }}/" class="rss">Feed</a></td>
+                {% for arch in arches %}
                 <td><a href="/feeds/packages/{{ arch }}/{{ repo|lower }}/" class="rss">Feed</a></td>
                 {% endfor %}
             </tr>
@@ -55,6 +62,11 @@
         </tbody>
     </table>
 
+    <h3>Release Feed</h3>
+
+    <p>Grab the <a href="/feeds/releases/" class="rss" title="{{BRANDING_DISTRONAME}} release feed">ISO release feed</a>
+    if you want to help seed the ISO release torrents as they come out.</p>
+
     <h3>Development Feeds</h3>
 
     <p>Subscribe to any of the following to track bug tickets and feature
diff --git a/templates/public/index.html b/templates/public/index.html
index ef8f2d69..40d887b7 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
-{% load markup cache %}
-{% load url from future %}
+{% load cache %}
 {% load static from staticfiles %}
 {% load wiki %}
 
@@ -45,19 +44,17 @@
     <a href="/feeds/news/" title="{{ BRANDING_SHORTNAME }} News RSS Feed"
         class="rss-icon"><img width="16" height="16" src="{% static "rss.png" %}" alt="RSS Feed" /></a>
 
-    {% for news in news_updates %}
-    {% if forloop.counter0 < 5 %}
+    {% for news in news_updates %}{% if forloop.counter0 < 5 %}
     <h4>
         <a href="{{ news.get_absolute_url }}"
             title="View full article: {{ news.title }}">{{ news.title }}</a>
     </h4>
     <p class="timestamp">{{ news.postdate|date }}</p>
     <div class="article-content">
-        {% if forloop.counter0 == 0 %}{{ news.content|markdown|truncatewords_html:300 }}
-        {% else %}{{ news.content|markdown|truncatewords_html:100 }}{% endif %}
+        {% if forloop.counter0 == 0 %}{{ news.html|truncatewords_html:300 }}
+        {% else %}{{ news.html|truncatewords_html:100 }}{% endif %}
     </div>
-    {% else %}
-    {% if forloop.counter0 == 5 %}
+    {% else %}{% if forloop.counter0 == 5 %}
     <h3>
         <a href="{% url 'news-list' %}"
             title="Browse the news archives">Older News</a>
@@ -70,17 +67,14 @@
             <a href="{{ news.get_absolute_url }}"
                 title="View full article: {{ news.title }}">{{ news.title }}</a>
         </dd>
-    {% if forloop.last %}
-    </dl>
-    {% endif %}
-    {% endif %}
-    {% endfor %}
+    {% if forloop.last %}</dl>{% endif %}
+    {% endif %}{% endfor %}
 </div>
 {% endcache %}
 {% endblock %}
 
 {% block content_right %}
-{% cache 59 main-page-right secure %}
+{% cache 59 main-page-updates user.is_authenticated %}
 <div id="pkgsearch" class="widget">
     <form id="pkgsearch-form" method="get" action="/packages/">
         <fieldset>
@@ -88,7 +82,6 @@
             <input id="pkgsearch-field" type="text" name="q" size="18" maxlength="200" />
         </fieldset>
     </form>
-
 </div>
 
 <div id="pkg-updates" class="widget box">
@@ -110,7 +103,9 @@
         {% endfor %}
     </table>
 </div>
+{% endcache %}
 
+{% cache 59 main-page-right secure %}
 <div id="nav-sidebar" class="widget">
     <h4>Documentation</h4>
 
@@ -148,11 +143,12 @@
     <ul>
         <li><a href="{% url 'mirrorlist' %}"
             title="Get a custom mirrorlist from our database">Mirrorlist Updater</a></li>
+        <li><a href="{% url 'mirror-list' %}"
+            title="See a listing of all available mirrors">Mirror List</a></li>
         <li><a href="{% url 'mirror-status' %}"
             title="Check the status of all known mirrors">Mirror Status</a></li>
-        <li><a href="/packages/differences/"
-            title="See differences in packages between available architectures">Differences Reports</a>
-        <img width="16" height="16" src="{% static "new.png" %}" alt="New"/></li>
+        <li><a href="{% url 'packages-differences' %}"
+            title="See differences in packages between available architectures">Differences Reports</a></li>
     </ul>
 
     <h4>Development</h4>
@@ -168,21 +164,17 @@
 {% endcomment %}
         <li><a href="/groups/"
             title="View the available package groups">Package Groups</a></li>
-        <li><a href="/todolists/"
+        <li><a href="/todo/"
             title="Hacker Todo Lists">Todo Lists</a></li>
-        <li><a href="{% url 'releng-test-overview' %}"
-            title="Releng Testbuild Feedback">Releng Testbuild Feedback</a></li>
         <li><a href="{% url 'visualize-index' %}"
-            title="View visualizations">Visualizations</a>
-        <img width="16" height="16" src="{% static "new.png" %}" alt="New"/></li>
+            title="View visualizations">Visualizations</a></li>
     </ul>
 
     <h4>More Resources</h4>
 
     <ul>
         <li><a href="{% url 'page-keys' %}"
-            title="Package/Database signing master keys">Signing Master Keys</a>
-        <img width="16" height="16" src="{% static "new.png" %}" alt="New"/></li>
+            title="Package/Database signing master keys">Signing Master Keys</a></li>
         <li><a href="{% wiki_url 'Media' %}"
             title="{{ BRANDING_DISTRONAME }} in the media">Press Coverage</a></li>
         <li><a href="{% url 'page-art' %}" title="{{ BRANDING_SHORTNAME }} logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
@@ -201,7 +193,6 @@ donate button would go here
 {% endcomment %}
 
 <div id="arch-sponsors" class="widget">
-
     <a href="http://gnuchile.cl">
       <img src="{% static "gnuchile.png" %}"
 	   alt="GNU Chile - Donates the .org domain"
@@ -223,7 +214,42 @@ donate button would go here
 	   alt="Freedom Included - Donated Lemote Yeeloongs to port Parabola to the MIPS architecture"
 	   title="Freedom Included - Donated Lemote Yeeloongs to port Parabola to the MIPS architecture" />
     </a>
-
 </div>
 {% endcache %}
 {% endblock %}
+
+{% block script_block %}
+<div id="konami" style="display:none;"></div>
+
+{% load cdn %}{% jquery %}
+<script type="text/javascript">
+function setupTypeahead() {
+    $('#pkgsearch-field').typeahead({
+        source: function(query, callback) {
+            $.getJSON('/opensearch/packages/suggest', {q: query}, function(data) {
+                callback(data[1]);
+            });
+        },
+        matcher: function(item) { return true; },
+        sorter: function(items) { return items; },
+        menu: '<ul class="pkgsearch-typeahead"></ul>',
+        items: 10
+    }).attr('autocomplete', 'off');
+}
+function setupKonami() {
+    var konami = new Konami(function() {
+        $('#konami').html('<img src="{% static "vector_tux.png" %}" alt=""/>');
+        setTimeout(function() {
+            $('#konami').fadeIn(500);
+        }, 500);
+        $('#konami').click(function() {
+            $('#konami').fadeOut(500);
+        });
+    });
+}
+$(document).ready(function() {
+    $.ajax({ url: "{% static "bootstrap-typeahead.min.js" %}", cache: true, dataType: "script", success: setupTypeahead });
+    $.ajax({ url: "{% static "konami.min.js" %}", cache: true, dataType: "script", success: setupKonami });
+});
+</script>
+{% endblock %}
diff --git a/templates/public/keys.html b/templates/public/keys.html
index 4afc6d6b..ab89423e 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -48,6 +48,16 @@
         </tbody>
     </table>
 
+    <ul>
+        <li><a href="#master-sigs">Master Key Signatures</a></li>
+        <li><a href="#visualization">Visualization of PGP Master and Developer Keys</a></li>
+        <li><a href="#cross-sigs">Developer Cross-Signatures</a></li>
+    </ul>
+</div>
+
+<div class="box">
+    <h2 id="master-sigs">Master Key Signatures</h2>
+
     <p>The following table shows all active developers and trusted users along
     with the status of their personal signing key. A 'Yes' indicates that the
     personal key of the developer is signed by the given master key. A 'No'
@@ -89,14 +99,58 @@
         </tbody>
     </table>
 </div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+
+<div class="box">
+    <h2 id="visualization">Visualization of PGP Master and Developer Keys</h2>
+
+    <div id="visualize-keys" class="visualize-chart"></div>
+</div>
+
+<div class="box">
+    <h2 id="cross-sigs">Developer Cross-Signatures</h2>
+
+    <p>This table lists signatures directly between developer keys.</p>
+
+    <table class="pretty2" id="cross-signatures">
+        <thead>
+            <tr>
+                <th>Signer</th>
+                <th>Signee</th>
+                <th>Created</th>
+                <th>Expires</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for sig in cross_signatures %}
+            <tr>
+                <td>{% user_pgp_key_link sig.signer %}</td>
+                <td>{% user_pgp_key_link sig.signee %}</td>
+                <td>{{ sig.created }}</td>
+                <td>{{ sig.expires|default:"" }}</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+{% endblock %}
+
+{% block script_block %}
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
+<script type="text/javascript" src="{% static "d3-3.0.6.min.js" %}"></script>
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
+<script type="text/javascript" src="{% static "visualize.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $("#key-status").tablesorter({
+        sortLocaleCompare: true,
         headers: { 1: { sorter: false } }
     });
+    $("#cross-signatures").tablesorter({
+        sortLocaleCompare: true
+    });
+});
+$(document).ready(function() {
+    developer_keys("#visualize-keys", "{% url 'pgp-keys-json' %}");
 });
 </script>
 {% endblock %}
diff --git a/templates/public/userlist.html b/templates/public/userlist.html
index 197346c3..6292af83 100644
--- a/templates/public/userlist.html
+++ b/templates/public/userlist.html
@@ -1,8 +1,11 @@
 {% extends "base.html" %}
+{% load static from staticfiles %}
 {% load cache %}
 
 {% block title %}{{ BRANDING_DISTRONAME }} - {{ user_type }}{% endblock %}
 
+{% block head %}<link rel="stylesheet" type="text/css" href="{% static "flags/fam.css" %}" media="screen, projection" />{% endblock %}
+
 {% block content %}
 {% cache 600 dev-tu-profiles user_type %}
 <div id="dev-tu-profiles" class="box">