euscanwww: Watched herds/maintainers/categories panel

* Refactored templates and templatetags
* Added unfavourite views
* Added button to favourite/unfavourite package
* Panel for showing favourited objects

Signed-off-by: volpino <fox91@anche.no>

euscanwww/djeuscan/templates/euscan/_categories_table.html

@@ -0,0 +1,32 @@
+{% load url from future %}
+{% load euscan %}
+
+<table id="table" class="display">
+  <thead>
+    <th>Category</th>
+    <th><img src="{{ STATIC_URL }}img/gentoo-icon.png" alt="gentoo" title="Versions in Gentoo" /></th>
+    <th><img src="{{ STATIC_URL }}img/overlay-icon.png" alt="overlays" title="Versions in Overlays" /></th>
+    <th><img src="{{ STATIC_URL }}img/upstream-icon.png" alt="upstream" title="Versions only upstream" /></th>
+    <th><img src="{{ STATIC_URL }}img/freshness-icon.png" title="Freshness" /></th>
+    {% if extras %}
+    <th>Graphs</th>
+    {% endif %}
+  </thead>
+  <tbody>
+  {% for category in categories %}
+  <tr>
+    <td>
+      <a href="{% url "category" category.category %}">{{ category.category }}</a>
+      {% package_bar category %}
+    </td>
+    {% package_cols category %}
+    {% if extras %}
+    <td>
+      <img src="{% url "chart_category" category.category 'packages-monthly-small' %}" />
+      <img src="{% url "chart_category" category.category 'versions-monthly-small' %}" />
+    </td>
+    {% endif %}
+  </tr>
+  {% endfor %}
+  </tbody>
+</table>

euscanwww/djeuscan/templates/euscan/_herds_table.html

@@ -0,0 +1,34 @@
+{% load url from future %}
+{% load euscan %}
+
+<table id="table" class="display">
+  <thead>
+    <th>Herd</th>
+    <th><img src="{{ STATIC_URL }}img/gentoo-icon.png" alt="gentoo" title="Versions in Gentoo" /></th>
+    <th><img src="{{ STATIC_URL }}img/overlay-icon.png" alt="overlays" title="Versions in Overlays" /></th>
+    <th><img src="{{ STATIC_URL }}img/upstream-icon.png" alt="upstream" title="Versions only upstream" /></th>
+    <th><img src="{{ STATIC_URL }}img/freshness-icon.png" title="Freshness" /></th>
+    {% if extras %}
+    <th>Graphs</th>
+    {% endif %}
+  </thead>
+  <tbody>
+  {% for herd in herds %}
+    <tr>
+      <td>
+        <a href="{% url "herd" herd.herds__herd %}">
+          {{ herd.herds__herd }}
+        </a>
+        {% package_bar herd %}
+      </td>
+      {% package_cols herd %}
+      {% if extras %}
+        <td>
+          <img src="{% url "chart_herd" herd.herds__herd 'packages-monthly-small' %}" />
+          <img src="{% url "chart_herd" herd.herds__herd 'versions-monthly-small' %}" />
+        </td>
+      {% endif %}
+    </tr>
+  {% endfor %}
+  </tbody>
+</table>

euscanwww/djeuscan/templates/euscan/_maintainers_table.html

