From: Simo Sorce Date: Fri, 1 Aug 2014 11:59:52 +0000 (-0400) Subject: Rename form login page X-Git-Tag: v0.3.0~101 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=commitdiff_plain;h=32bb6d8b38b9147143074710ba2dcb7f45cd4157 Rename form login page Signed-off-by: Simo Sorce Reviewed-by: Patrick Uiterwijk --- diff --git a/ipsilon/login/authform.py b/ipsilon/login/authform.py index bd06b60..9e8e56c 100755 --- a/ipsilon/login/authform.py +++ b/ipsilon/login/authform.py @@ -31,7 +31,7 @@ class Form(LoginPageBase): def GET(self, *args, **kwargs): context = self.create_tmpl_context() # pylint: disable=star-args - return self._template('login/pam.html', **context) + return self._template('login/form.html', **context) def POST(self, *args, **kwargs): us = UserSession() diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py index 378cfb6..663ed19 100755 --- a/ipsilon/login/authpam.py +++ b/ipsilon/login/authpam.py @@ -43,7 +43,7 @@ class Pam(LoginPageBase): def GET(self, *args, **kwargs): context = self.create_tmpl_context() # pylint: disable=star-args - return self._template('login/pam.html', **context) + return self._template('login/form.html', **context) def POST(self, *args, **kwargs): username = kwargs.get("login_name") @@ -69,7 +69,7 @@ class Pam(LoginPageBase): error_username=not username ) # pylint: disable=star-args - return self._template('login/pam.html', **context) + return self._template('login/form.html', **context) def root(self, *args, **kwargs): op = getattr(self, cherrypy.request.method, self.GET) diff --git a/ipsilon/login/authtest.py b/ipsilon/login/authtest.py index 289a493..7b66066 100755 --- a/ipsilon/login/authtest.py +++ b/ipsilon/login/authtest.py @@ -28,7 +28,7 @@ class TestAuth(LoginPageBase): def GET(self, *args, **kwargs): context = self.create_tmpl_context() # pylint: disable=star-args - return self._template('login/pam.html', **context) + return self._template('login/form.html', **context) def POST(self, *args, **kwargs): username = kwargs.get("login_name") @@ -53,7 +53,7 @@ class TestAuth(LoginPageBase): error_username=not username ) # pylint: disable=star-args - return self._template('login/pam.html', **context) + return self._template('login/form.html', **context) def root(self, *args, **kwargs): op = getattr(self, cherrypy.request.method, self.GET) diff --git a/templates/login/form.html b/templates/login/form.html new file mode 100644 index 0000000..b856731 --- /dev/null +++ b/templates/login/form.html @@ -0,0 +1,43 @@ +{% extends "master.html" %} +{% block main %} + +{% if error %} +
+
+

{{ error }}

+
+
+ +{% endif %} + + + +
+

{{description}}

+
+ +{% endblock %} diff --git a/templates/login/pam.html b/templates/login/pam.html deleted file mode 100644 index b856731..0000000 --- a/templates/login/pam.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends "master.html" %} -{% block main %} - -{% if error %} -
-
-

{{ error }}

-
-
- -{% endif %} - - - -
-

{{description}}

-
- -{% endblock %}