Added tabs to the Configure Module page

diff --git a/usermin/CHANGELOG b/usermin/CHANGELOG
index fd0f2b5..95722c2 100644 (file)
--- a/usermin/CHANGELOG
+++ b/usermin/CHANGELOG
@@ -32,3 +32,5 @@ Added the Advanced Options page, which can be used to change the temporary files
 ---- Changes since 1.350 ----
 Added an option to the Authentication page to block users with too many failed logins, as well as hosts.
 Created the new Blocked Hosts and Users page to show blocks currently in force, and allow them to be cleared.
+---- Changes since 1.360 ----
+Separated the Configure Module page into tabs, to make it clearer which options are global and which are default user preferences.

diff --git a/usermin/edit_configs.cgi b/usermin/edit_configs.cgi
index 7f233f3..2226261 100755 (executable)
--- a/usermin/edit_configs.cgi
+++ b/usermin/edit_configs.cgi
@@ -10,9 +10,21 @@ $access{'configs'} || &error($text{'acl_ecannot'});
 &ui_print_header(undef, $text{'configs_title2'}, "");
 &get_usermin_miniserv_config(\%miniserv);
 
+# Show start of tabs
+$prog = "edit_configs.cgi?mod=$in{'mod'}&mode=";
+if (-r "$miniserv{'root'}/$in{'mod'}/config.info") {
+       push(@tabs, [ "global", $text{'configs_global'}, $prog."global" ]);
+       }
+if (-r "$miniserv{'root'}/$in{'mod'}/uconfig.info") {
+       push(@tabs, [ "user", $text{'configs_user'}, $prog."user" ]);
+       }
+print &ui_tabs_start(\@tabs, "mode", $in{'mode'} || $tabs[0]->[0], 1);
+
 &read_file("$config{'usermin_dir'}/$in{'mod'}/config", \%mconfig);
 if (-r "$miniserv{'root'}/$in{'mod'}/config.info") {
        # Display config form for the module
+       print &ui_tabs_start_tab("mode", "global");
+       print $text{'configs_globaldesc'},"<p>\n";
        %minfo = &get_usermin_module_info($in{'mod'});
        print &ui_form_start("save_configs.cgi", "post");
        print &ui_hidden("mod", $in{'mod'}),"\n";
@@ -23,15 +35,13 @@ if (-r "$miniserv{'root'}/$in{'mod'}/config.info") {
        &generate_config(\%mconfig, "$miniserv{'root'}/$in{'mod'}/config.info");
        print &ui_table_end();
        print &ui_form_end([ [ "save", $text{'save'} ] ]);
-       }
-
-if (-r "$miniserv{'root'}/$in{'mod'}/config.info" &&
-    -r "$miniserv{'root'}/$in{'mod'}/uconfig.info") {
-       print "<hr>\n";
+       print &ui_tabs_end_tab();
        }
 
 if (-r "$miniserv{'root'}/$in{'mod'}/uconfig.info") {
        # Display default user config form for the module
+       print &ui_tabs_start_tab("mode", "user");
+       print $text{'configs_userdesc'},"<p>\n";
        %minfo = &get_usermin_module_info($in{'mod'});
        print &ui_form_start("save_uconfigs.cgi", "post");
        print &ui_hidden("mod", $in{'mod'}),"\n";
@@ -58,7 +68,10 @@ if (-r "$miniserv{'root'}/$in{'mod'}/uconfig.info") {
                         undef, $noprefs == 2 ? \%canconfig : undef, "_can");
        print &ui_table_end();
        print &ui_form_end([ [ "save", $text{'save'} ] ]);
+       print &ui_tabs_end_tab();
        }
 
+print &ui_tabs_end(1);
+
 &ui_print_footer("list_configs.cgi", $text{'configs_return'});
 

diff --git a/usermin/lang/en b/usermin/lang/en
index 06c80a8..5e6d602 100644 (file)
--- a/usermin/lang/en
+++ b/usermin/lang/en
@@ -118,6 +118,10 @@ configs_uheader=Default user preferences for $1
 configs_return=Usermin module configuration
 configs_prefs=Users can edit preferences?
 configs_sels=Only selected ..
+configs_global=Global module configuration
+configs_globaldesc=The settings in this form apply to all users of the module, and generally set options related to the programs and files that it uses.
+configs_user=Default users preferences
+configs_userdesc=The settings in this form define the defaults for user-editable preferences for this module. Unless you specify otherwise, they can be over-ridden by individual users.
 
 acl_title=Available Modules
 acl_desc=Use this page to select which installed Usermin modules are visible to users.