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

Conflicts:
	templates/devel/clock.html
	templates/packages/group_details.html
	templates/packages/groups.html

5 files changed, 19 insertions, 16 deletions

diff --git a/templates/devel/clock.html b/templates/devel/clock.html
index 60a365cd..ebc3b8bf 100644
--- a/templates/devel/clock.html
+++ b/templates/devel/clock.html
@@ -6,13 +6,13 @@
 <div id="dev-clocks-box" class="box">
     <h2>Hackers World Clocks</h2>
 
-	<p>This page helps prevent you from waking a sleeping hacker. It also
-	depends on hackers keeping the time zone information up to date, so if
-	you see 'UTC' listed, pester them to update their settings.</p>
-	<p>
-	Parbola Server Time: {{ now|date:"Y-m-d H:i T" }}<br/>
-	UTC Time: {{ utc_now|date:"Y-m-d H:i T" }}
-	</p>
+    <p>This page helps prevent you from waking a sleeping hacker. It also
+    depends on hackers keeping the time zone information up to date, so if
+    you see 'UTC' listed, pester them to update their settings.</p>
+    <p>
+    Parabola Server Time: {{ now|date:"Y-m-d H:i T" }}<br/>
+    UTC Time: {{ utc_now|date:"Y-m-d H:i T" }}
+    </p>
 
     <table id="clocks-table" class="results dash-stats">
         <thead>
@@ -27,7 +27,7 @@
         <tbody>
             {% for dev in developers %}
             <tr class="{% cycle 'odd' 'even' %}">
-                <td>{{ dev.get_full_name }}</td>
+                <td><a href="mailto:{{ dev.email }}">{{ dev.get_full_name }}</a></td>
                 <td>{{ dev.username }}</td>
                 <td>{{ dev.userprofile.location }}</td>
                 <td>{{ dev.userprofile.time_zone }}</td>
diff --git a/templates/packages/group_details.html b/templates/packages/group_details.html
index b02a51ce..ee4f61d3 100644
--- a/templates/packages/group_details.html
+++ b/templates/packages/group_details.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}Parabola - {{ groupname }} - Group Details{% endblock %}
+{% block title %}Parabola - {{ groupname }} - {{ arch.name }} - Group Details{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
diff --git a/templates/packages/groups.html b/templates/packages/groups.html
index f332e11d..941ec8de 100644
--- a/templates/packages/groups.html
+++ b/templates/packages/groups.html
@@ -1,10 +1,10 @@
 {% extends "base.html" %}
-{% block title %}Parabola - Package Groups{% endblock %}
+{% block title %}Parabola - Package Groups{% if arch %} - {{ arch }}{% endif %}{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
 <div class="box">
-    <h2>Package Groups Overview</h2>
+    <h2>Package Groups Overview{% if arch %} - {{ arch }}{% endif %}</h2>
     <table class="results">
         <thead>
             <tr>
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index ec3d274b..a9cce4a8 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -33,7 +33,7 @@
                     {{ pkg.approved_for_signoff|yesno:"Yes,No" }}</td>
                 <td>
                     <ul>
-                        <li><a href="/packages/signoff_package/{{pkg.arch}}/{{pkg.pkgname}}/"
+                        <li><a class="signoff-link" href="/packages/signoff_package/{{pkg.arch}}/{{pkg.pkgname}}/"
                             title="Signoff {{pkg.pkgname}} for {{pkg.arch}}">Signoff</a>
                         </li>
                         {% for signoff in pkg.signoffs %}
@@ -49,9 +49,12 @@
 </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'], sortList: [[1,0]]});
+    $('a.signoff-link').click(signoff_package);
+    $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0]],
+        headers: { 6: { sorter: false } } });
 });
 </script>
 {% endif %}
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 9622739f..046aed32 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -40,10 +40,10 @@
                 <td>
                     {% if pkg.complete %}
                     <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"
-                        class="complete" title="Toggle completion status">Complete</a>
+                        class="status-link complete" title="Toggle completion status">Complete</a>
                     {% else %}
                     <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"
-                        class="incomplete" title="Toggle completion status">Incomplete</a>
+                        class="status-link incomplete" title="Toggle completion status">Incomplete</a>
                     {% endif %}
                 </td>
             </tr>
@@ -56,7 +56,7 @@
 <script type="text/javascript" src="/media/archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-    $('a[href*=todo/flag]').click(todolist_flag);
+    $('a.status-link').click(todolist_flag);
     $(".results").tablesorter({
         widgets: ['zebra'],
         sortList: [[0,0], [1,0]],