diff options
| author | Belen Barros <belen.barros.pena@intel.com> | 2014-11-11 12:22:46 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-12 17:04:50 +0000 |
| commit | 76f1800f11cd424dcf4672886aae44a52722d5cf (patch) | |
| tree | 8ec0f3e9fea1040929f5d4342945b9a0d0efb359 /bitbake/lib/toaster/toastergui/templates/project.html | |
| parent | 3a338a2be74764f6f36f28abd4f469d8514b62b6 (diff) | |
| download | poky-76f1800f11cd424dcf4672886aae44a52722d5cf.tar.gz | |
bitbake: toastergui: Silly UI fixes
Small fixes to the UI of the project.html and targets.html templates.
In project.html:
* Remove some inline styles and replace them with declarations
in default.css
* Make sure that the 'add' and 'build' buttons in the project
configuration areas have nice, rounded corners
* Add some space between the machine name and the change icon
* Remove the input-prepend class from the build form (we don't
need it)
* Apply the success class to target names in completed builds
* Bold machine and project name in the change notifications to
match all other notifications
* There is a bug in Twitter Boostrap in tooltips inside buttons, so
moving the tooltip in the 'build' button outside the button tag
In targets.html, just add a missing space between the semicolon
and the first layer name in the add layer notification.
(Bitbake rev: 19113c4fe915be7db51ab06dfab5ea0797faea84)
Signed-off-by: Belen Barros <belen.barros.pena@intel.com>
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/project.html')
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/project.html | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index a8f2d6ad4f..38863a3ac6 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html | |||
| @@ -88,15 +88,15 @@ vim: expandtab tabstop=2 | |||
| 88 | <!-- build form --> | 88 | <!-- build form --> |
| 89 | <div class="well"> | 89 | <div class="well"> |
| 90 | <form class="build-form" ng-submit="targetNamedBuild()"> | 90 | <form class="build-form" ng-submit="targetNamedBuild()"> |
| 91 | <div class="input-append input-prepend controls"> | 91 | <div class="input-append controls"> |
| 92 | <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 getSuggestions('targets', $viewValue)|filter:$viewValue" typeahead-template-url="suggestion_details" ng-disabled="!layers.length"/> | 92 | <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 getSuggestions('targets', $viewValue)|filter:$viewValue" typeahead-template-url="suggestion_details" ng-disabled="!layers.length"/> |
| 93 | <button type="submit" id="build-button" class="btn btn-large btn-primary" ng-disabled="!targetName.length"> | 93 | <button type="submit" id="build-button" class="btn btn-large btn-primary" ng-disabled="!targetName.length"> |
| 94 | Build | 94 | Build |
| 95 | <i class="icon-question-sign get-help heading-help" style="margin-left: 5px;" data-toggle="tooltip" title="Type the name of one or more targets you want to build, separated by a space. You can also specify a task by appending a semicolon and a task name to a target name, like so: <code>core-image-minimal:do_build</code>"></i> | ||
| 96 | </button> | 95 | </button> |
| 97 | </div> | 96 | </div> |
| 97 | <i class="icon-question-sign get-help get-help-blue" title="Type the name of one or more targets you want to build, separated by a space. You can also specify a task by appending a semicolon and a task name to a target name, like so: <code>core-image-minimal:do_build</code>"></i> | ||
| 98 | <p> | 98 | <p> |
| 99 | <a href="{% url 'targets' %}" style="padding-right: 5px;"> | 99 | <a href="{% url 'targets' %}"> |
| 100 | View all targets | 100 | View all targets |
| 101 | </a> | 101 | </a> |
| 102 | {% if completedbuilds.count %} | 102 | {% if completedbuilds.count %} |
| @@ -167,7 +167,7 @@ vim: expandtab tabstop=2 | |||
| 167 | 167 | ||
| 168 | 168 | ||
| 169 | <case ng-switch-when="completed"> | 169 | <case ng-switch-when="completed"> |
| 170 | <div class="lead span3"><a href="{[b.build[0].build_page_url]}"><span ng-repeat="t in b.targets" ng-include src="'target_display'"></span></a></div> | 170 | <div class="lead span3"><a class="success" href="{[b.build[0].build_page_url]}"><span ng-repeat="t in b.targets" ng-include src="'target_display'"></span></a></div> |
| 171 | <div class="span2 lead"> | 171 | <div class="span2 lead"> |
| 172 | <ngif ng-if="b.build[0].completed_on - todaydate > 0"> | 172 | <ngif ng-if="b.build[0].completed_on - todaydate > 0"> |
| 173 | {[b.build[0].completed_on|date:'HH:mm']} | 173 | {[b.build[0].completed_on|date:'HH:mm']} |
| @@ -224,10 +224,12 @@ vim: expandtab tabstop=2 | |||
| 224 | Or type a layer name below. | 224 | Or type a layer name below. |
| 225 | </p> | 225 | </p> |
| 226 | </div> | 226 | </div> |
| 227 | <form class="input-append" ng-submit="layerAdd()"> | 227 | <form ng-submit="layerAdd()"> |
| 228 | <div class="input-append"> | ||
| 228 | <input type="text" class="input-xlarge" id="layer" autocomplete="off" placeholder="Type a layer name" data-minLength="1" ng-model="layerAddName" typeahead="e.name for e in getSuggestions('layers', $viewValue)|filter:$viewValue" typeahead-template-url="suggestion_details" typeahead-on-select="onLayerSelect($item, $model, $label)" typeahead-editable="false" ng-class="{ 'has-error': layerAddName.$invalid }" /> | 229 | <input type="text" class="input-xlarge" id="layer" autocomplete="off" placeholder="Type a layer name" data-minLength="1" ng-model="layerAddName" typeahead="e.name for e in getSuggestions('layers', $viewValue)|filter:$viewValue" typeahead-template-url="suggestion_details" typeahead-on-select="onLayerSelect($item, $model, $label)" typeahead-editable="false" ng-class="{ 'has-error': layerAddName.$invalid }" /> |
| 229 | <input type="submit" id="add-layer" class="btn" value="Add" ng-disabled="!layerAddName.length"/> | 230 | <input type="submit" id="add-layer" class="btn" value="Add" ng-disabled="!layerAddName.length"/> |
| 230 | {% csrf_token %} | 231 | </div> |
| 232 | {% csrf_token %} | ||
| 231 | </form> | 233 | </form> |
| 232 | <p><a href="{% url 'layers' %}">View all layers</a> | <a href="{% url 'importlayer' %}">Import layer</a></p> | 234 | <p><a href="{% url 'layers' %}">View all layers</a> | <a href="{% url 'importlayer' %}">Import layer</a></p> |
| 233 | <ul class="unstyled configuration-list"> | 235 | <ul class="unstyled configuration-list"> |
| @@ -245,15 +247,17 @@ vim: expandtab tabstop=2 | |||
| 245 | Targets | 247 | Targets |
| 246 | <i class="icon-question-sign get-help heading-help" title="What you build, often a recipe producing a root file system file (an image). Something like <code>core-image-minimal</code> or <code>core-image-sato</code>"></i> | 248 | <i class="icon-question-sign get-help heading-help" title="What you build, often a recipe producing a root file system file (an image). Something like <code>core-image-minimal</code> or <code>core-image-sato</code>"></i> |
| 247 | </h3> | 249 | </h3> |
| 248 | <form ng-submit="targetNamedBuild()" class="input-append"> | 250 | <form ng-submit="targetNamedBuild()"> |
| 249 | <input type="text" class="input-xlarge" placeholder="Type the target(s) you want to build" autocomplete="off" data-minLength="1" ng-model="targetName1" typeahead="e.name for e in getSuggestions('targets', $viewValue)|filter:$viewValue" typeahead-template-url="suggestion_details" ng-disabled="!layers.length"> | 251 | <div class="input-append"> |
| 250 | <button type="submit" id="build-button" class="btn btn-primary" ng-disabled="!targetName1.length"> | 252 | <input type="text" class="input-xlarge" placeholder="Type the target(s) you want to build" autocomplete="off" data-minLength="1" ng-model="targetName1" typeahead="e.name for e in getSuggestions('targets', $viewValue)|filter:$viewValue" typeahead-template-url="suggestion_details" ng-disabled="!layers.length"> |
| 251 | Build </button> | 253 | <button type="submit" id="build-button" class="btn btn-primary" ng-disabled="!targetName1.length"> |
| 254 | Build </button> | ||
| 255 | </div> | ||
| 252 | {% csrf_token %} | 256 | {% csrf_token %} |
| 253 | </form> | 257 | </form> |
| 254 | <p><a href="{% url 'targets' %}">View all targets</a></p> | 258 | <p><a href="{% url 'targets' %}">View all targets</a></p> |
| 255 | <div ng-if="frequenttargets.length"> | 259 | <div ng-if="frequenttargets.length"> |
| 256 | <h4> | 260 | <h4 class="air"> |
| 257 | Most built targets | 261 | Most built targets |
| 258 | </h4> | 262 | </h4> |
| 259 | <ul class="unstyled configuration-list"> | 263 | <ul class="unstyled configuration-list"> |
| @@ -274,7 +278,8 @@ vim: expandtab tabstop=2 | |||
| 274 | <i class="icon-question-sign get-help heading-help" title="The machine is the hardware for which you want to build. You can only set one machine per project"></i> | 278 | <i class="icon-question-sign get-help heading-help" title="The machine is the hardware for which you want to build. You can only set one machine per project"></i> |
| 275 | </h3> | 279 | </h3> |
| 276 | <p class="lead" id="select-machine-opposite"> | 280 | <p class="lead" id="select-machine-opposite"> |
| 277 | {[machine.name]}<i id="change-machine" class="icon-pencil" ng-click="toggle('#select-machine')" tooltip="Change"></i> | 281 | <span>{[machine.name]}</span> |
| 282 | <i id="change-machine" class="icon-pencil" ng-click="toggle('#select-machine')" tooltip="Change"></i> | ||
| 278 | </p> | 283 | </p> |
| 279 | <div id="select-machine" style="display: none"> | 284 | <div id="select-machine" style="display: none"> |
| 280 | <div class="alert alert-info"> | 285 | <div class="alert alert-info"> |
