simplify template registration and enable overrides with jbot

src/plone/login/browser/configure.zcml

@@ -14,59 +14,68 @@
         template="templates/insufficient_privileges.pt"
         />
 
+
+    <!-- LOGIN: form with plone page around, can be rendered in modal -->
     <browser:page
         name="login"
         for="plone.app.layout.navigation.interfaces.INavigationRoot"
         permission="zope.Public"
-        class=".login.LoginFormView"
-        template="templates/form_wrapper.pt"
+        class=".login.LoginForm"
+        template="templates/login.pt"
+        />
+
+    <!-- LOGIN: fail safe, simplified and unstyled form -->
+    <browser:page
+        name="failsafe_login"
+        for="plone.app.layout.navigation.interfaces.INavigationRoot"
+        permission="zope.Public"
+        class=".login.LoginForm"
+        template="templates/login_failsafe.pt"
         />
 
+    <!-- LOGIN: BBB name, same as 'login' do not use them to refer to the login -->
     <browser:page
         name="login_form"
         for="plone.app.layout.navigation.interfaces.INavigationRoot"
         permission="zope.Public"
-        class=".login.LoginFormView"
-        template="templates/form_wrapper.pt"
+        class=".login.LoginForm"
+        template="templates/login.pt"
         />
 
+    <!-- LOGIN: BBB name, same as 'failsafe_login' do not use it any longer-->
     <browser:page
         name="failsafe_login_form"
         for="plone.app.layout.navigation.interfaces.INavigationRoot"
         permission="zope.Public"
         class=".login.LoginForm"
-        template="templates/form_wrapper.pt"
+        template="templates/login_failsafe.pt"
         />
 
-    <adapter factory=".login.wrapped_login_template" />
-
     <browser:page
-        name="logout"
+        name="login-help"
         for="plone.app.layout.navigation.interfaces.INavigationRoot"
         permission="zope.Public"
-        class=".logout.LogoutView"
+        class=".login_help.LoginHelpForm"
+        template="templates/login_help.pt"
         />
 
 
     <browser:page
-        name="logged-out"
+        name="logout"
         for="plone.app.layout.navigation.interfaces.INavigationRoot"
         permission="zope.Public"
-        template="templates/logged_out.pt"
-        class=".logout.LoggedOutView"
+        class=".logout.LogoutView"
         />
 
 
     <browser:page
-        name="login-help"
+        name="logged-out"
         for="plone.app.layout.navigation.interfaces.INavigationRoot"
         permission="zope.Public"
-        class=".login_help.LoginHelpFormView"
-        template="templates/form_wrapper.pt"
+        template="templates/logged_out.pt"
+        class=".logout.LoggedOutView"
         />
 
-    <adapter factory=".login_help.wrapped_loginhelp_template" />
-
     <browser:page
         name="require_login"
         for="*"
@@ -79,13 +88,15 @@
         for="plone.app.layout.navigation.interfaces.INavigationRoot"
         class=".login.InitialLoginPasswordChange"
         permission="cmf.SetOwnPassword"
+        template="templates/initial_login_password_change.pt"
         />
 
     <browser:page
         name="forced-password-change"
         for="plone.app.layout.navigation.interfaces.INavigationRoot"
         class=".login.ForcedPasswordChange"
         permission="cmf.SetOwnPassword"
+        template="templates/forced_password_change.pt"
         />
 
 </configure>

src/plone/login/browser/login.py

@@ -8,12 +8,9 @@
 from plone.login.interfaces import ILoginFormSchema
 from plone.login.interfaces import IRedirectAfterLogin
 from plone.registry.interfaces import IRegistry
-from plone.z3cform import layout
-from plone.z3cform.templates import FormTemplateFactory
 from Products.CMFCore.utils import getToolByName
 from Products.CMFPlone.interfaces import ISecuritySchema
 from Products.Five.browser import BrowserView
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from Products.statusmessages.interfaces import IStatusMessage
 from six.moves.urllib import parse
 from z3c.form import button
@@ -25,28 +22,26 @@
 from zope.component import queryUtility
 from zope.interface import implementer
 
-import os
-
 
 # TODO: Scale down this list now that we've removed a lot of
 # templates.
 LOGIN_TEMPLATE_IDS = [
+    'localhost',
+    'logged-out',
+    'logged_in',
     'login',
-    'login_success',
-    'login_password',
     'login_failed',
     'login_form',
-    'logged_in',
+    'login_password',
+    'login_success',
     'logout',
-    'logged-out',
-    'registered',
     'mail_password',
     'mail_password_form',
-    'register',
-    'require_login',
     'member_search_results',
     'pwreset_finish',
-    'localhost',
+    'register',
+    'registered',
+    'require_login',
 ]
 
 
