Merge git://projects.archlinux.org/archweb

Conflicts:
	templates/public/index.html
	urls.py

6 files changed, 89 insertions, 60 deletions

diff --git a/templates/devel/index.html b/templates/devel/index.html
index e1fe8deb..54bb317d 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -11,7 +11,7 @@
     <table id="dash-myflagged" class="results dash-stats">
         <thead>
             <tr>
-                <th class="key">Name</th>
+                <th>Name</th>
                 <th>Repo</th>
                 <th>Version</th>
                 <th>Arch</th>
@@ -42,7 +42,7 @@
         <thead>
             <tr>
                 <th>Todo List</th>
-                <th class="key">Name</th>
+                <th>Name</th>
                 <th>Repo</th>
                 <th>Arch</th>
                 <th>Maintainer(s)</th>
@@ -78,10 +78,10 @@
         <tbody>
             {% for todo in todos %}
                 <tr class="{% cycle 'odd' 'even' %}">
-                    <td class="key"><a href="{{ todo.get_absolute_url }}"
+                    <td><a href="{{ todo.get_absolute_url }}"
                             title="View todo list: {{ todo.name }}">{{ todo.name }}</a></td>
                     <td>{{ todo.date_added }}</td>
-                    <td>{{ todo.description|safe }}</td>
+                    <td class="wrap">{{ todo.description|safe }}</td>
                 </tr>
             {% empty %}
                 <tr class="empty"><td colspan="3"><em>No package todo lists to display</em></td></tr>
diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html
index 7d022799..cd56f8f9 100644
--- a/templates/mirrors/status.html
+++ b/templates/mirrors/status.html
@@ -50,8 +50,12 @@
     </ul>
 
     <p>The last mirror check ran at {{ last_check|date:'Y-m-d H:i' }} UTC.
-    Checks have ran {{ num_checks }} times in the last {{ cutoff|hours }} at an average
-    interval of {{ check_frequency|duration }} (hh:mm).</p>
+    Checks have ran {{ num_checks }} times in the last {{ cutoff|hours }} at
+    an average interval of {{ check_frequency|duration }} (hh:mm).</p>
+
+    <p>This data is also available in <a href="json/">JSON format</a>. The
+    units of all time/duration values are in seconds; date/time values are
+    UTC.</p>
 
     <a name="outofsync" id="outofsync"></a>
     <h3>Out of Sync Mirrors</h3>
diff --git a/templates/packages/search.html b/templates/packages/search.html
index 6e430487..f23c93b8 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -84,6 +84,8 @@
                     <th>Description</th>
                     <th><a href="/packages/{% buildsortqs "-last_update" %}"
                             title="Sort packages by last update">Last Updated</a></th>
+                    <th><a href="/packages/{% buildsortqs "-flag_date" %}"
+                            title="Sort packages by when marked-out of-date">Flag Date</a></th>
                 </tr>
             </thead>
             <tbody>
@@ -103,6 +105,7 @@
                     {% endif %}
                     <td class="wrap">{{ pkg.pkgdesc }}</td>
                     <td>{{ pkg.last_update|date }}</td>
+                    <td>{{ pkg.flag_date|date }}</td>
                 </tr>
             {% endfor %}
             </tbody>
diff --git a/templates/public/index.html b/templates/public/index.html
index 708c5347..6555debc 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -75,10 +75,10 @@
         {% for update in pkg_updates %}
         {% with update|first as fpkg %}
         <tr>
-            <td class="pkg-name"><span class="{{ fpkg.repo.name|lower }}">{{ fpkg.pkgname }} {{ fpkg.pkgver }}-{{ fpkg.pkgrel }}</span></td>
+            <td class="pkg-name"><span class="{{ fpkg.repo|lower }}">{{ fpkg.pkgname }} {{ fpkg.pkgver }}-{{ fpkg.pkgrel }}</span></td>
             <td class="pkg-arch">
                 {% for pkg in update %}<a href="{{ pkg.get_absolute_url }}"
-                    title="View package details for {{ pkg.pkgname }}">{{ pkg.arch }}</a>{% if not forloop.last %}/{% endif %}{% endfor %}
+                    title="Details for {{ pkg.pkgname }} [{{ pkg.repo|lower }}]">{{ pkg.arch }}</a>{% if not forloop.last %}/{% endif %}{% endfor %}
             </td>
         </tr>
         {% endwith %}
diff --git a/templates/public/svn.html b/templates/public/svn.html
index 7b084379..10a58ba6 100644
--- a/templates/public/svn.html
+++ b/templates/public/svn.html
@@ -7,27 +7,29 @@
     The PKGBUILD files can be fetched via the ABS utility. To learn more
     about ABS, see <a href="https://wiki.archlinux.org/index.php/ABS">the ABS wiki page</a>.
     </p>
