From 742128c517587b541748cee9cac8da45386984a1 Mon Sep 17 00:00:00 2001
From: Mariano Lopez <mariano.lopez@linux.intel.com>
Date: Mon, 17 Aug 2015 10:30:13 -0500
Subject: [PATCH] rrs/base_toplevel.html: Navbar redesign
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This provides changes in the front end for the
navbar, now it shows the percentage of recipes
up-to-date, not update, unknown and can't be
updated along with the number of recipes.

This also moves the update percentage to the
end and adds clarity to what it means.

This also moves the export list button the the
top bar.

[YOCTO #8020]

Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
 rrs/static/css/rrs-additional.css | 13 ++++++---
 templates/rrs/base_toplevel.html  | 44 +++++++++++++++++++------------
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/rrs/static/css/rrs-additional.css b/rrs/static/css/rrs-additional.css
index bdfa151..0066945 100644
--- a/rrs/static/css/rrs-additional.css
+++ b/rrs/static/css/rrs-additional.css
@@ -43,6 +43,11 @@
 	margin-top: 40px;
 }
 
+.nav > li.lead {
+	margin: 5px 25px 0 5px;
+}
+
+
 /* Sorting styles  */
 th > a, th.muted {
     font-weight: normal;
@@ -71,6 +76,10 @@ th > a, th.muted {
 	margin-bottom: 0;
 }
 
+.navbar .nav > li > .secondary-info {
+    font-size:70%;
+}
+
 .navbar .badge {
 	margin-top: 10px;
 	margin-right: 10px;
@@ -104,10 +113,6 @@ th > a, th.muted {
 	padding: 8px 14px 8px 14px;
 }
 
-.nav > li.lead {
-	margin: 5px 0 0 5px;
-}
-
 
 /* about recipe styles */
 
diff --git a/templates/rrs/base_toplevel.html b/templates/rrs/base_toplevel.html
index fd0c96c..9e00cef 100644
--- a/templates/rrs/base_toplevel.html
+++ b/templates/rrs/base_toplevel.html
@@ -51,6 +51,7 @@
     </li>
 {% endblock %}
 </ul>
+                    <a href="{% url 'recipesreport' release_name milestone_name %}" class="btn pull-right">Export recipe list</a>
 {% endblock %}
 
 {% block content %}
@@ -58,25 +59,34 @@
 
             <div class="navbar">
                 <div class="navbar-inner">
-                    <span class="brand">
-                        {{ release_name }}
-                        {% if milestone_name != "All" %}
-                        {{ milestone_name }}
-                        {% endif %}
-                    </span>
                     <ul class="nav">
-                        <li class="divider-vertical"></li>
-                        <li class="lead" id="percentage" data-toggle="tooltip" title="Upgrades done in the period divided by recipes not updated at the beginning of the period"><strong>{{ recipes_percentage }}%</strong> Updated</li>
-                        <li class="divider-vertical"></li>
-                        <li class="lead" id="up-to-date-recipes">Up-to-date: <span class="text-success">{{ recipes_up_to_date }}</strong></li>
-                        <li class="divider-vertical"></li>
-                        <li class="lead" id="not-updated-recipes">Not updated: <span class="text-error">{{ recipes_not_updated }}</strong></li>
-                        <li class="divider-vertical"></li>
-                        <li class="lead" id="cant-be-updated-recipes">Can't be updated: <span class="muted">{{ recipes_cant_be_updated }}</strong></li>
-                        <li class="divider-vertical"></li>
-                        <li class="lead" id="unknown-recipes">Unknown: <span class="text-warning">{{ recipes_unknown }}</strong></li>
+                        <li class="lead">
+                            {{ release_name }}
+                            {% if milestone_name != "All" %}
+                            {{ milestone_name }}
+                            {% endif %}
+                        </li>
+                        <li class="lead" id="up-to-date-recipes">
+                            <span class="text-success">{{ recipes_percentage_up_to_date }}%</span>
+                            <span class="secondary-info">up-to-date ({{ recipes_up_to_date }})</span>
+                        </li>
+                        <li class="lead" id="not-updated-recipes">
+                            <span class="text-error">{{ recipes_percentage_not_updated }}%</span>
+                            <span class="secondary-info">not updated ({{ recipes_not_updated }})</span>
+                        </li>
+                        <li class="lead" id="cant-be-updated-recipes">
+                            <span class="muted">{{ recipes_percentage_cant_be_updated }}%</span>
+                            <span class="secondary-info">can't be updated ({{ recipes_cant_be_updated }})</span>
+                        </li>
+                        <li class="lead" id="unknown-recipes">
+                            <span class="text-warning">{{ recipes_percentage_unknown }}%</span>
+                            <span class="secondary-info">unknown ({{ recipes_unknown }})</span>
+                        </li>
+                        <li class="lead" id="percentage">
+                            <span class="normal-text">{{ recipes_percentage }}%</span>
+                            <span class="secondary-info">of planned work done ({{ recipes_all_upgraded }} of {{ recipes_all_not_upgraded }})</span>
+                        </li>
                     </ul>
-                    <a href="{% url 'recipesreport' release_name milestone_name %}" class="btn pull-right">Export recipe list</a>
                     <ul class="nav">
                         {% block navs %}{% endblock %}
                     </ul>