From 309d25d015d65dc464a9b08114932185c8dbd4b7 Mon Sep 17 00:00:00 2001
From: Vicent Guardiola <vguardiola@mandriva.com>
Date: Thu, 2 Sep 2004 09:14:51 +0000
Subject: Modify text and label for add_user step

---
 ldap_wizard/Ldap.pm | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/ldap_wizard/Ldap.pm b/ldap_wizard/Ldap.pm
index 6e0995b7..652feb9e 100644
--- a/ldap_wizard/Ldap.pm
+++ b/ldap_wizard/Ldap.pm
@@ -8,6 +8,7 @@ use lib qw(/usr/lib/libDrakX);
 use ugtk2 qw(:create);
 use strict;
 use MDK::Wizard::ldapdef;
+use interactive;
 use common;
 use standalone;
 use MDK::Wizard::Varspaceval;
@@ -125,11 +126,14 @@ $o->{pages} = {
 				next => 'welcome'
 				},
                add_userposix => {
-                                 name => N("LDAP Adding User") . "\n\n" . N("User Created in: ") . $o->{var}{defou} . ", " . $o->{var}{suffix},
+                                 name => N("LDAP Adding User") . "\n\n" ,
 				 data => [
+				    	{ label => N(" ") },
+					{ label => N("User Created in:  ". $o->{var}{defou} . ", " . $o->{var}{suffix})},
+				    	{ label => N(" ") },
                                           { label => N("First Name:"), val => \$o->{var}{sn}, help =>   "aide p"  },
                                           { label => N("Name:"), val => \$o->{var}{cn}, help =>   "aide p"  },
-                                          { label => N("User Name:"), val => \$o->{var}{uid}, help =>   "aide p"  },
+                                          { label => N("User Login:"), val => \$o->{var}{uid}, help =>   "aide p"  },
                                          ],
 				 complete => sub {
 				   if (!$o->{var}{sn}) {
@@ -150,6 +154,7 @@ $o->{pages} = {
 	       password => {
 			    name => N("LDAP User Password"),
 			    data => [
+				    	{ label => N(" ") },
                                      { label => N("Password:"), val => \$o->{var}{uidpass}, hidden => 1, help => N("passwords must match") },
                                      { label => N("Password (again):"), val => \$o->{var}{uidpass2}, hidden => 1, help => N("passwords must match") },
                                     ],
@@ -226,7 +231,9 @@ $o->{pages} = {
 
                add_user_good => {
                           name => N("Successfully added User"),
-                          data => [ { label => N("\n"),fixed_val => \$o->{var}{error_user_add} }
+                          data => [
+			  { label => N(" ") },
+			  { label => N("\n"),fixed_val => \$o->{var}{error_user_add} }
                           ],
                           next => 'add_userposix',
                           end => 1,
@@ -234,7 +241,9 @@ $o->{pages} = {
 
                add_user_nogood => {
                           name => N("Error for added User"),
-                          data => [ { label => N("\n"),fixed_val => \$o->{var}{error_user_add} }
+                          data => [
+			  { label => N(" ") },
+			  { label => N("\n"),fixed_val => \$o->{var}{error_user_add} }
                           ],
                           next => 'add_userposix',
                           end => 1,
@@ -253,7 +262,8 @@ $o->{pages} = {
 			         { label => N("LDAP Administrator:"), type => 'field', fixed_val => \$o->{var}{rootdn} },
 			         { label => N("Users Container:"), type => 'field', fixed_val => \$o->{var}{defou} },
 		       ],
-                       next => 'welcome',
+		       no_back => '1',
+                       next => 'ask_menu',
                       },
               };
 
-- 
cgit v1.2.1