summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2015-08-28 17:27:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-29 14:03:52 +0100
commitae329b763304e14fc808e6150a8c076d4816303d (patch)
tree1486cf618f40a8c858e83d274fc449d35f2eba7e /bitbake/lib
parent7957e1f15f6a166c5cb4011c64794e9896632e70 (diff)
downloadpoky-ae329b763304e14fc808e6150a8c076d4816303d.tar.gz
bitbake: toaster: adjust spacing in project pages
Mainly in the top of the page, by adjusting some classes and the headings. Also, it removes the commented out tab for the 'My image recipes' section, since the final designs for image customisation do not need it. (Bitbake rev: 945746f21916eb64a0b4344bcf7e7e0dd75b9547) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html2
-rw-r--r--bitbake/lib/toaster/toastergui/templates/projectbuilds.html6
-rw-r--r--bitbake/lib/toaster/toastergui/templates/projecttopbar.html28
3 files changed, 12 insertions, 24 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html b/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html
index 8b043d1e44..229cd17ba6 100644
--- a/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html
+++ b/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html
@@ -6,7 +6,7 @@
6{% include "projecttopbar.html" %} 6{% include "projecttopbar.html" %}
7 7
8<!-- Begin main page container --> 8<!-- Begin main page container -->
9<div class="row-fluid"> 9<div>
10 {% block projectinfomain %}{% endblock %} 10 {% block projectinfomain %}{% endblock %}
11</div> 11</div>
12<!-- End main container --> 12<!-- End main container -->
diff --git a/bitbake/lib/toaster/toastergui/templates/projectbuilds.html b/bitbake/lib/toaster/toastergui/templates/projectbuilds.html
index f1db2f1504..df809de405 100644
--- a/bitbake/lib/toaster/toastergui/templates/projectbuilds.html
+++ b/bitbake/lib/toaster/toastergui/templates/projectbuilds.html
@@ -21,8 +21,7 @@
21 }); 21 });
22</script> 22</script>
23 23
24 <div class="page-header"> 24 <h2>
25 <h1>
26 {% if request.GET.filter and objects.paginator.count > 0 or request.GET.search and objects.paginator.count > 0 %} 25 {% if request.GET.filter and objects.paginator.count > 0 or request.GET.search and objects.paginator.count > 0 %}
27 {{objects.paginator.count}} build{{objects.paginator.count|pluralize}} found 26 {{objects.paginator.count}} build{{objects.paginator.count|pluralize}} found
28 {%elif request.GET.filter and objects.paginator.count == 0 or request.GET.search and objects.paginator.count == 0 %} 27 {%elif request.GET.filter and objects.paginator.count == 0 or request.GET.search and objects.paginator.count == 0 %}
@@ -31,8 +30,7 @@
31 Project builds 30 Project builds
32 {%endif%} 31 {%endif%}
33 <i class="icon-question-sign get-help heading-help" title="This page lists all the builds for the current project"></i> 32 <i class="icon-question-sign get-help heading-help" title="This page lists all the builds for the current project"></i>
34 </h1> 33 </h2>
35 </div>
36 34
37 35
38 {% if objects.paginator.count == 0 %} 36 {% if objects.paginator.count == 0 %}
diff --git a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html
index 7412e4c2b4..ca2741daf9 100644
--- a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html
+++ b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html
@@ -17,7 +17,7 @@
17 </form> 17 </form>
18</div> 18</div>
19 19
20<div class="row-fluid" id="project-topbar"> 20<div id="project-topbar">
21 <ul class="nav nav-pills"> 21 <ul class="nav nav-pills">
22 <li> 22 <li>
23 <a href="{% url 'projectbuilds' project.id %}"> 23 <a href="{% url 'projectbuilds' project.id %}">
@@ -34,24 +34,14 @@
34 Import layer 34 Import layer
35 </a> 35 </a>
36 </li> 36 </li>
37 <!-- Coming soon
38 <li>
39 <a href="my-image-recipes.html">
40 My image recipes
41 </a>
42 </li>
43 -->
44 <li class="pull-right"> 37 <li class="pull-right">
45 38 <form class="form-inline" style="margin-bottom:0px;">
46 <i class="icon-question-sign get-help heading-help" data-placement="left" title="" data-original-title="Type the name of one or more recipes you want to build, separated by a space. You can also specify a task by appending a semicolon and a task name to the recipe name, like so: <code>busybox:clean</code>"> 39 <i class="icon-question-sign get-help heading-help" data-placement="left" title="" data-original-title="Type the name of one or more recipes you want to build, separated by a space. You can also specify a task by appending a semicolon and a task name to the recipe name, like so: <code>busybox:clean</code>"></i>
47 </i>
48 <div class="input-append"> 40 <div class="input-append">
49 <form class="form-inline" style="margin-bottom: 0"> 41 <input id="build-input" type="text" class="input-xlarge input-lg build-target-input" placeholder="Type the recipe you want to build" autocomplete="off" disabled>
50 <input id="build-input" type="text" class="input-xlarge input-lg build-target-input" placeholder="Type the recipe you want to build" autocomplete="off" disabled> 42 <button id="build-button" class="btn btn-primary btn-large build-button" data-project-id="{{project.id}}" disabled>Build</button>
51 <button id="build-button" class="btn btn-primary btn-large build-button" data-project-id="{{project.id}}" disabled>Build 43 </div>
52 </button> 44 </form>
53 </form> 45 </li>
54 </div> 46 </ul>
55 </li>
56 </ul>
57</div> 47</div>