Merge branch 'archweb' into archweb-generic2

Conflicts:
	devel/views.py
	feeds.py
	public/views.py
	settings.py
	sitestatic/archweb.js
	templates/base.html
	templates/devel/profile.html
	templates/mirrors/status.html
	templates/news/view.html
	templates/packages/flaghelp.html
	templates/packages/opensearch.xml
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/registration/login.html
	templates/releng/results.html
	templates/todolists/public_list.html

1 files changed, 55 insertions, 32 deletions

diff --git a/templates/public/index.html b/templates/public/index.html
index 8856fd95..b32260b5 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 %}
 
@@ -46,19 +45,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>
@@ -71,17 +68,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>
@@ -89,7 +83,6 @@
             <input id="pkgsearch-field" type="text" name="q" size="18" maxlength="200" />
         </fieldset>
     </form>
-
 </div>
 
 <div id="pkg-updates" class="widget box">
@@ -111,7 +104,9 @@
         {% endfor %}
     </table>
 </div>
+{% endcache %}
 
+{% cache 59 main-page-right secure %}
 <div id="nav-sidebar" class="widget">
     <h4>Documentation</h4>
 
@@ -155,11 +150,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>
@@ -173,21 +169,17 @@
             title="Developer Wiki articles">Developer Wiki</a></li>
         <li><a href="/groups/"
             title="View the available package groups">Package Groups</a></li>
-        <li><a href="/todolists/"
+        <li><a href="/todo/"
             title="Developer 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 'Arch_Linux_Press_Review' %}"
             title="Arch Linux 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>
@@ -202,22 +194,53 @@
 
 <div id="home-donate-button" class="widget">
     <a href="https://co.clickandpledge.com/Default.aspx?WID=47294">
-        <img width="210" height="34" src="{% static "CP_EN_BK_S_001.gif" %}" alt="Donate via Click&amp;Pledge to Arch Linux" title="Donate via Click&amp;Pledge to Arch Linux"/>
+        <img width="210" height="34" src="{% static "click_and_pledge.png" %}" alt="Donate via Click&amp;Pledge to Arch Linux" title="Donate via Click&amp;Pledge to Arch Linux"/>
     </a>
 </div>
 
 <div id="arch-sponsors" class="widget">
-
     <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="Velocity Network">
         <img width="252" height="58" src="{% static "vnet_button.png" %}" alt="Velocity Network - It's about time" />
     </a>
-    <a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers">
-        <img width="252" height="58" src="{% static "sevenl_button.png" %}" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution" />
-    </a>
     <a href="http://www.airvm.com/ArchLinux" title="AirVM.com - Your Green Technology Partner">
-        <img width="252" height="58" src="{% static "airvm_button.png" %}" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" />
+        <img width="252" height="58" src="{% static "airvm_button.png" %}" alt="AirVM.com - Your Green Technology Partner" />
     </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 %}