diff options
| -rw-r--r-- | bitbake/lib/toaster/toastergui/tables.py | 15 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html | 15 |
2 files changed, 16 insertions, 14 deletions
diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py index b906718b665..86d111db736 100644 --- a/bitbake/lib/toaster/toastergui/tables.py +++ b/bitbake/lib/toaster/toastergui/tables.py @@ -765,20 +765,7 @@ class SelectPackagesTable(PackagesTable): def setup_columns(self, *args, **kwargs): super(SelectPackagesTable, self).setup_columns(*args, **kwargs) - add_remove_template = ''' - {% if data.is_locale_package %} - <p class="text-center"> - <span class="muted">Locale package</span> - <i class="icon-question-sign get-help hover-help" title="" - data-original-title="This package is included in your image - because the locale is specified in the IMAGE_LINGUAS variable" - style="visibility: hidden;"> - </i> - </p> - {% else %} - {% include "pkg_add_rm_btn.html" %} - {% endif %} - ''' + add_remove_template = '{% include "pkg_add_rm_btn.html" %}' self.add_column(title="Add | Remove", hideable=False, diff --git a/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html b/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html index 0d4429962e1..a3e8546706f 100644 --- a/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html +++ b/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html @@ -1,3 +1,16 @@ +{# TODO move to snippets dir #} +{% if data.is_locale_package %} +<p class="text-center"> + <span class="muted">Locale package</span> + <i class="icon-question-sign get-help hover-help" title="" + data-original-title="This package is included in your image + based on the locale specified in the IMAGE_LINGUAS variable" + style="visibility: hidden;"> + </i> +</p> + +{% else %} + <div id="package-btn-cell-{{data.pk}}"> <div style="display: none; font-size: 11px; line-height: 1.3;" class="tooltip-inner inline-notification"></div> <button class="btn btn-block btn-danger add-rm-package-btn" data-directive="remove" data-package="{{data.pk}}" data-package-url="{% url 'xhr_customrecipe_packages' extra.recipe_id data.pk %}" data-name="{{data.name}}" style=" @@ -17,3 +30,5 @@ Add package </button> </div> + +{% endif %} |