From 1cc2b42fa117ac7469e8b2036bce11a349ac635e Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 8 Mar 2012 11:38:14 -0600
Subject: Encourage robots to not dive into search results pages

Add a meta tag for all search results pages past the first.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/search.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/packages/search.html b/templates/packages/search.html
index 800b883d..0c67b86a 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -6,6 +6,7 @@
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block head %}
+{% if is_paginated and page_obj.number > 1 %}<meta name="robots" content="noindex, nofollow"/>{% endif %}
 <link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/widgets.css" />
 {% endblock %}
 
-- 
cgit v1.1-4-g5e80


From c919e337bf6afff22172a4a1f03581bc389431cd Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 7 Mar 2012 23:44:52 -0600
Subject: Break out search paginator into template

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 sitestatic/archweb.css                   |  3 +-
 templates/packages/search.html           | 50 ++------------------------------
 templates/packages/search_paginator.html | 27 +++++++++++++++++
 3 files changed, 30 insertions(+), 50 deletions(-)
 create mode 100644 templates/packages/search_paginator.html

diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css
index d653d98c..1a9d03bd 100644
--- a/sitestatic/archweb.css
+++ b/sitestatic/archweb.css
@@ -645,8 +645,7 @@ div#pkglist-about {
 }
 
 /* pkglist: results navigation */
-#pkglist-stats-top,
-#pkglist-stats-bottom {
+.pkglist-stats {
     font-size: 0.85em;
 }
 
diff --git a/templates/packages/search.html b/templates/packages/search.html
index 0c67b86a..ae67b184 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -52,31 +52,7 @@
 
 {% if package_list %}
 <div id="pkglist-results" class="box">
-
-    {% if paginator %}
-    <div id="pkglist-stats-top">
-
-        <p>{{paginator.count}} packages found.
-        Page {{page_obj.number}} of {{paginator.num_pages}}.</p>
-
-        <p class="pkglist-nav">
-            {% if page_obj.has_previous %}
-            <a class="prev" href="/packages/{{page_obj.previous_page_number}}/?{{current_query}}"
-                title="Go to previous page">&lt; Prev</a>
-            {% else %}
-            <span class="prev">&lt; Prev</span>
-            {% endif %}
-            {% if page_obj.has_next %}
-            <a class="next" href="/packages/{{page_obj.next_page_number}}/?{{current_query}}"
-                title="Go to next page">Next &gt;</a>
-            {% else %}
-            <span class="next">Next &gt;</span>
-            {% endif %}
-        </p>
-
-    </div>
-    {% endif %}
-
+    {% include "packages/search_paginator.html" %}
     <form id="pkglist-results-form" method="post" action="/packages/update/">{% csrf_token %}
 
         <table class="results">
@@ -120,29 +96,7 @@
             {% endfor %}
             </tbody>
         </table>
-
-        {% if paginator %}
-        <div id="pkglist-stats-bottom">
-
-            <p>{{paginator.count}} packages found. Page {{page_obj.number}} of {{paginator.num_pages}}.</p>
-
-                <p class="pkglist-nav">
-                    {% if page_obj.has_previous %}
-                    <a class="prev" href="/packages/{{page_obj.previous_page_number}}/?{{current_query}}"
-                        title="Go to previous page">&lt; Prev</a>
-                    {% else %}
-                    <span class="prev">&lt; Prev</span>
-                    {% endif %}
-                    {% if page_obj.has_next %}
-                    <a class="next" href="/packages/{{page_obj.next_page_number}}/?{{current_query}}"
-                        title="Go to next page">Next &gt;</a>
-                    {% else %}
-                    <span class="next">Next &gt;</span>
-                    {% endif %}
-                </p>
-
-        </div>
-        {% endif %}
+        {% include "packages/search_paginator.html" %}
 
         {% if perms.main.change_package %}
         <p><input title="Adopt selected packages" type="submit" id="adopt-btn"
