From fcb70ab9929d267d969ecb0a57a91e0f8cb5b4aa Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Mon, 16 Dec 2013 16:36:58 -0800
Subject: [PATCH] UI cleanup

---
 acl/convert_form.cgi | 19 ++++++++++++++-----
 acl/lang/en          |  3 ++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/acl/convert_form.cgi b/acl/convert_form.cgi
index 5eaa4b520..00c74b088 100755
--- a/acl/convert_form.cgi
+++ b/acl/convert_form.cgi
@@ -22,7 +22,11 @@ if (!@glist) {
 
 print "$text{'convert_desc'}<p>\n";
 print &ui_form_start("convert.cgi", "post");
-print &ui_radio_table("conv", 0,
+print &ui_table_start(undef, undef, 2);
+
+# Users to convert
+print &ui_table_row($text{'convert_users'},
+   &ui_radio_table("conv", 0,
 	[ [ 0, $text{'convert_0'} ],
 	  [ 1, $text{'convert_1'}, &ui_textbox("users", undef, 60)." ".
 				   &user_chooser_button("users", 1) ],
@@ -31,12 +35,17 @@ print &ui_radio_table("conv", 0,
 	  [ 3, $text{'convert_3'}, &unix_group_input("group") ],
 	  [ 4, $text{'convert_4'}, &ui_textbox("min", undef, 6)." - ".
 				   &ui_textbox("max", undef, 6) ]
-	]);
+	]));
 
-print $text{'convert_group'}," ",
-      &ui_select("wgroup", undef, [ map { $_->{'name'} } @glist ]),"<br>\n";
-print &ui_checkbox("sync", 1, $text{'convert_sync'}, 1),"<p>\n";
+# Put into group
+print &ui_table_row($text{'convert_group'},
+      &ui_select("wgroup", undef, [ map { $_->{'name'} } @glist ]));
 
+# Keep passwords in sync
+print &ui_table_row($text{'convert_sync2'},
+	&ui_yesno_radio("sync", 1));
+
+print &ui_table_end();
 print &ui_form_end([ [ undef, $text{'convert_ok'} ] ]);
 
 &ui_print_footer("", $text{'index_return'});
diff --git a/acl/lang/en b/acl/lang/en
index a884c333f..82227467f 100644
--- a/acl/lang/en
+++ b/acl/lang/en
@@ -270,7 +270,7 @@ convert_2=All except users
 convert_3=Users with group
 convert_4=Users with UIDs in range
 convert_group=Assign new users to Webmin group
-convert_sync=Use same password as Unix user in future?
+convert_sync2=Sync password with Unix user in future?
 convert_ok=Convert Now
 convert_err=Failed to convert users
 convert_eusers=No users to convert entered
@@ -287,6 +287,7 @@ convert_msg=Converting Unix users...
 convert_user=Unix user
 convert_action=Action taken
 convert_done=$1 users converted, $2 invalid, $3 already exist, $4 excluded.
+convert_users=Users to convert
 
 sync_title=Unix User Synchronization
 sync_desc=This form allows you to configure the automatic synchronization of Unix users created through Webmin and users in this module.