--- loncom/interface/lonpreferences.pm	2006/05/01 22:15:17	1.82
+++ loncom/interface/lonpreferences.pm	2006/05/08 22:22:48	1.85
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.82 2006/05/01 22:15:17 albertel Exp $
+# $Id: lonpreferences.pm,v 1.85 2006/05/08 22:22:48 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -519,13 +519,13 @@ sub colorschanger {
     foreach my $item (sort(keys(%colortypes))) {
        my $curcol=&Apache::loncommon::designparm($function.'.'.$item,$domain);
        $chtable.=&Apache::loncommon::start_data_table_row().
-	   '<td>'.$colortypes{$item}.'</td><td bgcolor="'.$curcol.
+	   '<td>'.$colortypes{$item}.'</td><td style="background: '.$curcol.
         '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><input name="'.$item.
         '" size="10" value="'.$curcol.
 '" /></td><td><a href="javascript:pjump('."'color_custom','".$colortypes{$item}.
 "','".$curcol."','"
 	    .$item."','parmform.pres','psub'".');">Select</a></td>'.
-	    &Apache::loncommon::end_data_table_row();
+	    &Apache::loncommon::end_data_table_row()."\n";
     }
     my $end_data_table = &Apache::loncommon::end_data_table();
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
@@ -600,6 +600,10 @@ sub verify_and_change_colors {
 	    $message.='Reset '.$colortypes{$item}.'<br />';
 	}
     }
+    my $now = time;
+    &Apache::lonnet::put('environment',{'color.timestamp' => $now});
+    &Apache::lonnet::appenv('environment.color.timestamp' => $now);
+
     $r->print(<<ENDVCCOL);
 $message
 <form name="client" action="/adm/preferences" method="POST">
@@ -1207,6 +1211,19 @@ sub handler {
                             text => 'Change Math Preferences'},
                       printmenu => 'yes',
                       }));
+
+    if ($env{'environment.remote'} eq 'off') {
+	push (@Options,({ action => 'launch',
+			  linktext => 'Launch Remote Control',
+			  href => '/adm/remote?url=/adm/preferences',
+		      }));
+    } else {
+	push (@Options,({ action => 'collapse',
+			  linktext => 'Collapse Remote Control',
+			  href => '/adm/remote?url=/adm/preferences',
+		      }));
+    }
+
     if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
 	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
 				    .$env{'request.course.sec'})) {
@@ -1273,9 +1290,10 @@ sub handler {
         foreach my $option(@Options) {
             my $optiontext = '';
             if (exists($option->{'href'})) {
-                $optiontext .= 
-                    '<a href="'.$option->{'href'}.
-                    '?action='.$option->{'action'}.'">'.
+		$option->{'href_args'}{'action'}=$option->{'action'};
+		$optiontext .= 
+                    '<a href="'.&add_get_param($option->{'href'},
+					       $option->{'href_args'}).'">'.
                     &mt($option->{'linktext'}).'</a>';
             }
             if (exists($option->{'text'})) {