diff options
author | Thierry Vignaud <tv@mandriva.org> | 2008-08-27 17:25:03 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mandriva.org> | 2008-08-27 17:25:03 +0000 |
commit | 3d3e74d93616c8b32dbfc65e6e18e6dd0a13c85d (patch) | |
tree | 45dfccfc7ac5ed306caa91b1970bd5a642855c68 | |
parent | 1baec2791a94e8f384c9d93479f4caf13560ab90 (diff) | |
download | drakx-3d3e74d93616c8b32dbfc65e6e18e6dd0a13c85d.tar drakx-3d3e74d93616c8b32dbfc65e6e18e6dd0a13c85d.tar.gz drakx-3d3e74d93616c8b32dbfc65e6e18e6dd0a13c85d.tar.bz2 drakx-3d3e74d93616c8b32dbfc65e6e18e6dd0a13c85d.tar.xz drakx-3d3e74d93616c8b32dbfc65e6e18e6dd0a13c85d.zip |
(ask_user_and_root) move icon at top
-rw-r--r-- | perl-install/any.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index d74f3f99b..6f9bfa016 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -799,6 +799,9 @@ sub ask_user_and_root { { label => N("Password (again)"), val => \$superuser->{password2}, hidden => 1 }, ) : (), { label => N("Enter a user"), title => 1 }, if_($names, { label => $names }), + if_($security <= 3 && !$options{noicons} && @icons, + { label => N("Icon"), val => \ ($u->{icon} ||= 'default'), list => \@icons, icon2f => \&face2png, format => \&translate }, + ), { label => N("Real name"), val => \$u->{realname}, focus_out => sub { $u->{name} ||= lc first($u->{realname} =~ /([a-zA-Z0-9_-]+)/); } }, @@ -809,9 +812,6 @@ sub ask_user_and_root { { label => N("Shell"), val => \$u->{shell}, list => [ shells() ], advanced => 1 }, { label => N("User ID"), val => \$u->{uid}, advanced => 1, validate => sub { $validate_uid_gid->('uid') } }, { label => N("Group ID"), val => \$u->{gid}, advanced => 1, validate => sub { $validate_uid_gid->('gid') } }, - if_($security <= 3 && !$options{noicons} && @icons, - { label => N("Icon"), val => \ ($u->{icon} ||= 'default'), list => \@icons, icon2f => \&face2png, format => \&translate }, - ), if_($security > 3, map { { label => $_, val => \$groups{$_}, text => $high_security_groups{$_}, type => 'bool' }; |