diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20110107/042902b0/attachment-0001.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110107/042902b0/attachment-0001.html | 623 |
1 files changed, 623 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110107/042902b0/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110107/042902b0/attachment-0001.html new file mode 100644 index 000000000..d0f1f7a28 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110107/042902b0/attachment-0001.html @@ -0,0 +1,623 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[246] merge with trunk, rev 245</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>246</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2011-01-07 02:42:11 +0100 (Fri, 07 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>merge with trunk, rev 245</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#identityCatDapbrancheslivelibCatDapControlleruserpm">identity/CatDap/branches/live/lib/CatDap/Controller/user.pm</a></li> +<li><a href="#identityCatDapbranchesliverootindextt">identity/CatDap/branches/live/root/index.tt</a></li> +<li><a href="#identityCatDapbranchesliverootstaticstylettsitecss">identity/CatDap/branches/live/root/static/style/ttsite.css</a></li> +<li><a href="#identityCatDapbranchesliverootuserindextt">identity/CatDap/branches/live/root/user/index.tt</a></li> +<li><a href="#identityCatDapbranchesliverootuserpasswordtt">identity/CatDap/branches/live/root/user/password.tt</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li><a href="#identityCatDapbrancheslivelibCatDapI18Ndepo">identity/CatDap/branches/live/lib/CatDap/I18N/de.po</a></li> +</ul> + +<h3>Property Changed</h3> +<ul> +<li><a href="#identityCatDapbrancheslive">identity/CatDap/branches/live/</a></li> +</ul> + +</div> +<div id="patch"><pre> + +<a id="identityCatDapbrancheslive">Property changes on: identity/CatDap/branches/live</a> +___________________________________________________________________ +<a id="svnmergeinfo">Modified: svn:mergeinfo</a> + - /identity/CatDap/trunk:64,66-68,140-211 + + /identity/CatDap/trunk:64,66-68,140-245 + +<a id="identityCatDapbrancheslivelibCatDapControlleruserpm">Modified: identity/CatDap/branches/live/lib/CatDap/Controller/user.pm</a> +=================================================================== +--- identity/CatDap/branches/live/lib/CatDap/Controller/user.pm 2011-01-07 01:39:40 UTC (rev 245) ++++ identity/CatDap/branches/live/lib/CatDap/Controller/user.pm 2011-01-07 01:42:11 UTC (rev 246) +@@ -237,15 +237,13 @@ + + sub add : Local { + my ( $self, $c) = @_; +- my ($mesg,$entry,$user,$attr,$value,$userfilter); +- $attr = $c->req->param('attribute'); +- $value = $c->req->param('value'); +- $user = $c->user->username; +- $userfilter = $c->user->store->user_filter; +- $userfilter = s/%s/$c->user->username/g; ++ my $attr = $c->req->param('attribute'); ++ my $value = $c->req->param('value'); ++ my $user = $c->user->username; ++ my $userfilter = sprintf($c->user->store->user_filter ,$c->user->username); + $c->log->debug("Searching for user $user with $userfilter"); +- $mesg = $c->model('User')->search($userfilter); +- $entry = $mesg->entry; ++ my $mesg = $c->model('User')->search($userfilter); ++ my $entry = $mesg->entry; + $entry->add( $attr => $value); + $c->log->info("Adding $attr = $value to user $user"); + $entry->update; + +<a id="identityCatDapbrancheslivelibCatDapI18Ndepofromrev245identityCatDaptrunklibCatDapI18Ndepo">Copied: identity/CatDap/branches/live/lib/CatDap/I18N/de.po (from rev 245, identity/CatDap/trunk/lib/CatDap/I18N/de.po)</a> +=================================================================== +--- identity/CatDap/branches/live/lib/CatDap/I18N/de.po (rev 0) ++++ identity/CatDap/branches/live/lib/CatDap/I18N/de.po 2011-01-07 01:42:11 UTC (rev 246) +@@ -0,0 +1,383 @@ ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# Oliver Burger <oliver.bgr@googlemail.com>, 2011. ++msgid "" ++msgstr "" ++"Project-Id-Version: \n" ++"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" ++"PO-Revision-Date: 2011-01-06 22:50+0100\n" ++"Last-Translator: Oliver Burger <oliver.bgr@googlemail.com>\n" ++"Language-Team: German <mageia-i18n@mageia.org>\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 1.0\n" ++"Plural-Forms: nplurals=2; plural=n != 1;\n" ++ ++#: lib/CatDap/Controller/register.pm:133 ++msgid "Activation" ++msgstr "Aktivierung" ++ ++#: root/admin/account_addoc.tt:28 root/admin/account_modify.tt:24 root/admin/group_modify.tt:18 root/user/index.tt:19 root/user/index.tt:46 ++msgid "Add" ++msgstr "Hinzufügen" ++ ++#: root/admin/account_modify.tt:85 ++msgid "Add ObjectClass" ++msgstr "Objekt-Klasse hinzufügen" ++ ++#: root/admin/account_modify.tt:47 ++msgid "Add attribute" ++msgstr "Attribut hinzufügen" ++ ++#. (oc, dn) ++#: root/admin/account_addoc.tt:1 ++msgid "Adding objectclass %1 to dn %2" ++msgstr "Objektklasse %1 zu dn %2 hinzufügen" ++ ++#: lib/CatDap/Controller/register.pm:49 ++msgid "Addresses do not match" ++msgstr "Die Adressen stimmen nicht überein" ++ ++#: lib/CatDap/Controller/register.pm:89 ++msgid "An account already exists with this email address" ++msgstr "Ein Zugang mit dieser Email-Adresse existiert bereits" ++ ++#: lib/CatDap/Controller/register.pm:94 ++msgid "An account already exists with this username" ++msgstr "Ein Zugang mit diesem Benutzernamen existiert bereits" ++ ++#. ($errors) ++#: lib/CatDap/Controller/register.pm:145 ++msgid "An error occured sending the email, but your account was created. Please try the password recovery process if you entered the correct email address. Errors %1" ++msgstr "" ++"Ein Fehler beim Senden der Email ist aufgetreten, aber Ihr Zugang wurde eingerichtet. Bitte versuchen Sie, den Passwortwiederherstellungs-Prozess durchzuführen, " ++"falls Sie die korrekte Email-Adresse angegeben haben. Fehler %1" ++ ++#. ($errors) ++#: lib/CatDap/Controller/admin.pm:539 ++msgid "An error occured sending the email, but your account was created. Please try the password recovery process if you entered the correct email address: %1" ++msgstr "" ++"Ein Fehler ist beim Senden der Email aufgetreten, aber Ihr Zugang wurde eingerichtet. Bitte versuchen Sie, den Passwortwiederherstellungs-Prozess durchzuführen, " ++"falls Sie die richtige Email-Adresse angegeben haben: %1" ++ ++#. ($errors) ++#: lib/CatDap/Controller/forgot_password.pm:105 ++msgid "An error occured sending the email, please try again later. Errors %1" ++msgstr "Ein Fehler ist beim Versenden der Email aufgetreten, bitte versuchen Sie es später erneut. Fehler %1" ++ ++#: root/admin/account_addoc.tt:9 root/admin/account_modify.tt:8 root/admin/group_modify.tt:5 root/user/index.tt:4 ++msgid "Attribute" ++msgstr "Attribut" ++ ++#: lib/CatDap/Controller/register.pm:56 ++msgid "Cannot check /etc/passwd, please warn system administrators" ++msgstr "Die Datei /etc/passwd kann nicht überprüft werden, bitte warnen Sie die System-Administratoren" ++ ++#: root/register/index.tt:29 ++msgid "Captcha" ++msgstr "Captcha" ++ ++#: root/user/firstlogin.tt:14 root/user/password.tt:19 ++msgid "Change" ++msgstr "Ändern" ++ ++#: root/user/fake.tt:2 ++msgid "Change password" ++msgstr "Das Passwort ändern" ++ ++#: root/register/complete.tt:5 ++msgid "Check your mail for activation instructions." ++msgstr "Überprüfen Sie Ihre Emails auf Anweisungen zum Aktivieren." ++ ++#: root/forgot_password/complete.tt:5 ++msgid "Check your mail for password reset instructions." ++msgstr "Überprüfen Sie Ihre Emails auf Anweisungen zum Zurücksetzen Ihres Passwortes." ++ ++#: root/register/index.tt:24 ++msgid "Confirm Email address" ++msgstr "Bestätigen Sie die Emailadresse" ++ ++#: root/user/password.tt:5 ++msgid "Current password" ++msgstr "Aktuelles Passwort" ++ ++#. (cn) ++#. (entry.cn) ++#: root/email/activation.tt:1 root/email/admin/password.tt:1 root/email/forgot_password.tt:1 ++msgid "Dear %1," ++msgstr "Sehr geehrter %1," ++ ++#: root/admin/account_modify.tt:27 root/user/index.tt:22 ++msgid "Delete" ++msgstr "Löschen" ++ ++#: root/user/fake.tt:1 ++msgid "Edit" ++msgstr "Ändern" ++ ++#: root/admin/account.tt:33 root/admin/account.tt:8 root/admin/account_promote.tt:6 root/register/index.tt:20 ++msgid "Email" ++msgstr "Email" ++ ++#: root/forgot_password/index.tt:11 root/register/index.tt:21 ++msgid "Email address" ++msgstr "Email-Adresse" ++ ++#: root/forgot_password/complete.tt:1 ++msgid "Email sent." ++msgstr "Email versandt." ++ ++#: root/forgot_password/confirm.tt:2 ++msgid "Enter new password." ++msgstr "Neues Passwort angeben." ++ ++#: root/register/index.tt:32 ++msgid "Enter text" ++msgstr "Text angeben" ++ ++#: root/admin/account.tt:34 root/admin/account_promote.tt:7 ++msgid "First Name" ++msgstr "Vorname" ++ ++#: root/register/index.tt:13 ++msgid "First name" ++msgstr "Nachname" ++ ++#: lib/CatDap/Controller/forgot_password.pm:94 ++msgid "Forgot password" ++msgstr "Passwort vergessen" ++ ++#: root/forgot_password/index.tt:5 ++msgid "Forgot your password?" ++msgstr "Haben Sie Ihr Passwort vergessen?" ++ ++#: root/index.tt:17 root/index.tt:18 ++msgid "Forgotten password?" ++msgstr "Vergessenes Passwort?" ++ ++#: root/admin/account.tt:36 root/admin/account.tt:9 root/admin/account_promote.tt:9 ++msgid "Full Name" ++msgstr "Vollständiger Name" ++ ++#: root/admin/group.tt:27 ++msgid "Group Name" ++msgstr "Gruppenname" ++ ++#: root/admin/group.tt:9 ++msgid "Group name" ++msgstr "Gruppenname" ++ ++#: root/admin/account_modify.tt:2 ++msgid "Groups" ++msgstr "Gruppen" ++ ++#: lib/CatDap/Controller/forgot_password.pm:48 lib/CatDap/Controller/register.pm:52 ++msgid "Incorrect validation text, please try again" ++msgstr "Inkorrekter Überprüfungstext, bitte versuchen Sie es erneut" ++ ++#: lib/CatDap/Controller/forgot_password.pm:45 lib/CatDap/Controller/register.pm:46 ++msgid "Invalid email address" ++msgstr "Ungültige Email-Adresse" ++ ++#: lib/CatDap/Controller/register.pm:42 ++msgid "Invalid username" ++msgstr "Ungültiger Benutzername" ++ ++#: lib/CatDap/Controller/register.pm:59 ++msgid "Invalid username, already used by system" ++msgstr "Ungültiger Benutzername, wird vom System bereits genutzt" ++ ++#: root/template/header:10 root/user/fake.tt:3 ++msgid "Log out" ++msgstr "Abmelden" ++ ++#: root/index.tt:1 root/index.tt:13 ++msgid "Login" ++msgstr "Anmelden" ++ ++#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5 root/user/password.tt:10 ++msgid "New Password" ++msgstr "Neues Passwort" ++ ++#: lib/CatDap/Controller/user.pm:296 ++msgid "New passwords dont match" ++msgstr "Die neuen Passwörter stimmen nicht überein" ++ ++#: root/forgot_password/complete.tt:4 ++msgid "Operation was successful." ++msgstr "Die Operation war erfolgreich." ++ ++#: root/index.tt:10 ++msgid "Password" ++msgstr "Passwort" ++ ++#: lib/CatDap/Controller/user.pm:290 ++msgid "Password incorrect" ++msgstr "Falsches Passwort" ++ ++#: lib/CatDap/Controller/admin.pm:542 ++msgid "Password reset and email sent" ++msgstr "Passwort zurückgesetzt und Email versandt" ++ ++#: root/register/index.tt:12 ++msgid "Personal Information" ++msgstr "Persönliche Informationen" ++ ++#: root/email/admin/password.tt:5 ++msgid "Please click below to change your password" ++msgstr "Bitte klicken Sie unten um Ihr Passwort zu ändern" ++ ++#: root/admin/index.tt:1 ++msgid "Please use the menus above." ++msgstr "Bitte benutzen Sie die Menüs oben." ++ ++#: root/admin/account_promote.tt:25 ++msgid "Primary group" ++msgstr "Primäre Gruppe" ++ ++#: root/admin/account_modify.tt:71 ++msgid "Promote" ++msgstr "" ++ ++#: root/admin/account_modify.tt:62 ++msgid "Promote user to posixAccount with primary group:" ++msgstr "" ++ ++#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35 ++msgid "Register" ++msgstr "Registrieren" ++ ++#: root/register/complete.tt:1 ++msgid "Registration completed" ++msgstr "Registrierung vollständig" ++ ++#: root/register/complete.tt:4 ++msgid "Registration was successful." ++msgstr "Die Registrierung war erfolgreich" ++ ++#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10 root/user/password.tt:15 ++msgid "Repeat New Password" ++msgstr "Neues Passwort wiederholen" ++ ++#: root/admin/account_modify.tt:1 ++msgid "Reset password" ++msgstr "Passwort wiederherstellen" ++ ++#: root/admin/account.tt:22 ++msgid "Search" ++msgstr "Suchen" ++ ++#: root/admin/account.tt:4 root/admin/group.tt:5 ++msgid "Search by" ++msgstr "Suchen nach" ++ ++#: root/admin/account_promote.tt:4 ++msgid "Select" ++msgstr "Auswählen" ++ ++#: root/forgot_password/index.tt:18 ++msgid "Send me my password" ++msgstr "Ein Passwort senden" ++ ++#: root/forgot_password/confirm.tt:16 ++msgid "Set new password" ++msgstr "Neues Passwort setzen" ++ ++#: root/register/check.tt:1 ++msgid "Success" ++msgstr "Erfolg" ++ ++#: root/admin/account.tt:10 root/admin/account.tt:35 root/admin/account_promote.tt:8 root/register/index.tt:16 ++msgid "Surname" ++msgstr "Nachname" ++ ++#: lib/CatDap/Controller/register.pm:70 ++msgid "The first name supplied contains illegal characters" ++msgstr "Der angegebene Vorname enthält ungültige Zeichen" ++ ++#: lib/CatDap/Controller/register.pm:75 ++msgid "The surname supplied contains illegal characters" ++msgstr "Der angegebene Nachname enthält ungültige Zeichen" ++ ++#: lib/CatDap/Controller/forgot_password.pm:66 ++msgid "This email address is not bound to an account" ++msgstr "Diese Email-Adresse ist nicht an einen Zugang gebunden" ++ ++#: root/email/activation.tt:3 ++msgid "To activate your account, please follow the link below." ++msgstr "Um Ihren Zugang zu aktivieren, folgen Sie bitte den Links unten." ++ ++#: root/email/forgot_password.tt:3 ++msgid "To reset your password, please follow the link below." ++msgstr "Um Ihr Passwort zurückzusetzen, folgen Sie den Links unten." ++ ++#: root/admin/account_modify.tt:35 root/user/index.tt:29 ++msgid "Update" ++msgstr "Aktualisieren" ++ ++#: root/admin/account.tt:32 root/admin/account.tt:7 root/admin/account_promote.tt:5 root/index.tt:6 root/register/index.tt:7 root/register/index.tt:8 ++msgid "Username" ++msgstr "Benutzername" ++ ++#: lib/CatDap/Controller/register.pm:65 ++msgid "Username is not authorized to be used" ++msgstr "Der Benutzername darf nicht verwendet werden" ++ ++#: root/admin/account_addoc.tt:10 root/admin/account_modify.tt:9 root/admin/group_modify.tt:6 root/user/index.tt:4 ++msgid "Value" ++msgstr "Wert" ++ ++#. (c.config.organisation) ++#: root/email/forgot_password.tt:2 ++msgid "Your %1 account has been requested to change the password. If you did not do this, or you do not want to change your password; you can just do nothing." ++msgstr "" ++"Für ihren %1-Zugang wurde angefordert, das Passwort zu ändern. Wenn Sie dies nicht getan haben oder Ihr Passwort nicht ändern wollen, können Sie einfach nichts tun." ++ ++#. (c.config.organisation) ++#: root/email/activation.tt:2 ++msgid "Your %1 account has been successfully created, but requires activation." ++msgstr "Ihr %1-Zugang wurde erfolgreich eingerichtet, benötigt aber noch Aktivierung." ++ ++#. (c.user.username) ++#: root/email/admin/password.tt:3 ++msgid "Your password was reset by %1" ++msgstr "Ihr Passwort wurde von %1 zurückgesetzt" ++ ++#: lib/CatDap/Controller/user.pm:61 ++msgid "Your session has expired" ++msgstr "Ihre Sitzung ist abgelaufen" ++ ++#: root/admin/account.tt:15 root/admin/group.tt:15 ++msgid "contains" ++msgstr "enthält" ++ ++#: root/admin/group_modify.tt:14 ++msgid "delete" ++msgstr "löschen" ++ ++#: root/admin/account.tt:17 root/admin/group.tt:17 ++msgid "greater than or equal to" ++msgstr "Größer als oder gleich wie" ++ ++#: root/admin/account.tt:16 root/admin/group.tt:16 ++msgid "is exactly" ++msgstr "ist genau" ++ ++#: root/admin/account.tt:18 root/admin/group.tt:18 ++msgid "less than" ++msgstr "weniger als" ++ ++#: root/admin/group.tt:10 ++msgid "member" ++msgstr "Mitglied" ++ ++#: lib/CatDap/Controller/admin.pm:526 ++msgid "password reset" ++msgstr "Passwort zurückgesetzt" ++ ++#: root/admin/account_modify.tt:53 ++msgid "with value" ++msgstr "mit dem Wert" ++ + +<a id="identityCatDapbranchesliverootindextt">Modified: identity/CatDap/branches/live/root/index.tt</a> +=================================================================== +--- identity/CatDap/branches/live/root/index.tt 2011-01-07 01:39:40 UTC (rev 245) ++++ identity/CatDap/branches/live/root/index.tt 2011-01-07 01:42:11 UTC (rev 246) +@@ -10,13 +10,13 @@ + <label for="password_">[% l('Password : ') %]</label> + <input id="password_" type="password" name="password" /> + <br /> ++ <button type="submit" value="[% l('Login') %]" >[% l('Login') %]</button> + </div> + <div id="login_form_line"> + <span><a href="/register">[% l('Register') %]</a> | + @todo [% l('Forgotten password?') %] + <!--<a href="/forgot_password">[% l('Forgotten password?') %]</a> --> + </span> +- <button type="submit" value="[% l('Login') %]" >[% l('Login') %]</button> + </div> + </form> + </div> + +<a id="identityCatDapbranchesliverootstaticstylettsitecss">Modified: identity/CatDap/branches/live/root/static/style/ttsite.css</a> +=================================================================== +--- identity/CatDap/branches/live/root/static/style/ttsite.css 2011-01-07 01:39:40 UTC (rev 245) ++++ identity/CatDap/branches/live/root/static/style/ttsite.css 2011-01-07 01:42:11 UTC (rev 246) +@@ -15,6 +15,10 @@ + + #hd, #ft, #nav, #content, .inside { padding: 0 1em 0.5em 0; } + ++#nav { ++ text-align: left; ++} ++ + #hd { + background: #aaa; + padding: 10px 20px 4px 20px; +@@ -96,6 +100,33 @@ + float: right; + } + ++#password_change_form { ++ display: block; ++ float: left; ++} ++ ++#password_change_form input:focus { ++ background: #ddf; ++} ++ ++#password_change_form button { ++ margin-bottom: 1.5em; ++ margin-top: 0.5em; ++ float: right; ++} ++ ++#password_change_form label { ++ text-align: left; ++ float: left; ++ width: 150px; ++} ++ ++ ++#attribute_add_form { ++ text-align: left; ++ float: left ++} ++ + /* End changes obgr_seneca */ + + .message { + +<a id="identityCatDapbranchesliverootuserindextt">Modified: identity/CatDap/branches/live/root/user/index.tt</a> +=================================================================== +--- identity/CatDap/branches/live/root/user/index.tt 2011-01-07 01:39:40 UTC (rev 245) ++++ identity/CatDap/branches/live/root/user/index.tt 2011-01-07 01:42:11 UTC (rev 246) +@@ -30,9 +30,11 @@ + </tr> + </table> + </form> ++</div> + + <hr /> +- ++<div id="attribute_add_form"> ++<h3>[%('Add a attribute')%]</h3> + <form method="post" action="/user/add"> + <p> + <select name="attribute"> + +<a id="identityCatDapbranchesliverootuserpasswordtt">Modified: identity/CatDap/branches/live/root/user/password.tt</a> +=================================================================== +--- identity/CatDap/branches/live/root/user/password.tt 2011-01-07 01:39:40 UTC (rev 245) ++++ identity/CatDap/branches/live/root/user/password.tt 2011-01-07 01:42:11 UTC (rev 246) +@@ -1,21 +1,18 @@ +- ++<div id="password_change_form"> ++<h2>Change password</h2> + <form method="post" action=""> + +- <p> + <label for="password_">[% l('Current password') %]</label> + <input id="password_" name="password" type="password" value="" /> +- </p> +- +- <p> ++ <br/> ++ <br/> + <label for="newpassword1_">[% l('New Password') %]</label> + <input id="newpassword1_" name="newpassword1" type="password" value="" /> +- </p> +- +- <p> ++ <br/> + <label for="newpassword2_">[% l('Repeat New Password') %]</label> + <input id="newpassword2_" name="newpassword2" type="password" value="" /> +- </p> ++ <br/> ++ <button type="submit" value="[% l('Change') %]" />[% l('Change') %]</button> + +- <p><input type="submit" value="[% l('Change') %]" /></p> +- + </form> ++</div> + +</pre></div> + +</body> +</html>
\ No newline at end of file |