diff options
| author | equinox <equinox@diac24.net> | 2011-09-27 06:09:30 +0200 |
|---|---|---|
| committer | equinox <equinox@diac24.net> | 2011-09-27 06:09:30 +0200 |
| commit | eb5d8a3c4b403978a5827e972d4c5391f0a5ed62 (patch) | |
| tree | 693307607882afc593b6978e9e1ae1e3e6931b80 | |
| parent | 230438d7c287a370422ca42b7bd6ef977475ef70 (diff) | |
templates: some brushing up
| -rwxr-xr-x | index.py | 8 | ||||
| -rw-r--r-- | static/layout.css | 5 | ||||
| -rw-r--r-- | templates/create.html | 1 | ||||
| -rw-r--r-- | templates/layout.xi | 4 | ||||
| -rw-r--r-- | templates/pwchange.html | 1 | ||||
| -rw-r--r-- | templates/select.html | 7 |
6 files changed, 16 insertions, 10 deletions
@@ -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 @@ <div>repeat: <input type='password' name='password2' size="10" value=""/></div> <b class="error" py:if="'password2' in errors">${errors.password2}</b> <input type='submit' value='create'/> + <p>The account creation process takes around 20 to 30 seconds. Please do not spam the button.</p> </form> </sub:bodyform> </html> 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 @@ <py:match path="sub:infobox" once="true"> <div id="infobox"> <img src="static/info.png" alt="info"/> - <p>${select('text()')}</p> + <p>${select('text()|*')}</p> </div> </py:match> @@ -25,7 +25,7 @@ <body id="formcont" py:attrs="select('@*')"> ${select('sub:infobox')} <div> - <img id="logo" src="static/ldap.png" alt="subdap" width="192" height="230"/> + <a href="login"><img id="logo" src="static/ldap.png" alt="subdap" width="192" height="230"/></a> ${select('*')} </div> </body> 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 @@ <div>repeat: <input type='password' name='password2' size="10" value=""/></div> <b class="error" py:if="'password2' in errors">${errors.password2}</b> <input type='submit' value='change password'/> + <p>The password change process takes around 20 to 30 seconds. Please do not spam the button.</p> </form> </sub:bodyform> </html> 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 @@ <head> <title>login</title> </head> - <sub:infobox py:if="message != None"> - ${message} + <sub:infobox py:if="message.has_key('pwchangeok')"> + <b>Your password has been changed.</b><br /> + — please note that it may take a few minutes for Kerberos to update + its <a href="http://en.wikipedia.org/wiki/File:RomanCerberus.JPG">three heads</a>. At any moment, either your old password or your new + password will work. </sub:infobox> <sub:bodyform> <div class="cont"> |