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

Conflicts:
	templates/packages/packages_list.html
	templates/public/index.html

5 files changed, 24 insertions, 28 deletions

diff --git a/templates/devel/clock.html b/templates/devel/clock.html
index ebc3b8bf..cbf4b834 100644
--- a/templates/devel/clock.html
+++ b/templates/devel/clock.html
@@ -14,11 +14,12 @@
     UTC Time: {{ utc_now|date:"Y-m-d H:i T" }}
     </p>
 
-    <table id="clocks-table" class="results dash-stats">
+    <table id="clocks-table" class="results">
         <thead>
             <tr>
                 <th>Hacker</th>
                 <th>Username</th>
+                <th>Alias</th>
                 <th>Location</th>
                 <th>Time Zone</th>
                 <th>Current Time</th>
@@ -29,6 +30,7 @@
             <tr class="{% cycle 'odd' 'even' %}">
                 <td><a href="mailto:{{ dev.email }}">{{ dev.get_full_name }}</a></td>
                 <td>{{ dev.username }}</td>
+                <td>{{ dev.userprofile.alias }}</td>
                 <td>{{ dev.userprofile.location }}</td>
                 <td>{{ dev.userprofile.time_zone }}</td>
                 <td>{{ dev.current_time|date:"Y-m-d H:i T" }}</td>
diff --git a/templates/devel/index.html b/templates/devel/index.html
index 260e0cb9..11f73f3a 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -8,7 +8,7 @@
 
     <h3>My Flagged Packages</h3>
 
-    <table id="dash-myflagged" class="results dash-stats">
+    <table id="dash-myflagged" class="results">
         <thead>
             <tr>
                 <th>Name</th>
@@ -38,7 +38,7 @@
 
     <h3>My Incomplete Todo List Packages</h3>
 
-    <table id="dash-mytodolist" class="results dash-stats">
+    <table id="dash-mytodolist" class="results">
         <thead>
             <tr>
                 <th>Todo List</th>
@@ -67,7 +67,7 @@
 
     <h3>Package Todo Lists</h3>
 
-    <table id="dash-todo" class="results dash-stats">
+    <table id="dash-todo" class="results">
         <thead>
             <tr>
                 <th>Name</th>
@@ -81,7 +81,7 @@
                     <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|safe }}</td>
+                    <td class="wrap">{{ todo.description|urlize }}</td>
                 </tr>
             {% empty %}
                 <tr class="empty"><td colspan="3"><em>No package todo lists to display</em></td></tr>
@@ -91,11 +91,9 @@
 
 </div><!-- #dev-dashboard -->
 
-<div id="dash-by-arch" class="dash-stats box">
+<div id="dash-by-arch" class="box">
 
-    <h3 class="dash-stats" style="cursor: pointer"
-        title="Click to toggle stats by architecture">
-        Stats by Architecture <span class="dash-click">(click to toggle)</span></h3>
+    <h2>Stats by Architecture</h2>
 
     <table id="stats-by-arch" class="results dash-stats">
         <thead>
@@ -122,11 +120,9 @@
 
 </div><!-- #dash-by-arch -->
 
-<div id="dash-by-repo" class="dash-stats box">
+<div id="dash-by-repo" class="box">
 
-    <h3 class="dashboard dash-stats" style="cursor: pointer"
-        title="Click to toggle stats by repository">
-        Stats by Repository <span class="dash-click">(click to toggle)</span></h3>
+    <h2>Stats by Repository</h2>
 
     <table id="stats-by-repo" class="results dash-stats">
         <thead>
@@ -153,11 +149,9 @@
 
 </div><!-- dash-by-arch -->
 
-<div id="dash-by-maintainer" class="dash-stats box">
+<div id="dash-by-maintainer" class="box">
 
-    <h3 class="dashboard dash-stats" style="cursor: pointer"
-        title="Click to toggle stats by maintainer">
-        Stats by Maintainer <span class="dash-click">(click to toggle)</span></h3>
+    <h2>Stats by Maintainer</h2>
 
     <table id="stats-by-maintainer" class="results dash-stats">
         <thead>
@@ -203,12 +197,9 @@ $(document).ready(function() {
         {widgets: ['zebra'], sortList: [[0,0], [1,0]]});
     $("#dash-todo:not(:has(tbody tr.empty))").tablesorter(
             {widgets: ['zebra'], sortList: [[1,1]]});
-    $("#stats-by-arch").add("#stats-by-repo").add("#stats-by-maintainer").tablesorter(
+    $(".dash-stats").tablesorter(
         {widgets: ['zebra'], sortList: [[0,0]],
         headers: { 1: { sorter: 'pkgcount' }, 2: { sorter: 'pkgcount' } } });
-    $("h3.dash-stats").click(
-        function(e) { $(this).next().toggle(); }
-    );
 });
 </script>
 {% endblock %}
diff --git a/templates/news/add.html b/templates/news/add.html
index 0534826c..fd75253c 100644
--- a/templates/news/add.html
+++ b/templates/news/add.html
@@ -23,14 +23,14 @@
         <p>
         <label></label>
         <input title="Save changes" type="submit" value="Save" />
-        <input id="previewbtn" title="Preview" type="button" value="Preview" />
+        <input id="news-preview-button" title="Preview" type="button" value="Preview" />
         </p>
     </form>
 </div>
 
-<div class="news-article box" style="display:none;">
-    <h2>News Preview: <span id="previewtitle"></span></h2>
-    <div id="previewdata" class="article-content"></div>
+<div id="news-preview" class="news-article box" style="display:none;">
+    <h2>News Preview: <span id="news-preview-title"></span></h2>
+    <div id="news-preview-data" class="article-content"></div>
 </div>
 {% load cdn %}{% jquery %}
 <script type="text/javascript" src="/media/archweb.js"></script>
diff --git a/templates/packages/details.html b/templates/packages/details.html
index 8cda7ca3..83673867 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -96,7 +96,8 @@
             <td><a href="{{ pkg.base_package.get_absolute_url }}"
                     title="Package details for {{ pkg.base_package.pkgname }}">{{ pkg.pkgbase }}</a></td>
             {% else %}
-            <td>{{ pkg.pkgbase }}</td>
+            <td><a href="../{{ pkg.pkgbase }}/"
+                    title="Split package details for {{ pkg.pkgbase }}">{{ pkg.pkgbase }}</a></td>
             {% endif %}
         </tr>
         {% endifequal %}
diff --git a/templates/packages/group_details.html b/templates/packages/packages_list.html
index 2a5a6149..2508d8fd 100644
--- a/templates/packages/group_details.html
+++ b/templates/packages/packages_list.html
@@ -1,10 +1,10 @@
 {% extends "base.html" %}
-{% block title %}Parabola - {{ groupname }} - {{ arch.name }} - Group Details{% endblock %}
+{% block title %}Parabola - {{ name }} ({{ arch.name }}) - {{ list_title }}{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
 <div class="box">
-    <h2>Details for group {{ groupname }} - {{ arch.name }}</h2>
+    <h2>{{ list_title }} - {{ name }} ({{ arch.name }})</h2>
     <table class="results">
         <thead>
             <tr>
@@ -14,6 +14,7 @@
                 <th>Version</th>
                 <th>Description</th>
                 <th>Last Updated</th>
+                <th>Flag Date</th>
             </tr>
         </thead>
         <tbody>
@@ -30,6 +31,7 @@
                 {% endif %}
                 <td class="wrap">{{ pkg.pkgdesc }}</td>
                 <td>{{ pkg.last_update|date }}</td>
+                <td>{{ pkg.flag_date|date }}</td>
             </tr>
             {% endfor %}
         </tbody>