From eb5d8a3c4b403978a5827e972d4c5391f0a5ed62 Mon Sep 17 00:00:00 2001 From: equinox Date: Tue, 27 Sep 2011 06:09:30 +0200 Subject: templates: some brushing up --- index.py | 8 ++------ static/layout.css | 5 +++++ templates/create.html | 1 + templates/layout.xi | 4 ++-- templates/pwchange.html | 1 + templates/select.html | 7 +++++-- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/index.py b/index.py index f7fb396..6de80c5 100755 --- a/index.py +++ b/index.py @@ -76,7 +76,7 @@ class SubdapSite(object): return s.selectpage(l, dn) - def selectpage(s, l, dn, message = None): + def selectpage(s, l, dn, message = {}): user = ldapobj(l.search_s(dn, ldap.SCOPE_BASE, '(objectclass=*)', [])) tgts = {} @@ -147,11 +147,7 @@ class SubdapSite(object): accountservice.kprop() os._exit(0) - return s.selectpage(l, dn, - '''Your password has been changed -- - please note that it may take a few minutes for Kerberos to update - its three heads. At any moment, either your old password or your new - password will work.''') + return s.selectpage(l, dn, {'pwchangeok': True}) @cherrypy.expose def kill(s): diff --git a/static/layout.css b/static/layout.css index 5b3b818..181d563 100644 --- a/static/layout.css +++ b/static/layout.css @@ -25,6 +25,11 @@ body#formcont div.cont { padding:2em; min-height:180px; } +body#formcont form p { + text-align:right; + max-width:20em; + font-size:8pt; +} p.app { border:1px solid #ccc; diff --git a/templates/create.html b/templates/create.html index eb2bdc1..4cb8e54 100644 --- a/templates/create.html +++ b/templates/create.html @@ -17,6 +17,7 @@
repeat:
${errors.password2} +

The account creation process takes around 20 to 30 seconds. Please do not spam the button.

diff --git a/templates/layout.xi b/templates/layout.xi index 290e7b0..ed8dab8 100644 --- a/templates/layout.xi +++ b/templates/layout.xi @@ -17,7 +17,7 @@
info -

${select('text()')}

+

${select('text()|*')}

 @@ -25,7 +25,7 @@ ${select('sub:infobox')}
- + ${select('*')}
diff --git a/templates/pwchange.html b/templates/pwchange.html index a7e0605..ec6ea34 100644 --- a/templates/pwchange.html +++ b/templates/pwchange.html @@ -18,6 +18,7 @@
repeat:
${errors.password2} +

The password change process takes around 20 to 30 seconds. Please do not spam the button.

diff --git a/templates/select.html b/templates/select.html index 01f7341..5fd322f 100644 --- a/templates/select.html +++ b/templates/select.html @@ -8,8 +8,11 @@ login - - ${message} + + Your password has been changed.
+ — please note that it may take a few minutes for Kerberos to update + its three heads. At any moment, either your old password or your new + password will work.
-- cgit v1.2.1