diff --git a/tailbone/templates/base_meta.mako b/tailbone/templates/base_meta.mako index 00cfdfe9..b6376448 100644 --- a/tailbone/templates/base_meta.mako +++ b/tailbone/templates/base_meta.mako @@ -1,10 +1,7 @@ ## -*- coding: utf-8; -*- +<%inherit file="wuttaweb:templates/base_meta.mako" /> -<%def name="app_title()">${rattail_app.get_node_title()} - -<%def name="global_title()">${"[STAGE] " if not request.rattail_config.production() else ''}${self.app_title()} - -<%def name="extra_styles()"> +<%def name="app_title()">${app.get_node_title()} <%def name="favicon()"> @@ -13,9 +10,3 @@ <%def name="header_logo()"> ${h.image(request.rattail_config.get('tailbone', 'header_image_url', default=request.static_url('tailbone:static/img/rattail.ico')), "Header Logo", style="height: 49px;")} - -<%def name="footer()"> -

- powered by ${h.link_to("Rattail", url('about'))} -

- diff --git a/tailbone/templates/home.mako b/tailbone/templates/home.mako index e4f7d072..54e44d57 100644 --- a/tailbone/templates/home.mako +++ b/tailbone/templates/home.mako @@ -1,33 +1,7 @@ ## -*- coding: utf-8; -*- -<%inherit file="/page.mako" /> -<%namespace name="base_meta" file="/base_meta.mako" /> - -<%def name="title()">Home - -<%def name="extra_styles()"> - ${parent.extra_styles()} - - +<%inherit file="wuttaweb:templates/home.mako" /> +## DEPRECATED; remains for back-compat <%def name="render_this_page()"> ${self.page_content()} - -<%def name="page_content()"> - - - - -${parent.body()} diff --git a/tailbone/templates/login.mako b/tailbone/templates/login.mako index 3eb46403..d2ea7828 100644 --- a/tailbone/templates/login.mako +++ b/tailbone/templates/login.mako @@ -1,84 +1,17 @@ ## -*- coding: utf-8; -*- -<%inherit file="/form.mako" /> -<%namespace name="base_meta" file="/base_meta.mako" /> - -<%def name="title()">Login +<%inherit file="wuttaweb:templates/auth/login.mako" /> +## TODO: this will not be needed with wuttaform <%def name="extra_styles()"> ${parent.extra_styles()} - -<%def name="logo()"> - ${h.image(image_url, "{} logo".format(capture(base_meta.app_title)))} - - -<%def name="login_form()"> -
- ${form.render_deform(form_kwargs={'data-ajax': 'false'})|n} -
- - +## DEPRECATED; remains for back-compat <%def name="render_this_page()"> ${self.page_content()} - -<%def name="page_content()"> - - -
-
-
-
- -
-
-
-
- - -<%def name="modify_vue_vars()"> - ${parent.modify_vue_vars()} - - diff --git a/tailbone/views/common.py b/tailbone/views/common.py index 26ef2626..f4d98c05 100644 --- a/tailbone/views/common.py +++ b/tailbone/views/common.py @@ -67,9 +67,15 @@ class CommonView(View): if redirect: return self.redirect(self.request.route_url('login')) - image_url = self.rattail_config.get( - 'tailbone', 'main_image_url', - default=self.request.static_url('tailbone:static/img/home_logo.png')) + image_url = self.config.get('wuttaweb.logo_url') + if not image_url: + image_url = self.config.get('tailbone.main_image_url') + if image_url: + warnings.warn("tailbone.main_image_url setting is deprecated; " + "please set wuttaweb.logo_url instead", + DeprecationWarning) + else: + image_url = self.request.static_url('tailbone:static/img/home_logo.png') context = { 'image_url': image_url,