diff options
| -rw-r--r-- | bitbake/lib/toaster/orm/models.py | 14 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/static/css/default.css | 3 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/tables.py | 17 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html | 2 |
4 files changed, 34 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 1cf997cfe52..b70fa18feb3 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -749,6 +749,20 @@ class Package(models.Model): section = models.CharField(max_length=80, blank=True) license = models.CharField(max_length=80, blank=True) + @property + def is_locale_package(self): + """ Returns True if this package is identifiable as a locale package """ + if self.name.find('locale') != -1: + return True + return False + + @property + def is_packagegroup(self): + """ Returns True is this package is identifiable as a packagegroup """ + if self.name.find('packagegroup') != -1: + return True + return False + class CustomImagePackage(Package): # CustomImageRecipe fields to track pacakges appended, # included and excluded from a CustomImageRecipe diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css index bc8a97bedc0..b674a9de8eb 100644 --- a/bitbake/lib/toaster/toastergui/static/css/default.css +++ b/bitbake/lib/toaster/toastergui/static/css/default.css @@ -153,6 +153,9 @@ select { width: auto; } /* make tables Chrome-happy (me, not so much) */ table { table-layout: fixed; word-wrap: break-word; } +table p { margin-bottom: 0 } +.table td { vertical-align: middle; } + /* styles for the new build button */ .new-build .btn-primary { padding: 4px 30px; } .new-build .alert { margin-top: 10px; } diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py index b73f459b2ca..b906718b665 100644 --- a/bitbake/lib/toaster/toastergui/tables.py +++ b/bitbake/lib/toaster/toastergui/tables.py @@ -765,12 +765,27 @@ 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 %} + ''' + self.add_column(title="Add | Remove", hideable=False, help_text="Use the add and remove buttons to modify " "the package content of your custom image", static_data_name="add_rm_pkg_btn", - static_data_template='{% include "pkg_add_rm_btn.html" %}', + static_data_template=add_remove_template, filter_name='in_current_image_filter') def setup_filters(self, *args, **kwargs): 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 493456f8556..0d4429962e1 100644 --- a/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html +++ b/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html @@ -7,7 +7,7 @@ "> <i class="icon-trash no-tooltip"></i> Remove package - </a> + </button> <button class="btn btn-block add-rm-package-btn" data-directive="add" data-package="{{data.pk}}" data-package-url="{% url 'xhr_customrecipe_packages' extra.recipe_id data.pk %}" data-name="{{data.name}}" style=" {% if data.pk in extra.current_packages %} display:none |