--- loncom/interface/lonhtmlcommon.pm	2006/04/19 22:26:26	1.125
+++ loncom/interface/lonhtmlcommon.pm	2006/05/30 12:46:09	1.130
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.125 2006/04/19 22:26:26 albertel Exp $
+# $Id: lonhtmlcommon.pm,v 1.130 2006/05/30 12:46:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,6 +60,8 @@ use Time::Local;
 use Time::HiRes;
 use Apache::lonlocal;
 use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 ##############################################
 ##############################################
@@ -93,7 +95,7 @@ sub authorbombs {
 
 sub recent_filename {
     my $area=shift;
-    return 'nohist_recent_'.&Apache::lonnet::escape($area);
+    return 'nohist_recent_'.&escape($area);
 }
 
 sub store_recent {
@@ -115,7 +117,7 @@ sub store_recent {
     }
 # store new value
     &Apache::lonnet::put($file,{ $name => 
-				 time.'&'.&Apache::lonnet::escape($value) });
+				 time.'&'.&escape($value) });
 }
 
 sub remove_recent {
@@ -134,7 +136,7 @@ sub select_recent {
 	unless ($_=~/^error\:/) {
 	    my $escaped = &Apache::loncommon::escape_url($_);
 	    $return.="\n<option value='$escaped'>".
-		&Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]).
+		&unescape((split(/\&/,$recent{$_}))[1]).
 		'</option>';
 	}
     }
@@ -158,7 +160,7 @@ sub get_recent {
     my $idx = 1;
     foreach (reverse sort keys %time_hash) {
        $return_hash{$time_hash{$_}} =
-                  &Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]);
+                  &unescape((split(/\&/,$recent{$_}))[1]);
        if ($n && ($idx++ >= $n)) {last;}
     }
 
@@ -178,6 +180,7 @@ sub get_recent {
 sub textbox {
     my ($name,$value,$size,$special) = @_;
     $size = 40 if (! defined($size));
+    $value = &HTML::Entities::encode($value,'<>&"');
     my $Str = '<input type="text" name="'.$name.'" size="'.$size.'" '.
         'value="'.$value.'" '.$special.' />';
     return $Str;
@@ -1078,7 +1081,7 @@ sub disablelink {
     if (defined($#fields)) {
 	unless ($#fields>=0) { return ''; }
     }
-    return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
+    return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl=','<>&"').&escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
 }
 
 sub enablelink {
@@ -1086,7 +1089,7 @@ sub enablelink {
     if (defined($#fields)) {
 	unless ($#fields>=0) { return ''; }
     }
-    return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
+    return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl=','<>&"').&escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
 }
 
 # ----------------------------------------- Script to activate only some fields
@@ -1165,20 +1168,9 @@ returns: nothing
     my @Crumbs;
     
     sub breadcrumbs {
-        my ($color,$component,$component_help,$function,$domain,$menulink,
-	    $helplink) = @_;
-        if (! defined($color)) {
-            if (! defined($function)) {
-                $function = &Apache::loncommon::get_users_function();
-            }
-            $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $domain);
-        }
+        my ($component,$component_help,$menulink,$helplink) = @_;
         #
-        my $Str = "\n".
-            '<table width="100%" border="0" cellpadding="0" cellspacing="0">'.
-            '<tr><td bgcolor="'.$color.'">'.
-            '<font size="-1">';
+        my $Str = "\n".'<table id="LC_breadcrumbs"><tr><td>';
         #
         # Make the faq and bug data cascade
         my $faq = '';
@@ -1233,17 +1225,19 @@ returns: nothing
 #            $icons .= &Apache::loncommon::help_open_bug($bug);
 #        }
 	if ($helplink ne 'nohelp') {
-	    $icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug);
+	    $icons .= &Apache::loncommon::help_open_menu(undef,$component,
+							 $component_help,
+							 undef,$faq,$bug);
 	}
         if ($icons ne '') {
             $Str .= $icons.'&nbsp;';
         }
         #
-        $Str .= $links.'</font></td>';
+        $Str .= $links.'</td>';
         #
         if (defined($component)) {
-            $Str .= '<td align="right" bgcolor="'.$color.'">'.
-                '<font size="+1">'.&mt($component).'</font></td>';
+            $Str .= '<td class="LC_breadcrumb_component">'.
+                &mt($component).'</td>';
         }
         $Str .= '</tr></table>'."\n";
         #
@@ -1438,11 +1432,11 @@ sub course_select_row {
     |;
     my $courseform='<b>'.&Apache::loncommon::selectcourse_link
                      ($formname,'pickcourse','pickdomain','coursedesc','',1).'</b>';
+        $output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.&mt('All courses').'<br />';
     if ($totcodes > 0) {
-        $output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.&mt('All courses');
         my $numtitles = @$codetitles;
         if ($numtitles > 0) {
-            $output .= '<br /><input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').' <br />';
+            $output .= '<input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').' <br />';
             $output .= '<table><tr><td>'.$$codetitles[0].'<br />'."\n".
                '<select name="'.$$codetitles[0].
                '" onChange="setPick(this.form);courseSet('."'$$codetitles[0]'".')">'."\n".