diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/2010-November/000974.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/2010-November/000974.html | 1382 |
1 files changed, 1382 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2010-November/000974.html b/zarb-ml/mageia-sysadm/2010-November/000974.html new file mode 100644 index 000000000..02881f5e4 --- /dev/null +++ b/zarb-ml/mageia-sysadm/2010-November/000974.html @@ -0,0 +1,1382 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-sysadm] [159] Merge r108:121 from branches/live/root (HTML/CSS base refactoring) + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B159%5D%20Merge%20r108%3A121%20from%20branches/live/root%0A%09%28HTML/CSS%20base%20refactoring%29&In-Reply-To=%3C20101126164258.D6BC03FD58%40valstar.mageia.org%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="000978.html"> + <LINK REL="Next" HREF="000975.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-sysadm] [159] Merge r108:121 from branches/live/root (HTML/CSS base refactoring)</H1> + <B>root at mageia.org</B> + <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B159%5D%20Merge%20r108%3A121%20from%20branches/live/root%0A%09%28HTML/CSS%20base%20refactoring%29&In-Reply-To=%3C20101126164258.D6BC03FD58%40valstar.mageia.org%3E" + TITLE="[Mageia-sysadm] [159] Merge r108:121 from branches/live/root (HTML/CSS base refactoring)">root at mageia.org + </A><BR> + <I>Fri Nov 26 17:42:58 CET 2010</I> + <P><UL> + <LI>Previous message: <A HREF="000978.html">[Mageia-sysadm] [480] Fix perms +</A></li> + <LI>Next message: <A HREF="000975.html">[Mageia-sysadm] [481] Fix the check on wget if server is down (thanks to rtp) +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#974">[ date ]</a> + <a href="thread.html#974">[ thread ]</a> + <a href="subject.html#974">[ subject ]</a> + <a href="author.html#974">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>Revision: 159 +Author: rda +Date: 2010-11-26 17:42:58 +0100 (Fri, 26 Nov 2010) +Log Message: +----------- +Merge r108:121 from branches/live/root (HTML/CSS base refactoring) + +Modified Paths: +-------------- + identity/CatDap/trunk/root/admin/account.tt + identity/CatDap/trunk/root/admin/account_addoc.tt + identity/CatDap/trunk/root/admin/account_group.tt + identity/CatDap/trunk/root/admin/account_modify.tt + identity/CatDap/trunk/root/admin/account_promote.tt + identity/CatDap/trunk/root/admin/group_modify.tt + identity/CatDap/trunk/root/admin/index.tt + identity/CatDap/trunk/root/email/activation.tt + identity/CatDap/trunk/root/email/admin/password.tt + identity/CatDap/trunk/root/index.tt + identity/CatDap/trunk/root/register/check.tt + identity/CatDap/trunk/root/register/complete.tt + identity/CatDap/trunk/root/register/index.tt + identity/CatDap/trunk/root/template/footer + identity/CatDap/trunk/root/template/header + identity/CatDap/trunk/root/template/html + identity/CatDap/trunk/root/template/layout + identity/CatDap/trunk/root/user/firstlogin.tt + identity/CatDap/trunk/root/user/index.tt + identity/CatDap/trunk/root/user/password.tt + +Added Paths: +----------- + identity/CatDap/trunk/root/static/style/ + +Removed Paths: +------------- + identity/CatDap/trunk/root/ttsite.css + +Property Changed: +---------------- + identity/CatDap/trunk/root/ + + +Property changes on: identity/CatDap/trunk/root +___________________________________________________________________ +Added: svn:mergeinfo + + /identity/CatDap/branches/live/root:109-121 + +Modified: identity/CatDap/trunk/root/admin/account.tt +=================================================================== +--- identity/CatDap/trunk/root/admin/account.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/account.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -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> ++ <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 %] +-</table> +-[% END %] + + + +Modified: identity/CatDap/trunk/root/admin/account_addoc.tt +=================================================================== +--- identity/CatDap/trunk/root/admin/account_addoc.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/account_addoc.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -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 + +Modified: identity/CatDap/trunk/root/admin/account_group.tt +=================================================================== +--- identity/CatDap/trunk/root/admin/account_group.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/account_group.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -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 + +Modified: identity/CatDap/trunk/root/admin/account_modify.tt +=================================================================== +--- identity/CatDap/trunk/root/admin/account_modify.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/account_modify.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -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 + +Modified: identity/CatDap/trunk/root/admin/account_promote.tt +=================================================================== +--- identity/CatDap/trunk/root/admin/account_promote.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/account_promote.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -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> + +Modified: identity/CatDap/trunk/root/admin/group_modify.tt +=================================================================== +--- identity/CatDap/trunk/root/admin/group_modify.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/group_modify.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -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 + +Modified: identity/CatDap/trunk/root/admin/index.tt +=================================================================== +--- identity/CatDap/trunk/root/admin/index.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/index.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1 +1 @@ +-Please use the menus above ++<p>Please use the menus above.</p> +\ No newline at end of file + +Modified: identity/CatDap/trunk/root/email/activation.tt +=================================================================== +--- identity/CatDap/trunk/root/email/activation.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/email/activation.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -3,3 +3,5 @@ + [% l('To activate your account, please follow the link below.') %] + [% url %] + ++-- ++<A HREF="http://mageia.org/">http://mageia.org/</A> +\ No newline at end of file + +Modified: identity/CatDap/trunk/root/email/admin/password.tt +=================================================================== +--- identity/CatDap/trunk/root/email/admin/password.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/email/admin/password.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -6,3 +6,5 @@ + + [% url %] + ++-- ++<A HREF="http://mageia.org/">http://mageia.org/</A> +\ No newline at end of file + +Modified: identity/CatDap/trunk/root/index.tt +=================================================================== +--- identity/CatDap/trunk/root/index.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/index.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,23 +1,21 @@ +-<h2>[% l('Login') %]</h2> ++<h1>[% l('Login') %]</h1> + +-<form method=post action="/user"> ++<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> ++ <p> ++ <label for="username_">[% l('Username') %]</label> ++ <input id="username_" type="text" name="username" value="[% c.user.username %]" /> ++ </p> + ++ <p> ++ <label for="password_">[% l('Password') %]</label> ++ <input id="password_" type="password" name="password" /> ++ </p> + ++ <p><input type="submit" value="[% l('Login') %]" /> ++ [% l('or') %] ++ <a href="/register">[% l('Register') %]</a></p> ++ ++ <p>@todo [% l('Forgotten password?') %]</p> ++ ++</form> + +Modified: identity/CatDap/trunk/root/register/check.tt +=================================================================== +--- identity/CatDap/trunk/root/register/check.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/register/check.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,4 +1,4 @@ + <h2>Success</h2> + <p> + [% message %] +- ++</p> +\ No newline at end of file + +Modified: identity/CatDap/trunk/root/register/complete.tt +=================================================================== +--- identity/CatDap/trunk/root/register/complete.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/register/complete.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,5 +1,6 @@ + <h2>[% l('Registration completed') %]</h2> + + <p> +-[% l('Registration was successful.') %] +-[% l('Check your mail for activation instructions.') %] ++ [% l('Registration was successful.') %] ++ [% l('Check your mail for activation instructions.') %] ++</p> +\ No newline at end of file + +Modified: identity/CatDap/trunk/root/register/index.tt +=================================================================== +--- identity/CatDap/trunk/root/register/index.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/register/index.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -5,41 +5,43 @@ + + <h2>[% l('Register') %]</h2> + +-<span class="error"> +-[% FOREACH error IN errors %] +-[% error %]<br/> +-[% END %] +-</span> ++<p class="error"> ++ [% FOREACH error IN errors %] ++ [% error %]<br/> ++ [% END %] ++</p> + +-<form method=POST action="/register/check"> ++<form method="post" action="/register/check"> ++ <p> ++ <label for="uid_">[% l('Username') %]</label> ++ <input id="uid_" type="text" name="uid" value="[% c.request.params.uid %]" /> ++ </p> + +-<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> +-</table> ++ <p> ++ <label for="gn_">[% l('First name') %]</label> ++ <input id="gn_" type="text" name="gn" value="[% c.request.params.gn %]" /> ++ </p> ++ ++ <p> ++ <label for="sn_">[% l('Surname') %]</label> ++ <input id="sn_" type="text" name="sn" value="[% c.request.params.sn %]" /> ++ </p> ++ ++ <p> ++ <label for="mail1_">[% l('Email address') %]</label> ++ <input id="mail1_" type="text" name="mail1" value="[% c.request.params.mail1 %]" /> ++ </p> ++ ++ <p> ++ <label for="mail2_">[% l('Confirm Email address') %]</label> ++ <input id="mail2_" type="text" name="mail2" value="[% c.request.params.mail2 %]" /> ++ </p> ++ ++ <p> ++ <img src="/register/captcha" /> ++ <input type="text" name="validate" /> ++ </p> ++ ++ <p><input type="submit" value="[% l('Register') %]" /></p> ++ ++</form>>>>>>>> .merge-right.r121 + +Modified: identity/CatDap/trunk/root/template/footer +=================================================================== +--- identity/CatDap/trunk/root/template/footer 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/template/footer 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,3 +1,4 @@ +-<!-- BEGIN site/footer --> +-<!-- div id="copyright">&copy; [% c.config.organisation %] 2010</div --> +-<!-- END site/footer --> ++<p>2010 <a href="<A HREF="http://mageia.org/">http://mageia.org/</A>">Mageia.org</a> ++ | <a href="<A HREF="http://mageia.org/policies/privacy/">http://mageia.org/policies/privacy/</A>">Privacy policy</a> ++ | <a href="<A HREF="http://mageia.org/faq/accounts/">http://mageia.org/faq/accounts/</A>">Mageia user accounts FAQ</a> ++ </p> +\ No newline at end of file + +Modified: identity/CatDap/trunk/root/template/header +=================================================================== +--- identity/CatDap/trunk/root/template/header 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/template/header 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,16 +1,15 @@ +-<!-- BEGIN template/header --> +-<div class="masthead"> +-<h1>[% c.config.apptitle %]</h1> +-</div> ++<p>[% template.title or site.title or c.config.apptitle %]</p> ++ + <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> ++ <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><strong><a href="[% c.uri_for("/user") %]">[% c.user.username %]</a></strong></li> ++ <li><a href="/user/logout">[% l('Log out') %]</a></li> ++ [% ELSE %] ++ <li><a href="/">[% l('Login') %]</a></li> ++ [% END %] ++ </ul> + </div> +-<!-- END template/header --> + +Modified: identity/CatDap/trunk/root/template/html +=================================================================== +--- identity/CatDap/trunk/root/template/html 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/template/html 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,14 +1,17 @@ +-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +-<html> +- <head> +- <title>[% template.title or site.title %]</title> +- <meta http-equiv="Content-type" content="text/html;charset=UTF-8" /> +- <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 or c.config.apptitle %]</title> ++ <meta content="description" value="Mageia.org online user account panel" /> ++ <meta content="keywords" value="mageia, user, account, password" /> ++ <meta content="robots" value="index,nofollow" /> ++ <link rel="stylesheet" type="text/css" href="/static/style/yui/reset-fonts-grids.css"> ++ <link rel="stylesheet" type="text/css" href="/static/style/yui/base-min.css"> ++ <link rel="stylesheet" type="text/css" href="/static/style/ttsite.css" /> ++</head> ++<body> + [% content %] +- </body> +-</html> ++</body> ++</html> +\ No newline at end of file + +Modified: identity/CatDap/trunk/root/template/layout +=================================================================== +--- identity/CatDap/trunk/root/template/layout 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/template/layout 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,40 +1,37 @@ +-<!-- BEGIN template/header --> +-<div id="header">[% PROCESS template/header %]</div> +-<!-- END template/header --> +- +-<div id="outerColumnContainer"> +- <div id="leftColumn"> +- <div class="inside"> +- <div class="vnav"> +- <ul> ++<div id="doc" class="yui-t7"> ++ <div id="hd" role="banner"> ++ [% PROCESS template/header %] ++ </div> ++ <div id="bd" role="main"> ++ <div class="yui-g"> ++ <ul id="nav"> + [% FOREACH subpage IN subpages %] +- <li><a href="[% c.uri_for(subpage.page) %]">[% l(subpage.title) %]</a></li> ++ <li><a href="[% c.uri_for(subpage.page) %]">[% l(subpage.title) %]</a></li> + [% END %] + </ul> +- </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/> ++ <div class="inside"> ++ [% IF errors %] ++ <span class="error"> ++ [% FOREACH error IN errors %] ++ [% error %] ++ <br/> ++ [% END %] ++ </span> + [% END %] +- </span> +- [% END %] +- <div id="content"> +- [% content %] +- </div> ++ </div> ++ <div id="content">[% content %]</div> + </div> +- <div class="clear"></div> ++ <div class="yui-g"> ++ <div class="yui-u first"> ++ <!-- YOUR DATA GOES HERE --> ++ </div> ++ <div class="yui-u"> ++ <!-- YOUR DATA GOES HERE --> ++ </div> + </div> +- <div class="clear"></div> +- </div> +- <!-- /div --> +- </div> ++ </div> ++ <div id="ft" role="contentinfo"> ++ [% PROCESS template/footer %] ++ </div> + </div> +-<!-- div id="footer">[% PROCESS template/footer %]</div --> + +Deleted: identity/CatDap/trunk/root/ttsite.css +=================================================================== +--- identity/CatDap/trunk/root/ttsite.css 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/ttsite.css 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,254 +0,0 @@ +- +-html { +- height: 100%; +- margin: 0; +-} +- +-body { +- /*background-color: #ccc;*/ +- color: #000; +- margin: 0; +- padding: 0px; +- height: 100%; +-} +- +-#header { +- background-color: #eee; +- border-bottom: 0px solid #fff; +-} +- +-#footer { +- background-color: #ccc; +- text-align: center; +- /*border-top: 1px solid #000;*/ +- position: absolute; +- /*top: 99%;*/ +- float: bottom; +- left: 0px; +- width: 100%; +- height: 1em; +- padding: 0px; +- padding-bottom: 2px; +- top: 100%; +-} +- +-#content { +- padding: 10px; +- vertical-align: top; +-} +- +-h1.title { +- padding: 4px; +- margin: 0px; +-} +- +-.message { +- color: #000; +-} +- +-.error { +- color: #f00; +-} +- +- +-/* Some stuff from skidoo_too.css */ +-#outerColumnContainer +-{ +- /* reserves space for the left and right columns. you can use either +- * padding, margins, or borders, depending on your needs. however you +- * can use the border method to create a background color for both left +- * and right columns +- */ +- /*height: 98%;*/ +- border-left: solid 12em #eee; +- border-right: solid 0em #eee; +- /*border-bottom: solid 1em #fff;*/ +-} +-#innerColumnContainer +-{ +- border: solid 0px #000; +- border-width: 0 0px; +- margin: 0 -1px; /* compensate for the borders because of +- 100% width declaration */ +- width: 100%; +- /*height: 90%;*/ +- /*z-index: 1;*/ +- background-color: #fff; +- float: right; +-} +-#leftColumn, #middleColumn, #rightColumn, * html #SOWrap +-{ +- overflow: visible; /* fix for IE italics bug */ +- position: relative; /* fix some rendering issues */ +-} +-#SOWrap +-{ +- float: left; +- margin: 0 -1px 0 0; +- width: 100%; +- /*z-index: 3;*/ +-} +-#middleColumn +-{ +- float: right; +- margin: 0 0 0 -1px; +- width: 100%; +- /*z-index: 5;*/ +-} +-#leftColumn +-{ +- float: left; +- margin: 0 1px 0 -12em; +- width: 12em; +- /*z-index: 4;*/ +- height: 100%; +- background-color: #eee; +-} +-#rightColumn +-{ +- float: right; +- width: 14em; +- margin: 0 -14em 0 1px; +- /*z-index: 2;*/ +-} +- +-/* vertical navigation stuff. mostly exactly as seen in the vnav.css styleheet +- * in the original skidoo layout. +- */ +-.vnav +-{ +- margin: 0em 0; +-} +-.vnav ul, .vnav ul li +-{ +- margin: 0; +- padding: 0; +- list-style-type: none; +- display: block; +-} +-.vnav ul +-{ +- border: solid 0px #fff; +- border-bottom-width: 0; +-} +-.vnav ul li +-{ +- border-bottom: solid 0px #fff; +-} +-.vnav ul li, .vnav ul li a +-{ +- margin: 0; +- display: block; +- padding: 0; +- line-height: normal; +-} +-.vnav ul li a +-{ +- display: block; +- padding: 2px 5px 3px 5px; +-} +-.vnav ul li a, .vnav ul li a:link, .vnav ul li a:visited, .vnav ul li a:active, .vnav ul li a:hover +-{ +- text-decoration: none; +- cursor: pointer; +- background-color: #eee; +- color: #000; +-} +- +-.vnav ul li a:hover +-{ +- text-decoration: none; +- background-color: #ccc; +-} +- +- +-.vnav h3 +-{ +- margin-bottom: 0; +- padding-bottom: 0; +- font-size: 126%; +-} +-* html .vnav ul li a/* hide from IE5.0/Win & IE5/Mac */ +-{ +- height: 0.01%; +-} +-* html .vnav ul +-{ +- position: relative; /* IE needs this to fix a rendering problem */ +-} +- +-/* horizontal navigation elements. create a DIV element with the class hnav +- * and stick one unordered list inside it to generate a horizontal menu. +- */ +-.hnav +-{ +- border-bottom: solid 0px #fff; +- text-align: center; +-} +-.hnav, .hnav ul li a +-{ +- /* need to middor veritcal padding on .hnav and child anchor elements +- * because the anchors are _not_ block elements. since they are not +- * block elements web browsers will not expand .hnav to contain them +- * even with the extra padding. by applying the same padding to both +- * the parent .hnav _looks_ like its containing the child anchor +- * elements. +- */ +- padding-top: 3px; +- padding-bottom: 4px; +-} +-.hnav ul, .hnav ul li +-{ +- display: inline; +- list-style-type: none; +- margin: 0; +- padding: 0; +-} +-.hnav ul li a +-{ +- margin: 0 -1px 0 0; +- padding-left: 10px; +- padding-right: 10px; /* short-hand padding attribute would overwrite +- top/bottom padding set in a previous rule */ +- border-left: solid 0px #000; +- border-right: solid 0px #000; +- white-space: nowrap; +-} +-.hnav ul li a:link, .hnav ul li a:visited, .hnav ul li a:active, .hnav ul li a:hover +-{ +- text-decoration: none; +- color: #7f899a; +-} +-.hnav ul li a:hover +-{ +- text-decoration: none; +- background-color: #ccc; +-} +-.hnav ul li span.divider +-{ +- display: none; +-} +-* html .hnav ul li, * html .hnav ul li a +-{ +- width: 1%; /* IE/Mac needs this */ +- display: inline-block; /* IE/Mac needs this */ +- /* \*/ +- width: auto; +- display: inline; +- /* reset above hack */ +-} +-* html .hnav, * html .hnav ul a +-{ +- /* \*/ height: 0.01%; /* hasLayout hack to fix render bugs in IE/Win. +- IE/Mac will ignore this rule. */ +-} +-* html .HNAV +-{ +- padding: 0; /* IE5/Win will resize #hnav to fit the heights of its +- inline children that have vertical padding. So this +- incorrect case selector hack will be applied only by +- IE 5.x/Win */ +-} +- +-/* svn test */ +- + +Modified: identity/CatDap/trunk/root/user/firstlogin.tt +=================================================================== +--- identity/CatDap/trunk/root/user/firstlogin.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/user/firstlogin.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,18 +1,16 @@ +-<html> +-<form method=post> +-<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> +-</table> ++ ++<form method="post" action=""> ++ ++ <p> ++ <label for="newpassword1_">[% l('New Password') %]</label> ++ <input id="newpassword1_" name="newpassword1" type="password" value="" /> ++ </p> ++ ++ <p> ++ <label for="newpassword2_">[% l('Repeat New Password') %]</label> ++ <input id="newpassword2_" name="newpassword2" type="password" value="" /> ++ </p> ++ ++ <p><input type="submit" value="[% l('Change') %]" /></p> ++ + </form> +-</html> + +Modified: identity/CatDap/trunk/root/user/index.tt +=================================================================== +--- identity/CatDap/trunk/root/user/index.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/user/index.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,32 +1,43 @@ +-<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 %] ++ </table> ++ ++ <p><input type="Submit" value="[% l('Update') %]" /></p> + </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> ++<hr /> ++ ++<form method="post" action="/user/add"> ++ <p> ++ <select name="attribute"> ++ [% FOREACH attr IN may %] ++ <option value="[% attr %]">[% attr %]</option> ++ [% END %] ++ ++ <input name="value" value="" /> ++ ++ <input type="submit" value="[% l('Add') %]" /> ++ </p> + </form> + +Modified: identity/CatDap/trunk/root/user/password.tt +=================================================================== +--- identity/CatDap/trunk/root/user/password.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/user/password.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -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> +-</table> ++ ++<form method="post" action=""> ++ ++ <p> ++ <label for="password_">[% l('Current password') %]</label> ++ <input id="password_" name="password" type="password" value="" /> ++ </p> ++ ++ <p> ++ <label for="newpassword1_">[% l('New Password') %]</label> ++ <input id="newpassword1_" name="newpassword1" type="password" value="" /> ++ </p> ++ ++ <p> ++ <label for="newpassword2_">[% l('Repeat New Password') %]</label> ++ <input id="newpassword2_" name="newpassword2" type="password" value="" /> ++ </p> ++ ++ <p><input type="submit" value="[% l('Change') %]" /></p> ++ + </form> +-</html> +-------------- next part -------------- +An HTML attachment was scrubbed... +URL: </pipermail/mageia-sysadm/attachments/20101126/0e05740d/attachment-0001.html> +</PRE> + + + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="000978.html">[Mageia-sysadm] [480] Fix perms +</A></li> + <LI>Next message: <A HREF="000975.html">[Mageia-sysadm] [481] Fix the check on wget if server is down (thanks to rtp) +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#974">[ date ]</a> + <a href="thread.html#974">[ thread ]</a> + <a href="subject.html#974">[ subject ]</a> + <a href="author.html#974">[ author ]</a> + </LI> + </UL> + +<hr> +<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm +mailing list</a><br> +</body></html> |