diff options
author | Buchan Milne <buchan@mageia.org> | 2010-11-04 11:59:43 +0000 |
---|---|---|
committer | Buchan Milne <buchan@mageia.org> | 2010-11-04 11:59:43 +0000 |
commit | f867429bab6efe18a21c4fd531ecbe4eff8cff40 (patch) | |
tree | 79950a5bc6548e151b149022def27119811accf4 /root | |
parent | 171bd5f8e175faa05549ff53ed43e134a5543354 (diff) | |
download | identity-f867429bab6efe18a21c4fd531ecbe4eff8cff40.tar identity-f867429bab6efe18a21c4fd531ecbe4eff8cff40.tar.gz identity-f867429bab6efe18a21c4fd531ecbe4eff8cff40.tar.bz2 identity-f867429bab6efe18a21c4fd531ecbe4eff8cff40.tar.xz identity-f867429bab6efe18a21c4fd531ecbe4eff8cff40.zip |
Switch to View::Email::Template for emails
Complete password reset by admin, and localise in user's preferredLanguage
Localise all /user content
Require re-entry of current password on password change
Clean up debugging
Diffstat (limited to 'root')
-rw-r--r-- | root/index.tt | 2 | ||||
-rw-r--r-- | root/register/complete.tt | 2 | ||||
-rw-r--r-- | root/template/header | 2 | ||||
-rw-r--r-- | root/template/layout | 4 | ||||
-rw-r--r-- | root/user/fake.tt | 3 | ||||
-rw-r--r-- | root/user/firstlogin.tt | 6 | ||||
-rw-r--r-- | root/user/index.tt | 8 | ||||
-rw-r--r-- | root/user/password.tt | 8 |
8 files changed, 19 insertions, 16 deletions
diff --git a/root/index.tt b/root/index.tt index 73f890a..a01aec2 100644 --- a/root/index.tt +++ b/root/index.tt @@ -5,7 +5,7 @@ <table border=0> <tr> <td>[% l('Username') %]</td> -<td><input type=text name="username" value=[% c.request.params.username %]></td> +<td><input type=text name="username" value="[% c.user.username %]"></td> </tr> <tr> <td>[% l('Password') %]</td> diff --git a/root/register/complete.tt b/root/register/complete.tt index 0ffaa8c..24638ba 100644 --- a/root/register/complete.tt +++ b/root/register/complete.tt @@ -2,4 +2,4 @@ <p> [% l('Registration was successful.') %] -[% l('Check your mail for activation instructions') %] +[% l('Check your mail for activation instructions.') %] diff --git a/root/template/header b/root/template/header index 11ca573..a80c079 100644 --- a/root/template/header +++ b/root/template/header @@ -9,7 +9,7 @@ <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">Log out</a></li> +<li>[ <a href="[% c.uri_for("/user") %]">[% c.user.username %]</a> ]<a href="/user/logout">[% l('Log out') %]</a></li> [% END %] </ul> </div> diff --git a/root/template/layout b/root/template/layout index 8a6b601..53d0202 100644 --- a/root/template/layout +++ b/root/template/layout @@ -8,7 +8,7 @@ <div class="vnav"> <ul> [% FOREACH subpage IN subpages %] - <li><a href="[% c.uri_for(subpage.page) %]">[% subpage.title %]</a></li> + <li><a href="[% c.uri_for(subpage.page) %]">[% l(subpage.title) %]</a></li> [% END %] </ul> </div> @@ -19,7 +19,7 @@ <!-- div id="SOWrap" --> <div id="middleColumn"> <div class="inside"> - [% IF errros %] + [% IF errors %] <span class="error"> [% FOREACH error IN errors %] [% error %]<br/> diff --git a/root/user/fake.tt b/root/user/fake.tt new file mode 100644 index 0000000..f2224e9 --- /dev/null +++ b/root/user/fake.tt @@ -0,0 +1,3 @@ +[% l('Edit') %] +[% l('Change password') %] +[% l('Log out') %] diff --git a/root/user/firstlogin.tt b/root/user/firstlogin.tt index 33d0e60..7ec3aa2 100644 --- a/root/user/firstlogin.tt +++ b/root/user/firstlogin.tt @@ -2,16 +2,16 @@ <form method=post> <table border='0'> <tr> -<td>New Password</td> +<td>[% l('New Password') %]</td> <td><input name='newpassword1' type='password'></td> </tr> <tr> -<td>Repeat New Password</td> +<td>[% l('Repeat New Password') %]</td> <td><input name='newpassword2' type='password'></td> </tr> <tr> <td></td> -<td align=right><input type='submit' value='Change'></td> +<td align=right><input type='submit' value='[% l('Change') %]'></td> </tr> </table> </form> diff --git a/root/user/index.tt b/root/user/index.tt index 3147cd9..dc5411c 100644 --- a/root/user/index.tt +++ b/root/user/index.tt @@ -5,12 +5,12 @@ <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 %]">Add</a>[% END %] -[% IF attr.removable AND attr.editable %]<a href="/user/delete/[% attr.name %]/[% val %]">Delete</a>[% 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='Update'></td></tr> +<tr><td colspan=2 align=center><input type='Submit' value='[% l('Update') %]'></td></tr> </table> </form> @@ -25,7 +25,7 @@ <td><input name='value'> </td> <td> - <input type=submit value='Add'> + <input type=submit value='[% l('Add') %]'> </td> </tr> </table> diff --git a/root/user/password.tt b/root/user/password.tt index ade4e11..2b4a26b 100644 --- a/root/user/password.tt +++ b/root/user/password.tt @@ -2,20 +2,20 @@ <form method=post> <table border='0'> <tr> -<td>Current password</td> +<td>[% l('Current password') %]</td> <td><input name='password' type='password'></td> </tr> <tr> -<td>New Password</td> +<td>[% l('New Password') %]</td> <td><input name='newpassword1' type='password'></td> </tr> <tr> -<td>Repeat New Password</td> +<td>[% l('Repeat New Password') %]</td> <td><input name='newpassword2' type='password'></td> </tr> <tr> <td></td> -<td align=right><input type='submit' value='Change'></td> +<td align=right><input type='submit' value='[% l('Change') %]'></td> </tr> </table> </form> |