From 3d3e74d93616c8b32dbfc65e6e18e6dd0a13c85d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 27 Aug 2008 17:25:03 +0000 Subject: (ask_user_and_root) move icon at top --- perl-install/any.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'perl-install/any.pm') 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' }; -- cgit v1.2.1