--- loncom/interface/lonhtmlcommon.pm	2005/11/15 21:08:47	1.119
+++ loncom/interface/lonhtmlcommon.pm	2006/08/08 19:10:54	1.152
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.119 2005/11/15 21:08:47 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.152 2006/08/08 19:10:54 albertel 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,29 +95,35 @@ sub authorbombs {
 
 sub recent_filename {
     my $area=shift;
-    return 'nohist_recent_'.&Apache::lonnet::escape($area);
+    return 'nohist_recent_'.&escape($area);
 }
 
 sub store_recent {
-    my ($area,$name,$value)=@_;
+    my ($area,$name,$value,$freeze)=@_;
     my $file=&recent_filename($area);
     my %recent=&Apache::lonnet::dump($file);
     if (scalar(keys(%recent))>20) {
 # remove oldest value
-	my $oldest=time;
+	my $oldest=time();
 	my $delkey='';
-	foreach (keys %recent) {
-	    my $thistime=(split(/\&/,$recent{$_}))[0];
-	    if ($thistime<$oldest) {
+	foreach my $item (keys(%recent)) {
+	    my $thistime=(split(/\&/,$recent{$item}))[0];
+	    if (($thistime ne "always_include") && ($thistime<$oldest)) {
 		$oldest=$thistime;
-		$delkey=$_;
+		$delkey=$item;
 	    }
 	}
 	&Apache::lonnet::del($file,[$delkey]);
     }
 # store new value
+    my $timestamp;
+    if ($freeze) {
+        $timestamp = "always_include";
+    } else {
+        $timestamp = time();
+    }   
     &Apache::lonnet::put($file,{ $name => 
-				 time.'&'.&Apache::lonnet::escape($value) });
+				 $timestamp.'&'.&escape($value) });
 }
 
 sub remove_recent {
@@ -130,11 +138,11 @@ sub select_recent {
     my $return="\n<select name='$fieldname'".
 	($event?" onchange='$event'":'').
 	">\n<option value=''>--- ".&mt('Recent')." ---</option>";
-    foreach (sort keys %recent) {
-	unless ($_=~/^error\:/) {
-	    my $escaped = &Apache::loncommon::escape_url($_);
+    foreach my $value (sort(keys(%recent))) {
+	unless ($value =~/^error\:/) {
+	    my $escaped = &Apache::loncommon::escape_url($value);
 	    $return.="\n<option value='$escaped'>".
-		&Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]).
+		&unescape((split(/\&/,$recent{$value}))[1]).
 		'</option>';
 	}
     }
@@ -147,24 +155,45 @@ sub get_recent {
     my %recent=&Apache::lonnet::dump(&recent_filename($area));
 
 # Create hash with key as time and recent as value
+# Begin filling return_hash with any 'always_include' option
     my %time_hash = ();
-    foreach (keys %recent) {
-        my $thistime=(split(/\&/,$recent{$_}))[0];
-        $time_hash{$thistime} = $_;
+    my %return_hash = ();
+    foreach my $item (keys %recent) {
+        my ($thistime,$thisvalue)=(split(/\&/,$recent{$item}));
+        if ($thistime eq 'always_include') {
+            $return_hash{$item} = &unescape($thisvalue);
+            $n--;
+        } else {
+            $time_hash{$thistime} = $item;
+        }
     }
 
 # Sort by decreasing time and return key value pairs
-    my %return_hash = ();
     my $idx = 1;
-    foreach (reverse sort keys %time_hash) {
-       $return_hash{$time_hash{$_}} =
-                  &Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]);
+    foreach my $item (reverse(sort(keys(%time_hash)))) {
+       $return_hash{$time_hash{$item}} =
+                  &unescape((split(/\&/,$recent{$time_hash{$item}}))[1]);
        if ($n && ($idx++ >= $n)) {last;}
     }
 
     return %return_hash;
 }
 
+sub get_recent_frozen {
+    my ($area) = @_;
+    my %recent=&Apache::lonnet::dump(&recent_filename($area));
+
+# Create hash with all 'frozen' items
+    my %return_hash = ();
+    foreach my $item (keys(%recent)) {
+        my ($thistime,$thisvalue)=(split(/\&/,$recent{$item}));
+        if ($thistime eq 'always_include') {
+            $return_hash{$item} = &unescape($thisvalue);
+        }
+    }
+    return %return_hash;
+}
+
 
 
 =pod
@@ -178,6 +207,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;
@@ -207,6 +237,28 @@ sub checkbox {
     return $Str;
 }
 
+
+=pod
+
+=item radiobutton
+
+=cut
+
+##############################################
+##############################################
+sub radio {
+    my ($name,$checked,$value) = @_;
+    my $Str = '<input type="radio" name="'.$name.'" ';
+    if (defined($value)) {
+        $Str .= 'value="'.$value.'"';
+    } 
+    if ($checked eq $value) {
+        $Str .= ' checked="1"';
+    }
+    $Str .= ' />';
+    return $Str;
+}
+
 ##############################################
 ##############################################
 
@@ -258,7 +310,7 @@ The method used to restrict user input w
 ##############################################
 sub date_setter {
     my ($formname,$dname,$currentvalue,$special,$includeempty,$state,
-        $no_hh_mm_ss,$defhour,$defmin,$defsec) = @_;
+        $no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink) = @_;
     my $wasdefined=1;
     if (! defined($state) || $state ne 'disabled') {
         $state = '';
@@ -300,7 +352,7 @@ sub date_setter {
     }
     my $result = "\n<!-- $dname date setting form -->\n";
     $result .= <<ENDJS;
-<script language="Javascript">
+<script type="text/javascript">
     function $dname\_checkday() {
         var day   = document.$formname.$dname\_day.value;
         var month = document.$formname.$dname\_month.value;
@@ -363,7 +415,7 @@ document.$formname.$dname\_year.value,
     }
 </script>
 ENDJS
-    $result .= '  <nobr>';
+    $result .= '  <span style="white-space: nowrap;">';
     my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" >};
     # Month
     my @Months = qw/January February  March     April   May      June 
@@ -406,19 +458,26 @@ ENDJS
     $hourselector .= "  </select>\n";
     my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" />};
     my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" />};
-    my $cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
+    my $cal_link;
+    if (!$nolink) {
+        $cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
+    }
     #
     if ($no_hh_mm_ss) {
-        $result .= &mt('[_1] [_2] [_3] [_4]Select Date[_5]',
-                       $monthselector,$dayselector,$yearselector,
-                       $cal_link,'</a>');
+        $result .= &mt('[_1] [_2] [_3] ',
+                       $monthselector,$dayselector,$yearselector);
+        if (!$nolink) {
+            $result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
+        }
     } else {
-        $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s [_7]Select Date[_8]',
-                       $monthselector,$dayselector,$yearselector,
-                       $hourselector,$minuteselector,$secondselector,
-                       $cal_link,'</a>');
+        $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s ',
+                      $monthselector,$dayselector,$yearselector,
+                      $hourselector,$minuteselector,$secondselector);
+        if (!$nolink) {
+            $result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
+        }
     }
-    $result .= "</nobr>\n<!-- end $dname date setting form -->\n";
+    $result .= "</span>\n<!-- end $dname date setting form -->\n";
     return $result;
 }
 
@@ -502,7 +561,7 @@ sub get_date_from_form {
     if (($year<70) || ($year>137)) { return undef; }
     if (defined($sec) && defined($min)   && defined($hour) &&
         defined($day) && defined($month) && defined($year) &&
-        eval(&timelocal($sec,$min,$hour,$day,$month,$year))) {
+        eval('&timelocal($sec,$min,$hour,$day,$month,$year)')) {
         return &timelocal($sec,$min,$hour,$day,$month,$year);
     } else {
         return undef;
@@ -630,14 +689,6 @@ sub StatusOptions {
         $status = $env{'form.Status'} if (exists($env{'form.Status'}));
     }
 
-    my $OpSel1 = '';
-    my $OpSel2 = '';
-    my $OpSel3 = '';
-
-    if($status eq 'Any')         { $OpSel3 = ' selected'; }
-    elsif($status eq 'Expired' ) { $OpSel2 = ' selected'; }
-    else                         { $OpSel1 = ' selected'; }
-
     my $Str = '';
     $Str .= '<select name="Status"';
     if(defined($formName) && $formName ne '' && ! defined($onchange)) {
@@ -648,12 +699,18 @@ sub StatusOptions {
     }
     $Str .= ' size="'.$size.'" ';
     $Str .= '>'."\n";
-    $Str .= '<option value="Active" '.$OpSel1.'>'.
-        &mt('Currently Enrolled').'</option>'."\n";
-    $Str .= '<option value="Expired" '.$OpSel2.'>'.
-        &mt('Previously Enrolled').'</option>'."\n";
-    $Str .= '<option value="Any" '.$OpSel3.'>'.
-        &mt('Any Enrollment Status').'</option>'."\n";
+    foreach my $type (['Active',  &mt('Currently Enrolled')],
+		      ['Future',  &mt('Future Enrollment')],
+		      ['Expired', &mt('Previously Enrolled')],
+		      ['Any',     &mt('Any Enrollment Status')]) {
+	my ($name,$label) = @$type;
+	$Str .= '<option value="'.$name.'" ';
+	if ($status eq $name) {
+	    $Str .= 'selected="selected" ';
+	}
+	$Str .= '>'.$label.'</option>'."\n";
+    }
+
     $Str .= '</select>'."\n";
 }
 
@@ -781,20 +838,25 @@ sub Create_PrgWin {
     $prog_state{'type'}=$type;
     if ($type eq 'popup') {
 	$prog_state{'window'}='popwin';
-	my $html=&Apache::lonxml::xmlbegin();
+	my $start_page =
+	    &Apache::loncommon::start_page($title,undef,
+					   {'only_body' => 1,
+					    'bgcolor'   => '#88DDFF',
+					    'js_ready'  => 1});
+	my $end_page = &Apache::loncommon::end_page({'js_ready'  => 1});
+
 	#the whole function called through timeout is due to issues
 	#in mozilla Read BUG #2665 if you want to know the whole story
-	&r_print($r,'<script>'.
+	&r_print($r,'<script type="text/javascript">'.
         "var popwin;
          function openpopwin () {
          popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
-        "popwin.document.writeln(\'".$html."<head><title>$title</title></head>".
-	      "<body bgcolor=\"#88DDFF\">".
-              "<h4>$heading</h4>".
-              "<form name=popremain>".
+        "popwin.document.writeln(\'".$start_page.
+              "<h4>$heading<\/h4>".
+              "<form name=\"popremain\" method=\"post\">".
               '<input type="text" size="'.$width.'" name="remaining" value="'.
-	      &mt('Starting').'"></form>'.
-              "</body></html>\');".
+	      &mt('Starting').'" /><\\/form>'.$end_page.
+              "\');".
         "popwin.document.close();}".
         "\nwindow.setTimeout(openpopwin,0)</script>");
 	$prog_state{'formname'}='popremain';
@@ -918,7 +980,7 @@ sub r_print {
 # ------------------------------------------------------- Puts directory header
 
 sub crumbs {
-    my ($uri,$target,$prefix,$form,$size,$noformat)=@_;
+    my ($uri,$target,$prefix,$form,$size,$noformat,$skiplast)=@_;
     if (! defined($size)) {
         $size = '+2';
     }
@@ -934,7 +996,14 @@ sub crumbs {
 	foreach my $dir (split('/',$uri)) {
             if (! $dir) { next; }
             $path .= $dir;
-	    unless ($path eq $uri) { $path.='/'; }
+	    if ($path eq $uri) {
+		if ($skiplast) {
+		    $output.=$dir;
+                    last;
+		} 
+	    } else {
+		$path.='/'; 
+	    }
             my $linkpath = &Apache::loncommon::escape_single($path);
             if ($form) {
 		$linkpath=
@@ -943,25 +1012,41 @@ sub crumbs {
 	    $output.=qq{<a href="$linkpath" $target>$dir</a>/};
 	}
     } else {
-	$output.=$uri;
+	foreach my $dir (split('/',$uri)) {
+            if (! $dir) { next; }
+	    $output.=$dir.'/';
+	}
     }
-    unless ($uri=~/\/$/) { $output=~s/\/$//; }
+    if ($uri !~ m|/$|) { $output=~s|/$||; }
     return $output.'</font>'.($noformat?'':'</b></tt><br />');
 }
 
 # --------------------- A function that generates a window for the spellchecker
 
 sub spellheader {
-    my $html=&Apache::lonxml::xmlbegin();
+    my $start_page=
+	&Apache::loncommon::start_page('Speller Suggestions',undef,
+				       {'only_body'   => 1,
+					'js_ready'    => 1,
+					'bgcolor'     => '#DDDDDD',
+				        'add_entries' => {
+					    'onload' => 
+                                               'document.forms.spellcheckform.submit()',
+                                             }
+				        });
+    my $end_page=
+	&Apache::loncommon::end_page({'js_ready'  => 1}); 
+
     my $nothing=&javascript_nothing();
     return (<<ENDCHECK);
 <script type="text/javascript"> 
 //<!-- BEGIN LON-CAPA Internal
 var checkwin;
 
-function spellcheckerwindow() {
+function spellcheckerwindow(string) {
+    var esc_string = string.replace(/\"/g,'&quot;');
     checkwin=window.open($nothing,'spellcheckwin','height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
-    checkwin.document.writeln('$html<head></head><body bgcolor="#DDDDDD"><form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /></form></body></html>');
+    checkwin.document.writeln('$start_page<form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="'+esc_string+'" /><\/form>$end_page');
     checkwin.document.close();
 }
 // END LON-CAPA Internal -->
@@ -975,12 +1060,28 @@ sub spelllink {
     my ($form,$field)=@_;
     my $linktext=&mt('Check Spelling');
     return (<<ENDLINK);
-<a href="javascript:if (typeof(document.$form.onsubmit)!='undefined') { if (document.$form.onsubmit!=null) { document.$form.onsubmit();}};spellcheckerwindow();checkwin.document.forms.spellcheckform.text.value=this.document.forms.$form.$field.value;checkwin.document.forms.spellcheckform.submit();">$linktext</a>
+<a href="javascript:if (typeof(document.$form.onsubmit)!='undefined') { if (document.$form.onsubmit!=null) { document.$form.onsubmit();}};spellcheckerwindow(this.document.forms.$form.$field.value);">$linktext</a>
 ENDLINK
 }
 
 # ------------------------------------------------- Output headers for HTMLArea
 
+{
+    my @htmlareafields;
+    sub init_htmlareafields {
+	undef(@htmlareafields);
+    }
+    
+    sub add_htmlareafields {
+	my (@newfields) = @_;
+	push(@htmlareafields,@newfields);
+    }
+
+    sub get_htmlareafields {
+	return @htmlareafields;
+    }
+}
+
 sub htmlareaheaders {
     if (&htmlareablocked()) { return ''; }
     unless (&htmlareabrowser()) { return ''; }
@@ -994,6 +1095,7 @@ _editor_url='/htmlarea/';
 _editor_lang='$lang';
 </script>
 <script type="text/javascript" src="/htmlarea/htmlarea.js"></script>
+<link rel="stylesheet" type="text/css" href="/htmlarea/htmlarea.css" />
 ENDHEADERS
 }
 
@@ -1028,7 +1130,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 {
@@ -1036,7 +1138,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
@@ -1084,13 +1186,11 @@ A link to help for the component will be
 
 All inputs can be undef without problems.
 
-Inputs: $color (the background color of the table returned),
-        $component (the large text on the right side of the table),
+Inputs: $component (the large text on the right side of the table),
         $component_help
-        $function (role to get colors from)
-        $domain   (domian of role)
         $menulink (boolean, controls whether to include a link to /adm/menu)
-
+        $helplink (if 'nohelp' don't include the orange help link)
+        $css_class (optional name for the class to apply to the table for CSS)
 Returns a string containing breadcrumbs for the current page.
 
 =item clear_breadcrumbs
@@ -1115,20 +1215,10 @@ 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,$css_class) = @_;
         #
-        my $Str = "\n".
-            '<table width="100%" border="0" cellpadding="0" cellspacing="0">'.
-            '<tr><td bgcolor="'.$color.'">'.
-            '<font size="-1">';
+	$css_class ||= 'LC_breadcrumbs';
+        my $Str = "\n".'<table class="'.$css_class.'"><tr><td>';
         #
         # Make the faq and bug data cascade
         my $faq = '';
@@ -1182,18 +1272,21 @@ returns: nothing
 #        if ($bug ne '') {
 #            $icons .= &Apache::loncommon::help_open_bug($bug);
 #        }
-	if ($helplink ne 'nohelp') {
-	    $icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug);
+	if ($faq ne '' || $component_help ne '' || $bug ne '') {
+	    $icons .= &Apache::loncommon::help_open_menu($component,
+							 $component_help,
+							 $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="'.$css_class.'_component">'.
+                &mt($component);
+	    if ($icons ne '') {
+		$Str .= '&nbsp;'.$icons;
+	    }
+	    $Str .= '</td>';
         }
         $Str .= '</tr></table>'."\n";
         #
@@ -1271,15 +1364,14 @@ returns: nothing
 # needs that are not accommodated by the *_select_row() routines.    
 
 sub start_pick_box {
-    my ($table_width) = @_;
+    my ($css_class) = @_;
+    if (defined($css_class)) {
+	$css_class = 'class="'.$css_class.'"';
+    } else {
+	$css_class= 'class="LC_pick_box"';
+    }
     my $output = <<"END";
- <table width="$table_width" border="0" cellpadding="0" cellspacing="1" bgcolor="#000000">
-  <tr>
-      <td>
-       <table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#ffffff">
-        <tr>
-         <td>
-          <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#ffffff">
+ <table $css_class>
 END
     return $output;
 }
@@ -1287,69 +1379,78 @@ END
 sub end_pick_box {
     my $output = <<"END";
        </table>
-      </td>
-     </tr>
-    </table>
-   </td>
-  </tr>
- </table>
 END
     return $output;
 }
 
 sub row_title {
-    my ($col_width,$tablecolor,$title) = @_;
+    my ($title,$css_title_class,$css_value_class) = @_;
+    $css_title_class ||= 'LC_pick_box_title';
+    $css_title_class = 'class="'.$css_title_class.'"';
+
+    $css_value_class ||= 'LC_pick_box_value';
+    $css_value_class = 'class="'.$css_value_class.'"';
+
     my $output = <<"ENDONE";
-           <tr>
-            <td width="$col_width" bgcolor="$tablecolor">
-             <table width="$col_width" border="0" cellpadding="8" cellspacing="0">
-              <tr>
-               <td align="right"><b>$title:</b>
-               </td>
-              </tr>
-             </table>
+           <tr class="LC_pick_box_row">
+            <td $css_title_class>
+	       $title:
             </td>
-            <td width="100%" valign="top">
-             <table width="100%" border="0" cellpadding="8" cellspacing="0">
-              <tr>
+            <td $css_value_class>
 ENDONE
     return $output;
 }
 
 sub row_closure {
+    my ($no_separator) =@_;
     my $output = <<"ENDTWO";
-              </tr>
-             </table>
             </td>
            </tr>
+ENDTWO
+    if (!$no_separator) {
+        $output .= <<"ENDTWO";
            <tr>
-            <td width="100%" colspan="2" bgcolor="#000000">
-             <img src="/adm/lonMisc/blackdot.gif" /><br />
+            <td colspan="2" class="LC_pick_box_separator">
             </td>
            </tr>
 ENDTWO
+    }
     return $output;
 }
 
 sub role_select_row {
-    my ($roles,$col_width,$tablecolor,$title) = @_;
+    my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_;
     my $output;
     if (defined($title)) {
-        $output = &row_title($col_width,$tablecolor,$title);
+        $output = &row_title($title,$css_class);
     }
-    $output .= qq|               <td valign="top">
+    $output .= qq|
                                   <select name="roles" multiple >\n|;
     foreach my $role (@$roles) {
         my $plrole;
         if ($role eq 'ow') {
             $plrole = &mt('Course Owner');
+        } elsif ($role eq 'cr') {
+            if ($show_separate_custom) {
+                if ($cdom ne '' && $cnum ne '') {
+                    my %course_customroles = &course_custom_roles($cdom,$cnum);
+                    foreach my $crrole (sort(keys(%course_customroles))) {
+                        my ($plcrrole) = ($crrole =~ m|^cr/[^/]+/[^/]+/(.+)$|);
+                        $output .= '  <option value="'.$crrole.'">'.$plcrrole.
+                                   '</option>';
+                    }
+                }
+            } else {
+                $plrole = &mt('Custom Role');
+            }
         } else {
             $plrole=&Apache::lonnet::plaintext($role);
         }
-        $output .= '  <option value="'.$role.'">'.$plrole.'</option>';
+        if (($role ne 'cr') || (!$show_separate_custom)) {
+            $output .= '  <option value="'.$role.'">'.$plrole.'</option>';
+        }
     }
-    $output .= qq|                </select>
-                                 </td>\n|;
+    $output .= qq|                </select>\n|;
     if (defined($title)) {
         $output .= &row_closure();
     }
@@ -1357,11 +1458,11 @@ sub role_select_row {
 }
 
 sub course_select_row {
-    my ($col_width,$tablecolor,$title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles) = @_;
-    my $output = &row_title($col_width,$tablecolor,$title);
-    $output .= "          <td>\n";
+    my ($title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles,
+	$css_class) = @_;
+    my $output = &row_title($title,$css_class);
     $output .= qq|
-<script type="text/javascript" language="Javascript" >
+<script type="text/javascript">
     function coursePick (formname) {
         for  (var i=0; i<formname.coursepick.length; i++) {
             if (formname.coursepick[i].value == 'category') {
@@ -1388,11 +1489,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".
@@ -1433,24 +1534,23 @@ sub course_select_row {
             $output .= '</tr></table><br />';
         }
     }
-    $output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".$formname."'".','."'".'dccourse'."'".','."'".'dcdomain'."'".','."'".'coursedesc'."','','1'".')" />'.&mt('Pick specific course(s):').' '.$courseform.'&nbsp;&nbsp;<input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br /></td>'."\n";
+    $output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".$formname."'".','."'".'dccourse'."'".','."'".'dcdomain'."'".','."'".'coursedesc'."','','1'".')" />'.&mt('Pick specific course(s):').' '.$courseform.'&nbsp;&nbsp;<input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br />'."\n";
     $output .= &row_closure();
     return $output;
 }
 
 sub status_select_row {
-    my ($types,$col_width,$tablecolor,$title) = @_;
+    my ($types,$title,$css_class) = @_;
     my $output; 
     if (defined($title)) {
-        $output = &row_title($col_width,$tablecolor,$title);
+        $output = &row_title($title,$css_class,'LC_pick_box_select');
     }
-    $output .= qq|              <td valign="top">
+    $output .= qq|
                                     <select name="types" multiple>\n|;
     foreach my $status_type (sort(keys(%{$types}))) {
         $output .= '  <option value="'.$status_type.'">'.$$types{$status_type}.'</option>';
     }
-    $output .= qq|                   </select>
-                                    </td>\n|; 
+    $output .= qq|                   </select>\n|; 
     if (defined($title)) {
         $output .= &row_closure();
     }
@@ -1458,18 +1558,18 @@ sub status_select_row {
 }
 
 sub email_default_row {
-    my ($authtypes,$col_width,$tablecolor,$title,$descrip) = @_;
-    my $output = &row_title($col_width,$tablecolor,$title);
+    my ($authtypes,$title,$descrip,$css_class) = @_;
+    my $output = &row_title($title,$css_class);
     my @rowcols = ('#eeeeee','#dddddd');
-    $output .= '              <td>'.$descrip;
-    $output .= &start_pick_box(''); 
-    $output .= '                <tr bgcolor="'.$tablecolor.'">
-                                 <td><b>'.&mt('Authentication Method').'</b></td><td align="right"><b>'.&mt('Username -> e-mail conversion').'</b></td>
-                                </tr>'."\n";
+    $output .= $descrip.
+	&Apache::loncommon::start_data_table().
+	&Apache::loncommon::start_data_table_header_row().
+	'<th>'.&mt('Authentication Method').'</th>'.
+	'<th align="right">'.&mt('Username -> e-mail conversion').'</th>'."\n".
+	&Apache::loncommon::end_data_table_header_row();
     my $rownum = 0;
     foreach my $auth (sort(keys(%{$authtypes}))) {
         my ($userentry,$size);
-        my $rowiter = $rownum%2;
         if ($auth =~ /^krb/) {
             $userentry = '';
             $size = 25;
@@ -1477,29 +1577,48 @@ sub email_default_row {
             $userentry = 'username@';
             $size = 15;
         }
-        $output .= '<tr bgcolor="'.$rowcols[$rowiter].'"><td>  '.$$authtypes{$auth}.'</td><td align="right">'.$userentry.'<input type="text" name="'.$auth.'" size="'.$size.'" /></td></tr>';
-        $rownum ++;
+        $output .= &Apache::loncommon::start_data_table_row().
+	    '<td>  '.$$authtypes{$auth}.'</td>'.
+	    '<td align="right">'.$userentry.
+	    '<input type="text" name="'.$auth.'" size="'.$size.'" /></td>'.
+	    &Apache::loncommon::end_data_table_row();
     }
-    $output .= &end_pick_box();
-    $output .= "                   <br /></td>\n"; 
+    $output .= &Apache::loncommon::end_data_table();
     $output .= &row_closure();
     return $output;
 }
 
 
 sub submit_row {
-    my ($col_width,$tablecolor,$title,$cmd,$submit_text) = @_;
-    my $output = &row_title($col_width,$tablecolor,$title);
+    my ($title,$cmd,$submit_text,$css_class) = @_;
+    my $output = &row_title($title,$css_class,'LC_pick_box_submit');
     $output .= qq|
-            <td width="100%" valign="top" align="right">
              <br />
              <input type="hidden" name="command" value="$cmd" />
              <input type="submit" value="$submit_text"/> &nbsp;
              <br /><br />
-            </td>\n|;
+            \n|;
     return $output;
 }
 
+sub course_custom_roles {
+    my ($cdom,$cnum) = @_;
+    my %returnhash=();
+    my %coursepersonnel=&Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
+    foreach my $person (sort(keys(%coursepersonnel))) {
+        my ($role) = ($person =~ /^([^:]+):/);
+        my ($end,$start) = split(/:/,$coursepersonnel{$person});
+        if ($end == -1 && $start == -1) {
+            next;
+        }
+        if ($role =~ m|^cr/[^/]+/[^/]+/[^/]|) {
+            $returnhash{$role} ++;
+        }
+    }
+    return %returnhash;
+}
+
+
 ##############################################
 ##############################################
                                                                              
@@ -1579,13 +1698,21 @@ sub echo_form_input {
 #
 # Intended to be called by onload event.
 #
-# Input:
-# Reference to hash of echoed form elements to be set.
+# Inputs:
+# (a) Reference to hash of echoed form elements to be set.
 #
 # In the hash, keys are the form element names, and the values are the
 # element type (selectbox, radio, checkbox or text -for textbox, textarea or
 # hidden).
-# 
+#
+# (b) Optional reference to hash of stored elements to be set.
+#
+# If the page being displayed is a page which permits modification of
+# previously stored data, e.g., the first page in a multi-page submission,
+# then if stored is supplied, form elements will be set to the last stored
+# values.  If user supplied values are also available for the same elements
+# these will replace the stored values. 
+#        
 # Output:
 #  
 # javascript function - set_form_elements() which sets form elements,
@@ -1593,94 +1720,110 @@ sub echo_form_input {
 # the DOM, e.g., document.compose
 
 sub set_form_elements {
-    my ($elements) = @_;
+    my ($elements,$stored) = @_;
+    my %values;
     my $output .= 'function setFormElements(courseForm) {
-';      
+';
+    if (defined($stored)) {
+        foreach my $name (keys(%{$stored})) {
+            if (exists($$elements{$name})) {
+                if (ref($$stored{$name}) eq 'ARRAY') {
+                    $values{$name} = $$stored{$name};
+                } else {
+                    @{$values{$name}} = ($$stored{$name});
+                }
+            }
+        }
+    }
+
     foreach my $key (keys(%env)) {
         if ($key =~ /^form\.(.+)$/) {
             my $name = $1;
             if (exists($$elements{$name})) {
-                my @values = &Apache::loncommon::get_env_multiple($key);
-                for (my $i=0; $i<@values; $i++) {
-                    $values[$i] = &HTML::Entities::decode($values[$i],'<>&"');
-                    $values[$i] =~ s/([\r\n\f]+)/\\n/g;
-                    $values[$i] =~ s/"/\\"/g;
-                }
-                if ($$elements{$name} eq 'text') {
-                    my $numvalues = @values;
-                    if ($numvalues > 1) {
-                        my $valuestring = join('","',@values);
-                        $output .= qq|
+                @{$values{$name}} = &Apache::loncommon::get_env_multiple($key);
+            }
+        }
+    }
+
+    foreach my $name (keys(%values)) {
+        for (my $i=0; $i<@{$values{$name}}; $i++) {
+            $values{$name}[$i] = &HTML::Entities::decode($values{$name}[$i],'<>&"');
+            $values{$name}[$i] =~ s/([\r\n\f]+)/\\n/g;
+            $values{$name}[$i] =~ s/"/\\"/g;
+        }
+        if ($$elements{$name} eq 'text') {
+            my $numvalues = @{$values{$name}};
+            if ($numvalues > 1) {
+                my $valuestring = join('","',@{$values{$name}});
+                $output .= qq|
   var textvalues = new Array ("$valuestring");
-  var total = courseForm.$name.length;
+  var total = courseForm.elements['$name'].length;
   if (total > $numvalues) {
       total = $numvalues;
   }    
   for (var i=0; i<total; i++) {
-      courseForm.$name\[i].value = textvalues[i];
+      courseForm.elements['$name']\[i].value = textvalues[i];
   }
 |;
-                    } else {
-                        $output .= qq|
-  courseForm.$name.value = "$values[0]";
+            } else {
+                $output .= qq|
+  courseForm.elements['$name'].value = "$values{$name}[0]";
 |;
-                    }
-                } else {
-                    $output .=  qq|
-  var elementLength = courseForm.$name.length;
+            }
+        } else {
+            $output .=  qq|
+  var elementLength = courseForm.elements['$name'].length;
   if (elementLength==undefined) {
 |;
-                    foreach my $value (@values) {
-                        if ($$elements{$name} eq 'selectbox') {
-                            $output .=  qq|
-      if (courseForm.$name.options[0].value == "$value") {
-          courseForm.$name.options[0].selected = true;
-      }|;
-                        } elsif (($$elements{$name} eq 'radio') ||
-                                 ($$elements{$name} eq 'checkbox')) {
-                            $output .= qq|
-      if (courseForm.$name.value == "$value") {
-          courseForm.$name.checked = true;
+            foreach my $value (@{$values{$name}}) {
+                if ($$elements{$name} eq 'selectbox') {
+                    $output .=  qq|
+      if (courseForm.elements['$name'].options[0].value == "$value") {
+          courseForm.elements['$name'].options[0].selected = true;
       }|;
-                        }
-                    }
+                } elsif (($$elements{$name} eq 'radio') ||
+                         ($$elements{$name} eq 'checkbox')) {
                     $output .= qq|
+      if (courseForm.elements['$name'].value == "$value") {
+          courseForm.elements['$name'].checked = true;
+      }|;
+                }
+            }
+            $output .= qq|
   }
   else {
-      for (var i=0; i<courseForm.$name.length; i++) {
+      for (var i=0; i<courseForm.elements['$name'].length; i++) {
 |;
-                    if ($$elements{$name} eq 'selectbox') {
-                        $output .=  qq|
-          courseForm.$name.options[i].selected = false;|;
-                    } elsif (($$elements{$name} eq 'radio') || 
-                             ($$elements{$name} eq 'checkbox')) {
-                        $output .= qq|
-          courseForm.$name\[i].checked = false;|; 
-                    }
-                    $output .= qq|
+            if ($$elements{$name} eq 'selectbox') {
+                $output .=  qq|
+          courseForm.elements['$name'].options[i].selected = false;|;
+            } elsif (($$elements{$name} eq 'radio') || 
+                     ($$elements{$name} eq 'checkbox')) {
+                $output .= qq|
+          courseForm.elements['$name']\[i].checked = false;|; 
+            }
+            $output .= qq|
       }
-      for (var j=0; j<courseForm.$name.length; j++) {
+      for (var j=0; j<courseForm.elements['$name'].length; j++) {
 |;
-                    foreach my $value (@values) {
-                        if ($$elements{$name} eq 'selectbox') {
-                            $output .=  qq|
-          if (courseForm.$name.options[j].value == "$value") {
-              courseForm.$name.options[j].selected = true;
+            foreach my $value (@{$values{$name}}) {
+                if ($$elements{$name} eq 'selectbox') {
+                    $output .=  qq|
+          if (courseForm.elements['$name'].options[j].value == "$value") {
+              courseForm.elements['$name'].options[j].selected = true;
           }|;
-                        } elsif (($$elements{$name} eq 'radio') ||
-                                 ($$elements{$name} eq 'checkbox')) { 
-                            $output .= qq|
-          if (courseForm.$name\[j].value == "$value") {
-              courseForm.$name\[j].checked = true;
+                } elsif (($$elements{$name} eq 'radio') ||
+                         ($$elements{$name} eq 'checkbox')) { 
+                      $output .= qq|
+          if (courseForm.elements['$name']\[j].value == "$value") {
+              courseForm.elements['$name']\[j].checked = true;
           }|;
-                        }
-                    }
-                    $output .= qq|
+                }
+            }
+            $output .= qq|
       }
   }
 |;
-                }
-            }
         }
     }
     $output .= "