diff --git a/tailbone/templates/about.mako b/tailbone/templates/about.mako index 83f8b3a6..8c0bd67a 100644 --- a/tailbone/templates/about.mako +++ b/tailbone/templates/about.mako @@ -1,7 +1,8 @@ ## -*- coding: utf-8 -*- <%inherit file="/base.mako" /> +<%namespace name="base_meta" file="/base_meta.mako" /> -<%def name="title()">About ${self.app_title()} +<%def name="title()">About ${base_meta.app_title()}

${project_title} ${project_version}

diff --git a/tailbone/templates/home.mako b/tailbone/templates/home.mako index 4081e298..552ed1a2 100644 --- a/tailbone/templates/home.mako +++ b/tailbone/templates/home.mako @@ -1,5 +1,6 @@ ## -*- coding: utf-8; -*- <%inherit file="/base.mako" /> +<%namespace name="base_meta" file="/base_meta.mako" /> <%def name="title()">Home @@ -16,6 +17,6 @@ diff --git a/tailbone/templates/login.mako b/tailbone/templates/login.mako index 7ec87274..7f64eda9 100644 --- a/tailbone/templates/login.mako +++ b/tailbone/templates/login.mako @@ -1,5 +1,6 @@ ## -*- coding: utf-8; -*- <%inherit file="/base.mako" /> +<%namespace name="base_meta" file="/base_meta.mako" /> <%def name="title()">Login @@ -14,7 +15,7 @@ <%def name="logo()"> - ${h.image(image_url, "{} logo".format(capture(self.app_title)), id='logo', width=500)} + ${h.image(image_url, "{} logo".format(capture(base_meta.app_title)), id='logo', width=500)} <%def name="login_form()"> diff --git a/tailbone/templates/mobile/about.mako b/tailbone/templates/mobile/about.mako index 595a1d2b..bfa55379 100644 --- a/tailbone/templates/mobile/about.mako +++ b/tailbone/templates/mobile/about.mako @@ -1,7 +1,8 @@ ## -*- coding: utf-8 -*- <%inherit file="/mobile/base.mako" /> +<%namespace name="base_meta" file="/base_meta.mako" /> -<%def name="title()">About ${self.app_title()} +<%def name="title()">About ${base_meta.app_title()}

${project_title} ${project_version}

diff --git a/tailbone/templates/mobile/base.mako b/tailbone/templates/mobile/base.mako index 43a4a4c0..11ee47ef 100644 --- a/tailbone/templates/mobile/base.mako +++ b/tailbone/templates/mobile/base.mako @@ -1,9 +1,10 @@ ## -*- coding: utf-8 -*- +<%namespace name="base_meta" file="/base_meta.mako" /> - ${self.global_title()} » ${self.title()} + ${base_meta.global_title()} » ${self.title()} ${self.jquery()} @@ -64,10 +65,6 @@ -<%def name="app_title()">Rattail Demo - -<%def name="global_title()">${"[STAGE] " if not request.rattail_config.production() else ''}${self.app_title()} - <%def name="page_url()">${request.current_route_url()} <%def name="page_title()">${self.title()} @@ -88,7 +85,7 @@ <%def name="mobile_header()">
${self.mobile_header_link()} -

${self.global_title()}

+

${base_meta.global_title()}

@@ -116,7 +113,7 @@
  • ${h.link_to("Become root", url('become_root'), **{'data-ajax': 'false'})}
  • % endif
  • ${h.link_to("Logout", url('mobile.logout'), **{'data-ajax': 'false'})}
  • -
  • ${h.link_to("About {}".format(capture(self.app_title)), url('mobile.about'))}
  • +
  • ${h.link_to("About {}".format(capture(base_meta.app_title)), url('mobile.about'))}