@@ -0,0 +1,40 @@
+{% load url from future %}
+{% load euscan %}
+
+<table id="table" class="display">
+  <thead>
+    <th>Maintainer</th>
+    <th><img src="{{ STATIC_URL }}img/gentoo-icon.png" alt="gentoo" title="Versions in Gentoo" /></th>
+    <th><img src="{{ STATIC_URL }}img/overlay-icon.png" alt="overlays" title="Versions in Overlays" /></th>
+    <th><img src="{{ STATIC_URL }}img/upstream-icon.png" alt="upstream" title="Versions only upstream" /></th>
+    <th><img src="{{ STATIC_URL }}img/freshness-icon.png" title="Freshness" /></th>
+    {% if extras %}
+      <th>Graphs</th>
+    {% endif %}
+  </thead>
+  <tbody>
+  {% for maintainer in maintainers %}
+    <tr>
+      <td>
+        <a href="{% url "maintainer" maintainer.maintainers__id %}">
+          {% if maintainer.maintainers__name != maintainer.maintainers__email %}
+            {{ maintainer.maintainers__name }} &lt;{{ maintainer.maintainers__email }}&gt;
+          {% else %}
+            {{ maintainer.maintainers__name }}
+          {% endif %}
+        </a>
+        {% package_bar maintainer %}
+      </td>
+      {% package_cols maintainer %}
+
+      {% if extras %}
+        <td>
+          <img src="{% url "chart_maintainer" maintainer.maintainers__id 'packages-monthly-small' %}" />
+          <img src="{% url "chart_maintainer" maintainer.maintainers__id 'versions-monthly-small' %}" />
+        </td>
+      {% endif %}
+
+    </tr>
+  {% endfor %}
+  </tbody>
+</table>

euscanwww/djeuscan/templates/euscan/_package_cols.html

@@ -1,4 +1,4 @@
-{% load packages %}
+{% load euscan %}
 {% load mul %}
 {% load sub %}
 {% load div %}

euscanwww/djeuscan/templates/euscan/_packages.html

@@ -1,4 +1,4 @@
-{% load packages %}
+{% load euscan %}
 {% load sub %}
 {% load div %}
 {% load mul %}

euscanwww/djeuscan/templates/euscan/accounts/categories.html

@@ -1,11 +1,15 @@
-{% extends "_base.html" %}
+{% extends "euscan/_datatable.html" %}
 {% load url from future %}
+{% load euscan %}
 
 {% block title %}
-  {{ block.super }} - My categories
+  {{ block.super }} - Watched categories
 {% endblock %}
 
 
 {% block content %}
-  <h2>Welcome {{ user }}</h2>
+  <h2>Watched categories</h2>
+
+  {% categories_table categories %}
+
 {% endblock %}

euscanwww/djeuscan/templates/euscan/accounts/herds.html

@@ -1,11 +1,14 @@
-{% extends "_base.html" %}
+{% extends "euscan/_datatable.html" %}
 {% load url from future %}
+{% load euscan %}
 
 {% block title %}
-  {{ block.super }} - My herds
+  {{ block.super }} - Watched herds
 {% endblock %}
 
 
 {% block content %}
-  <h2>Welcome {{ user }}</h2>
+  <h2>Watched herds</h2>
+
+  {% herds_table herds %}
 {% endblock %}

euscanwww/djeuscan/templates/euscan/accounts/maintainers.html

@@ -1,11 +1,14 @@
-{% extends "_base.html" %}
+{% extends "euscan/_datatable.html" %}
 {% load url from future %}
+{% load euscan %}
 
 {% block title %}
-  {{ block.super }} - My maintainer profiles
+  {{ block.super }} - Watched maintainers
 {% endblock %}
 
 
 {% block content %}
-  <h2>Welcome {{ user }}</h2>
+  <h2>Watched maintainers</h2>
+
+  {% maintainers_table maintainers %}
 {% endblock %}

euscanwww/djeuscan/templates/euscan/accounts/packages.html

@@ -1,15 +1,15 @@
 {% extends "euscan/_datatable.html" %}
 {% load url from future %}
 
-{% load packages %}
+{% load euscan %}
 
 {% block title %}
-  {{ block.super }} - My packages
+  {{ block.super }} - Watched packages
 {% endblock %}
 
 
 {% block content %}
-  <h2>My Packages</h2>
+  <h2>Watched packages</h2>
 
   {% packages packages %}
 

euscanwww/djeuscan/templates/euscan/categories.html

@@ -1,6 +1,6 @@
 {% extends "euscan/_datatable.html" %}
 
-{% load packages %}
+{% load euscan %}
 {% load url from future %}
 
 {% block title %}
