--- loncom/interface/domainprefs.pm 2007/03/08 01:58:44 1.5 +++ loncom/interface/domainprefs.pm 2007/04/04 00:10:01 1.7 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.5 2007/03/08 01:58:44 albertel Exp $ +# $Id: domainprefs.pm,v 1.7 2007/04/04 00:10:01 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,6 +37,7 @@ use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonlocal; use LONCAPA(); +use LONCAPA::Enrollment; sub handler { my $r=shift; @@ -64,15 +65,26 @@ sub handler { $phase = $env{'form.phase'}; } my %domconfig = - &Apache::lonnet::get_dom('configuration',['login','quotas', - 'autoenroll','autoupdate'],$dom); - + &Apache::lonnet::get_dom('configuration',['login','rolecolors', + 'quotas','autoenroll','autoupdate'],$dom); my @prefs = ( + { text => 'Default color schemes', + help => 'Default_Color_Schemes', + action => 'rolecolors', + header => [{col1 => 'Student Settings', + col2 => '',}, + {col1 => 'Coordinator Settings', + col2 => '',}, + {col1 => 'Author Settings', + col2 => '',}, + {col1 => 'Administrator Settings', + col2 => '',}], + }, { text => 'Log-in page options', help => 'Domain_Log-in_Page', action => 'login', header => [{col1 => 'Item', - col2 => 'Selection',}], + col2 => '',}], }, { text => 'Default quotas for user portfolios', help => 'Default_User_Quota', @@ -95,6 +107,7 @@ sub handler { col2 => 'Updataeable user data'}], }, ); + my @roles = ('student','coordinator','author','admin'); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'display')", text=>"Domain Configuration"}); @@ -105,7 +118,7 @@ sub handler { &print_header($r,$phase); foreach my $item (@prefs) { $r->print('

'.&mt($item->{'text'}).'

'. - &process_changes($dom,$item->{'action'},%domconfig)); + &process_changes($r,$dom,$item->{'action'},\@roles,%domconfig)); } $r->print('

