list: Replace the 16-arrow* icons by glyphicons

They look more modern.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Acked-by: Stephen Finucane <stephen.finucane@intel.com>

diff --git a/htdocs/images/16-arrow-down.png b/htdocs/images/16-arrow-down.png
deleted file mode 100644 (file)
index fa0ff7b..0000000
Binary files a/htdocs/images/16-arrow-down.png and /dev/null differ

diff --git a/htdocs/images/16-arrow-up.png b/htdocs/images/16-arrow-up.png
deleted file mode 100644 (file)
index 60c4eb9..0000000
Binary files a/htdocs/images/16-arrow-up.png and /dev/null differ

diff --git a/patchwork/templates/patchwork/patch-list.html b/patchwork/templates/patchwork/patch-list.html
index 4b3cb23afe7217c075995a042fd5c305a9327f08..cd691aebd988a0a33bbf7af5ac85ede991857e45 100644 (file)
--- a/patchwork/templates/patchwork/patch-list.html
+++ b/patchwork/templates/patchwork/patch-list.html
@@ -53,14 +53,9 @@
    <th>
     {% ifequal order.name "name" %}
      <a class="colactive"
-      href="{% listurl order=order.reversed_name %}"><img
-      {% if order.reversed %}
-      src="{% static "images/16-arrow-up.png" %}"
-      {% else %}
-      src="{% static "images/16-arrow-down.png" %}"
-      {%endif%}
-      width="16" height="16"
-     ></a> <a class="colactive"
+      href="{% listurl order=order.reversed_name %}"><span
+             class="glyphicon glyphicon-chevron-{{ order.updown }}"
+      ></span></a> <a class="colactive"
       href="{% listurl order=order.reversed_name %}">Patch</a>
     {% else %}
      {% if not order.editable %}
@@ -80,14 +75,9 @@
    <th>
     {% ifequal order.name "date" %}
      <a class="colactive"
-      href="{% listurl order=order.reversed_name %}"><img
-      {% if order.reversed %}
-      src="{% static "images/16-arrow-up.png" %}"
-      {% else %}
-      src="{% static "images/16-arrow-down.png" %}"
-      {%endif%}
-      width="16" height="16"
-     ></a> <a class="colactive"
+      href="{% listurl order=order.reversed_name %}"><span
+             class="glyphicon glyphicon-chevron-{{ order.updown }}"
+      ></span></a> <a class="colactive"
       href="{% listurl order=order.reversed_name %}">Date</a>
     {% else %}
      {% if not order.editable %}
@@ -101,14 +91,9 @@
    <th>
     {% ifequal order.name "submitter" %}
      <a class="colactive"
-      href="{% listurl order=order.reversed_name %}"><img
-      {% if order.reversed %}
-      src="{% static "images/16-arrow-up.png" %}"
-      {% else %}
-      src="{% static "images/16-arrow-down.png" %}"
-      {%endif%}
-      width="16" height="16"
-     ></a> <a class="colactive"
+      href="{% listurl order=order.reversed_name %}"><span
+             class="glyphicon glyphicon-chevron-{{ order.updown }}"
+      ></span></a> <a class="colactive"
       href="{% listurl order=order.reversed_name %}">Submitter</a>
     {% else %}
      {% if not order.editable %}
@@ -122,14 +107,9 @@
    <th>
     {% ifequal order.name "delegate" %}
      <a class="colactive"
-      href="{% listurl order=order.reversed_name %}"><img
-      {% if order.reversed %}
-      src="{% static "images/16-arrow-up.png" %}"
-      {% else %}
-      src="{% static "images/16-arrow-down.png" %}"
-      {%endif%}
-      width="16" height="16"
-     ></a> <a class="colactive"
+      href="{% listurl order=order.reversed_name %}"><span
+             class="glyphicon glyphicon-chevron-{{ order.updown }}"
+      ></span></a> <a class="colactive"
       href="{% listurl order=order.reversed_name %}">Delegate</a>
     {% else %}
      {% if not order.editable %}
@@ -143,14 +123,9 @@
    <th>
     {% ifequal order.name "state" %}
      <a class="colactive"
-      href="{% listurl order=order.reversed_name %}"><img
-      {% if order.reversed %}
-      src="{% static "images/16-arrow-up.png" %}"
-      {% else %}
-      src="{% static "images/16-arrow-down.png" %}"
-      {%endif%}
-      width="16" height="16"
-     ></a> <a class="colactive"
+      href="{% listurl order=order.reversed_name %}"><span
+             class="glyphicon glyphicon-chevron-{{ order.updown }}"
+      ></span></a> <a class="colactive"
       href="{% listurl order=order.reversed_name %}">State</a>
     {% else %}
      {% if not order.editable %}

diff --git a/patchwork/utils.py b/patchwork/utils.py
index 0dfe8dce2ded74a3db4fb484dbc1a1346a18f5d3..d69cb210ace4fa715adc5305d7fb2d38acc59ed7 100644 (file)
--- a/patchwork/utils.py
+++ b/patchwork/utils.py
@@ -93,6 +93,11 @@ class Order(object):
         else:
             return '-' + self.order
 
+    def updown(self):
+        if self.reversed:
+            return 'up'
+        return 'down'
+
     def apply(self, qs):
         q = self.order_map[self.order]
         if self.reversed: