summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2014-04-01 23:11:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-08 16:18:12 +0100
commit12782678073b1605cc282a0a89e4ebb2e10a9be8 (patch)
tree4b55af3803cb6446426cf2e2f4b748baaf808b0e
parent961f6226fa8019a7492ee40fdba18c5916065001 (diff)
downloadpoky-12782678073b1605cc282a0a89e4ebb2e10a9be8.tar.gz
bitbake: toaster: Make sure layer branch only shows when not empty
In the recipe details and package details pages, the layer branch definition list elements should only show when the branch field in the database is populated. If the branch field is empty, we don't show them. The patch also removes all unnecessary data-toggle and data-original-title attributes. [YP #6152] (Bitbake rev: 72adcadb931519f803dad7488544767241561fb7) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/toastergui/templates/dirinfo.html4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/package_built_detail.html4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/package_detail_base.html21
-rw-r--r--bitbake/lib/toaster/toastergui/templates/package_included_tabs.html4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/recipe.html22
-rw-r--r--bitbake/lib/toaster/toastergui/templates/target.html4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/task.html2
-rw-r--r--bitbake/lib/toaster/toastergui/templates/tasks.html2
9 files changed, 35 insertions, 32 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/dirinfo.html b/bitbake/lib/toaster/toastergui/templates/dirinfo.html
index 749ae242ea..11c709ac9a 100644
--- a/bitbake/lib/toaster/toastergui/templates/dirinfo.html
+++ b/bitbake/lib/toaster/toastergui/templates/dirinfo.html
@@ -189,13 +189,13 @@
189 <ul class="nav nav-pills"> 189 <ul class="nav nav-pills">
190 <li class=""> 190 <li class="">
191 <a href="{% url 'target' build.id target.id %}"> 191 <a href="{% url 'target' build.id target.id %}">
192 <i class="icon-question-sign get-help" data-toggle="tooltip" title="Of all the packages built, the subset installed in the root file system of this image"></i> 192 <i class="icon-question-sign get-help" title="Of all the packages built, the subset installed in the root file system of this image"></i>
193 Packages included ({{target.package_count}} - {{packages_sum|filtered_filesizeformat}}) 193 Packages included ({{target.package_count}} - {{packages_sum|filtered_filesizeformat}})
194 </a> 194 </a>
195 </li> 195 </li>
196 <li class="active"> 196 <li class="active">
197 <a href="{% url 'dirinfo' build.id target.id %}"> 197 <a href="{% url 'dirinfo' build.id target.id %}">
198 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The directories and files in the root file system of this image"></i> 198 <i class="icon-question-sign get-help" title="The directories and files in the root file system of this image"></i>
199 Directory structure 199 Directory structure
200 </a> 200 </a>
201 </li> 201 </li>
diff --git a/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html b/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html
index a0c5a1e4f0..e6f20c3300 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html
+++ b/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html
@@ -5,13 +5,13 @@
5 <ul class="nav nav-pills"> 5 <ul class="nav nav-pills">
6 <li class=""> 6 <li class="">
7 <a href="{% url 'package_built_detail' build.id package.id %}"> 7 <a href="{% url 'package_built_detail' build.id package.id %}">
8 <i class="icon-question-sign get-help" data-toggle="tooltip" title="Shows the files produced by this package."></i> 8 <i class="icon-question-sign get-help" title="Shows the files produced by this package."></i>
9 Generated files ({{package.buildfilelist_package.count}}) 9 Generated files ({{package.buildfilelist_package.count}})
10 </a> 10 </a>
11 </li> 11 </li>
12 <li class="active"> 12 <li class="active">
13 <a href="{% url 'package_built_dependencies' build.id package.id %}"> 13 <a href="{% url 'package_built_dependencies' build.id package.id %}">
14 <i class="icon-question-sign get-help" data-toggle="tooltip" title="Shows the runtime packages required by this package."></i> 14 <i class="icon-question-sign get-help" title="Shows the runtime packages required by this package."></i>
15 Runtime dependencies ({{dependency_count}}) 15 Runtime dependencies ({{dependency_count}})
16 </a> 16 </a>
17 </li> 17 </li>
diff --git a/bitbake/lib/toaster/toastergui/templates/package_built_detail.html b/bitbake/lib/toaster/toastergui/templates/package_built_detail.html
index 0fe01165da..9be8ccb85c 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_built_detail.html
+++ b/bitbake/lib/toaster/toastergui/templates/package_built_detail.html
@@ -8,11 +8,11 @@
8 {# Not included case #} 8 {# Not included case #}
9 <ul class="nav nav-pills"> 9 <ul class="nav nav-pills">
10 <li class="active"> <a href="#"> 10 <li class="active"> <a href="#">
11 <i class="icon-question-sign get-help" data-toggle="tooltip" title="Files added to a root file system when you include {{package.name}} in an image"></i> 11 <i class="icon-question-sign get-help" title="Files added to a root file system when you include {{package.name}} in an image"></i>
12 Generated files ({{packageFileCount}}) 12 Generated files ({{packageFileCount}})
13 </a></li> 13 </a></li>
14 <li class=""><a href="{% url 'package_built_dependencies' build.id package.id %}"> 14 <li class=""><a href="{% url 'package_built_dependencies' build.id package.id %}">
15 <i class="icon-question-sign get-help" data-toggle="tooltip" title="Projected runtime dependencies when you include {{package.name}} in an image"></i> 15 <i class="icon-question-sign get-help" title="Projected runtime dependencies when you include {{package.name}} in an image"></i>
16 Runtime dependencies ({{dependency_count}}) 16 Runtime dependencies ({{dependency_count}})
17 </a></li> 17 </a></li>
18 </ul> 18 </ul>
diff --git a/bitbake/lib/toaster/toastergui/templates/package_detail_base.html b/bitbake/lib/toaster/toastergui/templates/package_detail_base.html
index 5888513486..cd015d3555 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_detail_base.html
+++ b/bitbake/lib/toaster/toastergui/templates/package_detail_base.html
@@ -57,7 +57,7 @@
57 <dl> 57 <dl>
58 <dt> 58 <dt>
59 Size 59 Size
60 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The size of the package"></i> 60 <i class="icon-question-sign get-help" title="The size of the package"></i>
61 </dt> 61 </dt>
62 <dd> 62 <dd>
63 {% comment %} 63 {% comment %}
@@ -74,7 +74,7 @@
74 74
75 <dt> 75 <dt>
76 License 76 License
77 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The license under which this package is distributed"></i> 77 <i class="icon-question-sign get-help" title="The license under which this package is distributed"></i>
78 </dt> 78 </dt>
79 <dd>{{package.license}}</dd> 79 <dd>{{package.license}}</dd>
80 80
@@ -83,14 +83,14 @@
83 # problemse are resolved. 83 # problemse are resolved.
84 <dt> 84 <dt>
85 License files 85 License files
86 <i class="icon-question-sign get-help" data-toggle="tooltip" title="Path to the license files that apply to the package"></i> 86 <i class="icon-question-sign get-help" title="Path to the license files that apply to the package"></i>
87 </dt> 87 </dt>
88 <dd></dd> 88 <dd></dd>
89 {% endcomment %} 89 {% endcomment %}
90 90
91 <dt> 91 <dt>
92 Recipe 92 Recipe
93 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The name of the recipe building this package"></i> 93 <i class="icon-question-sign get-help" title="The name of the recipe building this package"></i>
94 </dt> 94 </dt>
95 <dd> 95 <dd>
96 {% if package.recipe_id > 0 %} 96 {% if package.recipe_id > 0 %}
@@ -102,13 +102,13 @@
102 102
103 <dt> 103 <dt>
104 Recipe version 104 Recipe version
105 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The version of the recipe building this package"></i> 105 <i class="icon-question-sign get-help" title="The version of the recipe building this package"></i>
106 </dt> 106 </dt>
107 <dd>{{package.recipe.version}}</dd> 107 <dd>{{package.recipe.version}}</dd>
108 108
109 <dt> 109 <dt>
110 Layer 110 Layer
111 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The name of the layer providing the recipe that builds this package"></i> 111 <i class="icon-question-sign get-help" title="The name of the layer providing the recipe that builds this package"></i>
112 </dt> 112 </dt>
113 <dd> 113 <dd>
114 {{package.recipe.layer_version.layer.name}} 114 {{package.recipe.layer_version.layer.name}}
@@ -122,21 +122,22 @@
122 {% endcomment %} 122 {% endcomment %}
123 {% endif %} 123 {% endif %}
124 </dd> 124 </dd>
125 125 {% if package.recipe.layer_version.branch %}
126 <dt> 126 <dt>
127 Layer branch 127 Layer branch
128 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The Git branch of the layer providing the recipe that builds this package"></i> 128 <i class="icon-question-sign get-help" title="The Git branch of the layer providing the recipe that builds this package"></i>
129 </dt> 129 </dt>
130 <dd>{{package.recipe.layer_version.branch}}</dd> 130 <dd>{{package.recipe.layer_version.branch}}</dd>
131 {% endif %}
131 <dt> 132 <dt>
132 Layer commit 133 Layer commit
133 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The Git commit of the layer providing the recipe that builds this package"></i> 134 <i class="icon-question-sign get-help" title="The Git commit of the layer providing the recipe that builds this package"></i>
134 </dt> 135 </dt>
135 136
136 <dd class="iscommit">{{package.recipe.layer_version.commit}}</dd> 137 <dd class="iscommit">{{package.recipe.layer_version.commit}}</dd>
137 <dt> 138 <dt>
138 Layer directory 139 Layer directory
139 <i class="icon-question-sign get-help" data-toggle="tooltip" title="Path to the layer providing the recipe that builds this package"></i> 140 <i class="icon-question-sign get-help" title="Path to the layer providing the recipe that builds this package"></i>
140 </dt> 141 </dt>
141 <dd><code>{{package.recipe.layer_version.layer.local_path}}</code></dd> 142 <dd><code>{{package.recipe.layer_version.layer.local_path}}</code></dd>
142 </dl> 143 </dl>
diff --git a/bitbake/lib/toaster/toastergui/templates/package_included_tabs.html b/bitbake/lib/toaster/toastergui/templates/package_included_tabs.html
index 0140b03c05..958aa8827b 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_included_tabs.html
+++ b/bitbake/lib/toaster/toastergui/templates/package_included_tabs.html
@@ -16,7 +16,7 @@
16 <li class=""> 16 <li class="">
17 {% endif %} 17 {% endif %}
18 <a href="{% url 'package_included_dependencies' build.id target.id package.id %}"> 18 <a href="{% url 'package_included_dependencies' build.id target.id package.id %}">
19 <i class="icon-question-sign get-help" data-toggle="tooltip" title="Package runtime dependencies"></i> 19 <i class="icon-question-sign get-help" title="Package runtime dependencies"></i>
20 Runtime dependencies ({{dependency_count}}) 20 Runtime dependencies ({{dependency_count}})
21 </a> 21 </a>
22 </li> 22 </li>
@@ -26,7 +26,7 @@
26 <li class=""> 26 <li class="">
27 {% endif %} 27 {% endif %}
28 <a href="{% url 'package_included_reverse_dependencies' build.id target.id package.id %}"> 28 <a href="{% url 'package_included_reverse_dependencies' build.id target.id package.id %}">
29 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The package runtime reverse dependencies (i.e. the packages in this image that depend on this package). Reverse dependencies reflect only the 'depends' dependency type"></i> 29 <i class="icon-question-sign get-help" title="The package runtime reverse dependencies (i.e. the packages in this image that depend on this package). Reverse dependencies reflect only the 'depends' dependency type"></i>
30 Reverse runtime dependencies ({{reverse_count}}) 30 Reverse runtime dependencies ({{reverse_count}})
31 </a> 31 </a>
32 </li> 32 </li>
diff --git a/bitbake/lib/toaster/toastergui/templates/recipe.html b/bitbake/lib/toaster/toastergui/templates/recipe.html
index 6e9cd23424..a830ba9fb8 100644
--- a/bitbake/lib/toaster/toastergui/templates/recipe.html
+++ b/bitbake/lib/toaster/toastergui/templates/recipe.html
@@ -21,25 +21,25 @@
21 <ul class="nav nav-pills"> 21 <ul class="nav nav-pills">
22 <li class="active"> 22 <li class="active">
23 <a href="#information" data-toggle="tab"> 23 <a href="#information" data-toggle="tab">
24 <i class="icon-question-sign get-help" data-toggle="tooltip" title="Build-related information about the recipe"></i> 24 <i class="icon-question-sign get-help" title="Build-related information about the recipe"></i>
25 Recipe details 25 Recipe details
26 </a> 26 </a>
27 </li> 27 </li>
28 <li> 28 <li>
29 <a href="#packages-built" data-toggle="tab"> 29 <a href="#packages-built" data-toggle="tab">
30 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The packaged output resulting from building the recipe"></i> 30 <i class="icon-question-sign get-help" title="The packaged output resulting from building the recipe"></i>
31 Packages ({{packages.count}}) 31 Packages ({{packages.count}})
32 </a> 32 </a>
33 </li> 33 </li>
34 <li> 34 <li>
35 <a href="#dependencies" data-toggle="tab"> 35 <a href="#dependencies" data-toggle="tab">
36 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The recipe build-time dependencies (i.e. other recipes)"></i> 36 <i class="icon-question-sign get-help" title="The recipe build-time dependencies (i.e. other recipes)"></i>
37 Build dependencies ({{object.r_dependencies_recipe.all.count}}) 37 Build dependencies ({{object.r_dependencies_recipe.all.count}})
38 </a> 38 </a>
39 </li> 39 </li>
40 <li> 40 <li>
41 <a href="#brought-in-by" data-toggle="tab"> 41 <a href="#brought-in-by" data-toggle="tab">
42 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The recipe build-time reverse dependencies (i.e. the recipes that depend on this recipe)"></i> 42 <i class="icon-question-sign get-help" title="The recipe build-time reverse dependencies (i.e. the recipes that depend on this recipe)"></i>
43 Reverse build dependencies ({{object.r_dependencies_depends.all.count}}) 43 Reverse build dependencies ({{object.r_dependencies_depends.all.count}})
44 </a> 44 </a>
45 </li> 45 </li>
@@ -48,27 +48,29 @@
48 <div class="tab-pane active" id="information" name="information"> 48 <div class="tab-pane active" id="information" name="information">
49 <dl class="dl-horizontal"> 49 <dl class="dl-horizontal">
50 <dt> 50 <dt>
51 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The name of the layer providing the recipe"></i> 51 <i class="icon-question-sign get-help" title="The name of the layer providing the recipe"></i>
52 Layer 52 Layer
53 </dt> 53 </dt>
54 <dd>{{layer.name}}</dd> 54 <dd>{{layer.name}}</dd>
55 <dt> 55 <dt>
56 <i class="icon-question-sign get-help" data-toggle="tooltip" title="Path to the layer providing the recipe"></i> 56 <i class="icon-question-sign get-help" title="Path to the layer providing the recipe"></i>
57 Layer directory 57 Layer directory
58 </dt> 58 </dt>
59 <dd><code>{{layer.local_path}}</code></dd> 59 <dd><code>{{layer.local_path}}</code></dd>
60 <dt> 60 <dt>
61 <i class="icon-question-sign get-help" data-toggle="tooltip" title="Path to the recipe .bb file"></i> 61 <i class="icon-question-sign get-help" title="Path to the recipe .bb file"></i>
62 Recipe file 62 Recipe file
63 </dt> 63 </dt>
64 <dd><code>{{object.file_path}}</code></dd> 64 <dd><code>{{object.file_path}}</code></dd>
65 {% if layer_version.branch %}
65 <dt> 66 <dt>
66 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The Git branch of the layer providing the recipe"></i> 67 <i class="icon-question-sign get-help" title="The Git branch of the layer providing the recipe"></i>
67 Layer branch 68 Layer branch
68 </dt> 69 </dt>
69 <dd>{{layer_version.branch}}</dd> 70 <dd>{{layer_version.branch}}</dd>
71 {% endif %}
70 <dt> 72 <dt>
71 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The Git commit of the layer providing the recipe"></i> 73 <i class="icon-question-sign get-help" title="The Git commit of the layer providing the recipe"></i>
72 Layer commit 74 Layer commit
73 </dt> 75 </dt>
74 <dd class="iscommit">{{layer_version.commit}}</dd> 76 <dd class="iscommit">{{layer_version.commit}}</dd>
@@ -259,7 +261,7 @@
259 {% if object.section %} 261 {% if object.section %}
260 <dt> 262 <dt>
261 Section 263 Section
262 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The section in which recipes should be categorized"></i> 264 <i class="icon-question-sign get-help" title="The section in which recipes should be categorized"></i>
263 </dt> 265 </dt>
264 <dd>{{object.section}}</dd> 266 <dd>{{object.section}}</dd>
265 {% endif %} 267 {% endif %}
diff --git a/bitbake/lib/toaster/toastergui/templates/target.html b/bitbake/lib/toaster/toastergui/templates/target.html
index 3a0c4d7998..86e46dcb1b 100644
--- a/bitbake/lib/toaster/toastergui/templates/target.html
+++ b/bitbake/lib/toaster/toastergui/templates/target.html
@@ -35,13 +35,13 @@
35 <ul class="nav nav-pills"> 35 <ul class="nav nav-pills">
36 <li class="active"> 36 <li class="active">
37 <a href="#target"> 37 <a href="#target">
38 <i class="icon-question-sign get-help" data-toggle="tooltip" title="Of all the packages built, the subset installed in the root file system of this image"></i> 38 <i class="icon-question-sign get-help" title="Of all the packages built, the subset installed in the root file system of this image"></i>
39 Packages included ({{target.package_count}} - {{packages_sum|filtered_filesizeformat}}) 39 Packages included ({{target.package_count}} - {{packages_sum|filtered_filesizeformat}})
40 </a> 40 </a>
41 </li> 41 </li>
42 <li> 42 <li>
43 <a href="{% url 'dirinfo' build.id target.id %}"> 43 <a href="{% url 'dirinfo' build.id target.id %}">
44 <i class="icon-question-sign get-help" data-toggle="tooltip" title="The directories and files in the root file system of this image"></i> 44 <i class="icon-question-sign get-help" title="The directories and files in the root file system of this image"></i>
45 Directory structure 45 Directory structure
46 </a> 46 </a>
47 </li> 47 </li>
diff --git a/bitbake/lib/toaster/toastergui/templates/task.html b/bitbake/lib/toaster/toastergui/templates/task.html
index 455599932c..3c4a3d4893 100644
--- a/bitbake/lib/toaster/toastergui/templates/task.html
+++ b/bitbake/lib/toaster/toastergui/templates/task.html
@@ -46,7 +46,7 @@
46{# not executed tasks outcome #} 46{# not executed tasks outcome #}
47 {% if task.outcome == task.OUTCOME_PREBUILT %} 47 {% if task.outcome == task.OUTCOME_PREBUILT %}
48 {% if not showing_matches %} 48 {% if not showing_matches %}
49 <a class="btn" href="javascript:reload_params({'show_matches' : 'true' })">Match to tasks in previous builds <i class="icon-question-sign get-help" style="margin-top:20px;" data-toggle="tooltip" title="This shows you a list of tasks from previous builds with the same signature generated from the same inputs as used in the prebuilt task. Any of them could be the task that generated the output this prebuilt task is reusing"></i></a> 49 <a class="btn" href="javascript:reload_params({'show_matches' : 'true' })">Match to tasks in previous builds <i class="icon-question-sign get-help" style="margin-top:20px;" title="This shows you a list of tasks from previous builds with the same signature generated from the same inputs as used in the prebuilt task. Any of them could be the task that generated the output this prebuilt task is reusing"></i></a>
50 {% elif matching_tasks %} 50 {% elif matching_tasks %}
51 <h3 class="details">Prebuilt task could be based on 51 <h3 class="details">Prebuilt task could be based on
52 <i class="icon-question-sign get-help heading-help" title="This table shows a list of tasks from previous builds with the same signature generated from the same inputs as used in the prebuilt task. Any of them could be the task that generated the output this prebuilt task is reusing"></i> 52 <i class="icon-question-sign get-help heading-help" title="This table shows a list of tasks from previous builds with the same signature generated from the same inputs as used in the prebuilt task. Any of them could be the task that generated the output this prebuilt task is reusing"></i>
diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html
index 77d38b00de..d0c6f4e326 100644
--- a/bitbake/lib/toaster/toastergui/templates/tasks.html
+++ b/bitbake/lib/toaster/toastergui/templates/tasks.html
@@ -86,7 +86,7 @@
86 <a href="{% url "recipe" build.pk task.recipe.pk %}">{{task.recipe.version}}</a> 86 <a href="{% url "recipe" build.pk task.recipe.pk %}">{{task.recipe.version}}</a>
87 </td> 87 </td>
88 <td class="task_name"> 88 <td class="task_name">
89 <a href="{%url "task" build.pk task.pk%} ">{{task.task_name}}</a> {% if task.get_description %}<i class="icon-question-sign get-help hover-help" title="" data-original-title="{{task.get_description}}"></i> {% endif %} 89 <a href="{%url "task" build.pk task.pk%} ">{{task.task_name}}</a> {% if task.get_description %}<i class="icon-question-sign get-help hover-help" title="{{task.get_description}}"></i> {% endif %}
90 </td> 90 </td>
91 <td class="executed"> 91 <td class="executed">
92 <a href="{%url "task" build.pk task.pk%} ">{{task.get_executed_display}}</a> 92 <a href="{%url "task" build.pk task.pk%} ">{{task.get_executed_display}}</a>