'); &print_footer($r,$phase,'display','Back to actions menu'); @@ -119,11 +132,11 @@ sub handler { &print_header($r,$phase); $r->print('
'); foreach my $item (@prefs) { - if ($item->{'action'} eq 'autoupdate') { + if ($item->{'action'} eq 'login') { $r->print(' '); } - &print_config_box($r,$dom,$item->{'action'},$item, - $domconfig{$item->{'action'}}); + &print_config_box($r,$dom,$phase,$item->{'action'}, + $item,$domconfig{$item->{'action'}}); } $r->print('
@@ -139,10 +152,12 @@ sub handler { } sub process_changes { - my ($dom,$action,%domconfig) = @_; + my ($r,$dom,$action,$roles,%domconfig) = @_; my $output; if ($action eq 'login') { - $output = &modify_login($dom,%domconfig); + $output = &modify_login($r,$dom,%domconfig); + } elsif ($action eq 'rolecolors') { + $output = &modify_rolecolors($r,$dom,$roles,%domconfig); } elsif ($action eq 'quotas') { $output = &modify_quotas($dom,%domconfig); } elsif ($action eq 'autoenroll') { @@ -154,23 +169,29 @@ sub process_changes { } sub print_config_box { - my ($r,$dom,$action,$item,$settings) = @_; + my ($r,$dom,$phase,$action,$item,$settings) = @_; $r->print(' '); - if ($action eq 'autoupdate') { + if (($action eq 'autoupdate') || ($action eq 'rolecolors')) { + my $colspan = ($action eq 'rolecolors')?' colspan="2"':''; $r->print(' @@ -178,21 +199,54 @@ sub print_config_box { + + + + + + '; + return $datatable; +} + +sub display_color_options { + my ($dom,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs, + $images,$bgs,$links,$alt_text) = @_; + my $configuname = $dom.'-domainconfig'; + my $css_class = $itemcount%2?' class="LC_odd_row"':''; + my $datatable = ''. + ''; + if (!$is_custom->{'font'}) { + $datatable .= ''; + } else { + $datatable .= ''; + } + my $fontlink = &color_pick($phase,$role,'font',$choices->{'font'},$designs->{'font'}); + $datatable .= ''; + foreach my $img (@{$images}) { + $itemcount ++; + $css_class = $itemcount%2?' class="LC_odd_row"':''; + $datatable .= ''. + ''; + my $imgfile; + if ($designs->{$img} ne '') { + $imgfile = $designs->{$img}; + } else { + $imgfile = $defaults->{$img}; + } + if ($imgfile) { + my $showfile; + if ($imgfile =~ m-^(/uploaded/\Q$dom\E/\Q$configuname\E/portfolio.*)/([^/]+)$-) { + my $urldir = $1; + my $filename = $2; + my @info = &Apache::lonnet::stat_file($designs->{$img}); + if (@info) { + my $thumbfile = 'tn-'.$filename; + my @thumb=&Apache::lonnet::stat_file($urldir.'/'.$thumbfile); + if (@thumb) { + $showfile = $urldir.'/'.$thumbfile; + } else { + $showfile = $imgfile; + } + } else { + $showfile = ''; + } + } elsif ($imgfile =~ m-^/(adm/[^/]+)/([^/]+)$-) { + my $imgdir = $1; + my $filename = $2; + if (-e "/home/httpd/html/$imgdir/tn-".$filename) { + $showfile = "/$imgdir/tn-".$filename; + } else { + my $input = "/home/httpd/html".$imgfile; + my $output = '/home/httpd/html/'.$imgdir.'/tn-'.$filename; + if (!-e $output) { + system("convert -sample 200x50 $input $output"); + } + $showfile = '/'.$imgdir.'/tn-'.$filename; + } + } + if ($showfile) { + $datatable.= ''; + if ($is_custom->{$img}) { + $datatable.=''; + } + $itemcount ++; + $css_class = $itemcount%2?' class="LC_odd_row"':''; + $datatable .= ''. + ''; + my $bgs_def; + foreach my $item (@{$bgs}) { + if (!$is_custom->{$item}) { + $bgs_def .= ''; + } + } + if ($bgs_def) { + $datatable .= ''; + } else { + $datatable .= ''; + } + $datatable .= ''; + $itemcount ++; + $css_class = $itemcount%2?' class="LC_odd_row"':''; + $datatable .= ''. + ''; + my $links_def; + foreach my $item (@{$links}) { + if (!$is_custom->{$item}) { + $links_def .= ''; + } + } + if ($links_def) { + $datatable .= ''; + } else { + $datatable .= ''; + } + $datatable .= '
'.&mt($item->{text}).' '. &Apache::loncommon::help_open_topic($item->{'help'}).'
- + - '. - &print_autoupdate('top',$dom,$settings).' + '); + if ($action eq 'autoupdate') { + $r->print(&print_autoupdate('top',$dom,$settings)); + } else { + $r->print(&print_rolecolors($phase,'student',$dom,$settings)); + } + $r->print('
'.$item->{'header'}->[0]->{'col1'}.''.$item->{'header'}->[0]->{'col1'}.' '.$item->{'header'}->[0]->{'col2'}.'
- + + '); + if ($action eq 'autoupdate') { + $r->print(&print_autoupdate('bottom',$dom,$settings)); + } else { + $r->print(&print_rolecolors($phase,'coordinator',$dom,$settings).' +
'.$item->{'header'}->[1]->{'col1'}.''.$item->{'header'}->[1]->{'col1'}.' '.$item->{'header'}->[1]->{'col2'}.'
+
+ + + + '. - &print_autoupdate('bottom',$dom,$settings)); + &print_rolecolors($phase,'author',$dom,$settings).' +
'.$item->{'header'}->[2]->{'col1'}.''.$item->{'header'}->[2]->{'col2'}.'
+
+ + + + + '. + &print_rolecolors($phase,'admin',$dom,$settings)); + } } else { $r->print(' '; + return $datatable; +} + +sub login_choices { + my %choices = + &Apache::lonlocal::texthash ( + coursecatalog => 'Display Course Catalog link?', + adminmail => "Display Administrator's E-mail Address?", + img => "Header", + logo => "Main Logo", + domlogo => "Domain Logo", + bgs => "Background colors", + links => "Link colors", + font => "Font color", + pgbg => "Page", + mainbg => "Main panel", + sidebg => "Side panel", + link => "Link", + alink => "Active link", + vlink => "Visited link", + ); + return %choices; +} + +sub print_rolecolors { + my ($phase,$role,$dom,$settings) = @_; + my %choices = &color_font_choices(); + my @bgs = ('pgbg','tabbg','sidebg'); + my @links = ('link','alink','vlink'); + my @images = ('img'); + my %alt_text = &Apache::lonlocal::texthash(img => "Banner for $role role"); + my %designhash = &Apache::loncommon::get_domainconf($dom); + my %defaultdesign = %Apache::loncommon::defaultdesign; + my (%is_custom,%designs); + my %defaults = ( + img => $defaultdesign{$role.'.img'}, + font => $defaultdesign{$role.'.font'}, + ); + foreach my $item (@bgs) { + $defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item}; + } + foreach my $item (@links) { + $defaults{'links'}{$item} = $defaultdesign{$role.'.'.$item}; + } + if (ref($settings) eq 'HASH') { + if (ref($settings->{$role}) eq 'HASH') { + if ($settings->{$role}->{'img'} ne '') { + $designs{'img'} = $settings->{$role}->{'img'}; + $is_custom{'img'} = 1; + } + if ($settings->{$role}->{'font'} ne '') { + $designs{'font'} = $settings->{$role}->{'font'}; + $is_custom{'font'} = 1; + } + foreach my $item (@bgs) { + if ($settings->{$role}->{$item} ne '') { + $designs{'bgs'}{$item} = $settings->{$role}->{$item}; + $is_custom{$item} = 1; + } + } + foreach my $item (@links) { + if ($settings->{$role}->{$item} ne '') { + $designs{'links'}{$item} = $settings->{$role}->{$item}; + $is_custom{$item} = 1; + } + } + } + } else { + if ($designhash{$dom.'.'.$role.'.img'} ne '') { + $designs{img} = $designhash{$dom.'.'.$role.'.img'}; + $is_custom{'img'} = 1; + } + if ($designhash{$dom.'.'.$role.'.font'} ne '') { + $designs{font} = $designhash{$dom.'.'.$role.'.font'}; + $is_custom{'font'} = 1; + } + foreach my $item (@bgs) { + if ($designhash{$dom.'.'.$role.'.'.$item} ne '') { + $designs{'bgs'}{$item} = $designhash{$dom.'.'.$role.'.'.$item}; + $is_custom{$item} = 1; + + } + } + foreach my $item (@links) { + if ($designhash{$dom.'.'.$role.'.'.$item} ne '') { + $designs{'links'}{$item} = $designhash{$dom.'.'.$role.'.'.$item}; + $is_custom{$item} = 1; + } + } + } + my $itemcount = 1; + my $datatable = display_color_options($dom,$phase,$role,$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text); + $datatable .= '
'.$item->{'header'}->[3]->{'col1'}.''.$item->{'header'}->[3]->{'col2'}.'
- - + '); + if ($action eq 'login') { + $r->print(' + '); + } else { + $r->print(' + '); + } + $r->print(' '); if ($action eq 'login') { - $r->print(&print_login($settings)); + $r->print(&print_login($dom,$phase,$settings)); } elsif ($action eq 'quotas') { $r->print(&print_quotas($dom,$settings)); } elsif ($action eq 'autoenroll') { @@ -209,18 +263,28 @@ sub print_config_box { sub print_header { my ($r,$phase) = @_; - my $js = qq| + my $js = ' -|; +'; $r->print(&Apache::loncommon::start_page('View/Modify Domain Settings', $js)); $r->print(&Apache::lonhtmlcommon::breadcrumbs('Domain Settings')); - $r->print(''); + $r->print(' + + + + + +'); + $r->print(''); return; } @@ -241,11 +305,29 @@ sub print_footer { } sub print_login { - my ($settings) = @_; - my $catalogon = ' checked="checked" '; - my $catalogoff; - my $adminmailon = ' '; - my $adminmailoff = ' checked="checked" '; + my ($dom,$phase,$settings) = @_; + my %choices = &login_choices(); + my ($catalogon,$catalogoff,$adminmailon,$adminmailoff); + $catalogon = ' checked="checked" '; + $adminmailoff = ' checked="checked" '; + my @images = ('img','logo','domlogo'); + my @bgs = ('pgbg','mainbg','sidebg'); + my @links = ('link','alink','vlink'); + my %designhash = &Apache::loncommon::get_domainconf($dom); + my %defaultdesign = %Apache::loncommon::defaultdesign; + my (%is_custom,%designs); + my %defaults = ( + font => $defaultdesign{'login.font'}, + ); + foreach my $item (@images) { + $defaults{$item} = $defaultdesign{'login.'.$item}; + } + foreach my $item (@bgs) { + $defaults{'bgs'}{$item} = $defaultdesign{'login.'.$item}; + } + foreach my $item (@links) { + $defaults{'links'}{$item} = $defaultdesign{'login.'.$item}; + } if (ref($settings) eq 'HASH') { if ($settings->{'coursecatalog'} eq '0') { $catalogoff = $catalogon; @@ -255,30 +337,356 @@ sub print_login { $adminmailon = $adminmailoff; $adminmailoff = ' '; } + foreach my $item (@images) { + if ($settings->{$item} ne '') { + $designs{$item} = $settings->{$item}; + $is_custom{$item} = 1; + } + } + if ($settings->{'font'} ne '') { + $designs{'font'} = $settings->{'font'}; + $is_custom{'font'} = 1; + } + foreach my $item (@bgs) { + if ($settings->{$item} ne '') { + $designs{'bgs'}{$item} = $settings->{$item}; + $is_custom{$item} = 1; + } + } + foreach my $item (@links) { + if ($settings->{$item} ne '') { + $designs{'links'}{$item} = $settings->{$item}; + $is_custom{$item} = 1; + } + } + } else { + $designs{'domlogo'} = ''; + if (-e '/home/httpd/html/adm/lonDomLogos/'.$dom.'.gif') { + $designs{'domlogo'} = '/home/httpd/html/adm/lonDomLogos/'.$dom.'.gif'; + $is_custom{'domlogo'} = 1; + } + if ($designhash{$dom.'.login.img'} ne '') { + $designs{'img'} = $designhash{$dom.'.login.img'}; + $is_custom{'img'} = 1; + } + if ($designhash{$dom.'.login.logo'} ne '') { + $designs{'logo'} = $designhash{$dom.'.login.logo'}; + $is_custom{'logo'} = 1; + } + if ($designhash{$dom.'.login.font'} ne '') { + $designs{'font'} = $designhash{$dom.'.login.font'}; + $is_custom{'font'} = 1; + } + foreach my $item (@bgs) { + if ($designhash{$dom.'.login.'.$item} ne '') { + $designs{'bgs'}{$item} = $designhash{$dom.'.login.'.$item}; + $is_custom{$item} = 1; + } + } + foreach my $item (@links) { + if ($designhash{$dom.'.login.'.$item} ne '') { + $designs{'links'}{$item} = $designhash{$dom.'.login.'.$item}; + $is_custom{$item} = 1; + } + } } - my %choices = - &Apache::lonlocal::texthash( - coursecatalog => 'Display Course Catalog link?', - adminmail => "Display Administrator's E-mail Address?" - ); + my %alt_text = &Apache::lonlocal::texthash ( img => 'Log-in banner', + logo => 'Institution Logo', + domlogo => 'Domain Logo'); + my $itemcount = 1; + my $css_class = $itemcount%2?' class="LC_odd_row"':''; my $datatable = - ''. - ''. - ''. - ''; + $itemcount ++; + $css_class = $itemcount%2?' class="LC_odd_row"':''; + $datatable .= ''. + ''. + ''. - ''; + $adminmailoff.'value="0" />'.&mt('No').''; + $itemcount ++; + $datatable .= &display_color_options($dom,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text); + $datatable .= '
'.$item->{'header'}->[0]->{'col1'}.'
'.$item->{'header'}->[0]->{'col1'}.''.$item->{'header'}->[0]->{'col1'}.''.$item->{'header'}->[0]->{'col2'}.'
'.$choices{'coursecatalog'}. - ''. + ''.$choices{'coursecatalog'}. + ''. ''.&mt('Yes').' '. ''.&mt('No').'
'.$choices{'adminmail'}.''. + '
'.$choices{'adminmail'}.''. ''.&mt('Yes').' '. ''.&mt('No').'
'.$choices->{'font'}.''.&mt('Default in use:').' '.$defaults->{'font'}.' '. + ' '.$fontlink. + '
'.$choices->{$img}.''; + if (!$is_custom->{$img}) { + $datatable .= &mt('Default in use:').'
'; + } + $datatable.= ''. + $alt_text->{$img}.'		'. + &mt('Delete?').' '.&mt('Replace:').'
'; + } else { + $datatable.='		'.&mt('Upload:').'
'; + } + } else { + $datatable .= '
'. + &mt('Upload:'); + } + } else { + $datatable .= '
'. + &mt('Upload:'); + } + $datatable .= ' 
'.$choices->{'bgs'}.''.$choices->{$item}.'
'.$defaults->{'bgs'}{$item}.'		'.&mt('Default(s) in use').'
'.$bgs_def.'
 '. + ''; + foreach my $item (@{$bgs}) { + my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'bgs'}{$item}); + $datatable .= ''; + } + $datatable .= '
'.$link; + if ($designs->{'bgs'}{$item}) { + $datatable .= ' '; + } + $datatable .= '
'.$choices->{'links'}.''.$choices->{$item}.'
'.$defaults->{'links'}{$item}.'		'.&mt('Default(s) in use').'
'.$links_def.'
 '. + ''; + foreach my $item (@{$links}) { + $datatable .= ''; + } return $datatable; } +sub color_pick { + my ($phase,$role,$item,$desc,$curcol) = @_; + my $link = ''.$desc.''; + return $link; +} + +sub color_pick_js { + my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition(); + my $output = <<"ENDCOL"; + function pclose() { + parmwin=window.open("/adm/rat/empty.html","LONCAPAparms","height=350,width=350,scrollbars=no,menubar=no"); + parmwin.close(); + } + + $pjump_def + + function psub() { + pclose(); + if (document.parmform.pres_marker.value!='') { + if (document.parmform.pres_type.value!='') { + eval('document.display.'+ + document.parmform.pres_marker.value+ + '.value=document.parmform.pres_value.value;'); + } + } else { + document.parmform.pres_value.value=''; + document.parmform.pres_marker.value=''; + } + } +ENDCOL + return $output; +} + sub print_quotas { my ($dom,$settings) = @_; my $datatable; @@ -496,16 +904,20 @@ sub usertype_update_row { } sub modify_login { - my ($dom,%domconfig) = @_; - my ($resulttext,%changes); + my ($r,$dom,%domconfig) = @_; + my ($resulttext,$errors,$colchgtext,%changes,%colchanges); my %title = ( coursecatalog => 'Display course catalog', adminmail => 'Display administrator E-mail address'); my @offon = ('off','on'); - my %loginhash = ( - login => { coursecatalog => $env{'form.coursecatalog'}, - adminmail => $env{'form.adminmail'}, - } - ); + my %loginhash; + ($errors,%colchanges) = &modify_colors($r,$dom,['login'],\%domconfig, + \%loginhash); + $loginhash{login}{coursecatalog} = $env{'form.coursecatalog'}; + $loginhash{login}{adminmail} = $env{'form.adminmail'}; + if (ref($colchanges{'login'}) eq 'HASH') { + $colchgtext = &display_colorchgs($dom,\%colchanges,['login'], + \%loginhash); + } my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash, $dom); if ($putresult eq 'ok') { @@ -525,18 +937,248 @@ sub modify_login { ($env{'form.adminmail'} eq '1')) { $changes{'adminmail'} = 1; } - if (keys(%changes) > 0) { + if (keys(%changes) > 0 || $colchgtext) { $resulttext = &mt('Changes made:').'
    '; foreach my $item (sort(keys(%changes))) { $resulttext .= '
  • '.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'
    • '; } - $resulttext .= '
'; + $resulttext .= $colchgtext.''; } else { $resulttext = &mt('No changes made to log-in page settings'); } } else { $resulttext = &mt('An error occurred: [_1]',$putresult); } + if ($errors) { + $resulttext .= &mt('The following errors occurred: ').'
    '. + $errors.'
'; + } + return $resulttext; +} + +sub color_font_choices { + my %choices = + &Apache::lonlocal::texthash ( + img => "Header", + bgs => "Background colors", + links => "Link colors", + font => "Font color", + pgbg => "Page", + tabbg => "Header", + sidebg => "Border", + link => "Link", + alink => "Active link", + vlink => "Visited link", + ); + return %choices; +} + +sub modify_rolecolors { + my ($r,$dom,$roles,%domconfig) = @_; + my ($resulttext,%rolehash); + $rolehash{'rolecolors'} = {}; + my ($errors,%changes) = &modify_colors($r,$dom,$roles, + $domconfig{'rolecolors'},$rolehash{'rolecolors'}); + my $putresult = &Apache::lonnet::put_dom('configuration',\%rolehash, + $dom); + if ($putresult eq 'ok') { + if (keys(%changes) > 0) { + $resulttext = &display_colorchgs($dom,\%changes,$roles, + $rolehash{'rolecolors'}); + } else { + $resulttext = &mt('No changes made to default color schemes'); + } + } else { + $resulttext = &mt('An error occurred: [_1]',$putresult); + } + if ($errors) { + $resulttext .= &mt('The following errors occurred: ').'
    '. + $errors.'
'; + } + return $resulttext; +} + +sub modify_colors { + my ($r,$dom,$roles,$domconfig,$confhash) = @_; + my %changes; + my @bgs = ('pgbg','mainbg','sidebg'); + my @links = ('link','alink','vlink'); + my @images; + my $configuname = $dom.'-domainconfig'; + my $servadm = $r->dir_config('lonAdmEMail'); + my $errors; + foreach my $role (@{$roles}) { + if ($role eq 'login') { + @images = ('img','logo','domlogo'); + } else { + @images = ('img'); + } + $confhash->{$role}{'font'} = $env{'form.'.$role.'_font'}; + foreach my $item (@bgs,@links) { + $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item}; + } + foreach my $img (@images) { + if ($env{'form.'.$role.'_'.$img.'.filename'} ne '') { + my $configuserok; + if (&Apache::lonnet::homeserver($configuname,$dom) eq 'no_host') { + srand( time() ^ ($$ + ($$ << 15)) ); # Seed rand. + my $configpass = &LONCAPA::Enrollment::create_password(); + $configuserok = &Apache::lonnet::modifyuser($dom,$configuname,'','internal',$configpass,'','','','','',undef,$servadm); + } else { + $configuserok = 'ok'; + } + if ($configuserok eq 'ok') { + my $result = + &Apache::lonnet::userfileupload($role.'_'.$img,'', + 'portfolio/'.$img,'','','',$configuname,$dom,'200','50'); + if ($result =~ m|(^/uploaded/.+)/([^/]+)$|) { + my $urldir = $1; + my $filename = $2; + my $allowresult = &Apache::lonnet::make_public_indefinitely($result); + if ($allowresult eq 'ok') { + &Apache::lonnet::make_public_indefinitely($urldir.'/tn-'.$filename); + $confhash->{$role}{$img} = $result; + $changes{$role}{$img} = 1; + } + } + } else { + my $error = &mt("Upload of image [_1] for $role page(s) failed because a Domain Configuation user ([_2]) could not be created in domain: [_3]. Error was: [_4].",$img,$configuname,$dom,$configuserok); + &Apache::lonnet::logthis($error); + $errors .= '
  • '.$error.'
    • '; + } + } + } + if (ref($domconfig) eq 'HASH') { + if (ref($domconfig->{$role}) eq 'HASH') { + foreach my $img (@images) { + if ($domconfig->{$role}{$img} ne '') { + if ($env{'form.'.$role.'_del_'.$img}) { + $confhash->{$role}{$img} = ''; + $changes{$role}{$img} = 1; + } else { + $confhash->{$role}{$img} = $domconfig->{$role}{$img}; + } + } else { + if ($env{'form.'.$role.'_del_'.$img}) { + $confhash->{$role}{$img} = ''; + $changes{$role}{$img} = 1; + } + } + } + if ($domconfig->{$role}{'font'} ne '') { + if ($confhash->{$role}{'font'} ne $domconfig->{$role}{'font'}) { + $changes{$role}{'font'} = 1; + } + } else { + if ($confhash->{$role}{'font'}) { + $changes{$role}{'font'} = 1; + } + } + foreach my $item (@bgs) { + if ($domconfig->{$role}{$item} ne '') { + if ($confhash->{$role}{$item} ne $domconfig->{$role}{$item}) { + $changes{$role}{'bgs'}{$item} = 1; + } + } else { + if ($confhash->{$role}{$item}) { + $changes{$role}{'bgs'}{$item} = 1; + } + } + } + foreach my $item (@links) { + if ($domconfig->{$role}{$item} ne '') { + if ($confhash->{$role}{$item} ne $domconfig->{$role}{$item}) { + $changes{$role}{'links'}{$item} = 1; + } + } else { + if ($confhash->{$role}{$item}) { + $changes{$role}{'links'}{$item} = 1; + } + } + } + } else { + &default_change_checker($role,\@images,\@links,\@bgs, + $confhash,\%changes); + } + } else { + &default_change_checker($role,\@images,\@links,\@bgs, + $confhash,\%changes); + } + } + return ($errors,%changes); +} + +sub default_change_checker { + my ($role,$images,$links,$bgs,$confhash,$changes) = @_; + foreach my $item (@{$links}) { + if ($confhash->{$role}{$item}) { + $changes->{$role}{'links'}{$item} = 1; + } + } + foreach my $item (@{$bgs}) { + if ($confhash->{$role}{$item}) { + $changes->{$role}{'bgs'}{$item} = 1; + } + } + foreach my $img (@{$images}) { + if ($env{'form.'.$role.'_del_'.$img}) { + $confhash->{$role}{$img} = ''; + $changes->{$role}{$img} = 1; + } + } + if ($confhash->{$role}{'font'}) { + $changes->{$role}{'font'} = 1; + } +} + +sub display_colorchgs { + my ($dom,$changes,$roles,$confhash) = @_; + my (%choices,$resulttext); + &Apache::loncommon::devalidate_domconfig_cache($dom); + if (!grep(/^login$/,@{$roles})) { + $resulttext = &mt('Changes made:').'
    '; + } + foreach my $role (@{$roles}) { + if ($role eq 'login') { + %choices = &login_choices(); + } else { + %choices = &color_font_choices(); + } + if (ref($changes->{$role}) eq 'HASH') { + if ($role ne 'login') { + $resulttext .= '

    '.&mt($role).'

    '; + } + foreach my $key (sort(keys(%{$changes->{$role}}))) { + if ($role ne 'login') { + $resulttext .= '
      '; + } + if (ref($changes->{$role}{$key}) eq 'HASH') { + if ($role ne 'login') { + $resulttext .= '
    • '.&mt($choices{$key}).':
        '; + } + foreach my $item (sort(keys(%{$changes->{$role}{$key}}))) { + if ($confhash->{$role}{$item} eq '') { + $resulttext .= '
      • '.&mt("$choices{$item} set to default").'
        • '; + } else { + $resulttext .= '
      • '.&mt("$choices{$item} set to [_1]",$confhash->{$role}{$item}).'
        • '; + } + } + if ($role ne 'login') { + $resulttext .= '
      • '; + } + } else { + if ($confhash->{$role}{$key} eq '') { + $resulttext .= '
    • '.&mt("$choices{$key} set to default").'
      • '; + } else { + $resulttext .= '
    • '.&mt("$choices{$key} set to [_1]",$confhash->{$role}{$key}).'
      • '; + } + } + if ($role ne 'login') { + $resulttext .= '
    '; + } + } + } + } return $resulttext; } @@ -746,7 +1388,7 @@ sub modify_autoupdate { $newvaluestr = join(', ',@newvalues); } else { $newvaluestr = &mt('none'); - } + } if ($item eq 'default') { $resulttext .= '
  • '.&mt("Updates for $othertitle set to: [_1]",$newvaluestr).'
    • '; } else {
    '; + my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'links'}{$item}); + if ($designs->{'links'}{$item}) { + $datatable.=''. + $link.''; + } else { + $datatable .= $link; + } + $datatable .= '