diff --git a/templates/404.mako b/templates/404.mako index b441775..6af7e5f 100644 --- a/templates/404.mako +++ b/templates/404.mako @@ -1,6 +1,6 @@ <%inherit file="_base.mako"/> <%block name="title"> - 404 – ${g.config.get("corp.name") | h} + ${self.maketitle("404")}

Error 404

The page you asked for couldn't be found.

diff --git a/templates/_base.mako b/templates/_base.mako index 324f0d1..b0250cf 100644 --- a/templates/_base.mako +++ b/templates/_base.mako @@ -3,7 +3,16 @@ - <%block name="title">${g.config.get("corp.name") | h}</%block> + <%def name="maketitle(*parts)"> + <% + if request.url_rule.endpoint == "index": + parts = () + %> + ${" | ".join(parts + (g.config.get("corp.name"),)) | h} + </%def> + <%block name="title"> + ${maketitle()} + </%block> diff --git a/templates/campaigns/campaign.mako b/templates/campaigns/campaign.mako index ad20228..91e1ab3 100644 --- a/templates/campaigns/campaign.mako +++ b/templates/campaigns/campaign.mako @@ -1,6 +1,6 @@ <%inherit file="../_default.mako"/> <%block name="title"> - ${campaign["title"] | h} – Campaign – ${g.config.get("corp.name") | h} + ${self.maketitle(campaign["title"], "Campaign")}

Campaign: ${campaign["title"] | h}

Hello! ...

diff --git a/templates/error.mako b/templates/error.mako index df70604..7a8e364 100644 --- a/templates/error.mako +++ b/templates/error.mako @@ -1,6 +1,6 @@ <%inherit file="_base.mako"/> <%block name="title"> - Error – ${g.config.get("corp.name") | h} + ${self.maketitle("Error")}

Error!

You may report the following information to the developers:

diff --git a/templates/logout.mako b/templates/logout.mako index fd7afb4..c06ea9c 100644 --- a/templates/logout.mako +++ b/templates/logout.mako @@ -1,6 +1,6 @@ <%inherit file="_base.mako"/> <%block name="title"> - Log out – ${g.config.get("corp.name") | h} + ${self.maketitle("Log out")}

Log out

Use the button below to safely log out and clear your session.

diff --git a/templates/members/members.mako b/templates/members/members.mako index a030b16..f55b775 100644 --- a/templates/members/members.mako +++ b/templates/members/members.mako @@ -1,6 +1,6 @@ <%inherit file="../_default.mako"/> <%block name="title"> - Members – ${g.config.get("corp.name") | h} + ${self.maketitle("Members")}

Members

% if members: