From a11a34c60f2783063fbfe7be1712dde2006c3d76 Mon Sep 17 00:00:00 2001
From: Belen Barros Pena <belen.barros.pena@intel.com>
Date: Mon, 26 Jan 2015 12:17:18 +0000
Subject: bitbake: toaster: make layouts consistent

The layer details page should have the same layout as all
other detail pages (recipes, packages). For this to happen,
the basebuilddetailpage.html and baseprojectpage.html
templates should use the same layout, and so should the
layerdetails.html and recipe.html templates.

This patch also capitalises the string 'All layers' in the
breadcrumb of layerdetails.html as all other breadcrumb elements.

(Bitbake rev: 49d56fcbbf6b7d0c0c589b93182e4c73071b3fcf)

Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../toaster/toastergui/templates/baseprojectpage.html   | 12 ++++--------
 .../lib/toaster/toastergui/templates/layerdetails.html  | 17 ++++-------------
 bitbake/lib/toaster/toastergui/templates/project.html   |  4 ++--
 3 files changed, 10 insertions(+), 23 deletions(-)

(limited to 'bitbake')

diff --git a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
index 95a9f470ba..e1409252eb 100644
--- a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
+++ b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
@@ -4,7 +4,7 @@
 {% block pagecontent %}
 
 
- <div class="">
+ <div class="row-fluid">
 <!-- Breadcrumbs -->
     <div class="section">
         <ul class="breadcrumb" id="breadcrumb">
@@ -28,14 +28,10 @@
         </script>
     </div>
 
-    <div>
+    <!-- Begin main page container -->
+    {% block projectinfomain %}{% endblock %}
+    <!-- End main container -->
 
-        <!-- Begin main page container -->
-        {% block projectinfomain %}{% endblock %}
-        <!-- End main container -->
-
-
-    </div>
   </div>
 
 
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
index 5bed0f8f06..22e99e0ecc 100644
--- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html
+++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
@@ -3,7 +3,7 @@
 {% load humanize %}
 {% load static %}
 {% block localbreadcrumb %}
-<li><a href="{% url 'layers' %}">All Layers</a></li>
+<li><a href="{% url 'layers' %}">All layers</a></li>
 <li>
   {{layerversion.layer.name}} ({{layerversion.commit|truncatechars:13}})
 </li>
@@ -63,18 +63,13 @@
 {% endif %}
 
 {% include "layers_dep_modal.html" %}
- <div class="container-fluid top-padded">
-  <div class="row-fluid">
-    <div class="span11">
+  <div class="row-fluid span11">
       <div class="page-header">
         <h1>{{layerversion.layer.name}} <small class="commit" data-toggle="tooltip" title="{{layerversion.commit}}">({{layerversion.commit|truncatechars:13}})</small></h1>
       </div>
-    </div>
   </div>
 
-    <div class="row-fluid">
-    <div class="span7">
-      <div class="tabbable">
+    <div class="row-fluid span7 tabbable">
         <div class="alert alert-info lead" id="alert-area" style="display:none">
           <button type="button" class="close" id="dismiss-alert" data-dismiss="alert">&times;</button>
           <span id="alert-msg"></span>
@@ -91,7 +86,6 @@
             <a data-toggle="tab" href="#machines" id="machines-tab">Machines ({{total_machines}})</a>
           </li>
         </ul>
-      </div>
       <div class="tab-content">
         <span class="button-place">
           {% if layer_in_project == 0 %}
@@ -435,7 +429,7 @@
                   </div>
               </div>
             </div>
-            <div class="row span4 well">
+            <div class="row-fluid span4 well">
               <h2>About {{layerversion.layer.name}}</h2>
               <dl>
 
@@ -480,7 +474,4 @@
            </dl>
          </div>
 
-          </div>
-       </div>
-   </div>
 {% endblock %}
diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html
index b8579e45a6..3b75d1934c 100644
--- a/bitbake/lib/toaster/toastergui/templates/project.html
+++ b/bitbake/lib/toaster/toastergui/templates/project.html
@@ -91,7 +91,7 @@ vim: expandtab tabstop=2
   <div class="well">
     <form class="build-form" ng-submit="buildNamedTarget()">
       <div class="input-append controls">
-        <input type="text" class="huge span7" placeholder="Type the target(s) you want to build" autocomplete="off" ng-model="targetName" typeahead="e.name for e in getAutocompleteSuggestions('targets', $viewValue)|filter:$viewValue" typeahead-template-url="suggestion_details" ng-disabled="!layers.length"/>
+        <input type="text" class="huge input-xxlarge" placeholder="Type the target(s) you want to build" autocomplete="off" ng-model="targetName" typeahead="e.name for e in getAutocompleteSuggestions('targets', $viewValue)|filter:$viewValue" typeahead-template-url="suggestion_details" ng-disabled="!layers.length"/>
         <button type="submit" class="btn btn-large btn-primary" ng-disabled="!targetName.length">
         Build
         </button>
@@ -337,7 +337,7 @@ vim: expandtab tabstop=2
       <p class="link-action">
             <a href="{% url 'projectconf' project.id %}" class="link">Edit configuration variables</a>
             <i data-original-title="You can set other project configuration options here. Each option, like everything else in the build system, is a variable - value pair" class="icon-question-sign get-help heading-help" title=""></i>
-			</p>
+            </p>
     </div>
   </div>
 
-- 
cgit v1.2.3-54-g00ecf