diff --git a/templates/packages/search_paginator.html b/templates/packages/search_paginator.html
new file mode 100644
index 00000000..362b7cb3
--- /dev/null
+++ b/templates/packages/search_paginator.html
@@ -0,0 +1,27 @@
+<div class="pkglist-stats">
+    {% if is_paginated %}
+    <p>{{paginator.count}} packages found.
+    Page {{page_obj.number}} of {{paginator.num_pages}}.</p>
+
+    <div class="pkglist-nav">
+    <span class="prev">
+        {% if page_obj.has_previous %}
+        <a href="/packages/{{page_obj.previous_page_number}}/?{{current_query}}"
+            title="Go to previous page">&lt; Prev</a>
+        {% else %}
+        &lt; Prev
+        {% endif %}
+    </span>
+    <span class="next">
+        {% if page_obj.has_next %}
+        <a href="/packages/{{page_obj.next_page_number}}/?{{current_query}}"
+            title="Go to next page">Next &gt;</a>
+        {% else %}
+        Next &gt;
+        {% endif %}
+    </span>
+    </div>
+    {% else %}
+    <p>{{ package_list.count }} packages found.</p>
+    {% endif %}
+</div>
-- 
cgit v1.1-4-g5e80


From 749b0447287332c200585c2eb7ef6c4833b815d5 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Fri, 9 Mar 2012 11:26:00 -0600
Subject: Ensure users only show up once on the Fellows page

If a user was in both Developer and TU groups, they would show up twice.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 public/views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/views.py b/public/views.py
index 66c3a74f..1f7006a6 100644
--- a/public/views.py
+++ b/public/views.py
@@ -49,6 +49,7 @@ def userlist(request, user_type='devs'):
     else:
         raise Http404
 
+    users = users.distinct()
     context = USER_LISTS[user_type].copy()
     context['users'] = users
     return direct_to_template(request, 'public/userlist.html', context)
-- 
cgit v1.1-4-g5e80


From 6ee65265a051933ee154c42490fdc509b9994202 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 12 Mar 2012 13:13:11 -0400
Subject: Show first 300 words of most recent news item on home page

And 100 words of every other news item. We might as well make the most
recent item more prominent. I'm not displaying it in full only so the
front page doesn't look like a blog; 95% of our news items are under 300
words.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/public/index.html | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/templates/public/index.html b/templates/public/index.html
index a57ed8aa..00edf8c4 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -9,7 +9,6 @@
 {% block content_left %}
 {% cache 62 main-page-left secure %}
 <div id="intro" class="box">
-
     <h2>A simple, lightweight distribution</h2>
 
     <p>You've reached the website for <strong>Arch Linux</strong>, a
@@ -33,11 +32,9 @@
 
     <p class="readmore"><a href="{% url page-about %}"
         title="Learn more about Arch Linux">Learn more...</a></p>
-
 </div>
 
 <div id="news">
-
     <h3>
         <a href="{% url news-list %}" title="Browse the news archives">Latest News</a>
         <span class="arrow"></span>
@@ -53,7 +50,10 @@
             title="View full article: {{ news.title }}">{{ news.title }}</a>
     </h4>
     <p class="timestamp">{{ news.postdate|date }}</p>
-    <div class="article-content">{{ news.content|markdown|truncatewords_html:75 }}</div>
+    <div class="article-content">
+        {% if forloop.counter0 == 0 %}{{ news.content|markdown|truncatewords_html:300 }}
+        {% else %}{{ news.content|markdown|truncatewords_html:100 }}{% endif %}
+    </div>
     {% else %}
     {% if forloop.counter0 == 5 %}
     <h3>
@@ -73,7 +73,6 @@
     {% endif %}
     {% endif %}
     {% endfor %}
-
 </div>
 {% endcache %}
 {% endblock %}
@@ -81,7 +80,6 @@
 {% block content_right %}
 {% cache 59 main-page-right secure %}
 <div id="pkgsearch" class="widget">
-
     <form id="pkgsearch-form" method="get" action="/packages/">
         <fieldset>
             <label for="pkgsearch-field">Package Search:</label>
@@ -92,7 +90,6 @@
 </div>
 
 <div id="pkg-updates" class="widget box">
-
     <h3>Recent Updates <span class="more">(<a href="/packages/?sort=-last_update"
             title="Browse all of the latest packages">more</a>)</span></h3>
 
@@ -113,7 +110,6 @@
 </div>
 
 <div id="nav-sidebar" class="widget">
-
     <h4>Documentation</h4>
 
     <ul>
-- 
cgit v1.1-4-g5e80