From 84120c0fa615aed55d578379bcd10398f56a26f1 Mon Sep 17 00:00:00 2001
From: Belen Barros Pena <belen.barros.pena@intel.com>
Date: Wed, 18 Feb 2015 16:36:15 +0000
Subject: [PATCH] rrs: Set of UI improvments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Give some space to the tabs,
	Add some top margin to the nav-pills class so we
	create some breathing space between the milestone
	overview and the tabs.

Change 'No Maintainer' to 'No maintainer'
	Just to keep the capitalisation style consistent
	across the interface.

Apply the muted class to all not-sortable table headings
	The class was missing from the Recipe and Maintainer
	columns in the recipes table; and from the Not updated
	and % done column in the maintainers table.

Remove the strong tag from the recipe status information
	This is just to match the presentation of the milestone
	overview information in the base_toplevel.html template.

Separate the footer from the bottom of the viewport,
	It's hard to see the footer on click on its links when
	they are so close to the bottom of the veiwport, so
	add some margin at the bottom of the footer <div>.

Change the label of the recipes tab,
	From 'Recipes status' to 'Recipes upstream status' to
	match the label of the 'Upstream status' filter in the
	recipes table.

Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
 layerindex/static/css/additional.css |  1 +
 rrs/fixtures/initial_data.json       |  2 +-
 rrs/static/css/rrs-additional.css    |  4 ++++
 rrs/views.py                         |  2 +-
 templates/rrs/base_toplevel.html     |  2 +-
 templates/rrs/maintainers.html       |  4 ++--
 templates/rrs/recipedetail.html      | 12 ++++++------
 7 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/layerindex/static/css/additional.css b/layerindex/static/css/additional.css
index 324ee34..9d3f2bf 100644
--- a/layerindex/static/css/additional.css
+++ b/layerindex/static/css/additional.css
@@ -33,6 +33,7 @@ textarea {
 
 .footer {
     text-align: center;
+    margin-bottom: 40px;
 }
 
 .description {
diff --git a/rrs/fixtures/initial_data.json b/rrs/fixtures/initial_data.json
index e2f98a0..03b8f0d 100644
--- a/rrs/fixtures/initial_data.json
+++ b/rrs/fixtures/initial_data.json
@@ -3,7 +3,7 @@
         "pk": 0, 
         "model": "rrs.maintainer", 
         "fields": {
-            "name": "No Maintainer", 
+            "name": "No maintainer", 
             "email": ""
         }
     },
diff --git a/rrs/static/css/rrs-additional.css b/rrs/static/css/rrs-additional.css
index c199c1c..d052540 100644
--- a/rrs/static/css/rrs-additional.css
+++ b/rrs/static/css/rrs-additional.css
@@ -35,6 +35,10 @@
     margin-top: 5px;
 }
 
+.nav-pills {
+	margin-top: 40px;
+}
+
 /* Sorting styles  */
 th > a, th.muted {
     font-weight: normal;
diff --git a/rrs/views.py b/rrs/views.py
index e28e237..9b8551a 100644
--- a/rrs/views.py
+++ b/rrs/views.py
@@ -227,7 +227,7 @@ class RecipeListView(ListView):
         context['upstream_status_choices'] = [ruch['N'], ruch['C'], ruch['Y'], ruch['U']]
 
         context['maintainer_name'] = self.maintainer_name
-        context['set_maintainers'] =  ['All', 'No Maintainer']
+        context['set_maintainers'] =  ['All', 'No maintainer']
         all_maintainers = []
         for rm in RecipeMaintainer.objects.filter(history =
                 self.recipe_maintainer_history).values(
diff --git a/templates/rrs/base_toplevel.html b/templates/rrs/base_toplevel.html
index ceee760..3339000 100644
--- a/templates/rrs/base_toplevel.html
+++ b/templates/rrs/base_toplevel.html
@@ -87,7 +87,7 @@
                 <li>
                 <a href="{% url 'recipes' release_name milestone_name %}{{ extra_url_param }}">
 		{% endif %}
-                Recipes status</a>
+                Recipes upstream status</a>
                 </li>
 
                 {% if this_url_name == 'maintainers' %}
diff --git a/templates/rrs/maintainers.html b/templates/rrs/maintainers.html
index cd0fe7a..e52f3c7 100644
--- a/templates/rrs/maintainers.html
+++ b/templates/rrs/maintainers.html
@@ -40,10 +40,10 @@
         <th class="sorted">Maintainer</th>
         <th class="muted">Assigned recipes</th>
         <th class="muted">Up-to-date</th>
-        <th>Not updated</th>
+        <th class="muted">Not updated</th>
         <th class="muted">Can't be updated</th>
         <th class="muted">Unknown</th>
-        <th>% done</th>
+        <th class="muted">% done</th>
 
         {% for i in intervals %}
         {% if current_interval == forloop.counter0 %}
diff --git a/templates/rrs/recipedetail.html b/templates/rrs/recipedetail.html
index 3e2c55b..1506fec 100644
--- a/templates/rrs/recipedetail.html
+++ b/templates/rrs/recipedetail.html
@@ -31,20 +31,20 @@
     <div class="navbar-inner">
         <ul class="nav">
             {% if upstream_status == "Up-to-date" %}
-            <li class="lead">Upstream status: <strong class="text-success">{{ upstream_status }}</strong></li>
+            <li class="lead">Upstream status: <span class="text-success">{{ upstream_status }}</span></li>
             {% elif upstream_status == "Not updated" %}
-            <li class="lead">Upstream status: <strong class="text-error">{{ upstream_status }}</strong></li>
+            <li class="lead">Upstream status: <span class="text-error">{{ upstream_status }}</span></li>
             {% elif upstream_status == "Can't be updated" %}
-            <li class="lead">Upstream status: <strong class="muted">{{ upstream_status }}</strong></li>
+            <li class="lead">Upstream status: <span class="muted">{{ upstream_status }}</span></li>
             {% else %}
-            <li class="lead">Upstream status: <strong class="text-warning">{{ upstream_status }}</strong></li>
+            <li class="lead">Upstream status: <span class="text-warning">{{ upstream_status }}</span></li>
             {% endif %}
             {% if upstream_status == "Not updated" or upstream_status == "Can't be updated" %}
             <li class="divider-vertical"></li>
-            <li class="lead">Upstream version: <strong>{{ upstream_version }}</strong></li>
+            <li class="lead">Upstream version: <span>{{ upstream_version }}</span></li>
             {% endif %}
             <li class="divider-vertical"></li>
-            <li class="lead">Maintainer: <strong><a href="{% url recipes release_name milestone_name %}?maintainer_name={{ maintainer_name|urlencode }}">{{ maintainer_name }}</a></strong></li>
+            <li class="lead">Maintainer: <span><a href="{% url recipes release_name milestone_name %}?maintainer_name={{ maintainer_name|urlencode }}">{{ maintainer_name }}</a></span></li>
             <li class="divider-vertical"></li>
         </ul>
     </div>