diff options
author | Elliot Smith <elliot.smith@intel.com> | 2015-10-02 14:23:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-16 14:59:59 +0100 |
commit | 76702347a8f51871106e32f81e459c5548482e3d (patch) | |
tree | c31bba9ec789dddfb5bfb3bee3ac35114504a4f8 /bitbake/lib/toaster/toastergui/templates | |
parent | da4c6144f1125ac94f1ba515f97a433a983b7662 (diff) | |
download | poky-76702347a8f51871106e32f81e459c5548482e3d.tar.gz |
bitbake: toaster: Hide tabs and add info popups for command line builds
Command line builds don't have a configuration or
layers which can be modified through Toaster.
Change the project builds page for the command line builds project,
to hide the tabs and add some info popups in appropriate places on
that page.
[YOCTO #8231]
(Bitbake rev: 565611749d47c915035890db60d19ab2fca7c42e)
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/mrb_section.html | 4 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/projecttopbar.html | 80 |
2 files changed, 48 insertions, 36 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html index b29f650f5d..53f40d0f14 100644 --- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html +++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html | |||
@@ -8,6 +8,10 @@ | |||
8 | {%if mrb_type == 'project' %} | 8 | {%if mrb_type == 'project' %} |
9 | <h2> | 9 | <h2> |
10 | Latest project builds | 10 | Latest project builds |
11 | |||
12 | {% if project.is_default %} | ||
13 | <i class="icon-question-sign get-help heading-help" title="" data-original-title="Builds in this project cannot be started from Toaster: they are started from the command line"></i> | ||
14 | {% endif %} | ||
11 | </h2> | 15 | </h2> |
12 | {% else %} | 16 | {% else %} |
13 | <div class="page-header"> | 17 | <div class="page-header"> |
diff --git a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html index a3d1b88edf..ee86b5481d 100644 --- a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html +++ b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html | |||
@@ -5,8 +5,14 @@ | |||
5 | 5 | ||
6 | <!-- project name --> | 6 | <!-- project name --> |
7 | <div class="page-header"> | 7 | <div class="page-header"> |
8 | <h1><span id="project-name">{{project.name}}</span> | 8 | <h1 id="project-name-container"> |
9 | <span id="project-name">{{project.name}}</span> | ||
10 | |||
9 | <i class="icon-pencil" data-original-title="" id="project-change-form-toggle" title=""></i> | 11 | <i class="icon-pencil" data-original-title="" id="project-change-form-toggle" title=""></i> |
12 | |||
13 | {% if project.is_default %} | ||
14 | <i class="icon-question-sign get-help heading-help" title="" data-original-title="This project shows information about the builds you start from the command line while Toaster is running"></i> | ||
15 | {% endif %} | ||
10 | </h1> | 16 | </h1> |
11 | <form id="project-name-change-form" style="margin-bottom: 0px; display: none;"> | 17 | <form id="project-name-change-form" style="margin-bottom: 0px; display: none;"> |
12 | <div class="input-append"> | 18 | <div class="input-append"> |
@@ -17,38 +23,40 @@ | |||
17 | </form> | 23 | </form> |
18 | </div> | 24 | </div> |
19 | 25 | ||
20 | <div id="project-topbar"> | 26 | {% if not project.is_default %} |
21 | <ul class="nav nav-pills"> | 27 | <div id="project-topbar"> |
22 | <li> | 28 | <ul class="nav nav-pills"> |
23 | <a href="{% url 'projectbuilds' project.id %}"> | 29 | <li> |
24 | Builds (<span class="total-builds">0</span>) | 30 | <a href="{% url 'projectbuilds' project.id %}"> |
25 | </a> | 31 | Builds (<span class="total-builds">0</span>) |
26 | </li> | 32 | </a> |
27 | <li id="topbar-configuration-tab"> | 33 | </li> |
28 | <a href="{% url 'project' project.id %}"> | 34 | <li id="topbar-configuration-tab"> |
29 | Configuration | 35 | <a href="{% url 'project' project.id %}"> |
30 | </a> | 36 | Configuration |
31 | </li> | 37 | </a> |
32 | <li> | 38 | </li> |
33 | <a href="{% url 'importlayer' project.id %}"> | 39 | <li> |
34 | Import layer | 40 | <a href="{% url 'importlayer' project.id %}"> |
35 | </a> | 41 | Import layer |
36 | </li> | 42 | </a> |
37 | {% if CUSTOM_IMAGE %} | 43 | </li> |
38 | <li> | 44 | {% if CUSTOM_IMAGE %} |
39 | <a href="{% url 'newcustomimage' project.id %}"> | 45 | <li> |
40 | New custom image | 46 | <a href="{% url 'newcustomimage' project.id %}"> |
41 | </a> | 47 | New custom image |
42 | </li> | 48 | </a> |
43 | {% endif %} | 49 | </li> |
44 | <li class="pull-right"> | 50 | {% endif %} |
45 | <form class="form-inline" style="margin-bottom:0px;"> | 51 | <li class="pull-right"> |
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>"></i> | 52 | <form class="form-inline" style="margin-bottom:0px;"> |
47 | <div class="input-append"> | 53 | <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> |
48 | <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> | 54 | <div class="input-append"> |
49 | <button id="build-button" class="btn btn-primary btn-large build-button" data-project-id="{{project.id}}" disabled>Build</button> | 55 | <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 | </div> | 56 | <button id="build-button" class="btn btn-primary btn-large build-button" data-project-id="{{project.id}}" disabled>Build</button> |
51 | </form> | 57 | </div> |
52 | </li> | 58 | </form> |
53 | </ul> | 59 | </li> |
54 | </div> | 60 | </ul> |
61 | </div> | ||
62 | {% endif %} | ||