diff options
author | Belen Barros Pena <belen.barros.pena@intel.com> | 2014-02-20 01:20:47 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-17 13:59:36 +0000 |
commit | 1f83c7fca87851a97484b68b25d0c6a88db053af (patch) | |
tree | cbc5b197a16e527e16abb9159fee590e2ad8a464 /bitbake/lib | |
parent | be778cdded6b09066be5c5d326852da9a3ae0642 (diff) | |
download | poky-1f83c7fca87851a97484b68b25d0c6a88db053af.tar.gz |
bitbake: toaster: Move <tbody> outside for statement
In the package details pages, the <tbody> tags where inside
the for statements, which caused multiple <tbody> tags to
be generated inside a single table.
To make sure only one <tbody> tag exists per table, moving
the <tbody> tag outside the for statement.
(Bitbake rev: 0c111b24e9f86130bc43c1327a6d12026e92cdf2)
Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
5 files changed, 56 insertions, 59 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html b/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html index c67f60e20b..4932f74c88 100644 --- a/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html +++ b/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html | |||
@@ -35,8 +35,8 @@ | |||
35 | <th>Size</th> | 35 | <th>Size</th> |
36 | </tr> | 36 | </tr> |
37 | </thead> | 37 | </thead> |
38 | {% for runtime_dep in runtime_deps %} | 38 | <tbody> |
39 | <tbody> | 39 | {% for runtime_dep in runtime_deps %} |
40 | {% ifequal runtime_dep.version '' %} | 40 | {% ifequal runtime_dep.version '' %} |
41 | <tr class="muted"> | 41 | <tr class="muted"> |
42 | <td>{{runtime_dep.name}}</td> | 42 | <td>{{runtime_dep.name}}</td> |
@@ -55,8 +55,8 @@ | |||
55 | <td>{{runtime_dep.size|filtered_filesizeformat}}</td> | 55 | <td>{{runtime_dep.size|filtered_filesizeformat}}</td> |
56 | </tr> | 56 | </tr> |
57 | {% endifequal %} | 57 | {% endifequal %} |
58 | </tbody> | 58 | {% endfor %} |
59 | {% endfor %} | 59 | </tbody> |
60 | </table> | 60 | </table> |
61 | {% endifequal %} | 61 | {% endifequal %} |
62 | {% ifnotequal other_deps|length 0 %} | 62 | {% ifnotequal other_deps|length 0 %} |
@@ -67,43 +67,41 @@ | |||
67 | <th>Package</th> | 67 | <th>Package</th> |
68 | <th>Version</th> | 68 | <th>Version</th> |
69 | <th>Size</th> | 69 | <th>Size</th> |
70 | |||
71 | <th> | 70 | <th> |
72 | <i class="icon-question-sign get-help" title="There are 5 relationship types: recommends, suggests, provides, replaces and conflicts"></i> | 71 | <i class="icon-question-sign get-help" title="There are 5 relationship types: recommends, suggests, provides, replaces and conflicts"></i> |
73 | Relationship type | 72 | Relationship type |
74 | </th> | 73 | </th> |
75 | </tr> | 74 | </tr> |
76 | </thead> | 75 | </thead> |
77 | 76 | <tbody> | |
78 | {% for other_dep in other_deps %} | 77 | {% for other_dep in other_deps %} |
79 | <tbody> | 78 | {% ifequal other_dep.version '' %} |
80 | {% ifequal other_dep.version '' %} | 79 | <tr class="muted"> |
81 | <tr class="muted"> | 80 | <td>{{other_dep.name}}</td> |
82 | <td>{{other_dep.name}}</td> | 81 | <td>{{other_dep.version}}</td> |
83 | <td>{{other_dep.version}}</td> | 82 | <td></td> |
84 | <td></td> | 83 | <td> |
85 | <td> | 84 | {{other_dep.dep_type_display}} |
86 | {{other_dep.dep_type_display}} | 85 | <i class="icon-question-sign get-help hover-help" title="{{other_dep.dep_type_help}}" ></i> |
87 | <i class="icon-question-sign get-help hover-help" title="{{other_dep.dep_type_help}}" ></i> | 86 | </td> |
88 | </td> | 87 | </tr> |
89 | </tr> | 88 | {% else %} |
90 | {% else %} | 89 | <tr> |
91 | <tr> | 90 | <td> |
92 | <td> | 91 | <a href="{% url 'package_built_detail' build.id other_dep.depends_on_id %}"> |
93 | <a href="{% url 'package_built_detail' build.id other_dep.depends_on_id %}"> | 92 | {{other_dep.name}} |
94 | {{other_dep.name}} | 93 | </a> |
95 | </a> | 94 | </td> |
96 | </td> | 95 | <td>{{other_dep.version}}</td> |
97 | <td>{{other_dep.version}}</td> | 96 | <td>{{other_dep.size|filtered_filesizeformat}}</td> |
98 | <td>{{other_dep.size|filtered_filesizeformat}}</td> | 97 | <td> |
99 | <td> | 98 | {{other_dep.dep_type_display}} |
100 | {{other_dep.dep_type_display}} | 99 | <i class="icon-question-sign get-help hover-help" title="{{other_dep.dep_type_help}}" ></i> |
101 | <i class="icon-question-sign get-help hover-help" title="{{other_dep.dep_type_help}}" ></i> | 100 | </td> |
102 | </td> | 101 | </tr> |
103 | </tr> | 102 | {% endifequal %} |
104 | </tbody> | 103 | {% endfor %} |
105 | {% endifequal %} | 104 | </tbody> |
106 | {% endfor %} | ||
107 | </table> | 105 | </table> |
108 | {% endifnotequal %} | 106 | {% endifnotequal %} |
109 | </div> <!-- tab-pane --> | 107 | </div> <!-- tab-pane --> |
diff --git a/bitbake/lib/toaster/toastergui/templates/package_built_detail.html b/bitbake/lib/toaster/toastergui/templates/package_built_detail.html index fe856a3cb6..b50ef53ded 100644 --- a/bitbake/lib/toaster/toastergui/templates/package_built_detail.html +++ b/bitbake/lib/toaster/toastergui/templates/package_built_detail.html | |||
@@ -29,15 +29,15 @@ | |||
29 | <th>File</th> | 29 | <th>File</th> |
30 | <th>Size</th> | 30 | <th>Size</th> |
31 | </tr> | 31 | </tr> |
32 | </thead> | 32 | </thead> |
33 | {% for file in package.buildfilelist_package.all|dictsort:"path" %} | 33 | <tbody> |
34 | <tbody> | 34 | {% for file in package.buildfilelist_package.all|dictsort:"path" %} |
35 | <tr> | 35 | <tr> |
36 | <td>{{file.path}}</td> | 36 | <td>{{file.path}}</td> |
37 | <td>{{file.size|filtered_filesizeformat}}</td> | 37 | <td>{{file.size|filtered_filesizeformat}}</td> |
38 | </tr> | 38 | </tr> |
39 | </tbody> | 39 | {% endfor %} |
40 | {% endfor %} | 40 | </tbody> |
41 | </table> | 41 | </table> |
42 | 42 | ||
43 | {% else %} | 43 | {% else %} |
diff --git a/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html b/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html index c8c2dddf29..00d42e76d1 100644 --- a/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html +++ b/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html | |||
@@ -21,8 +21,8 @@ | |||
21 | <th>Size</th> | 21 | <th>Size</th> |
22 | </tr> | 22 | </tr> |
23 | </thead> | 23 | </thead> |
24 | {% for runtime_dep in runtime_deps %} | 24 | <tbody> |
25 | <tbody> | 25 | {% for runtime_dep in runtime_deps %} |
26 | <tr> | 26 | <tr> |
27 | <td> | 27 | <td> |
28 | <a href="{% url 'package_included_detail' build.id target.id runtime_dep.depends_on_id %}"> | 28 | <a href="{% url 'package_included_detail' build.id target.id runtime_dep.depends_on_id %}"> |
@@ -32,8 +32,8 @@ | |||
32 | <td>{{runtime_dep.version}}</td> | 32 | <td>{{runtime_dep.version}}</td> |
33 | <td>{{runtime_dep.size|filtered_filesizeformat}}</td> | 33 | <td>{{runtime_dep.size|filtered_filesizeformat}}</td> |
34 | </tr> | 34 | </tr> |
35 | </tbody> | 35 | {% endfor %} |
36 | {% endfor %} | 36 | </tbody> |
37 | </table> | 37 | </table> |
38 | {% else %} | 38 | {% else %} |
39 | <div class="alert alert-info"> | 39 | <div class="alert alert-info"> |
@@ -54,10 +54,9 @@ | |||
54 | Relationship type | 54 | Relationship type |
55 | </th> | 55 | </th> |
56 | </tr> | 56 | </tr> |
57 | </thead> | 57 | </thead> |
58 | 58 | <tbody> | |
59 | {% for other_dep in other_deps %} | 59 | {% for other_dep in other_deps %} |
60 | <tbody> | ||
61 | {% if other_dep.installed %} | 60 | {% if other_dep.installed %} |
62 | <tr> | 61 | <tr> |
63 | <td> | 62 | <td> |
@@ -83,8 +82,8 @@ | |||
83 | </td> | 82 | </td> |
84 | </tr> | 83 | </tr> |
85 | {% endif %} | 84 | {% endif %} |
86 | </tbody> | 85 | {% endfor %} |
87 | {% endfor %} | 86 | </tbody> |
88 | </table> | 87 | </table> |
89 | {% endifnotequal %} | 88 | {% endifnotequal %} |
90 | </div> <!-- end tab-pane --> | 89 | </div> <!-- end tab-pane --> |
diff --git a/bitbake/lib/toaster/toastergui/templates/package_included_detail.html b/bitbake/lib/toaster/toastergui/templates/package_included_detail.html index 018de3eb42..af56b21b1e 100644 --- a/bitbake/lib/toaster/toastergui/templates/package_included_detail.html +++ b/bitbake/lib/toaster/toastergui/templates/package_included_detail.html | |||
@@ -20,8 +20,8 @@ | |||
20 | <th>Size</th> | 20 | <th>Size</th> |
21 | </tr> | 21 | </tr> |
22 | </thead> | 22 | </thead> |
23 | {% for file in package.buildfilelist_package.all|dictsort:"path" %} | 23 | <tbody> |
24 | <tbody> | 24 | {% for file in package.buildfilelist_package.all|dictsort:"path" %} |
25 | <tr> | 25 | <tr> |
26 | <td> | 26 | <td> |
27 | <a href="{% url 'image_information_dir' build.id target.id file.id %}"> | 27 | <a href="{% url 'image_information_dir' build.id target.id file.id %}"> |
@@ -30,8 +30,8 @@ | |||
30 | </td> | 30 | </td> |
31 | <td>{{file.size|filtered_filesizeformat}}</td> | 31 | <td>{{file.size|filtered_filesizeformat}}</td> |
32 | </tr> | 32 | </tr> |
33 | </tbody> | 33 | {% endfor %} |
34 | {% endfor %} | 34 | </tbody> |
35 | </table> | 35 | </table> |
36 | 36 | ||
37 | {% else %} | 37 | {% else %} |
diff --git a/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html b/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html index 9cfc7fe7c2..8ae0af3a8a 100644 --- a/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html +++ b/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html | |||
@@ -26,8 +26,8 @@ | |||
26 | <th>Size</th> | 26 | <th>Size</th> |
27 | </tr> | 27 | </tr> |
28 | </thead> | 28 | </thead> |
29 | {% for reverse_dep in reverse_deps|dictsort:"name" %} | 29 | <tbody> |
30 | <tbody> | 30 | {% for reverse_dep in reverse_deps|dictsort:"name" %} |
31 | <tr> | 31 | <tr> |
32 | <td> | 32 | <td> |
33 | <a href="{% url 'package_included_detail' build.id target.id reverse_dep.dependent_id %}"> | 33 | <a href="{% url 'package_included_detail' build.id target.id reverse_dep.dependent_id %}"> |
@@ -37,8 +37,8 @@ | |||
37 | <td>{{reverse_dep.version}}</td> | 37 | <td>{{reverse_dep.version}}</td> |
38 | <td>{{reverse_dep.size|filtered_filesizeformat}}</td> | 38 | <td>{{reverse_dep.size|filtered_filesizeformat}}</td> |
39 | </tr> | 39 | </tr> |
40 | </tbody> | 40 | {% endfor %} |
41 | {% endfor %} | 41 | </tbody> |
42 | </table> | 42 | </table> |
43 | {% endifequal %} | 43 | {% endifequal %} |
44 | </div> <!-- end tab-pane --> | 44 | </div> <!-- end tab-pane --> |