From 348610ca25bdd394d7c895a54870ca11b8c64402 Mon Sep 17 00:00:00 2001 From: stevetruckstuff Date: Mon, 2 Oct 2006 16:32:40 +0000 Subject: [PATCH] Begin some re-orginization of UI controls. Remove support for $theme_css, since it is no longer supported in page_header.php. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11809 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- config/conf.pl | 61 ++++++++------------------------------- config/config_default.php | 2 -- 2 files changed, 12 insertions(+), 51 deletions(-) diff --git a/config/conf.pl b/config/conf.pl index 038dfcb5..d87b702e 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -484,7 +484,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { print "2. Server Settings\n"; print "3. Folder Defaults\n"; print "4. General Options\n"; - print "5. Templates\n"; + print "5. User Interface\n"; print "6. Address Books\n"; print "7. Message of the Day (MOTD)\n"; print "8. Plugins\n"; @@ -619,18 +619,13 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 5 ) { - print $WHT. "Themes\n" . $NRM; - print "1. Change Template set\n"; -# for ( $count = 0 ; $count <= $#theme_name/2 ; $count++ ) { -# $temp_name = $theme_name[$count*2]; -# printf " %s%*s %s\n", $temp_name, -# 40 - length($temp_name), " ", -# $theme_name[($count*2)+1]; -# } - print "2. CSS File : $WHT$theme_css$NRM\n"; - print "3. Default font size: $WHT$default_fontsize$NRM\n"; - print "4. Change available font sets\n"; - print "5. Change Themes\n"; + print $WHT. "User Interface\n" . $NRM; + print "1. Modify Template sets\n"; + print "2. Use Icons : $WHT$use_icons$NRM\n"; + print "3. Default Icon Set : $WHT$icon_theme_def$NRM\n"; + print "4. Default font size : $WHT$default_fontsize$NRM\n"; + print "5. Modify available font sets\n"; +# print "4. Change Themes\n"; print "\n"; print "R Return to Main Menu\n"; @@ -719,8 +714,6 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { } elsif ( $menu == 11 ) { print $WHT. "Interface tweaks\n" . $NRM; print "1. Display html mails in iframe : $WHT$use_iframe$NRM\n"; - print "2. Use Icons : $WHT$use_icons$NRM\n"; - print "3. Default Icon Set : $WHT$icon_theme_def$NRM\n"; print "\n"; print $WHT. "PHP tweaks\n" . $NRM; print "4. Use php recode functions : $WHT$use_php_recode$NRM\n"; @@ -855,10 +848,10 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { elsif ( $command == 16 ) { $config_location_base = command_config_location_base(); } } elsif ( $menu == 5 ) { if ( $command == 1 ) { $templateset_default = command_templates(); } - elsif ( $command == 2 ) { $theme_css = command42(); } - elsif ( $command == 3 ) { $default_fontsize = command_default_fontsize(); } - elsif ( $command == 4 ) { command_fontsets(); } - elsif ( $command == 5 ) { command41(); } + elsif ( $command == 2 ) { $use_icons = commandB3(); } + elsif ( $command == 3 ) { $icon_theme_def = commandB7(); } + elsif ( $command == 4 ) { $default_fontsize = command_default_fontsize(); } + elsif ( $command == 5 ) { command_fontsets(); } } elsif ( $menu == 6 ) { if ( $command == 1 ) { command61(); } elsif ( $command == 2 ) { command62(); } @@ -890,8 +883,6 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { elsif ( $command == 5 ) { $lossy_encoding = commandA5(); } } elsif ( $menu == 11 ) { if ( $command == 1 ) { $use_iframe = commandB2(); } - elsif ( $command == 2 ) { $use_icons = commandB3(); } - elsif ( $command == 3 ) { $icon_theme_def = commandB7(); } elsif ( $command == 4 ) { $use_php_recode = commandB4(); } elsif ( $command == 5 ) { $use_php_iconv = commandB5(); } elsif ( $command == 6 ) { $allow_remote_configtest = commandB6(); } @@ -2930,34 +2921,6 @@ sub command_templates { } -# Theme - CSS file -sub command42 { - print "You may specify a cascading style-sheet (CSS) file to be included\n"; - print "on each html page generated by SquirrelMail. The CSS file is useful\n"; - print "for specifying a site-wide font. If you're not familiar with CSS\n"; - print "files, leave this blank.\n"; - print "\n"; - print "To clear out an existing value, just type a space for the input.\n"; - print "\n"; - print "Please be aware of the following: \n"; - print " - Relative URLs are relative to the config dir\n"; - print " to use the themes directory, use ../themes/css/newdefault.css\n"; - print " - To specify a css file defined outside the SquirrelMail source tree\n"; - print " use the absolute URL the webserver would use to include the file\n"; - print " e.g. http://some.host.com/css/mystyle.css or /css/mystyle.css\n"; - print "\n"; - print "[$WHT$theme_css$NRM]: $WHT"; - $new_theme_css = ; - - if ( $new_theme_css eq "\n" ) { - $new_theme_css = $theme_css; - } else { - $new_theme_css =~ s/[\r\n]//g; - } - $new_theme_css =~ s/^\s*//; - return $new_theme_css; -} - # sets default font size option sub command_default_fontsize { print "Enter default font size [$WHT$$default_fontsize$NRM]: $WHT"; diff --git a/config/config_default.php b/config/config_default.php index 447d6f2d..4b0d442c 100644 --- a/config/config_default.php +++ b/config/config_default.php @@ -673,13 +673,11 @@ $session_name = 'SQMSESSID'; * add a new number to the array at the bottom, and follow the pattern. * * $theme_default sets theme that will be used by default - * $theme_css sets stylesheet (from theme/css directory) that will be * used by default. * @global integer $theme_default * @global string $theme_css */ $theme_default = 0; -$theme_css = ''; /** * Listing of installed themes -- 2.25.1