@@ -10,33 +10,6 @@
 {% block content %}
 <h2>Categories</h2>
 
-<table id="table" class="display">
-  <thead>
-    <th>Category</th>
-    <th><img src="{{ STATIC_URL }}img/gentoo-icon.png" alt="gentoo" title="Versions in Gentoo" /></th>
-    <th><img src="{{ STATIC_URL }}img/overlay-icon.png" alt="overlays" title="Versions in Overlays" /></th>
-    <th><img src="{{ STATIC_URL }}img/upstream-icon.png" alt="upstream" title="Versions only upstream" /></th>
-    <th><img src="{{ STATIC_URL }}img/freshness-icon.png" title="Freshness" /></th>
-    {% if request.GET.extras %}
-    <th>Graphs</th>
-    {% endif %}
-  </thead>
-  <tbody>
-  {% for category in categories %}
-  <tr>
-    <td>
-      <a href="{% url "category" category.category %}">{{ category.category }}</a>
-      {% package_bar category %}
-    </td>
-    {% package_cols category %}
-    {% if request.GET.extras %}
-    <td>
-      <img src="{% url "chart_category" category.category 'packages-monthly-small' %}" />
-      <img src="{% url "chart_category" category.category 'versions-monthly-small' %}" />
-    </td>
-    {% endif %}
-  </tr>
-  {% endfor %}
-  </tbody>
-</table>
+{% categories_table categories request.GET.extras %}
+
 {% endblock %}

euscanwww/djeuscan/templates/euscan/category.html

@@ -1,6 +1,6 @@
 {% extends "euscan/_datatable.html" %}
 
-{% load packages %}
+{% load euscan %}
 {% load url from future %}
 
 {% block title %}

euscanwww/djeuscan/templates/euscan/herd.html

@@ -1,6 +1,6 @@
 {% extends "euscan/_datatable.html" %}
 
-{% load packages %}
+{% load euscan %}
 {% load url from future %}
 
 {% block title %}

euscanwww/djeuscan/templates/euscan/herds.html

@@ -1,6 +1,6 @@
 {% extends "euscan/_datatable.html" %}
 
-{% load packages %}
+{% load euscan %}
 {% load url from future %}
 
 {% block title %}
@@ -9,35 +9,7 @@
 
 {% block content %}
 <h2>Herds</h2>
-<table id="table" class="display">
-  <thead>
-    <th>Herd</th>
-    <th><img src="{{ STATIC_URL }}img/gentoo-icon.png" alt="gentoo" title="Versions in Gentoo" /></th>
-    <th><img src="{{ STATIC_URL }}img/overlay-icon.png" alt="overlays" title="Versions in Overlays" /></th>
-    <th><img src="{{ STATIC_URL }}img/upstream-icon.png" alt="upstream" title="Versions only upstream" /></th>
-    <th><img src="{{ STATIC_URL }}img/freshness-icon.png" title="Freshness" /></th>
-    {% if request.GET.extras %}
-    <th>Graphs</th>
-    {% endif %}
-  </thead>
-  <tbody>
-  {% for herd in herds %}
-    <tr>
-      <td>
-        <a href="{% url "herd" herd.herds__herd %}">
-          {{ herd.herds__herd }}
-        </a>
-        {% package_bar herd %}
-      </td>
-      {% package_cols herd %}
-      {% if request.GET.extras %}
-        <td>
-          <img src="{% url "chart_herd" herd.herds__herd 'packages-monthly-small' %}" />
-          <img src="{% url "chart_herd" herd.herds__herd 'versions-monthly-small' %}" />
-        </td>
-      {% endif %}
-    </tr>
-  {% endfor %}
-  </tbody>
-</table>
+
+{% herds_table herds request.GET.extras %}
+
 {% endblock %}

euscanwww/djeuscan/templates/euscan/maintainer.html

@@ -1,6 +1,6 @@
 {% extends "euscan/_datatable.html" %}
 
-{% load packages %}
+{% load euscan %}
 {% load url from future %}
 
 {% block title %}

