Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	devel/views.py
	feeds.py
	templates/devel/index.html
	templates/packages/flag.html
	templates/public/index.html
	todolists/views.py
	urls.py

2 files changed, 95 insertions, 13 deletions

diff --git a/templates/devel/index.html b/templates/devel/index.html
index 11f73f3a..5913cdde 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
-{% block title %}Parabola - Developer Dashboard{% endblock %}
+{% load cache %}
+
+{% block title %}Parabola - Hacker Dashboard{% endblock %}
 
 {% block content %}
 <div id="dev-dashboard" class="box">
@@ -72,25 +74,44 @@
             <tr>
                 <th>Name</th>
                 <th>Creation Date</th>
+                <th>Creator</th>
                 <th>Description</th>
+                <th>Package Count</th>
+                <th>Incomplete Count</th>
+            </tr>
             </tr>
         </thead>
         <tbody>
             {% for todo in todos %}
-                <tr class="{% cycle 'odd' 'even' %}">
-                    <td><a href="{{ todo.get_absolute_url }}"
-                            title="View todo list: {{ todo.name }}">{{ todo.name }}</a></td>
-                    <td>{{ todo.date_added|date }}</td>
-                    <td class="wrap">{{ todo.description|urlize }}</td>
-                </tr>
+            <tr class="{% cycle 'odd' 'even' %}">
+                <td><a href="{{ todo.get_absolute_url }}"
+                        title="View todo list: {{ todo.name }}">{{ todo.name }}</a></td>
+                <td>{{ todo.date_added|date }}</td>
+                <td>{{ todo.creator.get_full_name }}</td>
+                <td class="wrap">{{ todo.description|urlize }}</td>
+                <td>{{ todo.pkg_count }}</td>
+                <td>{{ todo.incomplete_count }}</td>
+            </tr>
             {% empty %}
-                <tr class="empty"><td colspan="3"><em>No package todo lists to display</em></td></tr>
+            <tr class="empty"><td colspan="3"><em>No package todo lists to display</em></td></tr>
             {% endfor %}
         </tbody>
     </table>
 
+    <h3>Developer Reports</h3>
+    <ul>
+        <li><a href="reports/big/">Big</a>: All packages with compressed size &gt; 50 MiB</li>
+        <li><a href="reports/old/">Old</a>: Packages last built more than two years ago</li>
+        <li><a href="reports/uncompressed-man/">Uncompressed Manpages</a>: Self-explanatory</li>
+        <li><a href="reports/uncompressed-info/">Uncompressed Info Pages</a>: Self-explanatory</li>
+        <li><a href="reports/unneeded-orphans/">Unneeded Orphans</a>: Packages
+        that have no maintainer and are not required by any other package in
+        any repository</li>
+    </ul>
+
 </div><!-- #dev-dashboard -->
 
+{% cache 60 dev-dash-by-arch %}
 <div id="dash-by-arch" class="box">
 
     <h2>Stats by Architecture</h2>
@@ -117,9 +138,10 @@
             {% endfor %}
         </tbody>
     </table>
+</div>{# #dash-by-arch #}
+{% endcache %}
 
-</div><!-- #dash-by-arch -->
-
+{% cache 60 dev-dash-by-repo %}
 <div id="dash-by-repo" class="box">
 
     <h2>Stats by Repository</h2>
@@ -146,9 +168,10 @@
             {% endfor %}
         </tbody>
     </table>
+</div>{# dash-by-arch #}
+{% endcache %}
 
-</div><!-- dash-by-arch -->
-
+{% cache 60 dev-dash-by-maintainer %}
 <div id="dash-by-maintainer" class="box">
 
     <h2>Stats by Maintainer</h2>
@@ -184,8 +207,9 @@
             {% endfor %}
         </tbody>
     </table>
+</div>{# #dash-by-maintainer #}
+{% endcache %}
 
-</div><!-- #dash-by-maintainer -->
 {% load cdn %}{% jquery %}
 <script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="/media/archweb.js"></script>
diff --git a/templates/devel/packages.html b/templates/devel/packages.html
new file mode 100644
index 00000000..e0988c03
--- /dev/null
+++ b/templates/devel/packages.html
@@ -0,0 +1,58 @@
+{% extends "base.html" %}
+{% load attributes %}
+
+{% block title %}Arch Linux - {{ title }}{% endblock %}
+
+{% block content %}
+<div class="box">
+    <h2>{{ title }}</h2>
+    <p>{{ packages|length }} package{{ packages|pluralize }} found.</p>
+    <table class="results">
+        <thead>
+            <tr>
+                <th>Arch</th>
+                <th>Repo</th>
+                <th>Name</th>
+                <th>Version</th>
+                <th>Description</th>
+                <th>Last Updated</th>
+                <th>Build Date</th>
+                <th>Flag Date</th>
+                {% for name in column_names %}
+                <th>{{ name }}</th>
+                {% endfor %}
+            </tr>
+        </thead>
+        <tbody>
+            {% for pkg in packages %}
+            <tr class="{% cycle pkgr2,pkgr1 %}">
+                <td>{{ pkg.arch.name }}</td>
+                <td>{{ pkg.repo.name|capfirst }}</td>
+                <td><a href="{{ pkg.get_absolute_url }}"
+                        title="Package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
+                {% if pkg.flag_date %}
+                <td><span class="flagged">{{ pkg.full_version }}</span></td>
+                {% else %}
+                <td>{{ pkg.full_version }}</td>
+                {% endif %}
+                <td class="wrap">{{ pkg.pkgdesc }}</td>
+                <td>{{ pkg.last_update|date }}</td>
+                <td>{{ pkg.build_date|date }}</td>
+                <td>{{ pkg.flag_date|date }}</td>
+                {% for attr in column_attrs %}
+                <td>{{ pkg|attribute:attr }}</td>
+                {% endfor %}
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+{% load cdn %}{% jquery %}
+<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+    $(".results").tablesorter({widgets: ['zebra']});
+});
+</script>
+{% endblock %}