diff --git a/trame_vuetify/ui/vuetify3.py b/trame_vuetify/ui/vuetify3.py index f32b022..ab11103 100644 --- a/trame_vuetify/ui/vuetify3.py +++ b/trame_vuetify/ui/vuetify3.py @@ -55,18 +55,16 @@ class SinglePageLayout(VAppLayout): .. code-block:: - # layout.app_layout - # layout.toolbar - # layout.icon - # layout.title - Trame application - - - # layout.content - # layout.footer - < ... /> - - + # layout.toolbar + # layout.icon + # layout.title + Trame application + + + # layout.content + # layout.footer + < ... /> + """ @@ -74,60 +72,56 @@ class SinglePageLayout(VAppLayout): def __init__(self, _server, template_name="main", **kwargs): super().__init__(_server, template_name=template_name, **kwargs) with self: - with vuetify3.VLayout() as app_layout: - self.app_layout = app_layout - with vuetify3.VAppBar() as toolbar: - self.toolbar = toolbar - self.icon = vuetify3.VAppBarNavIcon() - self.title = vuetify3.VToolbarTitle("Trame application") - - self.content = vuetify3.VMain() - - with vuetify3.VFooter( - app=True, classes="my-0 py-0", border=True - ) as footer: - self.footer = footer - vuetify3.VProgressCircular( - indeterminate=("!!trame__busy",), - color="#04a94d", - size=16, - width=3, - classes="ml-n3 mr-1", - ) - footer.add_child( - 'Powered by trame' - ) - vuetify3.VSpacer() - reload = self.server.controller.on_server_reload - if reload.exists(): - with vuetify3.VBtn( - size="x-small", - density="compact", - icon=True, - # border=True, - elevation=0, - click=self.on_server_reload, - classes="mx-2", - ): - vuetify3.VIcon("mdi-autorenew", size="small") - - with vuetify3.VTooltip(location="top"): - with vuetify3.Template(v_slot_activator=("{ props }",)): - vuetify3.VIcon( - "mdi-help-circle", - size=14, - classes="mr-4", - v_bind=("props",), - ) - html.Pre(get_trame_versions()) - - footer.add_child( - '© 2025 Kitware Inc.' - ) + with vuetify3.VAppBar() as toolbar: + self.toolbar = toolbar + self.icon = vuetify3.VAppBarNavIcon() + self.title = vuetify3.VToolbarTitle("Trame application") + + self.content = vuetify3.VMain() + + with vuetify3.VFooter(app=True, classes="my-0 py-0", border=True) as footer: + self.footer = footer + vuetify3.VProgressCircular( + indeterminate=("!!trame__busy",), + color="#04a94d", + size=16, + width=3, + classes="ml-n3 mr-1", + ) + footer.add_child( + 'Powered by trame' + ) + vuetify3.VSpacer() + reload = self.server.controller.on_server_reload + if reload.exists(): + with vuetify3.VBtn( + size="x-small", + density="compact", + icon=True, + # border=True, + elevation=0, + click=self.on_server_reload, + classes="mx-2", + ): + vuetify3.VIcon("mdi-autorenew", size="small") + + with vuetify3.VTooltip(location="top"): + with vuetify3.Template(v_slot_activator=("{ props }",)): + vuetify3.VIcon( + "mdi-help-circle", + size=14, + classes="mr-4", + v_bind=("props",), + ) + html.Pre(get_trame_versions()) + + footer.add_child( + '© 2025 Kitware Inc.' + ) def on_server_reload(self): self.server.controller.on_server_reload(self.server) @@ -147,27 +141,24 @@ class SinglePageWithDrawerLayout(SinglePageLayout): .. code-block:: - # layout.app_layout - # layout.toolbar - # layout.icon - # layout.title - Trame application - - - # layout.content - # layout.footer - < ... /> - - - - - + # layout.toolbar + # layout.icon + # layout.title + Trame application + + + # layout.content + # layout.footer + < ... /> + + + """ @@ -177,7 +168,7 @@ def __init__( ): super().__init__(_server, template_name=template_name, **kwargs) drawer_name = f"{template_name}_drawer" - with self.app_layout: + with self: self.drawer = vuetify3.VNavigationDrawer( disable_resize_watcher=True, disable_route_watcher=True,