diff options
Diffstat (limited to 'bitbake/lib')
3 files changed, 10 insertions, 23 deletions
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 @@ | |||
4 | {% block pagecontent %} | 4 | {% block pagecontent %} |
5 | 5 | ||
6 | 6 | ||
7 | <div class=""> | 7 | <div class="row-fluid"> |
8 | <!-- Breadcrumbs --> | 8 | <!-- Breadcrumbs --> |
9 | <div class="section"> | 9 | <div class="section"> |
10 | <ul class="breadcrumb" id="breadcrumb"> | 10 | <ul class="breadcrumb" id="breadcrumb"> |
@@ -28,14 +28,10 @@ | |||
28 | </script> | 28 | </script> |
29 | </div> | 29 | </div> |
30 | 30 | ||
31 | <div> | 31 | <!-- Begin main page container --> |
32 | {% block projectinfomain %}{% endblock %} | ||
33 | <!-- End main container --> | ||
32 | 34 | ||
33 | <!-- Begin main page container --> | ||
34 | {% block projectinfomain %}{% endblock %} | ||
35 | <!-- End main container --> | ||
36 | |||
37 | |||
38 | </div> | ||
39 | </div> | 35 | </div> |
40 | 36 | ||
41 | 37 | ||
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 @@ | |||
3 | {% load humanize %} | 3 | {% load humanize %} |
4 | {% load static %} | 4 | {% load static %} |
5 | {% block localbreadcrumb %} | 5 | {% block localbreadcrumb %} |
6 | <li><a href="{% url 'layers' %}">All Layers</a></li> | 6 | <li><a href="{% url 'layers' %}">All layers</a></li> |
7 | <li> | 7 | <li> |
8 | {{layerversion.layer.name}} ({{layerversion.commit|truncatechars:13}}) | 8 | {{layerversion.layer.name}} ({{layerversion.commit|truncatechars:13}}) |
9 | </li> | 9 | </li> |
@@ -63,18 +63,13 @@ | |||
63 | {% endif %} | 63 | {% endif %} |
64 | 64 | ||
65 | {% include "layers_dep_modal.html" %} | 65 | {% include "layers_dep_modal.html" %} |
66 | <div class="container-fluid top-padded"> | 66 | <div class="row-fluid span11"> |
67 | <div class="row-fluid"> | ||
68 | <div class="span11"> | ||
69 | <div class="page-header"> | 67 | <div class="page-header"> |
70 | <h1>{{layerversion.layer.name}} <small class="commit" data-toggle="tooltip" title="{{layerversion.commit}}">({{layerversion.commit|truncatechars:13}})</small></h1> | 68 | <h1>{{layerversion.layer.name}} <small class="commit" data-toggle="tooltip" title="{{layerversion.commit}}">({{layerversion.commit|truncatechars:13}})</small></h1> |
71 | </div> | 69 | </div> |
72 | </div> | ||
73 | </div> | 70 | </div> |
74 | 71 | ||
75 | <div class="row-fluid"> | 72 | <div class="row-fluid span7 tabbable"> |
76 | <div class="span7"> | ||
77 | <div class="tabbable"> | ||
78 | <div class="alert alert-info lead" id="alert-area" style="display:none"> | 73 | <div class="alert alert-info lead" id="alert-area" style="display:none"> |
79 | <button type="button" class="close" id="dismiss-alert" data-dismiss="alert">×</button> | 74 | <button type="button" class="close" id="dismiss-alert" data-dismiss="alert">×</button> |
80 | <span id="alert-msg"></span> | 75 | <span id="alert-msg"></span> |
@@ -91,7 +86,6 @@ | |||
91 | <a data-toggle="tab" href="#machines" id="machines-tab">Machines ({{total_machines}})</a> | 86 | <a data-toggle="tab" href="#machines" id="machines-tab">Machines ({{total_machines}})</a> |
92 | </li> | 87 | </li> |
93 | </ul> | 88 | </ul> |
94 | </div> | ||
95 | <div class="tab-content"> | 89 | <div class="tab-content"> |
96 | <span class="button-place"> | 90 | <span class="button-place"> |
97 | {% if layer_in_project == 0 %} | 91 | {% if layer_in_project == 0 %} |
@@ -435,7 +429,7 @@ | |||
435 | </div> | 429 | </div> |
436 | </div> | 430 | </div> |
437 | </div> | 431 | </div> |
438 | <div class="row span4 well"> | 432 | <div class="row-fluid span4 well"> |
439 | <h2>About {{layerversion.layer.name}}</h2> | 433 | <h2>About {{layerversion.layer.name}}</h2> |
440 | <dl> | 434 | <dl> |
441 | 435 | ||
@@ -480,7 +474,4 @@ | |||
480 | </dl> | 474 | </dl> |
481 | </div> | 475 | </div> |
482 | 476 | ||
483 | </div> | ||
484 | </div> | ||
485 | </div> | ||
486 | {% endblock %} | 477 | {% 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 | |||
91 | <div class="well"> | 91 | <div class="well"> |
92 | <form class="build-form" ng-submit="buildNamedTarget()"> | 92 | <form class="build-form" ng-submit="buildNamedTarget()"> |
93 | <div class="input-append controls"> | 93 | <div class="input-append controls"> |
94 | <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"/> | 94 | <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"/> |
95 | <button type="submit" class="btn btn-large btn-primary" ng-disabled="!targetName.length"> | 95 | <button type="submit" class="btn btn-large btn-primary" ng-disabled="!targetName.length"> |
96 | Build | 96 | Build |
97 | </button> | 97 | </button> |
@@ -337,7 +337,7 @@ vim: expandtab tabstop=2 | |||
337 | <p class="link-action"> | 337 | <p class="link-action"> |
338 | <a href="{% url 'projectconf' project.id %}" class="link">Edit configuration variables</a> | 338 | <a href="{% url 'projectconf' project.id %}" class="link">Edit configuration variables</a> |
339 | <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> | 339 | <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> |
340 | </p> | 340 | </p> |
341 | </div> | 341 | </div> |
342 | </div> | 342 | </div> |
343 | 343 | ||