--- loncom/interface/domainprefs.pm	2008/01/04 17:47:51	1.40
+++ loncom/interface/domainprefs.pm	2008/02/15 17:02:31	1.42
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.40 2008/01/04 17:47:51 raeburn Exp $
+# $Id: domainprefs.pm,v 1.42 2008/02/15 17:02:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -247,7 +247,7 @@ sub handler {
             my @ids=&Apache::lonnet::current_machine_ids();
             if (!grep(/^\Q$primarylibserv\E$/,@ids)) {
                 my %designhash = &Apache::loncommon::get_domainconf($dom);
-                my @loginimages = ('img','logo','domlogo');
+                my @loginimages = ('img','logo','domlogo','login');
                 my $custom_img_count = 0;
                 foreach my $img (@loginimages) {
                     if ($designhash{$dom.'.login.'.$img} ne '') {
@@ -568,10 +568,24 @@ sub print_footer {
 sub print_login {
     my ($dom,$confname,$phase,$settings,$rowtotal) = @_;
     my %choices = &login_choices();
-    my ($catalogon,$catalogoff,$adminmailon,$adminmailoff);
-    $catalogon = ' checked="checked" ';
-    $adminmailoff = ' checked="checked" ';
-    my @images = ('img','logo','domlogo');
+    my %defaultchecked = ( 
+                    'coursecatalog' => 'on',
+                    'adminmail'     => 'off',
+                  );
+    my @toggles = ('coursecatalog','adminmail');
+    my (%checkedon,%checkedoff);
+    foreach my $item (@toggles) {
+        if ($defaultchecked{$item} eq 'on') { 
+            $checkedon{$item} = ' checked="checked" ';
+            $checkedoff{$item} = ' ';
+        } elsif ($defaultchecked{$item} eq 'off') {
+            $checkedoff{$item} = ' checked="checked" ';
+            $checkedon{$item} = ' ';
+        }
+    }
+    my $loginheader = 'image';
+    my @images = ('img','logo','domlogo','login');
+    my @logintext = ('textcol','bgcol');
     my @bgs = ('pgbg','mainbg','sidebg');
     my @links = ('link','alink','vlink');
     my %designhash = &Apache::loncommon::get_domainconf($dom);
@@ -586,17 +600,21 @@ sub print_login {
     foreach my $item (@bgs) {
         $defaults{'bgs'}{$item} = $defaultdesign{'login.'.$item};
     }
+    foreach my $item (@logintext) {
+        $defaults{'logintext'}{$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;
-            $catalogon = ' ';
-        }
-        if ($settings->{'adminmail'} eq '1') {
-            $adminmailon = $adminmailoff;
-            $adminmailoff = ' ';
+        foreach my $item (@toggles) {
+            if ($settings->{$item} eq '1') {
+                $checkedon{$item} =  ' checked="checked" ';
+                $checkedoff{$item} = ' ';
+            } elsif ($settings->{$item} eq '0') {
+                $checkedoff{$item} =  ' checked="checked" ';
+                $checkedon{$item} = ' ';
+            }
         }
         foreach my $item (@images) {
             if ($settings->{$item} ne '') {
@@ -604,6 +622,15 @@ sub print_login {
                 $is_custom{$item} = 1;
             }
         }
+        foreach my $item (@logintext) {
+            if ($settings->{$item} ne '') {
+                $designs{'logintext'}{$item} = $settings->{$item};
+                $is_custom{$item} = 1;
+            }
+        }
+        if ($settings->{'loginheader'} ne '') {
+            $loginheader = $settings->{'loginheader'};
+        }
         if ($settings->{'font'} ne '') {
             $designs{'font'} = $settings->{'font'};
             $is_custom{'font'} = 1;
@@ -646,28 +673,23 @@ sub print_login {
     }
     my %alt_text = &Apache::lonlocal::texthash  ( img => 'Log-in banner',
                                                   logo => 'Institution Logo',
-                                                  domlogo => 'Domain Logo');
+                                                  domlogo => 'Domain Logo',
+                                                  login => 'Login box');
     my $itemcount = 1;
-    my $css_class = $itemcount%2?' class="LC_odd_row"':'';
-    my $datatable = 
-        '<tr'.$css_class.'><td colspan="2">'.$choices{'coursecatalog'}.
-        '</td><td>'.
-        '<span class="LC_nobreak"><label><input type="radio" name="coursecatalog"'.
-        $catalogon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
-        '<label><input type="radio" name="coursecatalog"'.
-        $catalogoff.'value="0" />'.&mt('No').'</label></span></td>'.
-        '</tr>';
-    $itemcount ++;
-    $css_class = $itemcount%2?' class="LC_odd_row"':'';
-    $datatable .= '<tr'.$css_class.'>'.
-        '<td colspan="2">'.$choices{'adminmail'}.'</td>'.
-        '<td><span class="LC_nobreak">'.
-        '<label><input type="radio" name="adminmail"'.
-        $adminmailon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
-        '<label><input type="radio" name="adminmail"'.
-        $adminmailoff.'value="0" />'.&mt('No').'</label></span></td></tr>';
-    $itemcount ++;
-    $datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal);
+    my ($css_class,$datatable);
+    foreach my $item (@toggles) {
+        $css_class = $itemcount%2?' class="LC_odd_row"':'';
+        $datatable .=  
+            '<tr'.$css_class.'><td colspan="2">'.$choices{$item}.
+            '</td><td>'.
+            '<span class="LC_nobreak"><label><input type="radio" name="'.
+            $item.'"'.$checkedon{$item}.' value="1" />'.&mt('Yes').
+            '</label>&nbsp;<label><input type="radio" name="'.$item.'"'.
+            $checkedoff{$item}.' value="0" />'.&mt('No').'</label></span></td>'.
+            '</tr>';
+        $itemcount ++;
+    }
+    $datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext,$loginheader);
     $datatable .= '</tr></table></td></tr>';
     return $datatable;
 }
@@ -680,6 +702,9 @@ sub login_choices {
             img => "Header",
             logo => "Main Logo",
             domlogo => "Domain Logo",
+            login => "Log-in Header", 
+            textcol => "Text color",
+            bgcol   => "Box color",
             bgs => "Background colors",
             links => "Link colors",
             font => "Font color",
@@ -767,7 +792,7 @@ sub print_rolecolors {
 
 sub display_color_options {
     my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs,
-        $images,$bgs,$links,$alt_text,$rowtotal) = @_;
+        $images,$bgs,$links,$alt_text,$rowtotal,$logintext,$loginheader) = @_;
     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
     my $datatable = '<tr'.$css_class.'>'.
         '<td>'.$choices->{'font'}.'</td>';
@@ -789,13 +814,19 @@ sub display_color_options {
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'>'.
                       '<td>'.$choices->{$img}.'</td>';
-        my ($imgfile, $img_import);
+        my ($imgfile,$img_import,$login_hdr_pick,$logincolors);
         if ($designs->{$img} ne '') {
             $imgfile = $designs->{$img};
 	    $img_import = ($imgfile =~ m{^/adm/});
         } else {
             $imgfile = $defaults->{$img};
         }
+        if ($img eq 'login') {
+            $login_hdr_pick = &login_header_options($img,$role,$defaults,$is_custom,$choices,
+                                                    $loginheader);
+            $logincolors =
+                &login_text_colors($img,$role,$logintext,$phase,$choices,$designs);
+        }
         if ($imgfile) {
             my ($showfile,$fullsize);
             if ($imgfile =~ m-^(/res/\Q$dom\E/\Q$confname\E/\Q$img\E)/([^/]+)$-) {
@@ -856,23 +887,12 @@ sub display_color_options {
                         $fullsize = $imgfile;
                     }
                 }
-                $datatable.= '<td>';
-                if (!$is_custom->{$img}) {
-                    $datatable .= &mt('Default in use:').'<br />';
-                }
-		if ($img_import) {
-		    $datatable.= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />';
-		}
-                $datatable.= '<a href="'.$fullsize.'" target="_blank"><img src="'.
-                             $showfile.'" alt="'.$alt_text->{$img}.
-                             '" border="0" /></a></td>';
-                if ($is_custom->{$img}) {
-                    $datatable.='<td><span class="LC_nobreak"><label><input type="checkbox" name="'.
-                                $role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
-                                '</label>&nbsp;'.&mt('Replace:').'</span><br />';
-                } else {
-                    $datatable.='<td valign="bottom">'.&mt('Upload:').'<br />';
+                $datatable .= '<td>';
+                if ($img eq 'login') {
+                    $datatable .= $login_hdr_pick;    
                 }
+                $datatable .= &image_changes($is_custom->{$img},$alt_text->{$img},$img_import,
+                                             $showfile,$fullsize,$role,$img,$imgfile,$logincolors);
             } else {
                 $datatable .= '<td colspan="2" class="LC_right_item"><br />'.
                               &mt('Upload:');
@@ -912,7 +932,7 @@ sub display_color_options {
             $datatable .= '&nbsp;<span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'bgs'}{$item}.';">&nbsp;&nbsp;&nbsp;</span>';
         }
         $datatable .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'.$designs->{'bgs'}{$item}.
-                      '" onblur = "javascript:document.display.css_'.$role.'_'.$item.'.style.background-color = document.display.'.$role.'_'.$item.'.value;"/></td>';
+                      '" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>';
     }
     $datatable .= '</tr></table></td></tr>';
     $itemcount ++;
@@ -946,6 +966,79 @@ sub display_color_options {
     return $datatable;
 }
 
+sub login_header_options  {
+    my ($img,$role,$defaults,$is_custom,$choices,$loginheader) = @_;
+    my $image_checked = ' checked="checked" ';
+    my $text_checked = ' ';
+    if ($loginheader eq 'text') {
+        $image_checked = ' ';
+        $text_checked = ' checked="checked" ';
+    }
+    my $output = '<span class="LC_nobreak"><label><input type="radio" name="'.
+              'loginheader" value="image" '.$image_checked.'/>'.
+              &mt('use image').'</label>&nbsp;&nbsp;&nbsp;'.
+              '<label><input type="radio" name="loginheader" value="text"'.
+              $text_checked.'/>'.&mt('use text').'</label><br />'."\n";
+    if ((!$is_custom->{'textcol'}) || (!$is_custom->{'bgcol'})) {
+        $output .= &mt('Text default(s)').':<br />';
+        if (!$is_custom->{'textcol'}) {
+            $output .= $choices->{'textcol'}.':&nbsp;'.$defaults->{'logintext'}{'textcol'}.
+                       '&nbsp;&nbsp;&nbsp;';
+        }
+        if (!$is_custom->{'bgcol'}) {
+            $output .= $choices->{'bgcol'}.':&nbsp;'.
+                       '<span id="css_'.$role.'_font" style="background-color: '.
+                       $defaults->{'logintext'}{'bgcol'}.';">&nbsp;&nbsp;&nbsp;</span>';
+        }
+        $output .= '<br />';
+    }
+    $output .='<br />';
+    return $output;
+}
+
+sub login_text_colors {
+    my ($img,$role,$logintext,$phase,$choices,$designs) = @_;
+    my $color_menu = '<table border="0"><tr>';
+    foreach my $item (@{$logintext}) {
+        my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'logintext'}{$item});
+        $color_menu .= '<td align="center">'.$link;
+        if ($designs->{'logintext'}{$item}) {
+            $color_menu .= '&nbsp;<span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'logintext'}{$item}.';">&nbsp;&nbsp;&nbsp;</span>';
+        }
+        $color_menu .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'.
+                       $designs->{'logintext'}{$item}.'" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>'.
+                       '<td>&nbsp;</td>';
+    }
+    $color_menu .= '</tr></table><br />';
+    return $color_menu;
+}
+
+sub image_changes {
+    my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_;
+    my $output;
+    if (!$is_custom) {
+        if ($img eq 'login') {
+            $output .= &mt('Default image:').'<br />';
+        } else {
+            $output .= &mt('Default in use:').'<br />';
+        }
+    }
+    if ($img_import) {
+        $output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />';
+    }
+    $output .= '<a href="'.$fullsize.'" target="_blank"><img src="'.
+               $showfile.'" alt="'.$alt_text.'" border="0" /></a></td>';
+    if ($is_custom) {
+        $output .= '<td>'.$logincolors.'<span class="LC_nobreak"><label>'.
+                   '<input type="checkbox" name="'.
+                   $role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
+                   '</label>&nbsp;'.&mt('Replace:').'</span><br />';
+    } else {
+        $output .= '<td valign="bottom">'.$logincolors.&mt('Upload:').'<br />';
+    }
+    return $output;
+}
+
 sub color_pick {
     my ($phase,$role,$item,$desc,$curcol) = @_;
     my $link = '<a href="javascript:pjump('."'color_custom','".$desc.
@@ -977,6 +1070,25 @@ sub color_pick_js {
             document.parmform.pres_marker.value='';
         }
     }
+
+    function get_id (span_id) {
+	if (document.getElementById) {
+            return document.getElementById(span_id);
+        }
+	if (document.all) {
+            return document.all[span_id];
+        } 
+	return false;
+    }
+
+    function colchg_span (span_id_str,new_color_item) {
+	var span_ref = get_id(span_id_str);
+	if (span_ref.style) { span_ref = span_ref.style; }
+	span_ref.background = new_color_item.value;
+	span_ref.backgroundColor = new_color_item.value;
+	span_ref.bgColor = new_color_item.value;
+    }
+
 ENDCOL
     return $output;
 }
@@ -1795,13 +1907,17 @@ sub modify_login {
     my ($r,$dom,$confname,%domconfig) = @_;
     my ($resulttext,$errors,$colchgtext,%changes,%colchanges);
     my %title = ( coursecatalog => 'Display course catalog',
-                  adminmail => 'Display administrator E-mail address');
+                  adminmail => 'Display administrator E-mail address',
+                  loginheader => 'Log-in box header');
     my @offon = ('off','on');
     my %loginhash;
     ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'],
                                            \%domconfig,\%loginhash);
-    $loginhash{login}{coursecatalog} = $env{'form.coursecatalog'};
-    $loginhash{login}{adminmail} = $env{'form.adminmail'};
+    my @toggles = ('coursecatalog','adminmail');
+    foreach my $item (@toggles) {
+        $loginhash{login}{$item} = $env{'form.'.$item};
+    }
+    $loginhash{login}{loginheader} = $env{'form.loginheader'};
     if (ref($colchanges{'login'}) eq 'HASH') {  
         $colchgtext = &display_colorchgs($dom,\%colchanges,['login'],
                                          \%loginhash);
@@ -1809,26 +1925,49 @@ sub modify_login {
     my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash,
                                              $dom);
     if ($putresult eq 'ok') {
-        if (($domconfig{'login'}{'coursecatalog'} eq '0') &&
-            ($env{'form.coursecatalog'} eq '1')) {
-            $changes{'coursecatalog'} = 1;
-        } elsif (($domconfig{'login'}{'coursecatalog'} eq '' ||
-                 $domconfig{'login'}{'coursecatalog'} eq '1') &&
-                 ($env{'form.coursecatalog'} eq '0')) {
-            $changes{'coursecatalog'} = 1;
-        }
-        if (($domconfig{'login'}{'adminmail'} eq '1') &&
-                ($env{'form.adminmail'} eq '0')) {
-            $changes{'adminmail'} = 1;
-        } elsif (($domconfig{'login'}{'adminmail'} eq '' ||
-                 $domconfig{'login'}{'adminmail'} eq '0') &&
-                 ($env{'form.adminmail'} eq '1')) {
-            $changes{'adminmail'} = 1;
+        my @toggles = ('coursecatalog','adminmail');
+        my %defaultchecked = (
+                    'coursecatalog' => 'on',
+                    'adminmail'     => 'off',
+        );
+        foreach my $item (@toggles) {
+            if ($defaultchecked{$item} eq 'on') { 
+                if (($domconfig{'login'}{$item} eq '0') &&
+                    ($env{'form.'.$item} eq '1')) {
+                    $changes{$item} = 1;
+                } elsif (($domconfig{'login'}{$item} eq '' ||
+                          $domconfig{'login'}{$item} eq '1') &&
+                         ($env{'form.'.$item} eq '0')) {
+                    $changes{$item} = 1;
+                }
+            } elsif ($defaultchecked{$item} eq 'off') {
+                if (($domconfig{'login'}{$item} eq '1') &&
+                    ($env{'form.'.$item} eq '0')) {
+                    $changes{$item} = 1;
+                } elsif (($domconfig{'login'}{$item} eq '' ||
+                          $domconfig{'login'}{$item} eq '0') &&
+                         ($env{'form.'.$item} eq '1')) {
+                    $changes{$item} = 1;
+                }
+            }
+        }
+        if (($domconfig{'login'}{'loginheader'} eq 'text') && 
+            ($env{'form.loginheader'} eq 'image')) {
+            $changes{'loginheader'} = 1;
+        } elsif (($domconfig{'login'}{'loginheader'} eq '' ||
+                  $domconfig{'login'}{'loginheader'} eq 'image') &&
+                 ($env{'form.loginheader'} eq 'text')) {
+            $changes{'loginheader'} = 1;
         }
         if (keys(%changes) > 0 || $colchgtext) {
+            &Apache::loncommon::devalidate_domconfig_cache($dom);
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (sort(keys(%changes))) {
-                $resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>';
+                if ($item eq 'loginheader') {
+                    $resulttext .= '<li>'.&mt("$title{$item} set to $env{'form.loginheader'}").'</li>';
+                } else {
+                    $resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>';
+                }
             }
             $resulttext .= $colchgtext.'</ul>';
         } else {
@@ -1872,6 +2011,7 @@ sub modify_rolecolors {
                                              $dom);
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
+            &Apache::loncommon::devalidate_domconfig_cache($dom);
             $resulttext = &display_colorchgs($dom,\%changes,$roles,
                                              $rolehash{'rolecolors'});
         } else {
@@ -1893,22 +2033,24 @@ sub modify_colors {
     my (%changes,%choices);
     my @bgs = ('pgbg','mainbg','sidebg');
     my @links = ('link','alink','vlink');
+    my @logintext;
     my @images;
     my $servadm = $r->dir_config('lonAdmEMail');
     my $errors;
     foreach my $role (@{$roles}) {
         if ($role eq 'login') {
             %choices = &login_choices();
+            @logintext = ('textcol','bgcol');
         } else {
             %choices = &color_font_choices();
         }
         if ($role eq 'login') {
-            @images = ('img','logo','domlogo');
+            @images = ('img','logo','domlogo','login');
         } else {
             @images = ('img');
         }
         $confhash->{$role}{'font'} = $env{'form.'.$role.'_font'};
-        foreach my $item (@bgs,@links) {
+        foreach my $item (@bgs,@links,@logintext) {
             $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
         }
         my ($configuserok,$author_ok,$switchserver,%currroles);
@@ -2032,20 +2174,31 @@ sub modify_colors {
                         }
                     }
                 }
+                foreach my $item (@logintext) {
+                    if ($domconfig->{$role}{$item} ne '') {
+                        if ($confhash->{$role}{$item} ne $domconfig->{$role}{$item}) {
+                            $changes{$role}{'logintext'}{$item} = 1;
+                        }
+                    } else {
+                        if ($confhash->{$role}{$item}) {
+                            $changes{$role}{'logintext'}{$item} = 1;
+                        }
+                    }
+                }
             } else {
                 &default_change_checker($role,\@images,\@links,\@bgs,
-                                        $confhash,\%changes); 
+                                        \@logintext,$confhash,\%changes); 
             }
         } else {
             &default_change_checker($role,\@images,\@links,\@bgs,
-                                    $confhash,\%changes); 
+                                    \@logintext,$confhash,\%changes); 
         }
     }
     return ($errors,%changes);
 }
 
 sub default_change_checker {
-    my ($role,$images,$links,$bgs,$confhash,$changes) = @_;
+    my ($role,$images,$links,$bgs,$logintext,$confhash,$changes) = @_;
     foreach my $item (@{$links}) {
         if ($confhash->{$role}{$item}) {
             $changes->{$role}{'links'}{$item} = 1;
@@ -2056,6 +2209,11 @@ sub default_change_checker {
             $changes->{$role}{'bgs'}{$item} = 1;
         }
     }
+    foreach my $item (@{$logintext}) {
+        if ($confhash->{$role}{$item}) {
+            $changes->{$role}{'logintext'}{$item} = 1;
+        }
+    }
     foreach my $img (@{$images}) {
         if ($env{'form.'.$role.'_del_'.$img}) {
             $confhash->{$role}{$img} = '';
@@ -2070,7 +2228,6 @@ sub default_change_checker {
 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:').'<br />';
     }