From 0d4e8283aed6796ef676eee978208be45ea48f18 Mon Sep 17 00:00:00 2001
From: volpino <fox91@anche.no>
Date: Fri, 20 Jul 2012 17:20:18 +0200
Subject: [PATCH] euscanwww: added alert on refresh request, added missing
 pull-right

Signed-off-by: volpino <fox91@anche.no>
---
 euscanwww/djeuscan/templates/euscan/category.html | 14 ++++++++------
 euscanwww/djeuscan/templates/euscan/herd.html     | 14 ++++++++------
 .../djeuscan/templates/euscan/maintainer.html     | 15 +++++++++------
 euscanwww/djeuscan/templates/euscan/overlay.html  | 14 ++++++++------
 euscanwww/djeuscan/templates/euscan/package.html  |  5 +++++
 5 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/euscanwww/djeuscan/templates/euscan/category.html b/euscanwww/djeuscan/templates/euscan/category.html
index 8474914..17f117b 100644
--- a/euscanwww/djeuscan/templates/euscan/category.html
+++ b/euscanwww/djeuscan/templates/euscan/category.html
@@ -20,12 +20,14 @@
   Category: {{ category }}
 
   {% if user.is_authenticated %}
-    <button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_category" category %}">
-      <img src="{{ STATIC_URL}}/img/watch-icon.png" alt="Watch" >
-    </button>
-    <button class="btn unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_category" category %}">
-      <img src="{{ STATIC_URL}}/img/unwatch-icon.png" alt="Unwatch" >
-    </button>
+    <span class="pull-right">
+      <button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_category" category %}">
+        <img src="{{ STATIC_URL}}/img/watch-icon.png" alt="Watch" >
+      </button>
+      <button class="btn unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_category" category %}">
+        <img src="{{ STATIC_URL}}/img/unwatch-icon.png" alt="Unwatch" >
+      </button>
+    </span>
   {% endif %}
 </h2>
 
diff --git a/euscanwww/djeuscan/templates/euscan/herd.html b/euscanwww/djeuscan/templates/euscan/herd.html
index 3dc1969..ee6ccd1 100644
--- a/euscanwww/djeuscan/templates/euscan/herd.html
+++ b/euscanwww/djeuscan/templates/euscan/herd.html
@@ -19,12 +19,14 @@
 <h2>
   Herd: {{ herd.herd }}
   {% if user.is_authenticated %}
-    <button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_herd" herd.herd %}">
-      <img src="{{ STATIC_URL}}/img/watch-icon.png" alt="Watch" >
-    </button>
-    <button class="btn unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_herd" herd.herd %}">
-      <img src="{{ STATIC_URL}}/img/unwatch-icon.png" alt="Unwatch" >
-    </button>
+    <span class="pull-right">
+      <button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_herd" herd.herd %}">
+        <img src="{{ STATIC_URL}}/img/watch-icon.png" alt="Watch" >
+      </button>
+      <button class="btn unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_herd" herd.herd %}">
+        <img src="{{ STATIC_URL}}/img/unwatch-icon.png" alt="Unwatch" >
+      </button>
+    </span>
   {% endif %}
 
 </h2>
diff --git a/euscanwww/djeuscan/templates/euscan/maintainer.html b/euscanwww/djeuscan/templates/euscan/maintainer.html
index 03bd60d..227a1d3 100644
--- a/euscanwww/djeuscan/templates/euscan/maintainer.html
+++ b/euscanwww/djeuscan/templates/euscan/maintainer.html
@@ -21,14 +21,17 @@
 <h2>
   Maintainer: {{ maintainer.name }} &lt{{ maintainer.email }}&gt
   {% if user.is_authenticated %}
-    <button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_maintainer" maintainer.id %}">
-      <img src="{{ STATIC_URL}}/img/watch-icon.png" alt="Watch" >
-    </button>
-    <button class="btn unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_maintainer" maintainer.id %}">
-      <img src="{{ STATIC_URL}}/img/unwatch-icon.png" alt="Unwatch" >
-    </button>
+    <span class="pull-right">
+      <button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_maintainer" maintainer.id %}">
+        <img src="{{ STATIC_URL}}/img/watch-icon.png" alt="Watch" >
+      </button>
+      <button class="btn unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_maintainer" maintainer.id %}">
+        <img src="{{ STATIC_URL}}/img/unwatch-icon.png" alt="Unwatch" >
+      </button>
+    </span>
   {% endif %}
 </h2>
+
 {% packages packages %}
 
 <h3>Statistics</h2>
diff --git a/euscanwww/djeuscan/templates/euscan/overlay.html b/euscanwww/djeuscan/templates/euscan/overlay.html
index 46249ea..5e2a8c1 100644
--- a/euscanwww/djeuscan/templates/euscan/overlay.html
+++ b/euscanwww/djeuscan/templates/euscan/overlay.html
@@ -11,12 +11,14 @@
 <h2>
   Overlay: {{ overlay }}
   {% if user.is_authenticated %}
-    <button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_overlay" overlay %}">
-      <img src="{{ STATIC_URL}}/img/watch-icon.png" alt="Watch" >
-    </button>
-    <button class="btn unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_overlay" overlay %}">
-      <img src="{{ STATIC_URL}}/img/unwatch-icon.png" alt="Unwatch" >
-    </button>
+    <span class="pull-right">
+      <button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_overlay" overlay %}">
+        <img src="{{ STATIC_URL}}/img/watch-icon.png" alt="Watch" >
+      </button>
+      <button class="btn unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_overlay" overlay %}">
+        <img src="{{ STATIC_URL}}/img/unwatch-icon.png" alt="Unwatch" >
+      </button>
+    </span>
   {% endif %}
 
 </h2>
diff --git a/euscanwww/djeuscan/templates/euscan/package.html b/euscanwww/djeuscan/templates/euscan/package.html
index 416cd03..40037d9 100644
--- a/euscanwww/djeuscan/templates/euscan/package.html
+++ b/euscanwww/djeuscan/templates/euscan/package.html
@@ -32,6 +32,10 @@
   </div>
 {% endif %}
 
+<div class="refresh-alert alert {% if not refreshed %}hide{% endif %}">
+  A refresh request is in progress, please wait...
+</div>
+
 <h2>
   {{ package.category }}/{{ package.name }}
 
@@ -214,6 +218,7 @@
         function() {
           $(".refresh-button").addClass("hide");
           $(".refresh-button-disabled").removeClass("hide");
+          $(".refresh-alert").show("slow");
         });
     });