diff --git a/src/wuttaweb/grids/base.py b/src/wuttaweb/grids/base.py index 313dd67..82965ef 100644 --- a/src/wuttaweb/grids/base.py +++ b/src/wuttaweb/grids/base.py @@ -2604,9 +2604,10 @@ class GridAction: # pylint: disable=too-many-instance-attributes """ html = [ self.render_icon(), + HTML.literal(" "), self.render_label(), ] - return HTML.literal(" ").join(html) + return HTML.tag("span", c=html, style="white-space: nowrap;") def render_icon(self): """ diff --git a/src/wuttaweb/subscribers.py b/src/wuttaweb/subscribers.py index 6fbd4b0..b296c74 100644 --- a/src/wuttaweb/subscribers.py +++ b/src/wuttaweb/subscribers.py @@ -402,6 +402,8 @@ def before_render(event): context = event context["config"] = config context["app"] = app + context["model"] = app.model + context["enum"] = app.enum context["web"] = web context["h"] = helpers context["url"] = request.route_url diff --git a/src/wuttaweb/templates/grids/table_element.mako b/src/wuttaweb/templates/grids/table_element.mako index c964089..fca2a68 100644 --- a/src/wuttaweb/templates/grids/table_element.mako +++ b/src/wuttaweb/templates/grids/table_element.mako @@ -16,6 +16,8 @@ :default-sort="${grid.get_vue_first_sorter() or 'null'}" % endif + hoverable + narrowed icon-pack="fas"> % for column in grid.get_vue_columns(): diff --git a/src/wuttaweb/templates/master/view.mako b/src/wuttaweb/templates/master/view.mako index b341012..38ce097 100644 --- a/src/wuttaweb/templates/master/view.mako +++ b/src/wuttaweb/templates/master/view.mako @@ -5,6 +5,17 @@ <%def name="content_title()">${instance_title} +<%def name="extra_styles()"> + ${parent.extra_styles()} + + + <%def name="render_instance_header_title_extras()"> ${parent.render_instance_header_title_extras()} % if master.should_expose_versions(): diff --git a/src/wuttaweb/templates/master/view_version.mako b/src/wuttaweb/templates/master/view_version.mako index 8e838e8..2101305 100644 --- a/src/wuttaweb/templates/master/view_version.mako +++ b/src/wuttaweb/templates/master/view_version.mako @@ -5,6 +5,17 @@ <%def name="content_title()">changes @ TXN ${transaction.id} +<%def name="extra_styles()"> + ${parent.extra_styles()} + + + <%def name="page_content()">
diff --git a/src/wuttaweb/views/people.py b/src/wuttaweb/views/people.py index a4ec254..b5d49ba 100644 --- a/src/wuttaweb/views/people.py +++ b/src/wuttaweb/views/people.py @@ -98,7 +98,7 @@ class PersonView(MasterView): # pylint: disable=abstract-method # users if self.creating or self.editing: f.remove("users") - elif self.viewing: + else: f.set_grid("users", self.make_users_grid(person)) def make_users_grid(self, person): diff --git a/tests/grids/test_base.py b/tests/grids/test_base.py index 4d9872d..b8334a6 100644 --- a/tests/grids/test_base.py +++ b/tests/grids/test_base.py @@ -2051,7 +2051,9 @@ class TestGridAction(TestCase): action, render_icon=lambda: "ICON", render_label=lambda: "LABEL" ): html = action.render_icon_and_label() - self.assertEqual("ICON LABEL", html) + self.assertTrue(html.startswith("