summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-sysadm/2011-January/001648.html
diff options
context:
space:
mode:
Diffstat (limited to 'zarb-ml/mageia-sysadm/2011-January/001648.html')
-rw-r--r--zarb-ml/mageia-sysadm/2011-January/001648.html645
1 files changed, 645 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2011-January/001648.html b/zarb-ml/mageia-sysadm/2011-January/001648.html
new file mode 100644
index 000000000..f3eff2275
--- /dev/null
+++ b/zarb-ml/mageia-sysadm/2011-January/001648.html
@@ -0,0 +1,645 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+ <HEAD>
+ <TITLE> [Mageia-sysadm] [246] merge with trunk, rev 245
+ </TITLE>
+ <LINK REL="Index" HREF="index.html" >
+ <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B246%5D%20merge%20with%20trunk%2C%20rev%20245&In-Reply-To=%3C20110107014212.009E341AE1%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="001647.html">
+ <LINK REL="Next" HREF="001650.html">
+ </HEAD>
+ <BODY BGCOLOR="#ffffff">
+ <H1>[Mageia-sysadm] [246] merge with trunk, rev 245</H1>
+ <B>root at mageia.org</B>
+ <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B246%5D%20merge%20with%20trunk%2C%20rev%20245&In-Reply-To=%3C20110107014212.009E341AE1%40valstar.mageia.org%3E"
+ TITLE="[Mageia-sysadm] [246] merge with trunk, rev 245">root at mageia.org
+ </A><BR>
+ <I>Fri Jan 7 02:42:11 CET 2011</I>
+ <P><UL>
+ <LI>Previous message: <A HREF="001647.html">[Mageia-sysadm] [245] more compact code
+</A></li>
+ <LI>Next message: <A HREF="001650.html">[Mageia-sysadm] [689] send reports to the new ml ( for test now, I will disable the previous one later )
+</A></li>
+ <LI> <B>Messages sorted by:</B>
+ <a href="date.html#1648">[ date ]</a>
+ <a href="thread.html#1648">[ thread ]</a>
+ <a href="subject.html#1648">[ subject ]</a>
+ <a href="author.html#1648">[ author ]</a>
+ </LI>
+ </UL>
+ <HR>
+<!--beginarticle-->
+<PRE>Revision: 246
+Author: misc
+Date: 2011-01-07 02:42:11 +0100 (Fri, 07 Jan 2011)
+Log Message:
+-----------
+merge with trunk, rev 245
+
+Modified Paths:
+--------------
+ identity/CatDap/branches/live/lib/CatDap/Controller/user.pm
+ identity/CatDap/branches/live/root/index.tt
+ identity/CatDap/branches/live/root/static/style/ttsite.css
+ identity/CatDap/branches/live/root/user/index.tt
+ identity/CatDap/branches/live/root/user/password.tt
+
+Added Paths:
+-----------
+ identity/CatDap/branches/live/lib/CatDap/I18N/de.po
+
+Property Changed:
+----------------
+ identity/CatDap/branches/live/
+
+
+Property changes on: identity/CatDap/branches/live
+___________________________________________________________________
+Modified: svn:mergeinfo
+ - /identity/CatDap/trunk:64,66-68,140-211
+ + /identity/CatDap/trunk:64,66-68,140-245
+
+Modified: identity/CatDap/branches/live/lib/CatDap/Controller/user.pm
+===================================================================
+--- 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-&gt;req-&gt;param('attribute');
+- $value = $c-&gt;req-&gt;param('value');
+- $user = $c-&gt;user-&gt;username;
+- $userfilter = $c-&gt;user-&gt;store-&gt;user_filter;
+- $userfilter = s/%s/$c-&gt;user-&gt;username/g;
++ my $attr = $c-&gt;req-&gt;param('attribute');
++ my $value = $c-&gt;req-&gt;param('value');
++ my $user = $c-&gt;user-&gt;username;
++ my $userfilter = sprintf($c-&gt;user-&gt;store-&gt;user_filter ,$c-&gt;user-&gt;username);
+ $c-&gt;log-&gt;debug(&quot;Searching for user $user with $userfilter&quot;);
+- $mesg = $c-&gt;model('User')-&gt;search($userfilter);
+- $entry = $mesg-&gt;entry;
++ my $mesg = $c-&gt;model('User')-&gt;search($userfilter);
++ my $entry = $mesg-&gt;entry;
+ $entry-&gt;add( $attr =&gt; $value);
+ $c-&gt;log-&gt;info(&quot;Adding $attr = $value to user $user&quot;);
+ $entry-&gt;update;
+
+Copied: identity/CatDap/branches/live/lib/CatDap/I18N/de.po (from rev 245, identity/CatDap/trunk/lib/CatDap/I18N/de.po)
+===================================================================
+--- 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 &lt;<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">oliver.bgr at googlemail.com</A>&gt;, 2011.
++msgid &quot;&quot;
++msgstr &quot;&quot;
++&quot;Project-Id-Version: \n&quot;
++&quot;POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n&quot;
++&quot;PO-Revision-Date: 2011-01-06 22:50+0100\n&quot;
++&quot;Last-Translator: Oliver Burger &lt;<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">oliver.bgr at googlemail.com</A>&gt;\n&quot;
++&quot;Language-Team: German &lt;<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">mageia-i18n at mageia.org</A>&gt;\n&quot;
++&quot;MIME-Version: 1.0\n&quot;
++&quot;Content-Type: text/plain; charset=UTF-8\n&quot;
++&quot;Content-Transfer-Encoding: 8bit\n&quot;
++&quot;X-Generator: Lokalize 1.0\n&quot;
++&quot;Plural-Forms: nplurals=2; plural=n != 1;\n&quot;
++
++#: lib/CatDap/Controller/register.pm:133
++msgid &quot;Activation&quot;
++msgstr &quot;Aktivierung&quot;
++
++#: 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 &quot;Add&quot;
++msgstr &quot;Hinzuf&#252;gen&quot;
++
++#: root/admin/account_modify.tt:85
++msgid &quot;Add ObjectClass&quot;
++msgstr &quot;Objekt-Klasse hinzuf&#252;gen&quot;
++
++#: root/admin/account_modify.tt:47
++msgid &quot;Add attribute&quot;
++msgstr &quot;Attribut hinzuf&#252;gen&quot;
++
++#. (oc, dn)
++#: root/admin/account_addoc.tt:1
++msgid &quot;Adding objectclass %1 to dn %2&quot;
++msgstr &quot;Objektklasse %1 zu dn %2 hinzuf&#252;gen&quot;
++
++#: lib/CatDap/Controller/register.pm:49
++msgid &quot;Addresses do not match&quot;
++msgstr &quot;Die Adressen stimmen nicht &#252;berein&quot;
++
++#: lib/CatDap/Controller/register.pm:89
++msgid &quot;An account already exists with this email address&quot;
++msgstr &quot;Ein Zugang mit dieser Email-Adresse existiert bereits&quot;
++
++#: lib/CatDap/Controller/register.pm:94
++msgid &quot;An account already exists with this username&quot;
++msgstr &quot;Ein Zugang mit diesem Benutzernamen existiert bereits&quot;
++
++#. ($errors)
++#: lib/CatDap/Controller/register.pm:145
++msgid &quot;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&quot;
++msgstr &quot;&quot;
++&quot;Ein Fehler beim Senden der Email ist aufgetreten, aber Ihr Zugang wurde eingerichtet. Bitte versuchen Sie, den Passwortwiederherstellungs-Prozess durchzuf&#252;hren, &quot;
++&quot;falls Sie die korrekte Email-Adresse angegeben haben. Fehler %1&quot;
++
++#. ($errors)
++#: lib/CatDap/Controller/admin.pm:539
++msgid &quot;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&quot;
++msgstr &quot;&quot;
++&quot;Ein Fehler ist beim Senden der Email aufgetreten, aber Ihr Zugang wurde eingerichtet. Bitte versuchen Sie, den Passwortwiederherstellungs-Prozess durchzuf&#252;hren, &quot;
++&quot;falls Sie die richtige Email-Adresse angegeben haben: %1&quot;
++
++#. ($errors)
++#: lib/CatDap/Controller/forgot_password.pm:105
++msgid &quot;An error occured sending the email, please try again later. Errors %1&quot;
++msgstr &quot;Ein Fehler ist beim Versenden der Email aufgetreten, bitte versuchen Sie es sp&#228;ter erneut. Fehler %1&quot;
++
++#: root/admin/account_addoc.tt:9 root/admin/account_modify.tt:8 root/admin/group_modify.tt:5 root/user/index.tt:4
++msgid &quot;Attribute&quot;
++msgstr &quot;Attribut&quot;
++
++#: lib/CatDap/Controller/register.pm:56
++msgid &quot;Cannot check /etc/passwd, please warn system administrators&quot;
++msgstr &quot;Die Datei /etc/passwd kann nicht &#252;berpr&#252;ft werden, bitte warnen Sie die System-Administratoren&quot;
++
++#: root/register/index.tt:29
++msgid &quot;Captcha&quot;
++msgstr &quot;Captcha&quot;
++
++#: root/user/firstlogin.tt:14 root/user/password.tt:19
++msgid &quot;Change&quot;
++msgstr &quot;&#196;ndern&quot;
++
++#: root/user/fake.tt:2
++msgid &quot;Change password&quot;
++msgstr &quot;Das Passwort &#228;ndern&quot;
++
++#: root/register/complete.tt:5
++msgid &quot;Check your mail for activation instructions.&quot;
++msgstr &quot;&#220;berpr&#252;fen Sie Ihre Emails auf Anweisungen zum Aktivieren.&quot;
++
++#: root/forgot_password/complete.tt:5
++msgid &quot;Check your mail for password reset instructions.&quot;
++msgstr &quot;&#220;berpr&#252;fen Sie Ihre Emails auf Anweisungen zum Zur&#252;cksetzen Ihres Passwortes.&quot;
++
++#: root/register/index.tt:24
++msgid &quot;Confirm Email address&quot;
++msgstr &quot;Best&#228;tigen Sie die Emailadresse&quot;
++
++#: root/user/password.tt:5
++msgid &quot;Current password&quot;
++msgstr &quot;Aktuelles Passwort&quot;
++
++#. (cn)
++#. (entry.cn)
++#: root/email/activation.tt:1 root/email/admin/password.tt:1 root/email/forgot_password.tt:1
++msgid &quot;Dear %1,&quot;
++msgstr &quot;Sehr geehrter %1,&quot;
++
++#: root/admin/account_modify.tt:27 root/user/index.tt:22
++msgid &quot;Delete&quot;
++msgstr &quot;L&#246;schen&quot;
++
++#: root/user/fake.tt:1
++msgid &quot;Edit&quot;
++msgstr &quot;&#196;ndern&quot;
++
++#: root/admin/account.tt:33 root/admin/account.tt:8 root/admin/account_promote.tt:6 root/register/index.tt:20
++msgid &quot;Email&quot;
++msgstr &quot;Email&quot;
++
++#: root/forgot_password/index.tt:11 root/register/index.tt:21
++msgid &quot;Email address&quot;
++msgstr &quot;Email-Adresse&quot;
++
++#: root/forgot_password/complete.tt:1
++msgid &quot;Email sent.&quot;
++msgstr &quot;Email versandt.&quot;
++
++#: root/forgot_password/confirm.tt:2
++msgid &quot;Enter new password.&quot;
++msgstr &quot;Neues Passwort angeben.&quot;
++
++#: root/register/index.tt:32
++msgid &quot;Enter text&quot;
++msgstr &quot;Text angeben&quot;
++
++#: root/admin/account.tt:34 root/admin/account_promote.tt:7
++msgid &quot;First Name&quot;
++msgstr &quot;Vorname&quot;
++
++#: root/register/index.tt:13
++msgid &quot;First name&quot;
++msgstr &quot;Nachname&quot;
++
++#: lib/CatDap/Controller/forgot_password.pm:94
++msgid &quot;Forgot password&quot;
++msgstr &quot;Passwort vergessen&quot;
++
++#: root/forgot_password/index.tt:5
++msgid &quot;Forgot your password?&quot;
++msgstr &quot;Haben Sie Ihr Passwort vergessen?&quot;
++
++#: root/index.tt:17 root/index.tt:18
++msgid &quot;Forgotten password?&quot;
++msgstr &quot;Vergessenes Passwort?&quot;
++
++#: root/admin/account.tt:36 root/admin/account.tt:9 root/admin/account_promote.tt:9
++msgid &quot;Full Name&quot;
++msgstr &quot;Vollst&#228;ndiger Name&quot;
++
++#: root/admin/group.tt:27
++msgid &quot;Group Name&quot;
++msgstr &quot;Gruppenname&quot;
++
++#: root/admin/group.tt:9
++msgid &quot;Group name&quot;
++msgstr &quot;Gruppenname&quot;
++
++#: root/admin/account_modify.tt:2
++msgid &quot;Groups&quot;
++msgstr &quot;Gruppen&quot;
++
++#: lib/CatDap/Controller/forgot_password.pm:48 lib/CatDap/Controller/register.pm:52
++msgid &quot;Incorrect validation text, please try again&quot;
++msgstr &quot;Inkorrekter &#220;berpr&#252;fungstext, bitte versuchen Sie es erneut&quot;
++
++#: lib/CatDap/Controller/forgot_password.pm:45 lib/CatDap/Controller/register.pm:46
++msgid &quot;Invalid email address&quot;
++msgstr &quot;Ung&#252;ltige Email-Adresse&quot;
++
++#: lib/CatDap/Controller/register.pm:42
++msgid &quot;Invalid username&quot;
++msgstr &quot;Ung&#252;ltiger Benutzername&quot;
++
++#: lib/CatDap/Controller/register.pm:59
++msgid &quot;Invalid username, already used by system&quot;
++msgstr &quot;Ung&#252;ltiger Benutzername, wird vom System bereits genutzt&quot;
++
++#: root/template/header:10 root/user/fake.tt:3
++msgid &quot;Log out&quot;
++msgstr &quot;Abmelden&quot;
++
++#: root/index.tt:1 root/index.tt:13
++msgid &quot;Login&quot;
++msgstr &quot;Anmelden&quot;
++
++#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5 root/user/password.tt:10
++msgid &quot;New Password&quot;
++msgstr &quot;Neues Passwort&quot;
++
++#: lib/CatDap/Controller/user.pm:296
++msgid &quot;New passwords dont match&quot;
++msgstr &quot;Die neuen Passw&#246;rter stimmen nicht &#252;berein&quot;
++
++#: root/forgot_password/complete.tt:4
++msgid &quot;Operation was successful.&quot;
++msgstr &quot;Die Operation war erfolgreich.&quot;
++
++#: root/index.tt:10
++msgid &quot;Password&quot;
++msgstr &quot;Passwort&quot;
++
++#: lib/CatDap/Controller/user.pm:290
++msgid &quot;Password incorrect&quot;
++msgstr &quot;Falsches Passwort&quot;
++
++#: lib/CatDap/Controller/admin.pm:542
++msgid &quot;Password reset and email sent&quot;
++msgstr &quot;Passwort zur&#252;ckgesetzt und Email versandt&quot;
++
++#: root/register/index.tt:12
++msgid &quot;Personal Information&quot;
++msgstr &quot;Pers&#246;nliche Informationen&quot;
++
++#: root/email/admin/password.tt:5
++msgid &quot;Please click below to change your password&quot;
++msgstr &quot;Bitte klicken Sie unten um Ihr Passwort zu &#228;ndern&quot;
++
++#: root/admin/index.tt:1
++msgid &quot;Please use the menus above.&quot;
++msgstr &quot;Bitte benutzen Sie die Men&#252;s oben.&quot;
++
++#: root/admin/account_promote.tt:25
++msgid &quot;Primary group&quot;
++msgstr &quot;Prim&#228;re Gruppe&quot;
++
++#: root/admin/account_modify.tt:71
++msgid &quot;Promote&quot;
++msgstr &quot;&quot;
++
++#: root/admin/account_modify.tt:62
++msgid &quot;Promote user to posixAccount with primary group:&quot;
++msgstr &quot;&quot;
++
++#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
++msgid &quot;Register&quot;
++msgstr &quot;Registrieren&quot;
++
++#: root/register/complete.tt:1
++msgid &quot;Registration completed&quot;
++msgstr &quot;Registrierung vollst&#228;ndig&quot;
++
++#: root/register/complete.tt:4
++msgid &quot;Registration was successful.&quot;
++msgstr &quot;Die Registrierung war erfolgreich&quot;
++
++#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10 root/user/password.tt:15
++msgid &quot;Repeat New Password&quot;
++msgstr &quot;Neues Passwort wiederholen&quot;
++
++#: root/admin/account_modify.tt:1
++msgid &quot;Reset password&quot;
++msgstr &quot;Passwort wiederherstellen&quot;
++
++#: root/admin/account.tt:22
++msgid &quot;Search&quot;
++msgstr &quot;Suchen&quot;
++
++#: root/admin/account.tt:4 root/admin/group.tt:5
++msgid &quot;Search by&quot;
++msgstr &quot;Suchen nach&quot;
++
++#: root/admin/account_promote.tt:4
++msgid &quot;Select&quot;
++msgstr &quot;Ausw&#228;hlen&quot;
++
++#: root/forgot_password/index.tt:18
++msgid &quot;Send me my password&quot;
++msgstr &quot;Ein Passwort senden&quot;
++
++#: root/forgot_password/confirm.tt:16
++msgid &quot;Set new password&quot;
++msgstr &quot;Neues Passwort setzen&quot;
++
++#: root/register/check.tt:1
++msgid &quot;Success&quot;
++msgstr &quot;Erfolg&quot;
++
++#: root/admin/account.tt:10 root/admin/account.tt:35 root/admin/account_promote.tt:8 root/register/index.tt:16
++msgid &quot;Surname&quot;
++msgstr &quot;Nachname&quot;
++
++#: lib/CatDap/Controller/register.pm:70
++msgid &quot;The first name supplied contains illegal characters&quot;
++msgstr &quot;Der angegebene Vorname enth&#228;lt ung&#252;ltige Zeichen&quot;
++
++#: lib/CatDap/Controller/register.pm:75
++msgid &quot;The surname supplied contains illegal characters&quot;
++msgstr &quot;Der angegebene Nachname enth&#228;lt ung&#252;ltige Zeichen&quot;
++
++#: lib/CatDap/Controller/forgot_password.pm:66
++msgid &quot;This email address is not bound to an account&quot;
++msgstr &quot;Diese Email-Adresse ist nicht an einen Zugang gebunden&quot;
++
++#: root/email/activation.tt:3
++msgid &quot;To activate your account, please follow the link below.&quot;
++msgstr &quot;Um Ihren Zugang zu aktivieren, folgen Sie bitte den Links unten.&quot;
++
++#: root/email/forgot_password.tt:3
++msgid &quot;To reset your password, please follow the link below.&quot;
++msgstr &quot;Um Ihr Passwort zur&#252;ckzusetzen, folgen Sie den Links unten.&quot;
++
++#: root/admin/account_modify.tt:35 root/user/index.tt:29
++msgid &quot;Update&quot;
++msgstr &quot;Aktualisieren&quot;
++
++#: 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 &quot;Username&quot;
++msgstr &quot;Benutzername&quot;
++
++#: lib/CatDap/Controller/register.pm:65
++msgid &quot;Username is not authorized to be used&quot;
++msgstr &quot;Der Benutzername darf nicht verwendet werden&quot;
++
++#: root/admin/account_addoc.tt:10 root/admin/account_modify.tt:9 root/admin/group_modify.tt:6 root/user/index.tt:4
++msgid &quot;Value&quot;
++msgstr &quot;Wert&quot;
++
++#. (c.config.organisation)
++#: root/email/forgot_password.tt:2
++msgid &quot;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.&quot;
++msgstr &quot;&quot;
++&quot;F&#252;r ihren %1-Zugang wurde angefordert, das Passwort zu &#228;ndern. Wenn Sie dies nicht getan haben oder Ihr Passwort nicht &#228;ndern wollen, k&#246;nnen Sie einfach nichts tun.&quot;
++
++#. (c.config.organisation)
++#: root/email/activation.tt:2
++msgid &quot;Your %1 account has been successfully created, but requires activation.&quot;
++msgstr &quot;Ihr %1-Zugang wurde erfolgreich eingerichtet, ben&#246;tigt aber noch Aktivierung.&quot;
++
++#. (c.user.username)
++#: root/email/admin/password.tt:3
++msgid &quot;Your password was reset by %1&quot;
++msgstr &quot;Ihr Passwort wurde von %1 zur&#252;ckgesetzt&quot;
++
++#: lib/CatDap/Controller/user.pm:61
++msgid &quot;Your session has expired&quot;
++msgstr &quot;Ihre Sitzung ist abgelaufen&quot;
++
++#: root/admin/account.tt:15 root/admin/group.tt:15
++msgid &quot;contains&quot;
++msgstr &quot;enth&#228;lt&quot;
++
++#: root/admin/group_modify.tt:14
++msgid &quot;delete&quot;
++msgstr &quot;l&#246;schen&quot;
++
++#: root/admin/account.tt:17 root/admin/group.tt:17
++msgid &quot;greater than or equal to&quot;
++msgstr &quot;Gr&#246;&#223;er als oder gleich wie&quot;
++
++#: root/admin/account.tt:16 root/admin/group.tt:16
++msgid &quot;is exactly&quot;
++msgstr &quot;ist genau&quot;
++
++#: root/admin/account.tt:18 root/admin/group.tt:18
++msgid &quot;less than&quot;
++msgstr &quot;weniger als&quot;
++
++#: root/admin/group.tt:10
++msgid &quot;member&quot;
++msgstr &quot;Mitglied&quot;
++
++#: lib/CatDap/Controller/admin.pm:526
++msgid &quot;password reset&quot;
++msgstr &quot;Passwort zur&#252;ckgesetzt&quot;
++
++#: root/admin/account_modify.tt:53
++msgid &quot;with value&quot;
++msgstr &quot;mit dem Wert&quot;
++
+
+Modified: identity/CatDap/branches/live/root/index.tt
+===================================================================
+--- 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 @@
+ &lt;label for=&quot;password_&quot;&gt;[% l('Password : ') %]&lt;/label&gt;
+ &lt;input id=&quot;password_&quot; type=&quot;password&quot; name=&quot;password&quot; /&gt;
+ &lt;br /&gt;
++ &lt;button type=&quot;submit&quot; value=&quot;[% l('Login') %]&quot; &gt;[% l('Login') %]&lt;/button&gt;
+ &lt;/div&gt;
+ &lt;div id=&quot;login_form_line&quot;&gt;
+ &lt;span&gt;&lt;a href=&quot;/register&quot;&gt;[% l('Register') %]&lt;/a&gt; |
+ @todo [% l('Forgotten password?') %]
+ &lt;!--&lt;a href=&quot;/forgot_password&quot;&gt;[% l('Forgotten password?') %]&lt;/a&gt; --&gt;
+ &lt;/span&gt;
+- &lt;button type=&quot;submit&quot; value=&quot;[% l('Login') %]&quot; &gt;[% l('Login') %]&lt;/button&gt;
+ &lt;/div&gt;
+ &lt;/form&gt;
+ &lt;/div&gt;
+
+Modified: identity/CatDap/branches/live/root/static/style/ttsite.css
+===================================================================
+--- 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 {
+
+Modified: identity/CatDap/branches/live/root/user/index.tt
+===================================================================
+--- 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 @@
+ &lt;/tr&gt;
+ &lt;/table&gt;
+ &lt;/form&gt;
++&lt;/div&gt;
+
+ &lt;hr /&gt;
+-
++&lt;div id=&quot;attribute_add_form&quot;&gt;
++&lt;h3&gt;[%('Add a attribute')%]&lt;/h3&gt;
+ &lt;form method=&quot;post&quot; action=&quot;/user/add&quot;&gt;
+ &lt;p&gt;
+ &lt;select name=&quot;attribute&quot;&gt;
+
+Modified: identity/CatDap/branches/live/root/user/password.tt
+===================================================================
+--- 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 @@
+-
++&lt;div id=&quot;password_change_form&quot;&gt;
++&lt;h2&gt;Change password&lt;/h2&gt;
+ &lt;form method=&quot;post&quot; action=&quot;&quot;&gt;
+
+- &lt;p&gt;
+ &lt;label for=&quot;password_&quot;&gt;[% l('Current password') %]&lt;/label&gt;
+ &lt;input id=&quot;password_&quot; name=&quot;password&quot; type=&quot;password&quot; value=&quot;&quot; /&gt;
+- &lt;/p&gt;
+-
+- &lt;p&gt;
++ &lt;br/&gt;
++ &lt;br/&gt;
+ &lt;label for=&quot;newpassword1_&quot;&gt;[% l('New Password') %]&lt;/label&gt;
+ &lt;input id=&quot;newpassword1_&quot; name=&quot;newpassword1&quot; type=&quot;password&quot; value=&quot;&quot; /&gt;
+- &lt;/p&gt;
+-
+- &lt;p&gt;
++ &lt;br/&gt;
+ &lt;label for=&quot;newpassword2_&quot;&gt;[% l('Repeat New Password') %]&lt;/label&gt;
+ &lt;input id=&quot;newpassword2_&quot; name=&quot;newpassword2&quot; type=&quot;password&quot; value=&quot;&quot; /&gt;
+- &lt;/p&gt;
++ &lt;br/&gt;
++ &lt;button type=&quot;submit&quot; value=&quot;[% l('Change') %]&quot; /&gt;[% l('Change') %]&lt;/button&gt;
+
+- &lt;p&gt;&lt;input type=&quot;submit&quot; value=&quot;[% l('Change') %]&quot; /&gt;&lt;/p&gt;
+-
+ &lt;/form&gt;
++&lt;/div&gt;
+-------------- next part --------------
+An HTML attachment was scrubbed...
+URL: &lt;/pipermail/mageia-sysadm/attachments/20110107/042902b0/attachment-0001.html&gt;
+</PRE>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!--endarticle-->
+ <HR>
+ <P><UL>
+ <!--threads-->
+ <LI>Previous message: <A HREF="001647.html">[Mageia-sysadm] [245] more compact code
+</A></li>
+ <LI>Next message: <A HREF="001650.html">[Mageia-sysadm] [689] send reports to the new ml ( for test now, I will disable the previous one later )
+</A></li>
+ <LI> <B>Messages sorted by:</B>
+ <a href="date.html#1648">[ date ]</a>
+ <a href="thread.html#1648">[ thread ]</a>
+ <a href="subject.html#1648">[ subject ]</a>
+ <a href="author.html#1648">[ 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>