euscanwww/djeuscan/templates/euscan/maintainers.html

@@ -1,6 +1,6 @@
 {% extends "euscan/_datatable.html" %}
 
-{% load packages %}
+{% load euscan %}
 {% load url from future %}
 
 {% block title %}
@@ -9,41 +9,7 @@
 
 {% block content %}
 <h2>Maintainers</h2>
-<table id="table" class="display">
-  <thead>
-    <th>Maintainer</th>
-    <th><img src="{{ STATIC_URL }}img/gentoo-icon.png" alt="gentoo" title="Versions in Gentoo" /></th>
-    <th><img src="{{ STATIC_URL }}img/overlay-icon.png" alt="overlays" title="Versions in Overlays" /></th>
-    <th><img src="{{ STATIC_URL }}img/upstream-icon.png" alt="upstream" title="Versions only upstream" /></th>
-    <th><img src="{{ STATIC_URL }}img/freshness-icon.png" title="Freshness" /></th>
-    {% if request.GET.extras %}
-      <th>Graphs</th>
-    {% endif %}
-  </thead>
-  <tbody>
-  {% for maintainer in maintainers %}
-    <tr>
-      <td>
-        <a href="{% url "maintainer" maintainer.maintainers__id %}">
-          {% if maintainer.maintainers__name != maintainer.maintainers__email %}
-            {{ maintainer.maintainers__name }} &lt;{{ maintainer.maintainers__email }}&gt;
-          {% else %}
-            {{ maintainer.maintainers__name }}
-          {% endif %}
-        </a>
-        {% package_bar maintainer %}
-      </td>
-      {% package_cols maintainer %}
 
-      {% if request.GET.extras %}
-        <td>
-          <img src="{% url "chart_maintainer" maintainer.maintainers__id 'packages-monthly-small' %}" />
-          <img src="{% url "chart_maintainer" maintainer.maintainers__id 'versions-monthly-small' %}" />
-        </td>
-      {% endif %}
+{% maintainers_table maintainers request.GET.extras %}
 
-    </tr>
-  {% endfor %}
-  </tbody>
-</table>
 {% endblock %}

euscanwww/djeuscan/templates/euscan/overlay.html

@@ -1,6 +1,6 @@
 {% extends "euscan/_datatable.html" %}
 
-{% load packages %}
+{% load euscan %}
 
 {% block title %}
 {{ block.super }} - Overlay: {{ overlay }}

euscanwww/djeuscan/templates/euscan/overlays.html

@@ -1,6 +1,6 @@
 {% extends "euscan/_datatable.html" %}
 
-{% load packages %}
+{% load euscan %}
 {% load url from future %}
 
 {% block title %}

euscanwww/djeuscan/templates/euscan/package.html

@@ -31,9 +31,12 @@
     <button class="refresh-button" data-package="{{ package.category }}/{{ package.name }}">
       Refresh
     </button>
-    <button class="favourite-button" data-url="{% url "favourite_package" package.category package.name %}">
+    <button class="favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_package" package.category package.name %}">
       Add to favourites
     </button>
+    <button class="unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_package" package.category package.name %}">
+      Remove from favourites
+    </button>
   {% endif %}
 </h2>
 <dl>
@@ -151,7 +154,15 @@
 
   $(".favourite-button").click(function() {
     $.post($(this).data("url"), function() {
-      alert("Favourited!");
+      $(".unfavourite-button").removeClass("hide");
+      $(".favourite-button").addClass("hide");
+    });
+  });
+
+  $(".unfavourite-button").click(function() {
+    $.post($(this).data("url"), function() {
+      $(".favourite-button").removeClass("hide");
+      $(".unfavourite-button").addClass("hide");
     });
   });
 </script>

euscanwww/djeuscan/templates/euscan/world_scan.html

@@ -1,6 +1,6 @@
 {% extends "euscan/_datatable.html" %}
 
-{% load packages %}
+{% load euscan %}
 
 {% block title %}
 {{ block.super }} - World Scan