diff options
| -rw-r--r-- | root/admin/account.tt | 86 | ||||
| -rw-r--r-- | root/admin/account_addoc.tt | 53 | ||||
| -rw-r--r-- | root/admin/account_group.tt | 45 | ||||
| -rw-r--r-- | root/admin/account_modify.tt | 134 | ||||
| -rw-r--r-- | root/admin/account_promote.tt | 68 | ||||
| -rw-r--r-- | root/admin/group_modify.tt | 45 | ||||
| -rw-r--r-- | root/index.tt | 41 | ||||
| -rw-r--r-- | root/register/check.tt | 2 | ||||
| -rw-r--r-- | root/register/complete.tt | 1 | ||||
| -rw-r--r-- | root/register/index.tt | 64 | ||||
| -rw-r--r-- | root/template/footer | 4 | ||||
| -rw-r--r-- | root/template/header | 22 | ||||
| -rw-r--r-- | root/template/html | 25 | ||||
| -rw-r--r-- | root/template/layout | 57 | ||||
| -rw-r--r-- | root/user/firstlogin.tt | 29 | ||||
| -rw-r--r-- | root/user/index.tt | 77 | ||||
| -rw-r--r-- | root/user/password.tt | 39 |
17 files changed, 420 insertions, 372 deletions
diff --git a/root/admin/account.tt b/root/admin/account.tt index b00b8a4..aae4888 100644 --- a/root/admin/account.tt +++ b/root/admin/account.tt @@ -1,47 +1,49 @@ -<form method='POST'> -<table> -<tr> -<td> -Search by -</td> -<td> -<select name="attribute"> -<option value="uid">Username</option> -<option value="mail">Email</option> -<option value="cn">Full Name</option> -<option value="sn">Surname</option> -</select> -</td> -<!-- td> -<select name="matchtype"> -<option value="substring">contains</option> -<option value="exact">is exactly</option> -<option value="gte">greater than or equal to</option> -<option value="lt">less than</option> -</select> -</td --> -<td><input name='value'></td> -</table> +<form method="post" action=""> + <table> + <tr> + <td>Search by</td> + <td> + <select name="attribute"> + <option value="uid">Username</option> + <option value="mail">Email</option> + <option value="cn">Full Name</option> + <option value="sn">Surname</option> + </select> + </td> + <!-- td> + <select name="matchtype"> + <option value="substring">contains</option> + <option value="exact">is exactly</option> + <option value="gte">greater than or equal to</option> + <option value="lt">less than</option> + </select> + </td --> + <td><input name="value" value="" /></td> + </tr> + </table> </form> + +<hr /> + [% IF entries %] -<table border=0> -<tr> -<th>Username</th> -<th>Email</th> -<th>First Name</th> -<th>Surname</td> -<th>Full Name</td> -</tr> -[% FOREACH entry IN entries %] -<tr> -<td><a href="[% c.uri_for('/admin/account_modify') %]/[% entry.uid %]">[% entry.uid %]</a></td> -<td>[% entry.mail %]</td> -<td>[% entry.givenName %]</td> -<td>[% entry.sn %]</td> -<td>[% entry.cn %]</td> -</tr> -[% END %] -</table> + <table border=0> + <tr> + <th>Username</th> + <th>Email</th> + <th>First Name</th> + <th>Surname</td> + <th>Full Name</td> + </tr> + [% FOREACH entry IN entries %] + <tr> + <td><a href="[% c.uri_for('/admin/account_modify') %]/[% entry.uid %]">[% entry.uid %]</a></td> + <td>[% entry.mail %]</td> + <td>[% entry.givenName %]</td> + <td>[% entry.sn %]</td> + <td>[% entry.cn %]</td> + </tr> + [% END %] + </table> [% END %] diff --git a/root/admin/account_addoc.tt b/root/admin/account_addoc.tt index 771ac8d..75c6898 100644 --- a/root/admin/account_addoc.tt +++ b/root/admin/account_addoc.tt @@ -1,27 +1,30 @@ Adding objectclass [% oc %] to dn [% dn %] -<form method=post> -<input type=hidden name='dn' value='[% dn %]'> -<input type=hidden name='uid' value='[% uid %]'> -<input type='hidden' name='objectclass' value='[% oc %]'> -<table> -<tr> -<th>Attribute</th> -<th>Value</th> -</tr> -[% FOREACH attr IN must %] -[% IF attr != "objectClass" %] -<tr> -<td>[% attr %]</td> -<td><input name='[% attr %]'><span color='red'>*</span></td> -</tr> -[% END %] -[% END %] -[% FOREACH attr IN may %] -<tr> -<td>[% attr %]</td> -<td><input name='[% attr %]'></td> -</tr> -[% END %] -</table> -<input type='submit' value='Add'> +<form method="post" action=""> + <input type="hidden" name="dn" value="[% dn %]" /> + <input type="hidden" name="uid" value="[% uid %]" /> + <input type="hidden" name="objectclass" value="[% oc %]" /> + <table> + <tr> + <th>Attribute</th> + <th>Value</th> + </tr> + [% FOREACH attr IN must %] + [% IF attr != "objectClass" %] + <tr> + <td>[% attr %]</td> + <td><input name='[% attr %]'> + <span color='red'>*</span></td> + </tr> + [% END %] + [% END %] + [% FOREACH attr IN may %] + <tr> + <td>[% attr %]</td> + <td><input name='[% attr %]'></td> + </tr> + [% END %] + </table> + <p><input type="submit" value="Add" /></p> + +</form>
\ No newline at end of file diff --git a/root/admin/account_group.tt b/root/admin/account_group.tt index 3b04992..d2355c7 100644 --- a/root/admin/account_group.tt +++ b/root/admin/account_group.tt @@ -1,24 +1,29 @@ -Add user [% uid %] to a new group: +<h2>Add user [% uid %] to a new group</h2> -<form method='post'> -<input type='hidden' name='uid' value='[% uid %]'> -<input type='hidden' name='op' value='add'> -<select name='group'> -[% FOREACH group IN newgroups %] -<option value='[% group.cn %]'>[% group.cn %]</option> -[% END %] -</select> -<input type='submit' value='Add'> +<form method="post" action=""> + <input type='hidden' name='uid' value='[% uid %]' /> + <input type='hidden' name='op' value='add' /> + <select name='group'> + [% FOREACH group IN newgroups %] + <option value='[% group.cn %]'>[% group.cn %]</option> + [% END %] + </select> + <input type='submit' value='Add' /> </form> -Delete user [% uid %] from an existing group: -<form method='post'> -<input type='hidden' name='uid' value='[% uid %]'> -<input type='hidden' name='op' value='delete'> -<select name='group'> -[% FOREACH group IN groups %] -<option value='[% group.cn %]'>[% group.cn %]</option> -[% END %] -</select> -<input type='submit' value='Delete'> +<hr /> + +<h2>Delete user [% uid %] from an existing group:</h2> + +<form method="post" action=""> + <input type='hidden' name='uid' value='[% uid %]' /> + <input type='hidden' name='op' value='delete' /> + <select name='group'> + [% FOREACH group IN groups %] + <option value='[% group.cn %]'>[% group.cn %]</option> + [% END %] + </select> + <input type='submit' value='Delete' /> </form> + +<hr />
\ No newline at end of file diff --git a/root/admin/account_modify.tt b/root/admin/account_modify.tt index 6a1ecc8..8acd4b4 100644 --- a/root/admin/account_modify.tt +++ b/root/admin/account_modify.tt @@ -1,66 +1,88 @@ <a href="[% c.uri_for('/admin/password') %]/[% uid %]">Reset password</a> <a href="[% c.uri_for('/admin/account_group') %]/[% uid %]">Groups</a> -<form method=post> -<input type='hidden' name='operation' value='replace'> -<table border=0> -<tr><th>Attribute</th><th>Value</th></tr> -[% FOREACH attr IN values %] - <tr> - <td>[% attr.name %]</td> - <td>[% FOREACH val IN attr.values %][% IF attr.editable %]<input type=hidden name="[% attr.name %]_old" value="[% val %]"><input name="[% attr.name %]_new" value="[% val %]">[% ELSE %][% val %]<br/>[% END %] -[% IF attr.addable AND attr.editable %]<a href="[% c.uri_for('/admin/account_edit') %]/add/[% attr.name %]">Add</a>[% END %] -[% IF attr.removable AND attr.editable %]<a href="[% c.uri_for('/admin/account_modifydel') %]/[% uid %]/[% attr.name %]/[% val %]">Delete</a>[% END %] - [% END %]</td> - </tr> -[% END %] -<tr><td colspan=2 align=center><input type='Submit' value='Update'></td></tr> -</table> +<form method="post" action=""> + <input type='hidden' name='operation' value='replace' /> + <table border=0> + <tr> + <th>Attribute</th> + <th>Value</th> + </tr> + [% FOREACH attr IN values %] + <tr> + <td>[% attr.name %]</td> + <td> + [% FOREACH val IN attr.values %] + [% IF attr.editable %] + <input type="hidden" name="[% attr.name %]_old" value="[% val %]" /> + <input name="[% attr.name %]_new" value="[% val %]" /> + [% ELSE %] + [% val %] + <br/> + [% END %] + [% IF attr.addable AND attr.editable %] + <a href="[% c.uri_for('/admin/account_edit') %]/add/[% attr.name %]">Add</a> + [% END %] + [% IF attr.removable AND attr.editable %] + <a href="[% c.uri_for('/admin/account_modifydel') %]/[% uid %]/[% attr.name %]/[% val %]">Delete</a> + [% END %] + [% END %] + </td> + </tr> + [% END %] + <tr> + <td colspan=2 align=center> + <input type='Submit' value='Update'> + </td> + </tr> + </table> </form> -<table border=0> -<tr> -<td> -<form method=post action="[% c.uri_for('/admin/account_modify') %]/[% uid %]"> -<input type='hidden' name='operation' value='add'> - Add attribute - <select name='attribute'>[% FOREACH attr IN may %] - <option value="[% attr %]">[% attr %]</option>[% END %] - </select> - with value -<input name='value'> - <input type=submit value='Add'> +<hr /> + +<form method="post" action="[% c.uri_for('/admin/account_modify') %]/[% uid %]"> + <input type="hidden" name="operation" value="add" /> + + <p> + Add attribute + <select name='attribute'> + [% FOREACH attr IN may %] + <option value="[% attr %]">[% attr %]</option> + [% END %] + </select> + with value + <input name="value" value="" /> + <input type="submit" value="Add" /> + </p> </form> -</td> -</tr> + +<hr /> + [% IF groups %] -<tr> -<td> -Promote user to posixAccount with primary group: -<form method=post action="[% c.uri_for('/admin/account_promote') %]"> -<input type='hidden' name='dn' value='[% dn %]'> -<select name='gid'> -[% FOREACH group IN groups %] -<option value='[% group.gidNumber %]'>[% group.name %]</option> -[% END %] -</select> -<input type=submit value='Promote'> +<p>Promote user to posixAccount with primary group: </p> + +<form method="post" action="[% c.uri_for('/admin/account_promote') %]"> + <input type="hidden" name="dn" value="[% dn %]" /> + <select name="gid"> + [% FOREACH group IN groups %] + <option value="[% group.gidNumber %]">[% group.name %]</option> + [% END %] + </select> + <input type="submit" value="Promote" /> </form> -</td> -</tr> -[% END %] -<tr> -<td> -<form method=post action="[% c.uri_for('/admin/account_addoc') %]"> -<input type='hidden' name='dn' value='[% dn %]'> -<input type='hidden' name='uid' value='[% uid %]'> -<select name='objectclass'> -[% FOREACH oc IN offer_ocs %] -<option value='[% oc %]'>[% oc %]</option> [% END %] -</select> -<input type='submit' value='Add ObjectClass'> + +<hr /> + +<form method="post" action="[% c.uri_for('/admin/account_addoc') %]"> + <input type='hidden' name='dn' value='[% dn %]'> + <input type='hidden' name='uid' value='[% uid %]'> + <select name='objectclass'> + [% FOREACH oc IN offer_ocs %] + <option value='[% oc %]'>[% oc %]</option> + [% END %] + </select> + <input type="submit" value="Add ObjectClass" /> </form> -</td> -</tr> -</table> + +<hr />
\ No newline at end of file diff --git a/root/admin/account_promote.tt b/root/admin/account_promote.tt index fd6400e..39dba87 100644 --- a/root/admin/account_promote.tt +++ b/root/admin/account_promote.tt @@ -1,34 +1,38 @@ -<form method=post> -<table border=0> -<tr> -<th>Select</th> -<th>Username</th> -<th>Email</th> -<th>First Name</th> -<th>Surname</td> -<th>Full Name</td> -</tr> -[% FOREACH entry IN entries %] -<tr> -<td><input type='checkbox' name='username' value="[% entry.uid %]"> -<td>[% entry.uid %]</td> -<td>[% entry.mail %]</td> -<td>[% entry.givenName %]</td> -<td>[% entry.sn %]</td> -<td>[% entry.cn %]</td> -</tr> -[% END %] -</table> +<form method="post" action=""> + <table border=0> + <tr> + <th>Select</th> + <th>Username</th> + <th>Email</th> + <th>First Name</th> + <th>Surname</td> + <th>Full Name</td> + </tr> + [% FOREACH entry IN entries %] + <tr> + <td><input type='checkbox' name='username' value="[% entry.uid %]"> + <td>[% entry.uid %]</td> + <td>[% entry.mail %]</td> + <td>[% entry.givenName %]</td> + <td>[% entry.sn %]</td> + <td>[% entry.cn %]</td> + </tr> + [% END %] + </table> -<table border=0> -<tr> -<td>Primary group</td> -<td><select name='gid'> -[% FOREACH group IN groups %] -<option value=[% group.gidNumber %]>[% group.cn %]</option> -[% END %] -</td> -<td> -<input type='submit' value='Promote'> -</table> + <table border=0> + <tr> + <td>Primary group</td> + <td> + <select name="gid"> + [% FOREACH group IN groups %] + <option value=[% group.gidNumber %]>[% group.cn %]</option> + [% END %] + </select> + </td> + <td> + <input type="submit" value="Promote" /> + </td> + </tr> + </table> </form> diff --git a/root/admin/group_modify.tt b/root/admin/group_modify.tt index 01520d5..15357f6 100644 --- a/root/admin/group_modify.tt +++ b/root/admin/group_modify.tt @@ -1,22 +1,23 @@ -<form method=post> -<input type='hidden' name='dn' value='[% group.dn %]'> -<table> -<tr> -<th>Attribute</th> -<th>Value</th> -</tr> -[% FOREACH attr IN group.attributes %] -<tr> -<td> -[% attr %] -</td> -<td> -[% FOREACH value IN group.get_value(attr) %] -[% value %] <a href="[% c.uri_for('/admin/group_modify') %]/delete/[% group.dn %]/[% attr %]/[% value %]">delete</a><br/> -[% END %] -<input name='[% attr %]'> -<input type='submit' value='Add'> -</td> -</tr> -[% END %] -</table> +<form method="post" action=""> + <input type='hidden' name='dn' value='[% group.dn %]'> + <table> + <tr> + <th>Attribute</th> + <th>Value</th> + </tr> + [% FOREACH attr IN group.attributes %] + <tr> + <td>[% attr %]</td> + <td> + [% FOREACH value IN group.get_value(attr) %] + [% value %] + <a href="[% c.uri_for('/admin/group_modify') %]/delete/[% group.dn %]/[% attr %]/[% value %]">delete</a> + <br/> + [% END %] + <input name="[% attr %]" value="" /> + <input type="submit" value="Add" /> + </td> + </tr> + [% END %] + </table> +</form>
\ No newline at end of file diff --git a/root/index.tt b/root/index.tt index a01aec2..c42cc22 100644 --- a/root/index.tt +++ b/root/index.tt @@ -1,23 +1,22 @@ <h2>[% l('Login') %]</h2> -<form method=post action="/user"> - -<table border=0> -<tr> -<td>[% l('Username') %]</td> -<td><input type=text name="username" value="[% c.user.username %]"></td> -</tr> -<tr> -<td>[% l('Password') %]</td> -<td><input type=password name='password'></td> -</tr> -<tr> -<td></td> -<td colspan=1> - <input type='Submit' value='[% l('Login') %]'> [% l('or') %] - <a href="/register">[% l('Register') %]</a> -</td> -</tr> -</table> - - +<form method="post" action="/user"> + <table border=0> + <tr> + <td>[% l('Username') %]</td> + <td><input type=text name="username" value="[% c.user.username %]" /></td> + </tr> + <tr> + <td>[% l('Password') %]</td> + <td><input type="password" name="password" /></td> + </tr> + <tr> + <td></td> + <td colspan=1> + <input type="submit" value="[% l('Login') %]" /> + [% l('or') %] + <a href="/register">[% l('Register') %]</a> + </td> + </tr> + </table> +</form> diff --git a/root/register/check.tt b/root/register/check.tt index aab8e33..b8ec933 100644 --- a/root/register/check.tt +++ b/root/register/check.tt @@ -1,4 +1,4 @@ <h2>Success</h2> <p> [% message %] - +</p>
\ No newline at end of file diff --git a/root/register/complete.tt b/root/register/complete.tt index 24638ba..1cddd14 100644 --- a/root/register/complete.tt +++ b/root/register/complete.tt @@ -3,3 +3,4 @@ <p> [% l('Registration was successful.') %] [% l('Check your mail for activation instructions.') %] +</p>
\ No newline at end of file diff --git a/root/register/index.tt b/root/register/index.tt index f509316..4d2fa25 100644 --- a/root/register/index.tt +++ b/root/register/index.tt @@ -6,40 +6,40 @@ END; %] <h2>[% l('Register') %]</h2> <span class="error"> -[% FOREACH error IN errors %] -[% error %]<br/> -[% END %] + [% FOREACH error IN errors %] + [% error %]<br/> + [% END %] </span> -<form method=POST action="/register/check"> +<form method="post" action="/register/check"> <table border=0> -<tr> -<td>[% l('Username') %]</td> -<td><input type=text name="uid" value=[% c.request.params.uid %]></td> -</tr> -<tr> -<td>[% l('First name') %]</td> -<td><input type=text name='gn' value=[% c.request.params.gn %]></td> -</tr> -<tr> -<td>[% l('Surname') %]</td> -<td><input type=text name='sn' value=[% c.request.params.sn %]></td> -</tr> -<tr> -<td>[% l('Email address') %]</td> -<td><input type=text name='mail1' value=[% c.request.params.mail1 %]></td> -</tr> -<tr> -<td>[% l('Confirm Email address') %]</td> -<td><input type=text name='mail2' value=[% c.request.params.mail2 %]></td> -</tr> -<tr> -<td><img src=/register/captcha></td> -<td><input type=text name=validate> -</tr> -<tr> -<td></td> -<td colspan=1><input type='Submit' value='[% l('Register') %]'> -</tr> + <tr> + <td>[% l('Username') %]</td> + <td><input type=text name="uid" value="[% c.request.params.uid %]" /></td> + </tr> + <tr> + <td>[% l('First name') %]</td> + <td><input type=text name="gn" value="[% c.request.params.gn %]" /></td> + </tr> + <tr> + <td>[% l('Surname') %]</td> + <td><input type=text name="sn" value="[% c.request.params.sn %]" /></td> + </tr> + <tr> + <td>[% l('Email address') %]</td> + <td><input type=text name="mail1" value="[% c.request.params.mail1 %]" /></td> + </tr> + <tr> + <td>[% l('Confirm Email address') %]</td> + <td><input type=text name="mail2" value="[% c.request.params.mail2 %]" /></td> + </tr> + <tr> + <td><img src="/register/captcha" /></td> + <td><input type="text" name="validate" /></td> + </tr> + <tr> + <td></td> + <td colspan=1><input type="Submit" value="[% l('Register') %]" /></td> + </tr> </table> diff --git a/root/template/footer b/root/template/footer index 78203d5..0e1dc01 100644 --- a/root/template/footer +++ b/root/template/footer @@ -1,3 +1 @@ -<!-- BEGIN site/footer --> -<!-- div id="copyright">© [% c.config.organisation %] 2010</div --> -<!-- END site/footer --> +<!-- div id="copyright">© [% c.config.organisation %] 2010</div -->
\ No newline at end of file diff --git a/root/template/header b/root/template/header index a80c079..4812ea7 100644 --- a/root/template/header +++ b/root/template/header @@ -1,16 +1,14 @@ -<!-- BEGIN template/header --> <div class="masthead"> -<h1>[% c.config.apptitle %]</h1> + <h1>[% c.config.apptitle %]</h1> </div> <div class="hnav"> -<!--div class="hnav" --> -<ul class="hnav"> -[% FOREACH page IN pages %] -<li><a href="[% c.uri_for(page.page) %]">[% page.title %]</a></li> -[% END %] -[% IF c.user.username %] -<li>[ <a href="[% c.uri_for("/user") %]">[% c.user.username %]</a> ]<a href="/user/logout">[% l('Log out') %]</a></li> -[% END %] -</ul> + <!--div class="hnav" --> + <ul class="hnav"> + [% FOREACH page IN pages %] + <li><a href="[% c.uri_for(page.page) %]">[% page.title %]</a></li> + [% END %] + [% IF c.user.username %] + <li>[ <a href="[% c.uri_for("/user") %]">[% c.user.username %]</a> ]<a href="/user/logout">[% l('Log out') %]</a></li> + [% END %] + </ul> </div> -<!-- END template/header --> diff --git a/root/template/html b/root/template/html index c23fcfb..d28ca35 100644 --- a/root/template/html +++ b/root/template/html @@ -1,13 +1,14 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> - <head> - <title>[% template.title or site.title %]</title> - <link rel="Stylesheet" href="/ttsite.css"> - <!-- style type="text/css" --> - <!--% PROCESS ttsite.css %--> - <!-- /style --> - </head> - <body> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html> +<html lang="en" dir="ltr"> +<head> + <meta charset="utf-8" /> + <title>[% template.title or site.title %]</title> + <meta content="description" value="" /> + <meta content="robots" value="index,nofollow" /> + <link rel="stylesheet" href="/ttsite.css" /> +</head> +<body> [% content %] - </body> -</html> +</body> +</html>
\ No newline at end of file diff --git a/root/template/layout b/root/template/layout index 53d0202..3d7bc10 100644 --- a/root/template/layout +++ b/root/template/layout @@ -1,40 +1,37 @@ -<!-- BEGIN template/header --> <div id="header">[% PROCESS template/header %]</div> -<!-- END template/header --> <div id="outerColumnContainer"> - <div id="leftColumn"> + <div id="leftColumn"> <div class="inside"> - <div class="vnav"> - <ul> - [% FOREACH subpage IN subpages %] - <li><a href="[% c.uri_for(subpage.page) %]">[% l(subpage.title) %]</a></li> - [% END %] - </ul> - </div> + <div class="vnav"> + <ul> + [% FOREACH subpage IN subpages %] + <li><a href="[% c.uri_for(subpage.page) %]">[% l(subpage.title) %]</a></li> + [% END %] + </ul> + </div> </div> - </div> + </div> - <div id="innerColumnContainer"> - <!-- div id="SOWrap" --> - <div id="middleColumn"> - <div class="inside"> - [% IF errors %] - <span class="error"> - [% FOREACH error IN errors %] - [% error %]<br/> - [% END %] - </span> - [% END %] - <div id="content"> - [% content %] - </div> - </div> - <div class="clear"></div> + <div id="innerColumnContainer"> + <!-- div id="SOWrap" --> + <div id="middleColumn"> + <div class="inside"> + [% IF errors %] + <span class="error"> + [% FOREACH error IN errors %] + [% error %]<br/> + [% END %] + </span> + [% END %] + <div id="content"> + [% content %] + </div> + </div> + <div class="clear"></div> </div> <div class="clear"></div> - </div> - <!-- /div --> - </div> + </div> </div> + <!-- div id="footer">[% PROCESS template/footer %]</div --> diff --git a/root/user/firstlogin.tt b/root/user/firstlogin.tt index 7ec3aa2..79d15c1 100644 --- a/root/user/firstlogin.tt +++ b/root/user/firstlogin.tt @@ -1,18 +1,17 @@ -<html> -<form method=post> + +<form method="post" action=""> <table border='0'> -<tr> -<td>[% l('New Password') %]</td> -<td><input name='newpassword1' type='password'></td> -</tr> -<tr> -<td>[% l('Repeat New Password') %]</td> -<td><input name='newpassword2' type='password'></td> -</tr> -<tr> -<td></td> -<td align=right><input type='submit' value='[% l('Change') %]'></td> -</tr> + <tr> + <td>[% l('New Password') %]</td> + <td><input name="newpassword1" type="password"></td> + </tr> + <tr> + <td>[% l('Repeat New Password') %]</td> + <td><input name="newpassword2" type="password"></td> + </tr> + <tr> + <td></td> + <td align=right><input type="submit" value="[% l('Change') %]" /></td> + </tr> </table> </form> -</html> diff --git a/root/user/index.tt b/root/user/index.tt index dc5411c..d0bdb5a 100644 --- a/root/user/index.tt +++ b/root/user/index.tt @@ -1,32 +1,51 @@ -<form method=post> -<table border=0> -<tr><th>Attribute</th><th>Value</th></tr> -[% FOREACH attr IN values %] - <tr> - <td>[% attr.name %]</td> - <td>[% FOREACH val IN attr.values %][% IF attr.editable %]<input type=hidden name="[% attr.name %]_old" value="[% val %]"><input name="[% attr.name %]_new" value="[% val %]">[% ELSE %][% val %]<br/>[% END %] -[% IF attr.addable AND attr.editable %]<a href="/user/add/[% attr.name %]">[% l('Add') %]</a>[% END %] -[% IF attr.removable AND attr.editable %]<a href="/user/delete/[% attr.name %]/[% val %]">[% l('Delete') %]</a>[% END %] - [% END %]</td> - </tr> -[% END %] -<tr><td colspan=2 align=center><input type='Submit' value='[% l('Update') %]'></td></tr> -</table> +<form method="post" action=""> + <table border=0> + <tr><th>Attribute</th><th>Value</th></tr> + [% FOREACH attr IN values %] + <tr> + <td>[% attr.name %]</td> + <td> + [% FOREACH val IN attr.values %] + [% IF attr.editable %]<input type=hidden name="[% attr.name %]_old" value="[% val %]"> + <input name="[% attr.name %]_new" value="[% val %]"> + [% ELSE %] + [% val %] + <br/> + [% END %] + [% IF attr.addable AND attr.editable %] + <a href="/user/add/[% attr.name %]">[% l('Add') %]</a> + [% END %] + [% IF attr.removable AND attr.editable %] + <a href="/user/delete/[% attr.name %]/[% val %]">[% l('Delete') %]</a> + [% END %] + [% END %] + </td> + </tr> + [% END %] + <tr> + <td colspan=2 align=center> + <input type='Submit' value='[% l('Update') %]'> + </td> + </tr> + </table> </form> -<form method=post action=/user/add> -<table> -<tr> -<td> - <select name='attribute'>[% FOREACH attr IN may %] - <option value="[% attr %]">[% attr %]</option>[% END %] - </select> -</td> -<td><input name='value'> -</td> -<td> - <input type=submit value='[% l('Add') %]'> -</td> -</tr> -</table> +<form method="post" action="/user/add"> + <table> + <tr> + <td> + <select name="attribute"> + [% FOREACH attr IN may %] + <option value="[% attr %]">[% attr %]</option> + [% END %] + </select> + </td> + <td> + <input name="value" /> + </td> + <td> + <input type="submit" value="[% l('Add') %]" /> + </td> + </tr> + </table> </form> diff --git a/root/user/password.tt b/root/user/password.tt index 2b4a26b..38832a2 100644 --- a/root/user/password.tt +++ b/root/user/password.tt @@ -1,22 +1,21 @@ -<html> -<form method=post> -<table border='0'> -<tr> -<td>[% l('Current password') %]</td> -<td><input name='password' type='password'></td> -</tr> -<tr> -<td>[% l('New Password') %]</td> -<td><input name='newpassword1' type='password'></td> -</tr> -<tr> -<td>[% l('Repeat New Password') %]</td> -<td><input name='newpassword2' type='password'></td> -</tr> -<tr> -<td></td> -<td align=right><input type='submit' value='[% l('Change') %]'></td> -</tr> + +<form method="post"> +<table> + <tr> + <td>[% l('Current password') %]</td> + <td><input name="password" type="password" /></td> + </tr> + <tr> + <td>[% l('New Password') %]</td> + <td><input name="newpassword1" type="password" /></td> + </tr> + <tr> + <td>[% l('Repeat New Password') %]</td> + <td><input name="newpassword2" type="password" /></td> + </tr> + <tr> + <td></td> + <td align="right"><input type="submit" value="[% l('Change') %]"></td> + </tr> </table> </form> -</html> |