From 1f83c7fca87851a97484b68b25d0c6a88db053af Mon Sep 17 00:00:00 2001 From: Belen Barros Pena Date: Thu, 20 Feb 2014 01:20:47 +0000 Subject: bitbake: toaster: Move outside for statement In the package details pages, the tags where inside the for statements, which caused multiple tags to be generated inside a single table. To make sure only one tag exists per table, moving the tag outside the for statement. (Bitbake rev: 0c111b24e9f86130bc43c1327a6d12026e92cdf2) Signed-off-by: Belen Barros Pena Signed-off-by: Richard Purdie --- .../templates/package_built_dependencies.html | 70 +++++++++++----------- .../toastergui/templates/package_built_detail.html | 10 ++-- .../templates/package_included_dependencies.html | 19 +++--- .../templates/package_included_detail.html | 8 +-- .../package_included_reverse_dependencies.html | 8 +-- 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 @@ Size - {% for runtime_dep in runtime_deps %} - + + {% for runtime_dep in runtime_deps %} {% ifequal runtime_dep.version '' %} {{runtime_dep.name}} @@ -55,8 +55,8 @@ {{runtime_dep.size|filtered_filesizeformat}} {% endifequal %} - - {% endfor %} + {% endfor %} + {% endifequal %} {% ifnotequal other_deps|length 0 %} @@ -67,43 +67,41 @@ Package Version Size - Relationship type - - - {% for other_dep in other_deps %} - - {% ifequal other_dep.version '' %} - - {{other_dep.name}} - {{other_dep.version}} - - - {{other_dep.dep_type_display}} - - - - {% else %} - - - - {{other_dep.name}} - - - {{other_dep.version}} - {{other_dep.size|filtered_filesizeformat}} - - {{other_dep.dep_type_display}} - - - - - {% endifequal %} - {% endfor %} + + + {% for other_dep in other_deps %} + {% ifequal other_dep.version '' %} + + {{other_dep.name}} + {{other_dep.version}} + + + {{other_dep.dep_type_display}} + + + + {% else %} + + + + {{other_dep.name}} + + + {{other_dep.version}} + {{other_dep.size|filtered_filesizeformat}} + + {{other_dep.dep_type_display}} + + + + {% endifequal %} + {% endfor %} + {% endifnotequal %} 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 @@ File Size - - {% for file in package.buildfilelist_package.all|dictsort:"path" %} - + + + {% for file in package.buildfilelist_package.all|dictsort:"path" %} {{file.path}} {{file.size|filtered_filesizeformat}} - - {% endfor %} + {% endfor %} + {% 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 @@ Size - {% for runtime_dep in runtime_deps %} - + + {% for runtime_dep in runtime_deps %} @@ -32,8 +32,8 @@ {{runtime_dep.version}} {{runtime_dep.size|filtered_filesizeformat}} - - {% endfor %} + {% endfor %} + {% else %}
@@ -54,10 +54,9 @@ Relationship type - - - {% for other_dep in other_deps %} - + + + {% for other_dep in other_deps %} {% if other_dep.installed %} @@ -83,8 +82,8 @@ {% endif %} - - {% endfor %} + {% endfor %} + {% endifnotequal %}
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 @@ Size - {% for file in package.buildfilelist_package.all|dictsort:"path" %} - + + {% for file in package.buildfilelist_package.all|dictsort:"path" %}
@@ -30,8 +30,8 @@ {{file.size|filtered_filesizeformat}} - - {% endfor %} + {% endfor %} + {% 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 @@ Size - {% for reverse_dep in reverse_deps|dictsort:"name" %} - + + {% for reverse_dep in reverse_deps|dictsort:"name" %} @@ -37,8 +37,8 @@ {{reverse_dep.version}} {{reverse_dep.size|filtered_filesizeformat}} - - {% endfor %} + {% endfor %} + {% endifequal %} -- cgit v1.2.3-54-g00ecf