From 9976e4f169ad39bcbe5ca34c866318d654adaa59 Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Thu, 28 Jan 2016 18:05:14 +0000 Subject: [PATCH] bitbake: toaster: tables move template logic into the pkg_add_rm_btn Instead of defining this as a string it's sufficiently large enough to warrant its own file. (Bitbake rev: 6b39423fe5a3ed30289a8b303329a5725f7d273b) Signed-off-by: Michael Wood Signed-off-by: brian avery Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/tables.py | 15 +-------------- .../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 b906718b66..86d111db73 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 %} -

- Locale package - -

- {% 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 0d4429962e..a3e8546706 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 %} +

+ Locale package + +

+ +{% else %} +