@@ -62,6 +57,9 @@ class LoginForm(form.EditForm):
     ignoreContext = True
     prefix = ''
 
+    def render(self):
+        return self.index()
+
     def _get_auth(self):
         try:
             return self.context.acl_users.credentials_cookie_auth
@@ -189,26 +187,20 @@ def redirect_after_login(self, came_from=None, is_initial_login=False):
     def self_registration_enabled(self):
         registry = queryUtility(IRegistry)
         security_settings = registry.forInterface(
-            ISecuritySchema, prefix='plone')
+            ISecuritySchema,
+            prefix='plone'
+        )
         return security_settings.enable_self_reg
 
     def use_email_as_login(self):
         registry = queryUtility(IRegistry)
         security_settings = registry.forInterface(
-            ISecuritySchema, prefix='plone')
+            ISecuritySchema,
+            prefix='plone'
+        )
         return security_settings.use_email_as_login
 
 
-class LoginFormView(layout.FormWrapper):
-    form = LoginForm
-
-
-wrapped_login_template = FormTemplateFactory(
-    os.path.join(os.path.dirname(__file__), 'templates', 'login.pt'),
-    form=ILoginForm,
-)
-
-
 class RequireLoginView(BrowserView):
 
     def __call__(self):
@@ -235,9 +227,9 @@ def request_url(self):
 
 
 class InitialLoginPasswordChange(PasswordPanel):
-    template = ViewPageTemplateFile(
-        'templates/initial_login_password_change.pt',
-    )
+
+    def render(self):
+        return self.index()
 
     @button.buttonAndHandler(
         _(u'label_change_password', default=u'Change Password'),
@@ -251,9 +243,9 @@ def action_reset_passwd(self, action):
 
 
 class ForcedPasswordChange(PasswordPanel):
-    template = ViewPageTemplateFile(
-        'templates/forced_password_change.pt',
-    )
+
+    def render(self):
+        return self.index()
 
     @button.buttonAndHandler(
         _(u'label_change_password', default=u'Change Password'),

src/plone/login/browser/login_help.py

@@ -5,8 +5,6 @@
 from plone.login.interfaces import ILoginHelpForm
 from plone.login.interfaces import ILoginHelpFormSchema
 from plone.registry.interfaces import IRegistry
-from plone.z3cform import layout
-from plone.z3cform.templates import FormTemplateFactory
 from Products.CMFCore.utils import getToolByName
 from Products.CMFPlone.interfaces import ISecuritySchema
 from Products.CMFPlone.interfaces.controlpanel import IMailSchema
@@ -23,7 +21,6 @@
 from zope.interface import implementer
 
 import logging
-import os
 
 
 SEND_USERNAME_TEMPLATE = u"""From: {encoded_mail_sender}
@@ -64,7 +61,8 @@ def updateWidgets(self):
 
     @button.buttonAndHandler(
         _(u'button_pwreset_reset_password', default=u'Reset your password'),
-        name='reset')
+        name='reset'
+    )
     def handleResetPassword(self, action):
         data, errors = self.extractData()
         if errors:
@@ -104,7 +102,8 @@ class RequestUsername(form.Form):
 
     @button.buttonAndHandler(
         _(u'button_pwreset_get_username', default='Get your username'),
-        name='get_username')
+        name='get_username'
+    )
     def handleGetUsername(self, action):
         data, errors = self.extractData()
         if errors:
@@ -130,8 +129,10 @@ def handleGetUsername(self, action):
         # Because of this we always act as if that an email has been sent.
         # Instead we log the error-message.
         IStatusMessage(self.request).addStatusMessage(
-            _(u'statusmessage_pwreset_username_mail_sent', default=u'An '
-              u'email has been sent with your username.'), 'info')
+            _(u'statusmessage_pwreset_username_mail_sent',
+                default=u'An email has been sent with your username.'),
+            'info'
+        )
 
     def send_username(self, portal, userinfo):
         registry = getUtility(IRegistry)
@@ -191,6 +192,9 @@ class LoginHelpForm(form.EditForm):
 
     ignoreContext = True
 
+    def render(self):
+        return self.index()
+
     def can_reset_password(self):
         # TODO: Actually check that the site allows reseting password
         return True
@@ -219,13 +223,3 @@ def use_email_as_login(self):
         security_settings = registry.forInterface(
             ISecuritySchema, prefix='plone')
         return security_settings.use_email_as_login
-
-
-class LoginHelpFormView(layout.FormWrapper):
-    form = LoginHelpForm
-
-
-wrapped_loginhelp_template = FormTemplateFactory(
-    os.path.join(os.path.dirname(__file__), 'templates', 'login_help.pt'),
-    form=ILoginHelpForm,
-)