Merge branch 'archweb-generic' into master-nomake

1 files changed, 10 insertions, 49 deletions

diff --git a/templates/public/index.html b/templates/public/index.html
index 64d19e6d..e7174b45 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -110,7 +110,6 @@
 {% cache 115 main-page-right secure %}
 <div id="nav-sidebar" class="widget">
     <h4>Documentation</h4>
-
     <ul>
         <li><a href="{% wiki_url %}"
             title="Community documentation">Wiki</a></li>
@@ -123,7 +122,6 @@
     </ul>
 
     <h4>Community</h4>
-
     <ul>
         <li><a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/"
             title="Community and developer mailing lists">Mailing Lists</a></li>
@@ -134,14 +132,12 @@
     </ul>
 
     <h4>Support</h4>
-
     <ul>
         <li><a href="{% url 'page-donate' %}"
             title="Help support {{ BRANDING_DISTRONAME }}">Donate</a></li>
     </ul>
 
     <h4>Tools</h4>
-
     <ul>
         <li><a href="{% url 'mirrorlist' %}"
             title="Get a custom mirrorlist from our database">Mirrorlist Updater</a></li>
@@ -149,12 +145,9 @@
             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="{% url 'packages-differences' %}"
-            title="See differences in packages between available architectures">Differences Reports</a></li>
     </ul>
 
     <h4>Development</h4>
-
     <ul>
         <li><a href="{{ PROJECTS_URL }}"
             title="Official {{BRANDING_SHORTNAME}} projects (git)">Projects in Git</a></li>
@@ -172,22 +165,26 @@
             title="Release Engineering ISO listing">ISO Release List</a></li>
         <li><a href="{% url 'visualize-index' %}"
             title="View visualizations">Visualizations</a></li>
+        <li><a href="{% url 'packages-differences' %}"
+            title="See differences in packages between available architectures">Differences Reports</a></li>
     </ul>
 
-    <h4>More Resources</h4>
-
+    <h4>People</h4>
     <ul>
+        <li><a href="{% url 'page-devs' %}" title="Active hackers">Hackers</a></li>
+        <li><a href="{% url 'page-fellows' %}" title="Retired hackers">Fellows</a></li>
         <li><a href="{% url 'page-keys' %}"
             title="Package/Database signing master keys">Signing Master Keys</a></li>
+    </ul>
+
+    <h4>More Resources</h4>
+    <ul>
         <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>
         <li><a href="{% url 'news-list' %}" title="News Archives">News Archives</a></li>
         <li><a href="/feeds/" title="Various RSS Feeds">RSS Feeds</a></li>
-        <li><a href="{% url 'page-devs' %}" title="Active hackers">Hackers Profiles</a></li>
-        <li><a href="{% url 'page-fellows' %}" title="Retired hackers">Fellows Profiles</a></li>
     </ul>
-
 </div>
 
 {% comment %}
@@ -227,44 +224,8 @@ donate button would go here
 
 {% 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,
-        updater: function(item) {
-            $('#pkgsearch-field').val(item);
-            $('#pkgsearch-form').submit();
-            return item;
-        }
-    }).attr('autocomplete', 'off');
-    $('#pkgsearch-field').keyup(function(e) {
-        if (e.keyCode === 13 &&
-                $('ul.pkgsearch-typeahead li.active').size() === 0) {
-            $('#pkgsearch-form').submit();
-        }
-    });
-}
-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 });
+    $.ajax({ url: "{% static "homepage.js" %}", cache: true, dataType: "script", success: function() { setupTypeahead(); setupKonami("{% static "vector_tux.png" %}"); } });
 });
 </script>
 {% endblock %}