stop overriding a title block in templates

- app's base template should define title behavior
- add config value to set the proper variable for the app template

fixes #142

docs/source/getting-started.rst

@@ -350,6 +350,10 @@ Base templates are referenced from settings. The first of these defined is used:
     -  `BASE_TEMPLATE`
     -  `KEGAUTH_BASE_TEMPLATE`
 
+Keg-Auth will assume that a variable is used in the master template to determine the contents
+of a title block. That variable name defaults to ``page_title``, but may be customized
+via ``KEGAUTH_TEMPLATE_TITLE_VAR``.
+
 Form selects are rendered with select2 in templates extending ``keg_auth/form-base.html``.
 ``keg_auth/select2-scripts.html`` and ``keg_auth/select2-styles.html`` can be included
 in templates to render select2s without extending form-base. Apps can opt out of select2

keg_auth/core.py

@@ -103,6 +103,7 @@ def init_config(self, app):
         app.config.setdefault('KEGAUTH_EMAIL_SITE_ABBR', site_abbr)
 
         app.config.setdefault('KEGAUTH_BASE_TEMPLATE', 'base-page.html')
+        app.config.setdefault('KEGAUTH_TEMPLATE_TITLE_VAR', 'page_title')
         app.config.setdefault('KEGAUTH_TOKEN_EXPIRE_MINS', 60 * 4)
 
         app.config.setdefault('KEGAUTH_CLI_USER_ARGS', ['email'])

keg_auth/libs/authenticators.py

@@ -207,9 +207,10 @@ def create_form(self):
         return self.form_cls()
 
     def assign_template_vars(self, form):
+        title_var = flask.current_app.config.get('KEGAUTH_TEMPLATE_TITLE_VAR')
         self.assign('form', form)
         self.assign('form_action_text', self.page_title)
-        self.assign('page_title', self.page_title)
+        self.assign(title_var, self.page_title)
         self.assign('page_heading', self.page_title)
 
     def get(self, *args, **kwargs):

keg_auth/templates/keg_auth/crud-list.html

@@ -4,8 +4,6 @@
     {% from 'keg_auth/i18n.j2' import gettext as _ %}
 {%- endif -%}
 
-{% block title %}{{ page_title }}{% endblock %}
-
 {% block page_content %}
 <h1>{{ page_heading }}</h1>
 

keg_auth/templates/keg_auth/flash-messages-only.html

@@ -1,7 +1,5 @@
 {% extends config.get('BASE_TEMPLATE') or config['KEGAUTH_BASE_TEMPLATE'] %}
 
-{% block title %}{{ page_title }} | {{ super() }}{% endblock %}
-
 {% block page_content %}
     {# Show any flash messages. #}
 {% endblock %}

keg_auth/templates/keg_auth/form-base.html

@@ -1,8 +1,6 @@
 {% import 'keg_elements/forms/horizontal_b4.html' as horizontal %}
 {% extends config.get('BASE_TEMPLATE') or config['KEGAUTH_BASE_TEMPLATE'] %}
 
-{% block title %}{{ page_title }}{% endblock %}
-
 {% block scripts %}
 {{ super() }}
 {% if (use_select2 == true) %}

keg_auth/templates/keg_auth/login.html

@@ -5,7 +5,7 @@
 {%- endif -%}
 
 {% block form %}
-{{ horizontal.form(form, action_text=page_title) }}
+{{ horizontal.form(form, action_text=form_action_text) }}
 {% if config['KEGAUTH_EMAIL_OPS_ENABLED'] %}
 <p><a href="{{auth_manager.url_for('forgot-password')}}">{{ _('I forgot my password') }}</a>.</p>
 {% endif %}

keg_auth/views.py

@@ -135,14 +135,16 @@ def render_form(self, obj, action, form, action_button_text=_('Save Changes')):
 
         Template arguments may be customized with the `form_template_args` method.
         """
+        title_var = flask.current_app.config.get('KEGAUTH_TEMPLATE_TITLE_VAR')
+
         # args added with self.assign should be passed through here
         template_args = self.form_template_args(dict(self.template_args, **{
             'action': action,
             'action_button_text': action_button_text,
             'cancel_url': self.cancel_url(),
             'form': form,
             'obj_inst': obj,
-            'page_title': self.page_title(action),
+            title_var: self.page_title(action),
             'page_heading': self.form_page_heading(action),
         }))
         return flask.render_template(self.form_template, **template_args)
@@ -356,10 +358,12 @@ def render_grid(self):
             except webgrid.renderers.RenderLimitExceeded:
                 self.on_render_limit_exceeded(grid)
 
+        title_var = flask.current_app.config.get('KEGAUTH_TEMPLATE_TITLE_VAR')
+
         # args added with self.assign should be passed through here
         template_args = self.grid_template_args(dict(self.template_args, **{
             'add_url': self.add_url_with_session(grid.session_key),
-            'page_title': self.page_title(_('list')),
+            title_var: self.page_title(_('list')),
             'page_heading': self.grid_page_heading,
             'object_name': self.object_name,
             'grid': grid,
@@ -619,9 +623,12 @@ def get(self):
         if grid.export_to:
             return grid.export_as_response()
 
+        title_var = flask.current_app.config.get('KEGAUTH_TEMPLATE_TITLE_VAR')
+        self.assign(title_var, _('Permissions'))
+        print(self.template_args)
+
         return flask.render_template(
             self.grid_template,
-            page_title=_('Permissions'),
             page_heading=_('Permissions'),
             grid=grid,
             **self.template_args,

keg_auth_ta/config.py

@@ -5,6 +5,8 @@
 class DefaultProfile(object):
     SECRET_KEY = randchars()
 
+    KEGAUTH_TEMPLATE_TITLE_VAR = 'title'
+
     # These three just get rid of warnings on the console.
     KEG_KEYRING_ENABLE = False
     SQLALCHEMY_DATABASE_URI = 'postgresql://postgres@localhost/postgres'