From 12782678073b1605cc282a0a89e4ebb2e10a9be8 Mon Sep 17 00:00:00 2001 From: Belen Barros Pena Date: Tue, 1 Apr 2014 23:11:30 +0100 Subject: 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 Signed-off-by: Richard Purdie --- .../lib/toaster/toastergui/templates/dirinfo.html | 4 ++-- .../templates/package_built_dependencies.html | 4 ++-- .../toastergui/templates/package_built_detail.html | 4 ++-- .../toastergui/templates/package_detail_base.html | 21 +++++++++++---------- .../templates/package_included_tabs.html | 4 ++-- .../lib/toaster/toastergui/templates/recipe.html | 22 ++++++++++++---------- .../lib/toaster/toastergui/templates/target.html | 4 ++-- bitbake/lib/toaster/toastergui/templates/task.html | 2 +- .../lib/toaster/toastergui/templates/tasks.html | 2 +- 9 files changed, 35 insertions(+), 32 deletions(-) (limited to 'bitbake/lib') 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 @@
  • - + Packages included ({{target.package_count}} - {{packages_sum|filtered_filesizeformat}})
  • - + Directory structure
    • 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 @@
    • - + Generated files ({{package.buildfilelist_package.count}})
    • - + Runtime dependencies ({{dependency_count}})
      • 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 @@ {# Not included case #} 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 @@
      Size - +
      {% comment %} @@ -74,7 +74,7 @@
      License - +
      {{package.license}}
      @@ -83,14 +83,14 @@ # problemse are resolved.
      License files - +
      {% endcomment %}
      Recipe - +
      {% if package.recipe_id > 0 %} @@ -102,13 +102,13 @@
      Recipe version - +
      {{package.recipe.version}}
      Layer - +
      {{package.recipe.layer_version.layer.name}} @@ -122,21 +122,22 @@ {% endcomment %} {% endif %}
      - + {% if package.recipe.layer_version.branch %}
      Layer branch - +
      {{package.recipe.layer_version.branch}}
      + {% endif %}
      Layer commit - +
      {{package.recipe.layer_version.commit}}
      Layer directory - +
      {{package.recipe.layer_version.layer.local_path}}
      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 @@
    • {% endif %} - + Runtime dependencies ({{dependency_count}})
      • @@ -26,7 +26,7 @@
    • {% endif %} - + Reverse runtime dependencies ({{reverse_count}})
      • 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 @@