From 919d037189cd3134d3eb4ba07b5ce131f018936f Mon Sep 17 00:00:00 2001 From: "rcritten@redhat.com" Date: Fri, 21 Sep 2007 10:58:40 -0400 Subject: Add a failed login page. In theory it should never been seen but it makes things nicer Remove the login page Remove the login link from master.kid --- ipa-server/ipa-gui/dev.cfg | 1 + ipa-server/ipa-gui/ipagui/controllers.py | 4 + ipa-server/ipa-gui/ipagui/templates/login.kid | 112 --------------------- .../ipa-gui/ipagui/templates/loginfailed.kid | 35 +++++++ ipa-server/ipa-gui/ipagui/templates/master.kid | 2 +- 5 files changed, 41 insertions(+), 113 deletions(-) delete mode 100644 ipa-server/ipa-gui/ipagui/templates/login.kid create mode 100644 ipa-server/ipa-gui/ipagui/templates/loginfailed.kid diff --git a/ipa-server/ipa-gui/dev.cfg b/ipa-server/ipa-gui/dev.cfg index 7cc2441d0..ef5e98a62 100644 --- a/ipa-server/ipa-gui/dev.cfg +++ b/ipa-server/ipa-gui/dev.cfg @@ -24,6 +24,7 @@ identity.source = 'visit' # Turn on identity and visit (visit is required for identity) identity.on=True +identity.failure_url="/loginfailed" visit.on=True visit.manager='proxyvisit' diff --git a/ipa-server/ipa-gui/ipagui/controllers.py b/ipa-server/ipa-gui/ipagui/controllers.py index 75e448352..c1aa5e860 100644 --- a/ipa-server/ipa-gui/ipagui/controllers.py +++ b/ipa-server/ipa-gui/ipagui/controllers.py @@ -630,3 +630,7 @@ class Root(controllers.RootController): @identity.require(identity.not_anonymous()) def groupupdatevalidate(self, tg_errors=None, **kw): return tg_errors, kw + + @expose("ipagui.templates.loginfailed") + def loginfailed(self, **kw): + return dict() diff --git a/ipa-server/ipa-gui/ipagui/templates/login.kid b/ipa-server/ipa-gui/ipagui/templates/login.kid deleted file mode 100644 index a819cfc7a..000000000 --- a/ipa-server/ipa-gui/ipagui/templates/login.kid +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - Login - - - - -

Login

${message}

- -

- - diff --git a/ipa-server/ipa-gui/ipagui/templates/loginfailed.kid b/ipa-server/ipa-gui/ipagui/templates/loginfailed.kid new file mode 100644 index 000000000..84896be5c --- /dev/null +++ b/ipa-server/ipa-gui/ipagui/templates/loginfailed.kid @@ -0,0 +1,35 @@ + + + + + + Login Failure + + + + + + diff --git a/ipa-server/ipa-gui/ipagui/templates/master.kid b/ipa-server/ipa-gui/ipagui/templates/master.kid index 2675d3c40..9715e3844 100644 --- a/ipa-server/ipa-gui/ipagui/templates/master.kid +++ b/ipa-server/ipa-gui/ipagui/templates/master.kid @@ -26,7 +26,7 @@

- User Name: -	- -
- Password: -	- -
- -