summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xindex.py8
-rw-r--r--static/layout.css5
-rw-r--r--templates/create.html1
-rw-r--r--templates/layout.xi4
-rw-r--r--templates/pwchange.html1
-rw-r--r--templates/select.html7
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 @@
<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">