-    <p>
-    You can view the history of all the PKGBUILD files from the Repository
-    <a href="http://repos.archlinux.org/">WebSVN</a> interface.
-    </p>
+	<p>The SVN repositories have been cloned into git repositories and can be
+	viewed via the cgit interface.
+	<a href="http://projects.archlinux.org/svntogit/packages.git/">All
+		packages</a> are available here except for
+	<a href="http://projects.archlinux.org/svntogit/community.git/">community
+		and multilib</a> which are available in a different repository.</p>
     <p>
     You can also get individual PKGBUILDs directly from SVN. This can be
     especially useful if you need to compile an older version of a package.
     <strong>DO NOT CHECK OUT THE ENTIRE SVN REPO</strong>. Your address may be
     blocked.  Use the following commands to check out a specific package:
-    </p>
-    <pre>
-        svn checkout --depth=empty svn://svn.archlinux.org/packages
-        cd packages
-        svn update &lt;your-package-name&gt;
-    </pre>
-    For the community repository, use the following commands instead:
-    <pre>
-        svn checkout --depth=empty svn://svn.archlinux.org/community
-        cd community
-        svn update &lt;your-package-name&gt;
-    </pre>
+	</p>
+
+    <pre>svn checkout --depth=empty svn://svn.archlinux.org/packages
+cd packages
+svn update &lt;your-package-name&gt;</pre>
+
+	For the community and multilib repositories, use the following commands
+	instead:
+    <pre>svn checkout --depth=empty svn://svn.archlinux.org/community
+cd community
+svn update &lt;your-package-name&gt;</pre>
+
     <p>
     Visit <a href="https://wiki.archlinux.org/index.php?title=Getting_PKGBUILDS_From_SVN">the wiki</a>
     for more tips on checking out and updating svn PKGBUILDs.
diff --git a/templates/todolists/public_list.html b/templates/todolists/public_list.html
index 97a0325a..5b957692 100644
--- a/templates/todolists/public_list.html
+++ b/templates/todolists/public_list.html
@@ -5,44 +5,64 @@
 {% block content %}
 <div class="box">
     <h2>Developer Todo Lists</h2>
-    <div id="public_todo_lists">
-        {% for list in todo_lists %}
-            <h4>{{list.name}}</h4>
-            <div class="todo_list">
-                <p>{{list.description|safe|linebreaks}}</p>
-                <table "todo-pkglist-{{ list.id }}" class="results todo-table">
-                    <thead>
-                        <tr>
-                            <th>Name</th>
-                            <th>Arch</th>
-                            <th>Repo</th>
-                            <th>Maintainer</th>
-                            <th>Status</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for pkg in list.packages %}
-                        <tr class="{% cycle 'odd' 'even' %}">
-                            <td><a href="{{ pkg.pkg.get_absolute_url }}"
-                                    title="View package details for {{ pkg.pkg.pkgname }}">{{ pkg.pkg.pkgname }}</a></td>
-                            <td>{{ pkg.pkg.arch.name }}</td>
-                            <td>{{ pkg.pkg.repo.name|capfirst }}</td>
-                            <td>{{ pkg.pkg.maintainers|join:', ' }}</td>
-                            <td>
-                                {% if pkg.complete %}
-                                <span class="complete">Complete</a>
-                                {% else %}
-                                <span class="incomplete">Incomplete</a>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        {% endfor %}
+    <div id="public_todo_lists_toc">
+        <h3>Open Developer Todo Lists</h3>
+        <p>Todo lists are used by the developers when a rebuild of a set of
+        packages is needed. This is common when a library has an .so version
+        bump; during a toolchain rebuild, or a general cleanup of packages in
+        the repositories. The progress can be tracked here. Only todo lists
+        with currently incomplete packages are shown.</p>
+        {% if todo_lists %}<ul>
+            {% for list in todo_lists %}
+            <li><a href="#{{ list.id }}">{{ list.name }}</a></li>
+            {% endfor %}
+        </ul>{% else %}
+        <p>There are currently no incomplete developer todo lists.</p>
+        {% endif %}
     </div>
 </div>
+{% if todo_lists %}
+<div id="public_todo_lists">
+    {% for list in todo_lists %}
+    <div class="box">
+        <a name="{{ list.id }}"></a>
+        <h4>{{ list.name }}</h4>
+        <div class="todo_list">
+            <div>{{ list.description|safe|linebreaks }}</div>
+            <table id="todo-pkglist-{{ list.id }}" class="results todo-table">
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Arch</th>
+                        <th>Repo</th>
+                        <th>Maintainer</th>
+                        <th>Status</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for pkg in list.packages %}
+                    <tr class="{% cycle 'odd' 'even' %}">
+                        <td><a href="{{ pkg.pkg.get_absolute_url }}"
+                                title="View package details for {{ pkg.pkg.pkgname }}">{{ pkg.pkg.pkgname }}</a></td>
+                        <td>{{ pkg.pkg.arch.name }}</td>
+                        <td>{{ pkg.pkg.repo.name|capfirst }}</td>
+                        <td>{{ pkg.pkg.maintainers|join:', ' }}</td>
+                        <td>
+                            {% if pkg.complete %}
+                            <span class="complete">Complete</span>
+                            {% else %}
+                            <span class="incomplete">Incomplete</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+    {% endfor %}
+</div>
+{% endif %}
 {% load cdn %}{% jquery %}
 <script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
 <script type="text/javascript">