--- loncom/interface/loncommon.pm	2007/09/04 23:59:03	1.564.2.6
+++ loncom/interface/loncommon.pm	2009/05/07 16:25:02	1.806
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.564.2.6 2007/09/04 23:59:03 albertel Exp $
+# $Id: loncommon.pm,v 1.806 2009/05/07 16:25:02 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,12 +61,15 @@ use POSIX qw(strftime mktime);
 use Apache::lonmenu();
 use Apache::lonenc();
 use Apache::lonlocal;
+use Apache::lonnet();
 use HTML::Entities;
 use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
 use Apache::lontexconvert();
 use Apache::lonclonecourse();
 use LONCAPA qw(:DEFAULT :match);
+use DateTime::TimeZone;
+use DateTime::Locale::Catalog;
 
 # ---------------------------------------------- Designs
 use vars qw(%defaultdesign);
@@ -78,6 +81,76 @@ my $readit;
 ## Global Variables
 ##
 
+
+# ----------------------------------------------- SSI with retries:
+#
+
+=pod
+
+=head1 Server Side include with retries:
+
+=over 4
+
+=item * &ssi_with_retries(resource,retries form)
+
+Performs an ssi with some number of retries.  Retries continue either
+until the result is ok or until the retry count supplied by the
+caller is exhausted.  
+
+Inputs:
+
+=over 4
+
+resource   - Identifies the resource to insert.
+
+retries    - Count of the number of retries allowed.
+
+form       - Hash that identifies the rendering options.
+
+=back
+
+Returns:
+
+=over 4
+
+content    - The content of the response.  If retries were exhausted this is empty.
+
+response   - The response from the last attempt (which may or may not have been successful.
+
+=back
+
+=back
+
+=cut
+
+sub ssi_with_retries {
+    my ($resource, $retries, %form) = @_;
+
+
+    my $ok = 0;			# True if we got a good response.
+    my $content;
+    my $response;
+
+    # Try to get the ssi done. within the retries count:
+
+    do {
+	($content, $response) = &Apache::lonnet::ssi($resource, %form);
+	$ok      = $response->is_success;
+        if (!$ok) {
+            &Apache::lonnet::logthis("Failed ssi_with_retries on $resource: ".$response->is_success.', '.$response->code.', '.$response->message);
+        }
+	$retries--;
+    } while (!$ok && ($retries > 0));
+
+    if (!$ok) {
+	$content = '';		# On error return an empty content.
+    }
+    return ($content, $response);
+
+}
+
+
+
 # ----------------------------------------------- Filetypes/Languages/Copyright
 my %language;
 my %supported_language;
@@ -198,7 +271,7 @@ BEGIN {
         }
     }
     &Apache::lonnet::logthis(
-              "<font color=yellow>INFO: Read file types</font>");
+             "<span style='color:yellow;'>INFO: Read file types</span>");
     $readit=1;
     }  # end of unless($readit) 
     
@@ -214,14 +287,14 @@ BEGIN {
 
 =over 4
 
-=item * browser_and_searcher_javascript ()
+=item * &browser_and_searcher_javascript()
 
 X<browsing, javascript>X<searching, javascript>Returns a string
 containing javascript with two functions, C<openbrowser> and
 C<opensearcher>. Returned string does not contain E<lt>scriptE<gt>
 tags.
 
-=item * openbrowser(formname,elementname,only,omit) [javascript]
+=item * &openbrowser(formname,elementname,only,omit) [javascript]
 
 inputs: formname, elementname, only, omit
 
@@ -234,7 +307,7 @@ with the given extension.  Can be a comm
 Specifying 'omit' will restrict the browser to NOT displaying files
 with the given extension.  Can be a comma separated list.
 
-=item * opensearcher(formname, elementname) [javascript]
+=item * &opensearcher(formname,elementname) [javascript]
 
 Inputs: formname, elementname
 
@@ -257,6 +330,7 @@ sub browser_and_searcher_javascript {
         }
         url += 'catalogmode=interactive&';
         url += 'mode=$mode&';
+        url += 'inhibitmenu=yes&';
         url += 'form=' + formname + '&';
         if (only != null) {
             url += 'only=' + only + '&';
@@ -318,7 +392,7 @@ sub storeresurl {
     unless ($resurl=~/^\/res/) { return 0; }
     $resurl=~s/\/$//;
     &Apache::lonnet::put('environment',{'lastresurl' => $resurl});
-    &Apache::lonnet::appenv('environment.lastresurl' => $resurl);
+    &Apache::lonnet::appenv({'environment.lastresurl' => $resurl});
     return 1;
 }
 
@@ -332,9 +406,9 @@ sub studentbrowser_javascript {
          || ($env{'request.role'}=~/^(au|dc|su)/)
           ) { return ''; }  
    return (<<'ENDSTDBRW');
-<script type="text/javascript" language="Javascript" >
+<script type="text/javascript" language="Javascript">
     var stdeditbrowser;
-    function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) {
+    function openstdbrowser(formname,uname,udom,roleflag,ignorefilter,courseadvonly) {
         var url = '/adm/pickstudent?';
         var filter;
 	if (!ignorefilter) {
@@ -348,6 +422,7 @@ sub studentbrowser_javascript {
         url += 'form=' + formname + '&unameelement='+uname+
                                     '&udomelement='+udom;
 	if (roleflag) { url+="&roles=1"; }
+        if (courseadvonly) { url+="&courseadvonly=1"; }
         var title = 'Student_Browser';
         var options = 'scrollbars=1,resizable=1,menubar=0';
         options += ',width=700,height=600';
@@ -359,28 +434,54 @@ ENDSTDBRW
 }
 
 sub selectstudent_link {
-   my ($form,$unameele,$udomele)=@_;
+   my ($form,$unameele,$udomele,$courseadvonly)=@_;
+   my $callargs = "'".$form."','".$unameele."','".$udomele."'";
    if ($env{'request.course.id'}) {  
        if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
 	   && !&Apache::lonnet::allowed('srm',$env{'request.course.id'}.
 					'/'.$env{'request.course.sec'})) {
 	   return '';
        }
-       return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
-        '","'.$udomele.'","","1");'."'>".&mt('Select User')."</a>";
+       if ($courseadvonly)  {
+           $callargs .= ",'',1,1";
+       }
+       return '<span class="LC_nobreak">'.
+              '<a href="javascript:openstdbrowser('.$callargs.');">'.
+              &mt('Select User').'</a></span>';
    }
    if ($env{'request.role'}=~/^(au|dc|su)/) {
-       return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
-        '","'.$udomele.'",1);'."'>".&mt('Select User')."</a>";
+       $callargs .= ",1"; 
+       return '<span class="LC_nobreak">'.
+              '<a href="javascript:openstdbrowser('.$callargs.');">'.
+              &mt('Select User').'</a></span>';
    }
    return '';
 }
 
+sub authorbrowser_javascript {
+    return <<"ENDAUTHORBRW";
+<script type="text/javascript" language="JavaScript">
+var stdeditbrowser;
+
+function openauthorbrowser(formname,udom) {
+    var url = '/adm/pickauthor?';
+    url += 'form='+formname+'&roledom='+udom;
+    var title = 'Author_Browser';
+    var options = 'scrollbars=1,resizable=1,menubar=0';
+    options += ',width=700,height=600';
+    stdeditbrowser = open(url,title,options,'1');
+    stdeditbrowser.focus();
+}
+
+</script>
+ENDAUTHORBRW
+}
+
 sub coursebrowser_javascript {
     my ($domainfilter,$sec_element,$formname)=@_;
     my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
    my $output = '
-<script type="text/javascript">
+<script type="text/javascript" language="JavaScript">
     var stdeditbrowser;'."\n";
    $output .= <<"ENDSTDBRW";
     function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
@@ -407,7 +508,7 @@ sub coursebrowser_javascript {
 	                            '&cdomelement='+udom+
                                     '&cnameelement='+desc;
         if (extra_element !=null && extra_element != '') {
-            if (formname == 'rolechoice') {
+            if (formname == 'rolechoice' || formname == 'studentform') {
                 url += '&roleelement='+extra_element;
                 if (domainfilter == null || domainfilter == '') {
                     url += '&domainfilter='+extra_element;
@@ -416,6 +517,10 @@ sub coursebrowser_javascript {
             else {
                 if (formname == 'portform') {
                     url += '&setroles='+extra_element;
+                } else {
+                    if (formname == 'rules') {
+                        url += '&fixeddom='+extra_element; 
+                    }
                 }
             }     
         }
@@ -471,7 +576,10 @@ sub setsec_javascript {
     my ($sec_element,$formname) = @_;
     my $setsections = qq|
 function setSect(sectionlist) {
-    var sectionsArray = sectionlist.split(",");
+    var sectionsArray = new Array();
+    if ((sectionlist != '') && (typeof sectionlist != "undefined")) {
+        sectionsArray = sectionlist.split(",");
+    }
     var numSections = sectionsArray.length;
     document.$formname.$sec_element.length = 0;
     if (numSections == 0) {
@@ -506,8 +614,19 @@ function setSect(sectionlist) {
 
 sub selectcourse_link {
    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
-   return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
-        '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select Course')."</a>";
+   return '<span class="LC_nobreak">'
+         ."<a href='"
+         .'javascript:opencrsbrowser("'.$form.'","'.$unameele
+         .'","'.$udomele.'","'.$desc.'","'.$extra_element
+         .'","'.$multflag.'","'.$selecttype.'");'
+         ."'>".&mt('Select Course').'</a>'
+         .'</span>';
+}
+
+sub selectauthor_link {
+   my ($form,$udom)=@_;
+   return '<a href="javascript:openauthorbrowser('."'$form','$udom'".');">'.
+          &mt('Select Author').'</a>';
 }
 
 sub check_uncheck_jscript {
@@ -535,16 +654,103 @@ ENDSCRT
     return $jscript;
 }
 
+sub select_timezone {
+   my ($name,$selected,$onchange,$includeempty)=@_;
+   my $output='<select name="'.$name.'" '.$onchange.'>'."\n";
+   if ($includeempty) {
+       $output .= '<option value=""';
+       if (($selected eq '') || ($selected eq 'local')) {
+           $output .= ' selected="selected" ';
+       }
+       $output .= '> </option>';
+   }
+   my @timezones = DateTime::TimeZone->all_names;
+   foreach my $tzone (@timezones) {
+       $output.= '<option value="'.$tzone.'"';
+       if ($tzone eq $selected) {
+           $output.=' selected="selected"';
+       }
+       $output.=">$tzone</option>\n";
+   }
+   $output.="</select>";
+   return $output;
+}
+
+sub select_datelocale {
+    my ($name,$selected,$onchange,$includeempty)=@_;
+    my $output='<select name="'.$name.'" '.$onchange.'>'."\n";
+    if ($includeempty) {
+        $output .= '<option value=""';
+        if ($selected eq '') {
+            $output .= ' selected="selected" ';
+        }
+        $output .= '> </option>';
+    }
+    my (@possibles,%locale_names);
+    my @locales = DateTime::Locale::Catalog::Locales;
+    foreach my $locale (@locales) {
+        if (ref($locale) eq 'HASH') {
+            my $id = $locale->{'id'};
+            if ($id ne '') {
+                my $en_terr = $locale->{'en_territory'};
+                my $native_terr = $locale->{'native_territory'};
+                my @languages = &Apache::lonlocal::preferred_languages();
+                if (grep(/^en$/,@languages) || !@languages) {
+                    if ($en_terr ne '') {
+                        $locale_names{$id} = '('.$en_terr.')';
+                    } elsif ($native_terr ne '') {
+                        $locale_names{$id} = $native_terr;
+                    }
+                } else {
+                    if ($native_terr ne '') {
+                        $locale_names{$id} = $native_terr.' ';
+                    } elsif ($en_terr ne '') {
+                        $locale_names{$id} = '('.$en_terr.')';
+                    }
+                }
+                push (@possibles,$id);
+            }
+        }
+    }
+    foreach my $item (sort(@possibles)) {
+        $output.= '<option value="'.$item.'"';
+        if ($item eq $selected) {
+            $output.=' selected="selected"';
+        }
+        $output.=">$item";
+        if ($locale_names{$item} ne '') {
+            $output.="  $locale_names{$item}</option>\n";
+        }
+        $output.="</option>\n";
+    }
+    $output.="</select>";
+    return $output;
+}
+
+sub select_language {
+    my ($name,$selected,$includeempty) = @_;
+    my %langchoices;
+    if ($includeempty) {
+        %langchoices = ('' => 'No language preference');
+    }
+    foreach my $id (&languageids()) {
+        my $code = &supportedlanguagecode($id);
+        if ($code) {
+            $langchoices{$code} = &plainlanguagedescription($id);
+        }
+    }
+    return &select_form($selected,$name,%langchoices);
+}
 
 =pod
 
-=item * linked_select_forms(...)
+=item * &linked_select_forms(...)
 
 linked_select_forms returns a string containing a <script></script> block
 and html for two <select> menus.  The select menus will be linked in that
 changing the value of the first menu will result in new values being placed
 in the second menu.  The values in the select menu will appear in alphabetical
-order.
+order unless a defined order is provided.
 
 linked_select_forms takes the following ordered inputs:
 
@@ -562,6 +768,8 @@ linked_select_forms takes the following
 
 =item * $hashref, a reference to a hash containing the data for the menus.
 
+=item * $menuorder, the order of values in the first menu
+
 =back 
 
 Below is an example of such a hash.  Only the 'text', 'default', and 
@@ -578,7 +786,8 @@ $menu{$choice1}->{'select2'}.
                            B2 => "Choice B2",
                            B3 => "Choice B3",
                            B4 => "Choice B4"
-                           }
+                           },
+                       order => ['B4','B3','B1','B2'],
                    },
                A2 => { text =>"Choice A2" ,
                        default => "C2",
@@ -586,7 +795,8 @@ $menu{$choice1}->{'select2'}.
                            C1 => "Choice C1",
                            C2 => "Choice C2",
                            C3 => "Choice C3"
-                           }
+                           },
+                       order => ['C2','C1','C3'],
                    },
                A3 => { text =>"Choice A3" ,
                        default => "D6",
@@ -598,7 +808,8 @@ $menu{$choice1}->{'select2'}.
                            D5 => "Choice D5",
                            D6 => "Choice D6",
                            D7 => "Choice D7"
-                           }
+                           },
+                       order => ['D4','D3','D2','D1','D7','D6','D5'],
                    }
                );
 
@@ -610,13 +821,14 @@ sub linked_select_forms {
         $firstdefault,
         $firstselectname,
         $secondselectname, 
-        $hashref
+        $hashref,
+        $menuorder,
         ) = @_;
     my $second = "document.$formname.$secondselectname";
     my $first = "document.$formname.$firstselectname";
     # output the javascript to do the changing
     my $result = '';
-    $result.="<script type=\"text/javascript\">\n";
+    $result.='<script type="text/javascript" language="JavaScript">'."\n";
     $result.="var select2data = new Object();\n";
     $" = '","';
     my $debug = '';
@@ -624,8 +836,11 @@ sub linked_select_forms {
         $result.="select2data.d_$s1 = new Object();\n";        
         $result.="select2data.d_$s1.def = new String('".
             $hashref->{$s1}->{'default'}."');\n";
-        $result.="select2data.d_$s1.values = new Array(";        
+        $result.="select2data.d_$s1.values = new Array(";
         my @s2values = sort(keys( %{ $hashref->{$s1}->{'select2'} } ));
+        if (ref($hashref->{$s1}->{'order'}) eq 'ARRAY') {
+            @s2values = @{$hashref->{$s1}->{'order'}};
+        }
         $result.="\"@s2values\");\n";
         $result.="select2data.d_$s1.texts = new Array(";        
         my @s2texts;
@@ -663,7 +878,11 @@ function select1_changed() {
 END
     # output the initial values for the selection lists
     $result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1_changed()\">\n";
-    foreach my $value (sort(keys(%$hashref))) {
+    my @order = sort(keys(%{$hashref}));
+    if (ref($menuorder) eq 'ARRAY') {
+        @order = @{$menuorder};
+    }
+    foreach my $value (@order) {
         $result.="    <option value=\"$value\" ";
         $result.=" selected=\"selected\" " if ($value eq $firstdefault);
         $result.=">".&mt($hashref->{$value}->{'text'})."</option>\n";
@@ -673,7 +892,12 @@ END
     $result .= $middletext;
     $result .= "<select size=\"1\" name=\"$secondselectname\">\n";
     my $seconddefault = $hashref->{$firstdefault}->{'default'};
-    foreach my $value (sort(keys(%select2))) {
+    
+    my @secondorder = sort(keys(%select2));
+    if (ref($hashref->{$firstdefault}->{'order'}) eq 'ARRAY') {
+        @secondorder = @{$hashref->{$firstdefault}->{'order'}};
+    }
+    foreach my $value (@secondorder) {
         $result.="    <option value=\"$value\" ";        
         $result.=" selected=\"selected\" " if ($value eq $seconddefault);
         $result.=">".&mt($select2{$value})."</option>\n";
@@ -685,7 +909,7 @@ END
 
 =pod
 
-=item * help_open_topic($topic, $text, $stayOnPage, $width, $height)
+=item * &help_open_topic($topic,$text,$stayOnPage,$width,$height)
 
 Returns a string corresponding to an HTML link to the given help
 $topic, where $topic corresponds to the name of a .tex file in
@@ -711,9 +935,6 @@ sub help_open_topic {
     my ($topic, $text, $stayOnPage, $width, $height) = @_;
     $text = "" if (not defined $text);
     $stayOnPage = 0 if (not defined $stayOnPage);
-    if ($env{'browser.interface'} eq 'textual') {
-	$stayOnPage=1;
-    }
     $width = 350 if (not defined $width);
     $height = 400 if (not defined $height);
     my $filename = $topic;
@@ -721,33 +942,33 @@ sub help_open_topic {
 
     my $template = "";
     my $link;
-
+    
     $topic=~s/\W/\_/g;
 
-    if (!$stayOnPage)
-    {
+    if (!$stayOnPage) {
 	$link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
-    }
-    else
-    {
+    } else {
 	$link = "/adm/help/${filename}.hlp";
     }
 
     # Add the text
-    if ($text ne "")
-    {
-	$template .= 
-  "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
-  "<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+    if ($text ne "") {	
+	$template.='<span class="LC_help_open_topic">'
+                  .'<a target="_top" href="'.$link.'">'
+                  .$text.'</a>';
     }
 
-    # Add the graphic
+    # (Always) Add the graphic
     my $title = &mt('Online Help');
-    my $helpicon=&lonhttpdurl("/adm/help/gif/smallHelp.gif");
-    $template .= <<"ENDTEMPLATE";
- <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
-ENDTEMPLATE
-    if ($text ne '') { $template.='</td></tr></table>' };
+    my $helpicon=&lonhttpdurl("/adm/help/help.png");
+    $template.=' <a target="_top" href="'.$link.'" title="'.$title.'">'
+              .'<img src="'.$helpicon.'" border="0"'
+              .' alt="'.&mt('Help: [_1]',$topic).'"'
+              .' title="'.$title.'"' 
+              .' /></a>';
+    if ($text ne "") {	
+        $template.='</span>';
+    }
     return $template;
 
 }
@@ -755,21 +976,31 @@ ENDTEMPLATE
 # This is a quicky function for Latex cheatsheet editing, since it 
 # appears in at least four places
 sub helpLatexCheatsheet {
-    my $other = shift;
+    my ($topic,$text,$not_author) = @_;
+    my $out;
     my $addOther = '';
-    if ($other) {
-	$addOther = Apache::loncommon::help_open_topic($other, shift,
-						       undef, undef, 600) .
-							   '</td><td>';
-    }
-    return '<table><tr><td>'.
-	$addOther .
-	&Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols',
-					    undef,undef,600)
-	.'</td><td>'.
-	&Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols',
-					    undef,undef,600)
-	.'</td></tr></table>';
+    if ($topic) {
+	$addOther = '<span>'.&Apache::loncommon::help_open_topic($topic,&mt($text),
+							       undef, undef, 600).
+								   '</span> ';
+    }
+    $out = '<span>' # Start cheatsheet
+	  .$addOther
+          .'<span>'
+	  .&Apache::loncommon::help_open_topic('Greek_Symbols',&mt('Greek Symbols'),
+					       undef,undef,600)
+	  .'</span> <span>'
+	  .&Apache::loncommon::help_open_topic('Other_Symbols',&mt('Other Symbols'),
+					       undef,undef,600)
+	  .'</span>';
+    unless ($not_author) {
+        $out .= ' <span>'
+	       .&Apache::loncommon::help_open_topic('Authoring_Output_Tags',&mt('Output Tags'),
+	                                            undef,undef,600)
+	       .'</span>';
+    }
+    $out .= '</span>'; # End cheatsheet
+    return $out;
 }
 
 sub general_help {
@@ -778,6 +1009,8 @@ sub general_help {
 	$helptopic='Authoring_Intro';
     } elsif ($env{'request.role'}=~/^cc/) {
 	$helptopic='Course_Coordination_Intro';
+    } elsif ($env{'request.role'}=~/^dc/) {
+        $helptopic='Domain_Coordination_Intro';
     }
     return $helptopic;
 }
@@ -805,14 +1038,9 @@ sub help_open_menu {
     my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) 
 	= @_;    
     $stayOnPage = 0 if (not defined $stayOnPage);
-    # formerly only used pop-up help (stayOnPage = 0)
+    # only use pop-up help (stayOnPage == 0)
     # if environment.remote is on (using remote control UI)
-    # if ($env{'browser.interface'} eq 'textual' ||
-    #	$env{'environment.remote'} eq 'off' ) {
-    #   $stayOnPage=1;
-    #}
-    # Now making pop-up help the default even with remote control
-    if ($env{'browser.interface'} eq 'textual') {
+    if ($env{'environment.remote'} eq 'off' ) {
         $stayOnPage=1;
     }
     my $output;
@@ -834,15 +1062,12 @@ sub help_open_menu {
 
 sub top_nav_help {
     my ($text) = @_;
-
     $text = &mt($text);
-
-    my $stayOnPage = 
-	($env{'browser.interface'}  eq 'textual' ||
-	 $env{'environment.remote'} eq 'off' );
-    my $link=  ($stayOnPage) ? "javascript:helpMenu('display')"
+    my $stay_on_page = 
+	($env{'environment.remote'} eq 'off' );
+    my $link = ($stay_on_page) ? "javascript:helpMenu('display')"
 	                     : "javascript:helpMenu('open')";
-    my $banner_link = &update_help_link(undef,undef,undef,undef,$stayOnPage);
+    my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page);
 
     my $title = &mt('Get help');
 
@@ -856,8 +1081,7 @@ sub help_menu_js {
     my ($text) = @_;
 
     my $stayOnPage = 
-	($env{'browser.interface'}  eq 'textual' ||
-	 $env{'environment.remote'} eq 'off' );
+	($env{'environment.remote'} eq 'off' );
 
     my $width = 620;
     my $height = 600;
@@ -870,7 +1094,7 @@ sub help_menu_js {
 					'js_ready'    => 1,
 					'add_entries' => {
 					    'border' => '0',
-					    'rows'   => "105,*",},});
+					    'rows'   => "110,*",},});
     my $end_page =
         &Apache::loncommon::end_page({'frameset' => 1,
 				      'js_ready' => 1,});
@@ -916,8 +1140,7 @@ sub help_open_bug {
     unless ($Apache::lonnet::perlvar{'BugzillaHost'}) { return ''; }
     $text = "" if (not defined $text);
     $stayOnPage = 0 if (not defined $stayOnPage);
-    if ($env{'browser.interface'} eq 'textual' ||
-	$env{'environment.remote'} eq 'off' ) {
+    if ($env{'environment.remote'} eq 'off' ) {
 	$stayOnPage=1;
     }
     $width = 600 if (not defined $width);
@@ -941,7 +1164,7 @@ sub help_open_bug {
     {
 	$template .= 
   "<table bgcolor='#AA3333' cellspacing='1' cellpadding='1' border='0'><tr>".
-  "<td bgcolor='#FF5555'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+  "<td bgcolor='#FF5555'><a target=\"_top\" href=\"$link\"><span style=\"color:#FFFFFF;font-size:10pt;\">$text</span></a>";
     }
 
     # Add the graphic
@@ -961,8 +1184,7 @@ sub help_open_faq {
     unless ($Apache::lonnet::perlvar{'FAQHost'}) { return ''; }
     $text = "" if (not defined $text);
     $stayOnPage = 0 if (not defined $stayOnPage);
-    if ($env{'browser.interface'} eq 'textual' ||
-	$env{'environment.remote'} eq 'off' ) {
+    if ($env{'environment.remote'} eq 'off' ) {
 	$stayOnPage=1;
     }
     $width = 350 if (not defined $width);
@@ -986,7 +1208,7 @@ sub help_open_faq {
     {
 	$template .= 
   "<table bgcolor='#337733' cellspacing='1' cellpadding='1' border='0'><tr>".
-  "<td bgcolor='#448844'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+  "<td bgcolor='#448844'><a target=\"_top\" href=\"$link\"><span style=\"color:#FFFFFF; font-size:10pt;\">$text</span></a>";
     }
 
     # Add the graphic
@@ -1005,7 +1227,7 @@ ENDTEMPLATE
 
 =pod
 
-=item * change_content_javascript():
+=item * &change_content_javascript():
 
 This and the next function allow you to create small sections of an
 otherwise static HTML page that you can update on the fly with
@@ -1060,7 +1282,7 @@ DOMBASED
 
 =pod
 
-=item * changable_area($name, $origContent):
+=item * &changable_area($name,$origContent):
 
 This provides a "changable area" that can be modified on the fly via
 the Javascript code provided in C<change_content_javascript>. $name is
@@ -1084,8 +1306,139 @@ sub changable_area {
 
 =pod
 
+=item * &viewport_geometry_js 
+
+Provides javascript object (Geometry) which can provide information about the viewport geometry for the client browser.
+
+=cut
+
+
+sub viewport_geometry_js { 
+    return <<"GEOMETRY";
+var Geometry = {};
+function init_geometry() {
+    if (Geometry.init) { return };
+    Geometry.init=1;
+    if (window.innerHeight) {
+        Geometry.getViewportHeight   = function() { return window.innerHeight; };
+        Geometry.getViewportWidth   = function() { return window.innerWidth; };
+        Geometry.getHorizontalScroll = function() { return window.pageXOffset; };
+        Geometry.getVerticalScroll   = function() { return window.pageYOffset; };
+    }
+    else if (document.documentElement && document.documentElement.clientHeight) {
+        Geometry.getViewportHeight =
+            function() { return document.documentElement.clientHeight; };
+        Geometry.getViewportWidth =
+            function() { return document.documentElement.clientWidth; };
+
+        Geometry.getHorizontalScroll =
+            function() { return document.documentElement.scrollLeft; };
+        Geometry.getVerticalScroll =
+            function() { return document.documentElement.scrollTop; };
+    }
+    else if (document.body.clientHeight) {
+        Geometry.getViewportHeight =
+            function() { return document.body.clientHeight; };
+        Geometry.getViewportWidth =
+            function() { return document.body.clientWidth; };
+        Geometry.getHorizontalScroll =
+            function() { return document.body.scrollLeft; };
+        Geometry.getVerticalScroll =
+            function() { return document.body.scrollTop; };
+    }
+}
+
+GEOMETRY
+}
+
+=pod
+
+=item * &viewport_size_js()
+
+Provides a javascript function to set values of two form elements - width and height (elements are passed in as arguments to the javascript function) to the dimensions of the user's browser window. 
+
+=cut
+
+sub viewport_size_js {
+    my $geometry = &viewport_geometry_js();
+    return <<"DIMS";
+
+$geometry
+
+function getViewportDims(width,height) {
+    init_geometry();
+    width.value = Geometry.getViewportWidth();
+    height.value = Geometry.getViewportHeight();
+    return;
+}
+
+DIMS
+}
+
+=pod
+
+=item * &resize_textarea_js()
+
+emits the needed javascript to resize a textarea to be as big as possible
+
+creates a function resize_textrea that takes two IDs first should be
+the id of the element to resize, second should be the id of a div that
+surrounds everything that comes after the textarea, this routine needs
+to be attached to the <body> for the onload and onresize events.
+
 =back
- 
+
+=cut
+
+sub resize_textarea_js {
+    my $geometry = &viewport_geometry_js();
+    return <<"RESIZE";
+    <script type="text/javascript">
+$geometry
+
+function getX(element) {
+    var x = 0;
+    while (element) {
+	x += element.offsetLeft;
+	element = element.offsetParent;
+    }
+    return x;
+}
+function getY(element) {
+    var y = 0;
+    while (element) {
+	y += element.offsetTop;
+	element = element.offsetParent;
+    }
+    return y;
+}
+
+
+function resize_textarea(textarea_id,bottom_id) {
+    init_geometry();
+    var textarea        = document.getElementById(textarea_id);
+    //alert(textarea);
+
+    var textarea_top    = getY(textarea);
+    var textarea_height = textarea.offsetHeight;
+    var bottom          = document.getElementById(bottom_id);
+    var bottom_top      = getY(bottom);
+    var bottom_height   = bottom.offsetHeight;
+    var window_height   = Geometry.getViewportHeight();
+    var fudge           = 23;
+    var new_height      = window_height-fudge-textarea_top-bottom_height;
+    if (new_height < 300) {
+	new_height = 300;
+    }
+    textarea.style.height=new_height+'px';
+}
+</script>
+RESIZE
+
+}
+
+=pod
+
 =head1 Excel and CSV file utility routines
 
 =over 4
@@ -1097,7 +1450,7 @@ sub changable_area {
 
 =pod
 
-=item * csv_translate($text) 
+=item * &csv_translate($text) 
 
 Translate $text to allow it to be output as a 'comma separated values' 
 format.
@@ -1118,7 +1471,7 @@ sub csv_translate {
 
 =pod
 
-=item * define_excel_formats
+=item * &define_excel_formats()
 
 Define some commonly used Excel cell formats.
 
@@ -1174,7 +1527,7 @@ sub define_excel_formats {
 
 =pod
 
-=item * create_workbook
+=item * &create_workbook()
 
 Create an Excel worksheet.  If it fails, output message on the
 request object and return undefs.
@@ -1217,7 +1570,7 @@ sub create_workbook {
 
 =pod
 
-=item * create_text_file
+=item * &create_text_file()
 
 Create a file to write to and eventually make available to the user.
 If file creation fails, outputs an error message on the request object and 
@@ -1242,9 +1595,9 @@ sub create_text_file {
     $fh = Apache::File->new('>/home/httpd'.$filename);
     if (! defined($fh)) {
         $r->log_error("Couldn't open $filename for output $!");
-        $r->print("Problems occured in creating the output file.  ".
-                  "This error has been logged.  ".
-                  "Please alert your LON-CAPA administrator.");
+        $r->print(&mt('Problems occurred in creating the output file. '
+                     .'This error has been logged. '
+                     .'Please alert your LON-CAPA administrator.'));
     }
     return ($fh,$filename)
 }
@@ -1285,9 +1638,7 @@ sub domain_select {
 
 =over 4
 
-=cut
-
-=item * multiple_select_form($name,$value,$size,$hash,$order)
+=item * &multiple_select_form($name,$value,$size,$hash,$order)
 
 Returns a string containing a <select> element int multiple mode
 
@@ -1313,7 +1664,7 @@ sub multiple_select_form {
             $size = scalar(keys(%$hash));
         }
     }
-    $output.="\n<select name='$name' size='$size' multiple='1'>";
+    $output.="\n".'<select name="'.$name.'" size="'.$size.'" multiple="multiple">';
     my @order;
     if (ref($order) eq 'ARRAY')  {
         @order = @{$order};
@@ -1337,7 +1688,7 @@ sub multiple_select_form {
 
 =pod
 
-=item * select_form($defdom,$name,%hash)
+=item * &select_form($defdom,$name,%hash)
 
 Returns a string containing a <select name='$name' size='1'> form to 
 allow a user to select options from a hash option_name => displayed text.  
@@ -1370,17 +1721,17 @@ sub select_form {
 sub display_filter {
     if (!$env{'form.show'}) { $env{'form.show'}=10; }
     if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; }
-    return '<nobr><label>'.&mt('Records [_1]',
+    return '<span class="LC_nobreak"><label>'.&mt('Records [_1]',
 			       &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
 							   (&mt('all'),10,20,50,100,1000,10000))).
-	   '</label></nobr> <nobr>'.
+	   '</label></span> <span class="LC_nobreak">'.
            &mt('Filter [_1]',
 	   &select_form($env{'form.displayfilter'},
 			'displayfilter',
 			('currentfolder' => 'Current folder/page',
 			 'containing' => 'Containing phrase',
 			 'none' => 'None'))).
-			 '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></nobr>';
+			 '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></span>';
 }
 
 sub gradeleveldescription {
@@ -1424,7 +1775,7 @@ sub select_level_form {
 
 =pod
 
-=item * select_dom_form($defdom,$name,$includeempty,$showdomdesc)
+=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$autosubmit)
 
 Returns a string containing a <select name='$name' size='1'> form to 
 allow a user to select the domain to preform an operation in.  
@@ -1433,16 +1784,22 @@ See loncreateuser.pm for an example invo
 If the $includeempty flag is set, it also includes an empty choice ("no domain
 selected");
 
-If the $showdomdesc flag is set, the domain name is followed by the domain description. 
+If the $showdomdesc flag is set, the domain name is followed by the domain description.
+
+If the $autosubmit flag is set, the form containing the domain selector will be auto-submitted by an onchange action.  
 
 =cut
 
 #-------------------------------------------
 sub select_dom_form {
-    my ($defdom,$name,$includeempty,$showdomdesc) = @_;
+    my ($defdom,$name,$includeempty,$showdomdesc,$autosubmit) = @_;
+    my $onchange;
+    if ($autosubmit) {
+        $onchange = ' onchange="this.form.submit()"';
+    }
     my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
     if ($includeempty) { @domains=('',@domains); }
-    my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
+    my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";
     foreach my $dom (@domains) {
         $selectdomain.="<option value=\"$dom\" ".
             ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
@@ -1464,24 +1821,68 @@ sub select_dom_form {
 
 =pod
 
-=item * home_server_option_list($domain)
+=item * &home_server_form_item($domain,$name,$defaultflag)
+
+input: 4 arguments (two required, two optional) - 
+    $domain - domain of new user
+    $name - name of form element
+    $default - Value of 'default' causes a default item to be first 
+                            option, and selected by default. 
+    $hide - Value of 'hide' causes hiding of the name of the server, 
+                            if 1 server found, or default, if 0 found.
+output: returns 2 items: 
+(a) form element which contains either:
+   (i) <select name="$name">
+        <option value="$hostid1">$hostid $servers{$hostid}</option>
+        <option value="$hostid2">$hostid $servers{$hostid}</option>       
+       </select>
+       form item if there are multiple library servers in $domain, or
+   (ii) an <input type="hidden" name="$name" value="$hostid" /> form item 
+       if there is only one library server in $domain.
+
+(b) number of library servers found.
 
-returns a string which contains an <option> list to be used in a 
-<select> form input.  See loncreateuser.pm for an example.
+See loncreateuser.pm for example of use.
 
 =cut
 
 #-------------------------------------------
-sub home_server_option_list {
-    my $domain = shift;
+sub home_server_form_item {
+    my ($domain,$name,$default,$hide) = @_;
     my %servers = &Apache::lonnet::get_servers($domain,'library');
-    my $result = '';
-    foreach my $hostid (sort(keys(%servers))) {
-        $result.=
-            '<option value="'.$hostid.'">'.
-	    $hostid.' '.$servers{$hostid}."</option>\n";
+    my $result;
+    my $numlib = keys(%servers);
+    if ($numlib > 1) {
+        $result .= '<select name="'.$name.'" />'."\n";
+        if ($default) {
+            $result .= '<option value="default" selected="selected">'.&mt('default').
+                       '</option>'."\n";
+        }
+        foreach my $hostid (sort(keys(%servers))) {
+            $result.= '<option value="'.$hostid.'">'.
+	              $hostid.' '.$servers{$hostid}."</option>\n";
+        }
+        $result .= '</select>'."\n";
+    } elsif ($numlib == 1) {
+        my $hostid;
+        foreach my $item (keys(%servers)) {
+            $hostid = $item;
+        }
+        $result .= '<input type="hidden" name="'.$name.'" value="'.
+                   $hostid.'" />';
+                   if (!$hide) {
+                       $result .= $hostid.' '.$servers{$hostid};
+                   }
+                   $result .= "\n";
+    } elsif ($default) {
+        $result .= '<input type="hidden" name="'.$name.
+                   '" value="default" />';
+                   if (!$hide) {
+                       $result .= &mt('default');
+                   }
+                   $result .= "\n";
     }
-    return $result;
+    return ($result,$numlib);
 }
 
 =pod
@@ -1580,14 +1981,12 @@ sub decode_user_agent {
 
 =over 4
 
-=item * authform_xxxxxx
+=item * &authform_xxxxxx()
 
 The authform_xxxxxx subroutines provide javascript and html forms which 
 handle some of the conveniences required for authentication forms.  
 This is not an optimal method, but it works.  
 
-See loncreateuser.pm for invocation and use examples.
-
 =over 4
 
 =item * authform_header
@@ -1604,7 +2003,7 @@ See loncreateuser.pm for invocation and
 
 =back
 
-=back 
+See loncreateuser.pm for invocation and use examples.
 
 =cut
 
@@ -1634,19 +2033,16 @@ END
     }
 
     my $radioval = "'nochange'";
-    if (exists($in{'curr_authtype'}) &&
-        defined($in{'curr_authtype'}) &&
-        $in{'curr_authtype'} ne '') {
-        $radioval = "'$in{'curr_authtype'}arg'";
+    if (defined($in{'curr_authtype'})) {
+        if ($in{'curr_authtype'} ne '') {
+            $radioval = "'".$in{'curr_authtype'}."arg'";
+        }
     }
     my $argfield = 'null';
-    if ( grep/^mode$/,(keys %in) ) {
+    if (defined($in{'mode'})) {
         if ($in{'mode'} eq 'modifycourse')  {
-            if ( grep/^curr_authtype$/,(keys %in) ) {
-                $radioval = "'$in{'curr_authtype'}'";
-            }
-            if ( grep/^curr_autharg$/,(keys %in) ) {
-                unless ($in{'curr_autharg'} eq '') {
+            if (defined($in{'curr_autharg'})) {
+                if ($in{'curr_autharg'} ne '') {
                     $argfield = "'$in{'curr_autharg'}'";
                 }
             }
@@ -1729,79 +2125,181 @@ sub authform_nochange{
               kerb_def_dom => 'MSU.EDU',
               @_,
           );
-    my $result = '<label>'.&mt('[_1] Do not change login data',
-                     '<input type="radio" name="login" value="nochange" '.
-                     'checked="checked" onclick="'.
+    my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'}); 
+    my $result;
+    if (keys(%can_assign) == 0) {
+        $result = &mt('Under you current role you are not permitted to change login settings for this user');  
+    } else {
+        $result = '<label>'.&mt('[_1] Do not change login data',
+                  '<input type="radio" name="login" value="nochange" '.
+                  'checked="checked" onclick="'.
             "javascript:changed_radio('nochange',$in{'formname'});".'" />').
 	    '</label>';
+    }
     return $result;
 }
 
-sub authform_kerberos{  
+sub authform_kerberos {
     my %in = (
               formname => 'document.cu',
               kerb_def_dom => 'MSU.EDU',
               kerb_def_auth => 'krb4',
               @_,
               );
-    my ($check4,$check5,$krbarg);
+    my ($check4,$check5,$krbcheck,$krbarg,$krbver,$result,$authtype,
+        $autharg,$jscall);
+    my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
     if ($in{'kerb_def_auth'} eq 'krb5') {
-       $check5 = " checked=\"on\"";
+       $check5 = ' checked="checked"';
     } else {
-       $check4 = " checked=\"on\"";
+       $check4 = ' checked="checked"';
     }
     $krbarg = $in{'kerb_def_dom'};
-
-    my $krbcheck = "";
-    if ( grep/^curr_authtype$/,(keys %in) ) {
-        if ($in{'curr_authtype'} =~ m/^krb/) {
-            $krbcheck = " checked=\"on\"";
-            if ( grep/^curr_autharg$/,(keys %in) ) {
+    if (defined($in{'curr_authtype'})) {
+        if ($in{'curr_authtype'} eq 'krb') {
+            $krbcheck = ' checked="checked"';
+            if (defined($in{'mode'})) {
+                if ($in{'mode'} eq 'modifyuser') {
+                    $krbcheck = '';
+                }
+            }
+            if (defined($in{'curr_kerb_ver'})) {
+                if ($in{'curr_krb_ver'} eq '5') {
+                    $check5 = ' checked="checked"';
+                    $check4 = '';
+                } else {
+                    $check4 = ' checked="checked"';
+                    $check5 = '';
+                }
+            }
+            if (defined($in{'curr_autharg'})) {
                 $krbarg = $in{'curr_autharg'};
             }
+            if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) {
+                if (defined($in{'curr_autharg'})) {
+                    $result = 
+    &mt('Currently Kerberos authenticated with domain [_1] Version [_2].',
+        $in{'curr_autharg'},$krbver);
+                } else {
+                    $result =
+    &mt('Currently Kerberos authenticated, Version [_1].',$krbver);
+                }
+                return $result; 
+            }
+        }
+    } else {
+        if ($authnum == 1) {
+            $authtype = '<input type="hidden" name="login" value="krb" />';
         }
     }
-
-    my $jscall = "javascript:changed_radio('krb',$in{'formname'});";
-    my $result .= &mt
+    if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) {
+        return;
+    } elsif ($authtype eq '') {
+        if (defined($in{'mode'})) {
+            if ($in{'mode'} eq 'modifycourse') {
+                if ($authnum == 1) {
+                    $authtype = '<input type="hidden" name="login" value="krb" />';
+                }
+            }
+        }
+    }
+    $jscall = "javascript:changed_radio('krb',$in{'formname'});";
+    if ($authtype eq '') {
+        $authtype = '<input type="radio" name="login" value="krb" '.
+                    'onclick="'.$jscall.'" onchange="'.$jscall.'"'.
+                    $krbcheck.' />';
+    }
+    if (($can_assign{'krb4'} && $can_assign{'krb5'}) ||
+        ($can_assign{'krb4'} && !$can_assign{'krb5'} && 
+         $in{'curr_authtype'} eq 'krb5') ||
+        (!$can_assign{'krb4'} && $can_assign{'krb5'} && 
+         $in{'curr_authtype'} eq 'krb4')) {
+        $result .= &mt
         ('[_1] Kerberos authenticated with domain [_2] '.
          '[_3] Version 4 [_4] Version 5 [_5]',
-         '<label><input type="radio" name="login" value="krb" '.
-             'onclick="'.$jscall.'" onchange="'.$jscall.'"'.$krbcheck.' />',
+         '<label>'.$authtype,
          '</label><input type="text" size="10" name="krbarg" '.
              'value="'.$krbarg.'" '.
              'onchange="'.$jscall.'" />',
          '<label><input type="radio" name="krbver" value="4" '.$check4.' />',
          '</label><label><input type="radio" name="krbver" value="5" '.$check5.' />',
 	 '</label>');
+    } elsif ($can_assign{'krb4'}) {
+        $result .= &mt
+        ('[_1] Kerberos authenticated with domain [_2] '.
+         '[_3] Version 4 [_4]',
+         '<label>'.$authtype,
+         '</label><input type="text" size="10" name="krbarg" '.
+             'value="'.$krbarg.'" '.
+             'onchange="'.$jscall.'" />',
+         '<label><input type="hidden" name="krbver" value="4" />',
+         '</label>');
+    } elsif ($can_assign{'krb5'}) {
+        $result .= &mt
+        ('[_1] Kerberos authenticated with domain [_2] '.
+         '[_3] Version 5 [_4]',
+         '<label>'.$authtype,
+         '</label><input type="text" size="10" name="krbarg" '.
+             'value="'.$krbarg.'" '.
+             'onchange="'.$jscall.'" />',
+         '<label><input type="hidden" name="krbver" value="5" />',
+         '</label>');
+    }
     return $result;
 }
 
 sub authform_internal{  
-    my %args = (
+    my %in = (
                 formname => 'document.cu',
                 kerb_def_dom => 'MSU.EDU',
                 @_,
                 );
-
-    my $intcheck = "";
-    my $intarg = 'value=""';
-    if ( grep/^curr_authtype$/,(keys %args) ) {
-        if ($args{'curr_authtype'} eq 'int') {
-            $intcheck = " checked=\"on\"";
-            if ( grep/^curr_autharg$/,(keys %args) ) {
-                $intarg = "value=\"$args{'curr_autharg'}\"";
+    my ($intcheck,$intarg,$result,$authtype,$autharg,$jscall);
+    my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
+    if (defined($in{'curr_authtype'})) {
+        if ($in{'curr_authtype'} eq 'int') {
+            if ($can_assign{'int'}) {
+                $intcheck = 'checked="checked" ';
+                if (defined($in{'mode'})) {
+                    if ($in{'mode'} eq 'modifyuser') {
+                        $intcheck = '';
+                    }
+                }
+                if (defined($in{'curr_autharg'})) {
+                    $intarg = $in{'curr_autharg'};
+                }
+            } else {
+                $result = &mt('Currently internally authenticated.');
+                return $result;
             }
         }
+    } else {
+        if ($authnum == 1) {
+            $authtype = '<input type="hidden" name="login" value="int" />';
+        }
     }
-
-    my $jscall = "javascript:changed_radio('int',$args{'formname'});";
-    my $result.=&mt
+    if (!$can_assign{'int'}) {
+        return;
+    } elsif ($authtype eq '') {
+        if (defined($in{'mode'})) {
+            if ($in{'mode'} eq 'modifycourse') {
+                if ($authnum == 1) {
+                    $authtype = '<input type="hidden" name="login" value="int" />';
+                }
+            }
+        }
+    }
+    $jscall = "javascript:changed_radio('int',$in{'formname'});";
+    if ($authtype eq '') {
+        $authtype = '<input type="radio" name="login" value="int" '.$intcheck.
+                    ' onchange="'.$jscall.'" onclick="'.$jscall.'" />';
+    }
+    $autharg = '<input type="password" size="10" name="intarg" value="'.
+               $intarg.'" onchange="'.$jscall.'" />';
+    $result = &mt
         ('[_1] Internally authenticated (with initial password [_2])',
-         '<label><input type="radio" name="login" value="int" '.$intcheck.
-             ' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
-         '</label><input type="text" size="10" name="intarg" '.$intarg.
-             ' onchange="'.$jscall.'" />');
+         '<label>'.$authtype,'</label>'.$autharg);
+    $result.="<label><input type=\"checkbox\" name=\"visible\" onClick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
     return $result;
 }
 
@@ -1811,24 +2309,51 @@ sub authform_local{
               kerb_def_dom => 'MSU.EDU',
               @_,
               );
-
-    my $loccheck = "";
-    my $locarg = 'value=""';
-    if ( grep/^curr_authtype$/,(keys %in) ) {
+    my ($loccheck,$locarg,$result,$authtype,$autharg,$jscall);
+    my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
+    if (defined($in{'curr_authtype'})) {
         if ($in{'curr_authtype'} eq 'loc') {
-            $loccheck = " checked=\"on\"";
-            if ( grep/^curr_autharg$/,(keys %in) ) {
-                $locarg = "value=\"$in{'curr_autharg'}\"";
+            if ($can_assign{'loc'}) {
+                $loccheck = 'checked="checked" ';
+                if (defined($in{'mode'})) {
+                    if ($in{'mode'} eq 'modifyuser') {
+                        $loccheck = '';
+                    }
+                }
+                if (defined($in{'curr_autharg'})) {
+                    $locarg = $in{'curr_autharg'};
+                }
+            } else {
+                $result = &mt('Currently using local (institutional) authentication.');
+                return $result;
             }
         }
+    } else {
+        if ($authnum == 1) {
+            $authtype = '<input type="hidden" name="login" value="loc" />';
+        }
     }
-
-    my $jscall = "javascript:changed_radio('loc',$in{'formname'});";
-    my $result.=&mt('[_1] Local Authentication with argument [_2]',
-                    '<label><input type="radio" name="login" value="loc" '.$loccheck.
-                        ' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
-                    '</label><input type="text" size="10" name="locarg" '.$locarg.
-                        ' onchange="'.$jscall.'" />');
+    if (!$can_assign{'loc'}) {
+        return;
+    } elsif ($authtype eq '') {
+        if (defined($in{'mode'})) {
+            if ($in{'mode'} eq 'modifycourse') {
+                if ($authnum == 1) {
+                    $authtype = '<input type="hidden" name="login" value="loc" />';
+                }
+            }
+        }
+    }
+    $jscall = "javascript:changed_radio('loc',$in{'formname'});";
+    if ($authtype eq '') {
+        $authtype = '<input type="radio" name="login" value="loc" '.
+                    $loccheck.' onchange="'.$jscall.'" onclick="'.
+                    $jscall.'" />';
+    }
+    $autharg = '<input type="text" size="10" name="locarg" value="'.
+               $locarg.'" onchange="'.$jscall.'" />';
+    $result = &mt('[_1] Local Authentication with argument [_2]',
+                  '<label>'.$authtype,'</label>'.$autharg);
     return $result;
 }
 
@@ -1838,51 +2363,96 @@ sub authform_filesystem{
               kerb_def_dom => 'MSU.EDU',
               @_,
               );
-    my $jscall = "javascript:changed_radio('fsys',$in{'formname'});";
-    my $result.= &mt
+    my ($fsyscheck,$result,$authtype,$autharg,$jscall);
+    my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
+    if (defined($in{'curr_authtype'})) {
+        if ($in{'curr_authtype'} eq 'fsys') {
+            if ($can_assign{'fsys'}) {
+                $fsyscheck = 'checked="checked" ';
+                if (defined($in{'mode'})) {
+                    if ($in{'mode'} eq 'modifyuser') {
+                        $fsyscheck = '';
+                    }
+                }
+            } else {
+                $result = &mt('Currently Filesystem Authenticated.');
+                return $result;
+            }           
+        }
+    } else {
+        if ($authnum == 1) {
+            $authtype = '<input type="hidden" name="login" value="fsys" />';
+        }
+    }
+    if (!$can_assign{'fsys'}) {
+        return;
+    } elsif ($authtype eq '') {
+        if (defined($in{'mode'})) {
+            if ($in{'mode'} eq 'modifycourse') {
+                if ($authnum == 1) {
+                    $authtype = '<input type="hidden" name="login" value="fsys" />';
+                }
+            }
+        }
+    }
+    $jscall = "javascript:changed_radio('fsys',$in{'formname'});";
+    if ($authtype eq '') {
+        $authtype = '<input type="radio" name="login" value="fsys" '.
+                    $fsyscheck.' onchange="'.$jscall.'" onclick="'.
+                    $jscall.'" />';
+    }
+    $autharg = '<input type="text" size="10" name="fsysarg" value=""'.
+               ' onchange="'.$jscall.'" />';
+    $result = &mt
         ('[_1] Filesystem Authenticated (with initial password [_2])',
          '<label><input type="radio" name="login" value="fsys" '.
-         'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
-         '</label><input type="text" size="10" name="fsysarg" value="" '.
+         $fsyscheck.'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
+         '</label><input type="password" size="10" name="fsysarg" value="" '.
                   'onchange="'.$jscall.'" />');
     return $result;
 }
 
-###############################################################
-##    Get Authentication Defaults for Domain                 ##
-###############################################################
-
-=pod
-
-=head1 Domains and Authentication
-
-Returns default authentication type and an associated argument as
-listed in file 'domain.tab'.
-
-=over 4
-
-=item * get_auth_defaults
-
-get_auth_defaults($target_domain) returns the default authentication
-type and an associated argument (initial password or a kerberos domain).
-These values are stored in lonTabs/domain.tab
-
-($def_auth, $def_arg) = &get_auth_defaults($target_domain);
-
-If target_domain is not found in domain.tab, returns nothing ('').
-
-=cut
-
-#-------------------------------------------
-sub get_auth_defaults {
-    my $domain=shift;
-    return (&Apache::lonnet::domain($domain,'auth_def'),
-	    &Apache::lonnet::domain($domain,'auth_arg_def'));
-	    
+sub get_assignable_auth {
+    my ($dom) = @_;
+    if ($dom eq '') {
+        $dom = $env{'request.role.domain'};
+    }
+    my %can_assign = (
+                          krb4 => 1,
+                          krb5 => 1,
+                          int  => 1,
+                          loc  => 1,
+                     );
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
+    if (ref($domconfig{'usercreation'}) eq 'HASH') {
+        if (ref($domconfig{'usercreation'}{'authtypes'}) eq 'HASH') {
+            my $authhash = $domconfig{'usercreation'}{'authtypes'};
+            my $context;
+            if ($env{'request.role'} =~ /^au/) {
+                $context = 'author';
+            } elsif ($env{'request.role'} =~ /^dc/) {
+                $context = 'domain';
+            } elsif ($env{'request.course.id'}) {
+                $context = 'course';
+            }
+            if ($context) {
+                if (ref($authhash->{$context}) eq 'HASH') {
+                   %can_assign = %{$authhash->{$context}}; 
+                }
+            }
+        }
+    }
+    my $authnum = 0;
+    foreach my $key (keys(%can_assign)) {
+        if ($can_assign{$key}) {
+            $authnum ++;
+        }
+    }
+    if ($can_assign{'krb4'} && $can_assign{'krb5'}) {
+        $authnum --;
+    }
+    return ($authnum,%can_assign);
 }
-###############################################################
-##   End Get Authentication Defaults for Domain              ##
-###############################################################
 
 ###############################################################
 ##    Get Kerberos Defaults for Domain                 ##
@@ -1896,22 +2466,31 @@ sub get_auth_defaults {
 
 =pod
 
-=item * get_kerberos_defaults
+=item * &get_kerberos_defaults()
 
 get_kerberos_defaults($target_domain) returns the default kerberos
-version and domain. If not found in domain.tabs, it defaults to
-version 4 and the domain of the server.
+version and domain. If not found, it defaults to version 4 and the 
+domain of the server.
+
+=over 4
 
 ($def_version, $def_krb_domain) = &get_kerberos_defaults($target_domain);
 
+=back
+
+=back
+
 =cut
 
 #-------------------------------------------
 sub get_kerberos_defaults {
     my $domain=shift;
-    my ($krbdef,$krbdefdom) =
-        &Apache::loncommon::get_auth_defaults($domain);
-    unless ($krbdef =~/^krb/ && $krbdefdom) {
+    my ($krbdef,$krbdefdom);
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
+    if (($domdefaults{'auth_def'} =~/^krb(4|5)$/) && ($domdefaults{'auth_arg_def'} ne '')) {
+        $krbdef = $domdefaults{'auth_def'};
+        $krbdefdom = $domdefaults{'auth_arg_def'};
+    } else {
         $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
         my $krbdefdom=$1;
         $krbdefdom=~tr/a-z/A-Z/;
@@ -1920,11 +2499,6 @@ sub get_kerberos_defaults {
     return ($krbdef,$krbdefdom);
 }
 
-=pod
-
-=back
-
-=cut
 
 ###############################################################
 ##                Thesaurus Functions                        ##
@@ -1936,7 +2510,7 @@ sub get_kerberos_defaults {
 
 =over 4
 
-=item * initialize_keywords
+=item * &initialize_keywords()
 
 Initializes the package variable %Keywords if it is empty.  Uses the
 package variable $thesaurus_db_file.
@@ -1973,7 +2547,7 @@ sub initialize_keywords {
     # Remove special values from %Keywords.
     foreach my $value ('total.count','average.count') {
         delete($Keywords{$value}) if (exists($Keywords{$value}));
-    }
+  }
     return 1;
 }
 
@@ -1981,7 +2555,7 @@ sub initialize_keywords {
 
 =pod
 
-=item * keyword($word)
+=item * &keyword($word)
 
 Returns true if $word is a keyword.  A keyword is a word that appears more 
 than the average number of times in the thesaurus database.  Calls 
@@ -2002,7 +2576,7 @@ sub keyword {
 
 =pod 
 
-=item * get_related_words
+=item * &get_related_words()
 
 Look up a word in the thesaurus.  Takes a scalar argument and returns
 an array of words.  If the keyword is not in the thesaurus, an empty array
@@ -2060,7 +2634,7 @@ sub get_related_words {
 
 =over 4
 
-=item * plainname($uname,$udom,$first)
+=item * &plainname($uname,$udom,$first)
 
 Takes a users logon name and returns it as a string in
 "first middle last generation" form 
@@ -2089,7 +2663,7 @@ sub plainname {
 # -------------------------------------------------------------------- Nickname
 =pod
 
-=item * nickname($uname,$udom)
+=item * &nickname($uname,$udom)
 
 Gets a users name and returns it as a string as
 
@@ -2139,18 +2713,21 @@ sub getnames {
 }
 
 # -------------------------------------------------------------------- getemails
+
 =pod
 
-=item * getemails($uname,$udom)
+=item * &getemails($uname,$udom)
 
 Gets a user's email information and returns it as a hash with keys:
 notification, critnotification, permanentemail
 
 For notification and critnotification, values are comma-separated lists 
-of e-mail address(es); for permanentemail, value is a single e-mail address.
+of e-mail addresses; for permanentemail, value is a single e-mail address.
  
+
 =cut
 
+
 sub getemails {
     my ($uname,$udom)=@_;
     if ($udom eq 'public' && $uname eq 'public') {
@@ -2181,11 +2758,48 @@ sub flush_email_cache {
     &Apache::lonnet::devalidate_cache_new('emailscache',$id);
 }
 
+# -------------------------------------------------------------------- getlangs
+
+=pod
+
+=item * &getlangs($uname,$udom)
+
+Gets a user's language preference and returns it as a hash with key:
+language.
+
+=cut
+
+
+sub getlangs {
+    my ($uname,$udom) = @_;
+    if (!$udom)  { $udom =$env{'user.domain'}; }
+    if (!$uname) { $uname=$env{'user.name'};   }
+    my $id=$uname.':'.$udom;
+    my ($langs,$cached)=&Apache::lonnet::is_cached_new('userlangs',$id);
+    if ($cached) {
+        return %{$langs};
+    } else {
+        my %loadlangs=&Apache::lonnet::get('environment',['languages'],
+                                           $udom,$uname);
+        &Apache::lonnet::do_cache_new('userlangs',$id,\%loadlangs);
+        return %loadlangs;
+    }
+}
+
+sub flush_langs_cache {
+    my ($uname,$udom)=@_;
+    if (!$udom)  { $udom =$env{'user.domain'}; }
+    if (!$uname) { $uname=$env{'user.name'};   }
+    return if ($udom eq 'public' && $uname eq 'public');
+    my $id=$uname.':'.$udom;
+    &Apache::lonnet::devalidate_cache_new('userlangs',$id);
+}
+
 # ------------------------------------------------------------------ Screenname
 
 =pod
 
-=item * screenname($uname,$udom)
+=item * &screenname($uname,$udom)
 
 Gets a users screenname and returns it as a string
 
@@ -2200,6 +2814,26 @@ sub screenname {
 }
 
 
+# ------------------------------------------------------------- Confirm Wrapper
+=pod
+
+=item confirmwrapper
+
+Wrap messages about completion of operation in box
+
+=cut
+
+sub confirmwrapper {
+    my ($message)=@_;
+    if ($message) {
+        return "\n".'<div class="LC_confirm_box">'."\n"
+               .$message."\n"
+               .'</div>'."\n";
+    } else {
+        return $message;
+    }
+}
+
 # ------------------------------------------------------------- Message Wrapper
 
 sub messagewrapper {
@@ -2210,6 +2844,7 @@ sub messagewrapper {
 	'&amp;subject='.&escape($subject).'&amp;text='.&escape($text).'" '.
         'title="'.&mt('Send message').'">'.$link.'</a>';
 }
+
 # --------------------------------------------------------------- Notes Wrapper
 
 sub noteswrapper {
@@ -2217,6 +2852,7 @@ sub noteswrapper {
     return 
 "<a href='/adm/email?recordftf=retrieve&recname=$un&recdom=$do'>$link</a>";
 }
+
 # ------------------------------------------------------------- Aboutme Wrapper
 
 sub aboutmewrapper {
@@ -2225,20 +2861,18 @@ sub aboutmewrapper {
         return;
     }
     return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'.
-	($target?' target="$target"':'').' title="'.&mt("View this user's personal page").'">'.$link.'</a>';
+	($target?' target="$target"':'').' title="'.&mt("View this user's personal information page").'">'.$link.'</a>';
 }
 
 # ------------------------------------------------------------ Syllabus Wrapper
 
-
 sub syllabuswrapper {
-    my ($linktext,$coursedir,$domain,$fontcolor)=@_;
-    if ($fontcolor) { 
-        $linktext='<font color="'.$fontcolor.'">'.$linktext.'</font>'; 
-    }
+    my ($linktext,$coursedir,$domain)=@_;
     return qq{<a href="/public/$domain/$coursedir/syllabus">$linktext</a>};
 }
 
+# -----------------------------------------------------------------------------
+
 sub track_student_link {
     my ($linktext,$sname,$sdom,$target,$start) = @_;
     my $link ="/adm/trackstudent?";
@@ -2260,6 +2894,27 @@ sub track_student_link {
 	&help_open_topic('View_recent_activity');
 }
 
+sub slot_reservations_link {
+    my ($linktext,$sname,$sdom,$target) = @_;
+    my $link ="/adm/slotrequest?command=showresv&amp;origin=aboutme";
+    my $title = 'View slot reservation history';
+    if (defined($sname) && $sname !~ /^\s*$/ &&
+        defined($sdom)  && $sdom  !~ /^\s*$/) {
+        $link .= "&amp;uname=$sname&amp;udom=$sdom";
+        $title .= ' of this student';
+    }
+    if (defined($target) && $target !~ /^\s*$/) {
+        $target = qq{target="$target"};
+    } else {
+        $target = '';
+    }
+    $title = &mt($title);
+    $linktext = &mt($linktext);
+    return qq{<a href="$link" title="$title" $target>$linktext</a>};
+# FIXME uncomment when help item created: &help_open_topic('Slot_Reservation_History');
+
+}
+
 # ===================================================== Display a student photo
 
 
@@ -2281,7 +2936,7 @@ sub student_image_tag {
 
 =over 4
 
-=item * languageids() 
+=item * &languageids() 
 
 returns list of all language ids
 
@@ -2293,7 +2948,7 @@ sub languageids {
 
 =pod
 
-=item * languagedescription() 
+=item * &languagedescription() 
 
 returns description of a specified language id
 
@@ -2318,7 +2973,7 @@ sub supportedlanguagecode {
 
 =pod
 
-=item * copyrightids() 
+=item * &copyrightids() 
 
 returns list of all copyrights
 
@@ -2330,7 +2985,7 @@ sub copyrightids {
 
 =pod
 
-=item * copyrightdescription() 
+=item * &copyrightdescription() 
 
 returns description of a specified copyright id
 
@@ -2342,7 +2997,7 @@ sub copyrightdescription {
 
 =pod
 
-=item * source_copyrightids() 
+=item * &source_copyrightids() 
 
 returns list of all source copyrights
 
@@ -2354,7 +3009,7 @@ sub source_copyrightids {
 
 =pod
 
-=item * source_copyrightdescription() 
+=item * &source_copyrightdescription() 
 
 returns description of a specified source copyright id
 
@@ -2366,7 +3021,7 @@ sub source_copyrightdescription {
 
 =pod
 
-=item * filecategories() 
+=item * &filecategories() 
 
 returns list of all file categories
 
@@ -2378,7 +3033,7 @@ sub filecategories {
 
 =pod
 
-=item * filecategorytypes() 
+=item * &filecategorytypes() 
 
 returns list of file types belonging to a given file
 category
@@ -2392,7 +3047,7 @@ sub filecategorytypes {
 
 =pod
 
-=item * fileembstyle() 
+=item * &fileembstyle() 
 
 returns embedding style for a specified file type
 
@@ -2416,7 +3071,7 @@ sub filecategoryselect {
 
 =pod
 
-=item * filedescription() 
+=item * &filedescription() 
 
 returns description for a specified file type
 
@@ -2430,7 +3085,7 @@ sub filedescription {
 
 =pod
 
-=item * filedescriptionex() 
+=item * &filedescriptionex() 
 
 returns description for a specified file type with
 extra formatting
@@ -2462,7 +3117,7 @@ sub fileextensions {
 
 sub display_languages {
     my %languages=();
-    foreach my $lang (&preferred_languages()) {
+    foreach my $lang (&Apache::lonlocal::preferred_languages()) {
 	$languages{$lang}=1;
     }
     &get_unprocessed_cgi($ENV{'QUERY_STRING'},['displaylanguage']);
@@ -2474,48 +3129,52 @@ sub display_languages {
     return %languages;
 }
 
-sub preferred_languages {
-    my @languages=();
-    if ($env{'course.'.$env{'request.course.id'}.'.languages'}) {
-	@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,
-	         $env{'course.'.$env{'request.course.id'}.'.languages'}));
-    }
-    if ($env{'environment.languages'}) {
-	@languages=(@languages,
-		    split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'}));
-    }
-    my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0];
-    if ($browser) {
-	@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$browser));
-    }
-    if (&Apache::lonnet::domain($env{'user.domain'},'lang_def')) {
-	@languages=(@languages,
-		    &Apache::lonnet::domain($env{'user.domain'},
-					    'lang_def'));
-    }
-    if (&Apache::lonnet::domain($env{'request.role.domain'},'lang_def')) {
-	@languages=(@languages,
-		    &Apache::lonnet::domain($env{'request.role.domain'},
-					    'lang_def'));
-    }
-    if (&Apache::lonnet::domain($Apache::lonnet::perlvar{'lonDefDomain'},
-				'lang_def')) {
-	@languages=(@languages,
-		    &Apache::lonnet::domain($Apache::lonnet::perlvar{'lonDefDomain'},
-					    'lang_def'));
-    }
-# turn "en-ca" into "en-ca,en"
-    my @genlanguages;
-    foreach my $lang (@languages) {
-	unless ($lang=~/\w/) { next; }
-	push (@genlanguages,$lang);
-	if ($lang=~/(\-|\_)/) {
-	    push(@genlanguages,(split(/(\-|\_)/,$lang))[0]);
+sub languages {
+    my ($possible_langs) = @_;
+    my @preferred_langs = &Apache::lonlocal::preferred_languages();
+    if (!ref($possible_langs)) {
+	if( wantarray ) {
+	    return @preferred_langs;
+	} else {
+	    return $preferred_langs[0];
 	}
     }
-    return @genlanguages;
+    my %possibilities = map { $_ => 1 } (@$possible_langs);
+    my @preferred_possibilities;
+    foreach my $preferred_lang (@preferred_langs) {
+	if (exists($possibilities{$preferred_lang})) {
+	    push(@preferred_possibilities, $preferred_lang);
+	}
+    }
+    if( wantarray ) {
+	return @preferred_possibilities;
+    }
+    return $preferred_possibilities[0];
+}
+
+sub user_lang {
+    my ($touname,$toudom,$fromcid) = @_;
+    my @userlangs;
+    if (($fromcid ne '') && ($env{'course.'.$fromcid.'.languages'} ne '')) {
+        @userlangs=(@userlangs,split(/\s*(\,|\;|\:)\s*/,
+                    $env{'course.'.$fromcid.'.languages'}));
+    } else {
+        my %langhash = &getlangs($touname,$toudom);
+        if ($langhash{'languages'} ne '') {
+            @userlangs = split(/\s*(\,|\;|\:)\s*/,$langhash{'languages'});
+        } else {
+            my %domdefs = &Apache::lonnet::get_domain_defaults($toudom);
+            if ($domdefs{'lang_def'} ne '') {
+                @userlangs = ($domdefs{'lang_def'});
+            }
+        }
+    }
+    my @languages=&Apache::lonlocal::get_genlanguages(@userlangs);
+    my $user_lh = Apache::localize->get_handle(@languages);
+    return $user_lh;
 }
 
+
 ###############################################################
 ##               Student Answer Attempts                     ##
 ###############################################################
@@ -2526,7 +3185,7 @@ sub preferred_languages {
 
 =over 4
 
-=item * get_previous_attempt($symb, $username, $domain, $course,
+=item * &get_previous_attempt($symb, $username, $domain, $course,
     $getattempt, $regexp, $gradesub)
 
 Return string with previous attempt on problem. Arguments:
@@ -2570,14 +3229,14 @@ sub get_previous_attempt {
 	  $lasthash{$key}=$returnhash{$version.':'.$key};
         }
       }
-      $prevattempts='<table border="0" width="100%"><tr><td bgcolor="#777777">';
-      $prevattempts.='<table border="0" width="100%"><tr bgcolor="#e6ffff"><td>History</td>';
+      $prevattempts=&start_data_table().&start_data_table_header_row();
+      $prevattempts.='<th>'.&mt('History').'</th>';
       foreach my $key (sort(keys(%lasthash))) {
 	my ($ign,@parts) = split(/\./,$key);
 	if ($#parts > 0) {
 	  my $data=$parts[-1];
 	  pop(@parts);
-	  $prevattempts.='<td>Part '.join('.',@parts).'<br />'.$data.'&nbsp;</td>';
+	  $prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.'&nbsp;</th>';
 	} else {
 	  if ($#parts == 0) {
 	    $prevattempts.='<th>'.$parts[0].'</th>';
@@ -2586,41 +3245,53 @@ sub get_previous_attempt {
 	  }
 	}
       }
+      $prevattempts.=&end_data_table_header_row();
       if ($getattempt eq '') {
 	for ($version=1;$version<=$returnhash{'version'};$version++) {
-	  $prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Transaction '.$version.'</td>';
+	  $prevattempts.=&start_data_table_row().
+	      '<td>'.&mt('Transaction [_1]',$version).'</td>';
 	    foreach my $key (sort(keys(%lasthash))) {
-	       my $value;
-	       if ($key =~ /timestamp/) {
-		  $value=scalar(localtime($returnhash{$version.':'.$key}));
-	       } else {
-		  $value=$returnhash{$version.':'.$key};
-	       }
-	       $prevattempts.='<td>'.&unescape($value).'&nbsp;</td>';   
+		my $value = &format_previous_attempt_value($key,
+							   $returnhash{$version.':'.$key});
+		$prevattempts.='<td>'.$value.'&nbsp;</td>';   
 	    }
+	  $prevattempts.=&end_data_table_row();
 	 }
       }
-      $prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Current</td>';
+      $prevattempts.=&start_data_table_row().'<td>'.&mt('Current').'</td>';
       foreach my $key (sort(keys(%lasthash))) {
-	my $value;
-	if ($key =~ /timestamp/) {
-	  $value=scalar(localtime($lasthash{$key}));
-	} else {
-	  $value=$lasthash{$key};
-	}
-	$value=&unescape($value);
+	my $value = &format_previous_attempt_value($key,$lasthash{$key});
 	if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)}
 	$prevattempts.='<td>'.$value.'&nbsp;</td>';
       }
-      $prevattempts.='</tr></table></td></tr></table>';
+      $prevattempts.= &end_data_table_row().&end_data_table();
     } else {
-      $prevattempts='Nothing submitted - no attempts.';
+      $prevattempts=
+	  &start_data_table().&start_data_table_row().
+	  '<td>'.&mt('Nothing submitted - no attempts.').'</td>'.
+	  &end_data_table_row().&end_data_table();
     }
   } else {
-    $prevattempts='No data.';
+    $prevattempts=
+	  &start_data_table().&start_data_table_row().
+	  '<td>'.&mt('No data.').'</td>'.
+	  &end_data_table_row().&end_data_table();
   }
 }
 
+sub format_previous_attempt_value {
+    my ($key,$value) = @_;
+    if ($key =~ /timestamp/) {
+	$value = &Apache::lonlocal::locallocaltime($value);
+    } elsif (ref($value) eq 'ARRAY') {
+	$value = '('.join(', ', @{ $value }).')';
+    } else {
+	$value = &unescape($value);
+    }
+    return $value;
+}
+
+
 sub relative_to_absolute {
     my ($url,$output)=@_;
     my $parser=HTML::TokeParser->new(\$output);
@@ -2642,7 +3313,7 @@ sub relative_to_absolute {
     }
     $thisdir=~s-/[^/]*$--;
     foreach my $link (@rlinks) {
-	unless (($link=~/^http:\/\//i) ||
+	unless (($link=~/^https?\:\/\//i) ||
 		($link=~/^\//) ||
 		($link=~/^javascript:/i) ||
 		($link=~/^mailto:/i) ||
@@ -2658,7 +3329,7 @@ sub relative_to_absolute {
 
 =pod
 
-=item * get_student_view
+=item * &get_student_view()
 
 show a snapshot of what student was looking at
 
@@ -2677,7 +3348,7 @@ sub get_student_view {
   }
   if (defined($target)) { $form{'grade_target'} = $target; }
   $feedurl=&Apache::lonnet::clutter($feedurl);
-  my $userview=&Apache::lonnet::ssi_body($feedurl,%form);
+  my ($userview,$response)=&Apache::lonnet::ssi_body($feedurl,%form);
   $userview=~s/\<body[^\>]*\>//gi;
   $userview=~s/\<\/body\>//gi;
   $userview=~s/\<html\>//gi;
@@ -2686,12 +3357,44 @@ sub get_student_view {
   $userview=~s/\<\/head\>//gi;
   $userview=~s/action\s*\=/would_be_action\=/gi;
   $userview=&relative_to_absolute($feedurl,$userview);
-  return $userview;
+  if (wantarray) {
+     return ($userview,$response);
+  } else {
+     return $userview;
+  }
+}
+
+sub get_student_view_with_retries {
+  my ($symb,$retries,$username,$domain,$courseid,$target,$moreenv) = @_;
+
+    my $ok = 0;                 # True if we got a good response.
+    my $content;
+    my $response;
+
+    # Try to get the student_view done. within the retries count:
+    
+    do {
+         ($content, $response) = &get_student_view($symb,$username,$domain,$courseid,$target,$moreenv);
+         $ok      = $response->is_success;
+         if (!$ok) {
+            &Apache::lonnet::logthis("Failed get_student_view_with_retries on $symb: ".$response->is_success.', '.$response->code.', '.$response->message);
+         }
+         $retries--;
+    } while (!$ok && ($retries > 0));
+    
+    if (!$ok) {
+       $content = '';          # On error return an empty content.
+    }
+    if (wantarray) {
+       return ($content, $response);
+    } else {
+       return $content;
+    }
 }
 
 =pod
 
-=item * get_student_answers() 
+=item * &get_student_answers() 
 
 show a snapshot of how student was answering problem
 
@@ -2779,9 +3482,9 @@ sub pprmlink {
     if (!$symb) { $symb=&Apache::lonnet::symbread(); }
     $symb=&escape($symb);
     if ($target) { $target="target=\"$target\""; }
-    return '<a href="/adm/parmset?&command=set&'.
-	'symb='.$symb.'&uname='.$uname.
-	'&udom='.$udom.'" '.$target.'>'.$text.'</a>';
+    return '<a href="/adm/parmset?command=set&amp;'.
+	'symb='.$symb.'&amp;uname='.$uname.
+	'&amp;udom='.$udom.'" '.$target.'>'.$text.'</a>';
 }
 ##############################################
 
@@ -2795,16 +3498,21 @@ sub pprmlink {
 
 
 sub timehash {
-    my @ltime=localtime(shift);
-    return ( 'seconds' => $ltime[0],
-             'minutes' => $ltime[1],
-             'hours'   => $ltime[2],
-             'day'     => $ltime[3],
-             'month'   => $ltime[4]+1,
-             'year'    => $ltime[5]+1900,
-             'weekday' => $ltime[6],
-             'dayyear' => $ltime[7]+1,
-             'dlsav'   => $ltime[8] );
+    my ($thistime) = @_;
+    my $timezone = &Apache::lonlocal::gettimezone();
+    my $dt = DateTime->from_epoch(epoch => $thistime)
+                     ->set_time_zone($timezone);
+    my $wday = $dt->day_of_week();
+    if ($wday == 7) { $wday = 0; }
+    return ( 'second' => $dt->second(),
+             'minute' => $dt->minute(),
+             'hour'   => $dt->hour(),
+             'day'     => $dt->day_of_month(),
+             'month'   => $dt->month(),
+             'year'    => $dt->year(),
+             'weekday' => $wday,
+             'dayyear' => $dt->day_of_year(),
+             'dlsav'   => $dt->is_dst() );
 }
 
 sub utc_string {
@@ -2814,6 +3522,24 @@ sub utc_string {
 
 sub maketime {
     my %th=@_;
+    my ($epoch_time,$timezone,$dt);
+    $timezone = &Apache::lonlocal::gettimezone();
+    eval {
+        $dt = DateTime->new( year   => $th{'year'},
+                             month  => $th{'month'},
+                             day    => $th{'day'},
+                             hour   => $th{'hour'},
+                             minute => $th{'minute'},
+                             second => $th{'second'},
+                             time_zone => $timezone,
+                         );
+    };
+    if (!$@) {
+        $epoch_time = $dt->epoch;
+        if ($epoch_time) {
+            return $epoch_time;
+        }
+    }
     return POSIX::mktime(
         ($th{'seconds'},$th{'minutes'},$th{'hours'},
          $th{'day'},$th{'month'}-1,$th{'year'}-1900,0,0,-1));
@@ -3164,7 +3890,7 @@ sub blocking_status {
                              &Apache::lonnet::coursedescription($course);
                         $coursedesc = $courseinfo{'description'};
                     }
-                    $category = "Group files in the course '$coursedesc'";
+                    $category = "Group portfolio in the course '$coursedesc'";
                 } else {
                     $category = 'Portfolio files belonging to ';
                     if ($env{'user.name'} eq 'public' && 
@@ -3194,6 +3920,60 @@ sub blocking_status {
 
 ###############################################
 
+sub check_ip_acc {
+    my ($acc)=@_;
+    &Apache::lonxml::debug("acc is $acc");
+    if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) {
+        return 1;
+    }
+    my $allowed=0;
+    my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'};
+
+    my $name;
+    foreach my $pattern (split(',',$acc)) {
+        $pattern =~ s/^\s*//;
+        $pattern =~ s/\s*$//;
+        if ($pattern =~ /\*$/) {
+            #35.8.*
+            $pattern=~s/\*//;
+            if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
+        } elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {
+            #35.8.3.[34-56]
+            my $low=$2;
+            my $high=$3;
+            $pattern=$1;
+            if ($ip =~ /^\Q$pattern\E/) {
+                my $last=(split(/\./,$ip))[3];
+                if ($last <=$high && $last >=$low) { $allowed=1; }
+            }
+        } elsif ($pattern =~ /^\*/) {
+            #*.msu.edu
+            $pattern=~s/\*//;
+            if (!defined($name)) {
+                use Socket;
+                my $netaddr=inet_aton($ip);
+                ($name)=gethostbyaddr($netaddr,AF_INET);
+            }
+            if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
+        } elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
+            #127.0.0.1
+            if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
+        } else {
+            #some.name.com
+            if (!defined($name)) {
+                use Socket;
+                my $netaddr=inet_aton($ip);
+                ($name)=gethostbyaddr($netaddr,AF_INET);
+            }
+            if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
+        }
+        if ($allowed) { last; }
+    }
+    return $allowed;
+}
+
+###############################################
+
 =pod
 
 =head1 Domain Template Functions
@@ -3237,45 +4017,85 @@ sub get_domainconf {
 
     my %domconfig = &Apache::lonnet::get_dom('configuration',
 					     ['login','rolecolors'],$udom);
-    my %designhash;
+    my (%designhash,%legacy);
     if (keys(%domconfig) > 0) {
         if (ref($domconfig{'login'}) eq 'HASH') {
-            foreach my $key (keys(%{$domconfig{'login'}})) {
-                $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
+            if (keys(%{$domconfig{'login'}})) {
+                foreach my $key (keys(%{$domconfig{'login'}})) {
+                    if (ref($domconfig{'login'}{$key}) eq 'HASH') {
+                        foreach my $img (keys(%{$domconfig{'login'}{$key}})) {
+                            $designhash{$udom.'.login.'.$key.'_'.$img} = 
+                                $domconfig{'login'}{$key}{$img};
+                        }
+                    } else {
+                        $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
+                    }
+                }
+            } else {
+                $legacy{'login'} = 1;
             }
+        } else {
+            $legacy{'login'} = 1;
         }
         if (ref($domconfig{'rolecolors'}) eq 'HASH') {
-            foreach my $role (keys(%{$domconfig{'rolecolors'}})) {
-                if (ref($domconfig{'rolecolors'}{$role}) eq 'HASH') {
-                    foreach my $item (keys(%{$domconfig{'rolecolors'}{$role}})) {
-                        $designhash{$udom.'.'.$role.'.'.$item}=$domconfig{'rolecolors'}{$role}{$item};
+            if (keys(%{$domconfig{'rolecolors'}})) {
+                foreach my $role (keys(%{$domconfig{'rolecolors'}})) {
+                    if (ref($domconfig{'rolecolors'}{$role}) eq 'HASH') {
+                        foreach my $item (keys(%{$domconfig{'rolecolors'}{$role}})) {
+                            $designhash{$udom.'.'.$role.'.'.$item}=$domconfig{'rolecolors'}{$role}{$item};
+                        }
                     }
                 }
+            } else {
+                $legacy{'rolecolors'} = 1;
             }
+        } else {
+            $legacy{'rolecolors'} = 1;
         }
-    } else {
-        my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
-        my $designfile =  $designdir.'/'.$udom.'.tab';
-        if (-e $designfile) {
-            if ( open (my $fh,"<$designfile") ) {
-                while (my $line = <$fh>) {
-                    next if ($line =~ /^\#/);
-                    chomp($line);
-                    my ($key,$val)=(split(/\=/,$line));
-                    if ($val) { $designhash{$udom.'.'.$key}=$val; }
+        if (keys(%legacy) > 0) {
+            my %legacyhash = &get_legacy_domconf($udom);
+            foreach my $item (keys(%legacyhash)) {
+                if ($item =~ /^\Q$udom\E\.login/) {
+                    if ($legacy{'login'}) { 
+                        $designhash{$item} = $legacyhash{$item};
+                    }
+                } else {
+                    if ($legacy{'rolecolors'}) {
+                        $designhash{$item} = $legacyhash{$item};
+                    }
                 }
-                close($fh);
             }
         }
-        if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') {
-            $designhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif";
-        }
+    } else {
+        %designhash = &get_legacy_domconf($udom); 
     }
     &Apache::lonnet::do_cache_new('domainconfig',$udom,\%designhash,
 				  $cachetime);
     return %designhash;
 }
 
+sub get_legacy_domconf {
+    my ($udom) = @_;
+    my %legacyhash;
+    my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
+    my $designfile =  $designdir.'/'.$udom.'.tab';
+    if (-e $designfile) {
+        if ( open (my $fh,"<$designfile") ) {
+            while (my $line = <$fh>) {
+                next if ($line =~ /^\#/);
+                chomp($line);
+                my ($key,$val)=(split(/\=/,$line));
+                if ($val) { $legacyhash{$udom.'.'.$key}=$val; }
+            }
+            close($fh);
+        }
+    }
+    if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') {
+        $legacyhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif";
+    }
+    return %legacyhash;
+}
+
 =pod
 
 =item * &domainlogo()
@@ -3325,10 +4145,10 @@ Returns: value of designparamter $which
 sub designparm {
     my ($which,$domain)=@_;
     if ($env{'browser.blackwhite'} eq 'on') {
-	if ($which=~/\.(font|alink|vlink|link)$/) {
+	if ($which=~/\.(font|alink|vlink|link|textcol)$/) {
 	    return '#000000';
 	}
-	if ($which=~/\.(pgbg|sidebg)$/) {
+	if ($which=~/\.(pgbg|sidebg|bgcol)$/) {
 	    return '#FFFFFF';
 	}
 	if ($which=~/\.tabbg$/) {
@@ -3347,7 +4167,7 @@ sub designparm {
         $output = $defaultdesign{$which};
     }
     if (($which =~ /^(student|coordinator|author|admin)\.img$/) ||
-        ($which =~ /login\.(img|logo|domlogo)/)) {
+        ($which =~ /login\.(img|logo|domlogo|login)/)) {
         if ($output =~ m{^/(adm|res)/}) {
 	    if ($output =~ m{^/res/}) {
 		my $local_name = &Apache::lonnet::filelocation('',$output);
@@ -3431,7 +4251,7 @@ sub bodytag {
     my $font =   &designparm($function.'.font',$domain);
     my $pgbg   = $bgcolor || &designparm($function.'.pgbg',$domain);
 
-    my %design = ( 'style'   => 'margin-top: 0px',
+    my %design = ( 'style'   => 'margin-top: 0',
 		   'bgcolor' => $pgbg,
 		   'text'    => $font,
                    'alink'   => &designparm($function.'.alink',$domain),
@@ -3467,15 +4287,7 @@ sub bodytag {
 
     if ($bodyonly) {
         return $bodytag;
-    } elsif ($env{'browser.interface'} eq 'textual') {
-# Accessibility
-          
-	$bodytag.=&Apache::lonmenu::menubuttons($forcereg,$forcereg);
-	if (!$notitle) {
-	    $bodytag.='<h1>LON-CAPA: '.$title.'</h1>';
-	}
-	return $bodytag;
-    }
+    } 
 
     my $name = &plainname($env{'user.name'},$env{'user.domain'});
     if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
@@ -3499,7 +4311,7 @@ $realm&nbsp;
 </td>
 ENDROLE
 
-    my $titleinfo = '<span class="LC_title_bar_title">'.$title.'</span>';
+    my $titleinfo = '<h1>'.$title.'</h1>';
     if ($customtitle) {
         $titleinfo = $customtitle;
     }
@@ -3515,7 +4327,7 @@ ENDROLE
         $dc_info = '('.$dc_info.')';
     }
 
-    if ($env{'environment.remote'} eq 'off') {
+    if (($env{'environment.remote'} eq 'off') || ($args->{'suppress_header_logos'})) {
         # No Remote
 	if ($env{'request.state'} eq 'construct') {
 	    $forcereg=1;
@@ -3538,11 +4350,11 @@ ENDROLE
 		$lastitem = $thisdisfn;
 	    }
 	    $titleinfo = 
-		&Apache::loncommon::help_open_menu('','',3,'Authoring').
-		'<b>Construction Space</b>:&nbsp;'. 
-		'<form name="dirs" method="post" action="'.$formaction
+		&Apache::loncommon::help_open_menu('','',3,'Authoring')
+		.'<b>'.&mt('Construction Space').'</b>:&nbsp;'
+		.'<form name="dirs" method="post" action="'.$formaction
 		.'" target="_top"><tt><b>'
-		.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<font size=\"+1\">$lastitem</font></b></tt><br />"
+		.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<span class=\"LC_fontsize_big\">$lastitem</span></b></tt><br />"
 		.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
 		.'</form>'
 		.&Apache::lonmenu::constspaceform();
@@ -3589,8 +4401,8 @@ ENDROLE
     return(<<ENDBODY);
 $bodytag
 <table id="LC_title_bar" class="LC_with_remote">
-<tr><td class="LC_title_bar_role_logo">$upperleft</td>
-    <td class="LC_title_bar_domain_logo">$messages&nbsp;</td>
+<tr><td>$upperleft</td>
+    <td>$messages&nbsp;</td>
 </tr>
 <tr><td>$titleinfo $dc_info $menu</td>
 $roleinfo
@@ -3664,18 +4476,25 @@ sub make_attr_string {
 
 Returns a uniform footer for LON-CAPA web pages.
 
-Inputs: none
+Inputs: 1 - optional reference to an args hash
+If in the hash, key for noredirectlink has a value which evaluates to true,
+a 'Continue' link is not displayed if the page contains an
+internal redirect in the <head></head> section,
+i.e., $env{'internal.head.redirect'} exists   
 
 =cut
 
 sub endbodytag {
+    my ($args) = @_;
     my $endbodytag='</body>';
     $endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag;
     if ( exists( $env{'internal.head.redirect'} ) ) {
-	$endbodytag=
-	    "<br /><a href=\"$env{'internal.head.redirect'}\">".
-	    &mt('Continue').'</a>'.
-	    $endbodytag;
+        if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) {
+	    $endbodytag=
+	        "<br /><a href=\"$env{'internal.head.redirect'}\">".
+	        &mt('Continue').'</a>'.
+	        $endbodytag;
+        }
     }
     return $endbodytag;
 }
@@ -3700,6 +4519,8 @@ sub standard_css {
     my $img    = &designparm($function.'.img',   $domain);
     my $tabbg  = &designparm($function.'.tabbg', $domain);
     my $font   = &designparm($function.'.font',  $domain);
+    my $fontmenu = &designparm($function.'.fontmenu', $domain);
+#second colour for later usage
     my $sidebg = &designparm($function.'.sidebg',$domain);
     my $pgbg_or_bgcolor =
 	         $bgcolor ||
@@ -3709,7 +4530,11 @@ sub standard_css {
     my $vlink  = &designparm($function.'.vlink', $domain);
     my $link   = &designparm($function.'.link',  $domain);
 
-    my $sans                 = 'Arial,Helvetica,sans-serif';
+    my $loginbg = &designparm('login.sidebg',$domain);
+    my $bgcol = &designparm('login.bgcol',$domain);
+    my $textcol = &designparm('login.textcol',$domain);
+
+    my $sans                 = 'Verdana,Arial,Helvetica,sans-serif';
     my $mono                 = 'monospace';
     my $data_table_head      = $tabbg;
     my $data_table_light     = '#EEEEEE';
@@ -3726,33 +4551,78 @@ sub standard_css {
     my $mail_other_hover     = '#669999';
     my $table_header         = '#DDDDDD';
     my $feedback_link_bg     = '#BBBBBB';
+    my $lg_border_color	     = '#C8C8C8';
 
-    my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px'
-	                                              : '0px 3px 0px 4px';
+    my $border = ($env{'browser.type'} eq 'explorer' ||
+		  $env{'browser.type'} eq 'safari'     ) ? '0 2px 0 2px'
+	                                                 : '0 3px 0 4px';
 
 
     return <<END;
-h1, h2, h3, th { font-family: $sans }
-a:focus { color: red; background: yellow } 
-table.thinborder,
+body {
+   font-family: $sans;
+   line-height:130%;
+   font-size:0.83em;
+   color:$font;
+}
+
+a:link, a:visited { 
+  font-size:100%; 
+}
+
+a:focus { 
+  color: red;
+  background: yellow 
+}
 
+table.thinborder,
 table.thinborder tr th {
   border-style: solid;
   border-width: 1px;
+  border-color: $lg_border_color;
   background: $tabbg;
 }
+
 table.thinborder tr td {
   border-style: solid;
-  border-width: 1px
+  border-width: 1px;
+  border-color: $lg_border_color;
+}
+
+form, .inline { 
+   display: inline; 
+}
+
+.LC_right {
+   text-align:right;
+}
+
+.LC_middle {
+   vertical-align:middle;
+}
+
+/* just for tests */
+.LC_400Box {width:400px; }
+/* end */
+
+.LC_filename {
+  font-family: $mono;
+  white-space:pre;
+}
+
+.LC_fileicon {
+  border: none;
+  height: 1.3em;
+  vertical-align: text-bottom;
+  margin-right: 0.3em;
+  text-decoration:none;
 }
 
-form, .inline { display: inline; }
-.center { text-align: center; }
-.LC_filename {font-family: $mono;}
 .LC_error {
   color: red;
   font-size: larger;
 }
+
 .LC_warning,
 .LC_diff_removed {
   color: red;
@@ -3763,25 +4633,74 @@ form, .inline { display: inline; }
 .LC_diff_added {
   color: green;
 }
+
+div.LC_confirm_box {
+  background-color: #FAFAFA;
+  border: 1px solid $lg_border_color;
+  margin-right: 0;
+  padding: 5px;
+}
+
+div.LC_confirm_box .LC_error img,
+div.LC_confirm_box .LC_success img {
+  vertical-align: middle;
+}
+
 .LC_unknown {
   color: yellow;
 }
 
 .LC_icon {
-  border: 0px;
+  border: none;
+  vertical-align: middle;
 }
+
 .LC_indexer_icon {
-  border: 0px;
+  border: none;
   height: 22px;
 }
+
 .LC_docs_spacer {
   width: 25px;
   height: 1px;
-  border: 0px;
+  border: none;
 }
 
 .LC_internal_info {
-  color: #999;
+  color: #999999;
+}
+
+.LC_discussion {
+   background: $tabbg;
+   border: 1px solid black;
+   margin: 2px;
+}
+
+.LC_disc_action_links_bar {
+   background: $tabbg;
+   font-family: $sans;
+   border: none;
+   margin: 4px;
+}
+
+.LC_disc_action_left {
+   text-align: left;
+}
+
+.LC_disc_action_right {
+   text-align: right;
+}
+
+.LC_disc_new_item {
+   background: white;
+   border: 2px solid red;
+   margin: 2px;
+}
+
+.LC_disc_old_item {
+   background: white;
+   border: 1px solid black;
+   margin: 2px;
 }
 
 table.LC_pastsubmission {
@@ -3789,25 +4708,32 @@ table.LC_pastsubmission {
   margin: 2px;
 }
 
-table#LC_top_nav, table#LC_menubuttons {
+table#LC_top_nav,
+table#LC_menubuttons,
+table#LC_nav_location {
   width: 100%;
   background: $pgbg;
   border: 2px;
   border-collapse: separate;
-  padding: 0px;
+  padding: 0;
 }
 
-table#LC_title_bar, table.LC_breadcrumbs, table#LC_nav_location,
+table#LC_title_bar a {
+  color: $fontmenu;
+}
+
+table#LC_title_bar,
+table.LC_breadcrumbs,
 table#LC_title_bar.LC_with_remote {
   width: 100%;
   border-color: $pgbg;
   border-style: solid;
   border-width: $border;
-
   background: $pgbg;
+  color: $fontmenu;
   font-family: $sans;
   border-collapse: collapse;
-  padding: 0px;
+  padding: 0;
 }
 
 table.LC_docs_path {
@@ -3816,86 +4742,94 @@ table.LC_docs_path {
   background: $pgbg;
   font-family: $sans;
   border-collapse: collapse;
-  padding: 0px;
+  padding: 0;
 }
 
 table#LC_title_bar td {
   background: $tabbg;
 }
-table#LC_title_bar td.LC_title_bar_who {
+
+table#LC_title_bar .LC_title_bar_who {
   background: $tabbg;
-  color: $font;
+  color: $fontmenu;
   font: small $sans;
   text-align: right;
+  margin: 0;
 }
-span.LC_metadata {
-    font-family: $sans;
-}
-span.LC_title_bar_title {
-  font: bold x-large $sans;
+
+table#LC_title_bar .LC_title_bar_name {
+  margin: 0;
 }
-table#LC_title_bar td.LC_title_bar_domain_logo {
-  background: $sidebg;
-  text-align: right;
-  padding: 0px;
+
+table#LC_title_bar .LC_title_bar_role {
+  margin: 0;
 }
-table#LC_title_bar td.LC_title_bar_role_logo {
-  background: $sidebg;
-  padding: 0px;
+
+table#LC_title_bar .LC_title_bar_realm {
+  margin: 0;
 }
 
-table#LC_menubuttons_mainmenu {
-  width: 100%;
-  border: 0px;
-  border-spacing: 1px;
-  padding: 0px 1px;
-  margin: 0px;
-  border-collapse: separate;
+span.LC_metadata {
+  font-family: $sans;
 }
-table#LC_menubuttons img, table#LC_menubuttons_mainmenu img {
-  border: 0px;
+
+table#LC_menubuttons img{
+  border: none;
 }
+
 table#LC_top_nav td {
   background: $tabbg;
-  border: 0px;
+  border: none;
   font-size: small;
+  vertical-align:top;
+  padding:2px 5px 2px 5px;
 }
-table#LC_top_nav td a, div#LC_top_nav a {
+
+table#LC_top_nav td a,
+div#LC_top_nav a {
   color: $font;
   font-family: $sans;
 }
+
 table#LC_top_nav td.LC_top_nav_logo {
   background: $tabbg;
   text-align: left;
   white-space: nowrap;
   width: 31px;
 }
+
 table#LC_top_nav td.LC_top_nav_logo img {
-  border: 0px;
+  border: none;
   vertical-align: bottom;
 }
+
 table#LC_top_nav td.LC_top_nav_exit,
 table#LC_top_nav td.LC_top_nav_help {
   width: 2.0em;
 }
+
 table#LC_top_nav td.LC_top_nav_login {
   width: 4.0em;
   text-align: center;
 }
-table.LC_breadcrumbs td, table.LC_docs_path td  {
+
+table.LC_breadcrumbs td,
+table.LC_docs_path td  {
   background: $tabbg;
-  color: $font;
+  color: $fontmenu;
   font-family: $sans;
   font-size: smaller;
 }
+
 table.LC_breadcrumbs td.LC_breadcrumbs_component,
 table.LC_docs_path td.LC_docs_path_component {
   background: $tabbg;
-  color: $font;
+  color: $fontmenu;
   font-family: $sans;
   font-size: larger;
   text-align: right;
 }
+
 td.LC_table_cell_checkbox {
   text-align: center;
 }
@@ -3904,10 +4838,23 @@ table#LC_mainmenu td.LC_mainmenu_column
     vertical-align: top;
 }
 
+.LC_fontsize_small {
+ font-size: 70%;
+}
+
+.LC_fontsize_medium {
+ font-size: 85%;
+}
+
+.LC_fontsize_large {
+ font-size: 120%;
+}
+
 .LC_menubuttons_inline_text {
   color: $font;
   font-family: $sans;
-  font-size: smaller;
+  font-size: 90%;
+  padding-left:3px;
 }
 
 .LC_menubuttons_link {
@@ -3923,52 +4870,20 @@ table#LC_mainmenu td.LC_mainmenu_column
 }
 
 td.LC_menubuttons_text {
-  width: 90%;
-  color: $font;
-  font-family: $sans;
-}
-
-td.LC_menubuttons_img {
+ 	color: $font;
 }
 
 .LC_current_location {
   font-family: $sans;
   background: $tabbg;
 }
+
 .LC_new_mail {
   font-family: $sans;
+  background: $tabbg;
   font-weight: bold;
 }
 
-.LC_rolesmenu_is {
-  font-family: $sans;
-}
-
-.LC_rolesmenu_selected {
-  font-family: $sans;
-}
-
-.LC_rolesmenu_future {
-  font-family: $sans;
-}
-
-
-.LC_rolesmenu_will {
-  font-family: $sans;
-}
-
-.LC_rolesmenu_will_not {
-  font-family: $sans;
-}
-
-.LC_rolesmenu_expired {
-  font-family: $sans;
-}
-
-.LC_rolesinfo {
-  font-family: $sans;
-}
-
 .LC_dropadd_labeltext {
   font-family: $sans;
   text-align: right;
@@ -3979,49 +4894,85 @@ td.LC_menubuttons_img {
   text-align: right;
 }
 
+.LC_roleslog_note {
+  font-size: small;
+}
+
+.LC_mail_functions {
+    font-weight: bold;
+}
+
 table.LC_aboutme_port {
-  border: 0px;
+  border: none;
   border-collapse: collapse;
-  border-spacing: 0px;
+  border-spacing: 0;
 }
-table.LC_data_table, table.LC_mail_list {
+
+table.LC_data_table,
+table.LC_mail_list {
   border: 1px solid #000000;
   border-collapse: separate;
   border-spacing: 1px;
+  background: $pgbg;
 }
+
 .LC_data_table_dense {
   font-size: small;
 }
+
 table.LC_nested_outer {
   border: 1px solid #000000;
-  border-collapse: separate;
-  border-spacing: 0px;
+  border-collapse: collapse;
+  border-spacing: 0;
   width: 100%;
 }
+
 table.LC_nested {
-  border: 0px;
-  border-collapse: separate;
-  border-spacing: 0px;
+  border: none;
+  border-collapse: collapse;
+  border-spacing: 0;
   width: 100%;
 }
-table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th,
+
+table.LC_data_table tr th, 
+table.LC_calendar tr th, 
+table.LC_mail_list tr th,
 table.LC_prior_tries tr th {
   font-weight: bold;
   background-color: $data_table_head;
-  font-size: smaller;
+  color:$fontmenu;
+  font-size:90%;
+}
+
+table.LC_data_table tr.LC_info_row > td {
+  background-color: #CCCCCC;
+  font-weight: bold;
+  text-align: left;
 }
-table.LC_data_table tr td, 
+
+table.LC_data_table tr.LC_odd_row > td,
+table.LC_pick_box tr > td.LC_odd_row,
 table.LC_aboutme_port tr td {
   background-color: $data_table_light;
   padding: 2px;
 }
-table.LC_data_table tr.LC_even_row td,
+
+table.LC_data_table tr.LC_even_row > td,
+table.LC_pick_box tr > td.LC_even_row,
 table.LC_aboutme_port tr.LC_even_row td {
   background-color: $data_table_dark;
+  padding: 2px;
 }
+
 table.LC_data_table tr.LC_data_table_highlight td {
   background-color: $data_table_darker;
 }
+
+table.LC_data_table tr td.LC_leftcol_header {
+  background-color: $data_table_head;
+  font-weight: bold;
+}
+
 table.LC_data_table tr.LC_empty_row td,
 table.LC_nested tr.LC_empty_row td {
   background-color: #FFFFFF;
@@ -4030,15 +4981,19 @@ table.LC_nested tr.LC_empty_row td {
   text-align: center;
   padding: 8px;
 }
+
 table.LC_nested tr.LC_empty_row td {
   padding: 4ex
 }
+
 table.LC_nested_outer tr th {
   font-weight: bold;
+  color:$fontmenu;
   background-color: $data_table_head;
-  font-size: smaller;
+  font-size: small;
   border-bottom: 1px solid #000000;
 }
+
 table.LC_nested_outer tr td.LC_subheader {
   background-color: $data_table_head;
   font-weight: bold;
@@ -4046,19 +5001,24 @@ table.LC_nested_outer tr td.LC_subheader
   border-bottom: 1px solid #000000;
   text-align: right;
 }
+
 table.LC_nested tr.LC_info_row td {
-  background-color: #CCC;
+  background-color: #CCCCCC;
   font-weight: bold;
   font-size: small;
   text-align: center;
 }
-table.LC_nested tr.LC_info_row td.LC_left_item {
+
+table.LC_nested tr.LC_info_row td.LC_left_item,
+table.LC_nested_outer tr th.LC_left_item {
   text-align: left;
 }
+
 table.LC_nested td {
-  background-color: #FFF;
+  background-color: #FFFFFF;
   font-size: small;
 }
+
 table.LC_nested_outer tr th.LC_right_item,
 table.LC_nested tr.LC_info_row td.LC_right_item,
 table.LC_nested tr.LC_odd_row td.LC_right_item,
@@ -4067,18 +5027,18 @@ table.LC_nested tr td.LC_right_item {
 }
 
 table.LC_nested tr.LC_odd_row td {
-  background-color: #EEE;
+  background-color: #EEEEEE;
 }
 
 table.LC_createuser {
 }
 
 table.LC_createuser tr.LC_section_row td {
-  font-size: smaller;
+  font-size: small;
 }
 
 table.LC_createuser tr.LC_info_row td  {
-  background-color: #CCC;
+  background-color: #CCCCCC;
   font-weight: bold;
   text-align: center;
 }
@@ -4087,16 +5047,20 @@ table.LC_calendar {
   border: 1px solid #000000;
   border-collapse: collapse;
 }
+
 table.LC_calendar_pickdate {
   font-size: xx-small;
 }
+
 table.LC_calendar tr td {
   border: 1px solid #000000;
   vertical-align: top;
 }
+
 table.LC_calendar tr td.LC_calendar_day_empty {
   background-color: $data_table_dark;
 }
+
 table.LC_calendar tr td.LC_calendar_day_current {
   background-color: $data_table_highlight;
 }
@@ -4104,97 +5068,90 @@ table.LC_calendar tr td.LC_calendar_day_
 table.LC_mail_list tr.LC_mail_new {
   background-color: $mail_new;
 }
+
 table.LC_mail_list tr.LC_mail_new:hover {
   background-color: $mail_new_hover;
 }
+
+table.LC_mail_list tr.LC_mail_even {
+}
+
+table.LC_mail_list tr.LC_mail_odd {
+}
+
 table.LC_mail_list tr.LC_mail_read {
   background-color: $mail_read;
 }
+
 table.LC_mail_list tr.LC_mail_read:hover {
   background-color: $mail_read_hover;
 }
+
 table.LC_mail_list tr.LC_mail_replied {
   background-color: $mail_replied;
 }
+
 table.LC_mail_list tr.LC_mail_replied:hover {
   background-color: $mail_replied_hover;
 }
+
 table.LC_mail_list tr.LC_mail_other {
   background-color: $mail_other;
 }
+
 table.LC_mail_list tr.LC_mail_other:hover {
   background-color: $mail_other_hover;
 }
-table.LC_mail_list tr.LC_mail_even {
-}
-table.LC_mail_list tr.LC_mail_odd {
-}
-
 
-table#LC_portfolio_actions {
-  width: auto;
-  background: $pgbg;
-  border: 0px;
-  border-spacing: 2px 2px;
-  padding: 0px;
-  margin: 0px;
-  border-collapse: separate;
-}
-table#LC_portfolio_actions td.LC_label {
-  background: $tabbg;
-  text-align: right;
-}
-table#LC_portfolio_actions td.LC_value {
-  background: $tabbg;
+table.LC_data_table tr > td.LC_browser_file,
+table.LC_data_table tr > td.LC_browser_file_published {
+  background: #CCFF88;
 }
 
-table#LC_cstr_controls {
-  width: 100%;
-  border-collapse: collapse;
-}
-table#LC_cstr_controls tr td {
-  border: 4px solid $pgbg;
-  padding: 4px;
-  text-align: center;
-  background: $tabbg;
+table.LC_data_table tr > td.LC_browser_file_locked,
+table.LC_data_table tr > td.LC_browser_file_unpublished {
+  background: #FFAA99;
 }
-table#LC_cstr_controls tr th {
-  border: 4px solid $pgbg;
-  background: $table_header;
-  text-align: center;
-  font-family: $sans;
-  font-size: smaller;
+
+table.LC_data_table tr > td.LC_browser_file_obsolete {
+  background: #AAAAAA;
 }
 
-table#LC_browser {
- 
+table.LC_data_table tr > td.LC_browser_file_modified,
+table.LC_data_table tr > td.LC_browser_file_metamodified {
+  background: #FFFF77;
 }
-table#LC_browser tr th {
-  background: $table_header;
+
+table.LC_data_table tr.LC_browser_folder > td {
+  background: #CCCCFF;
 }
-table#LC_browser tr td {
-  padding: 2px;
+
+table.LC_data_table tr > td.LC_roles_is {
+/*  background: #77FF77; */
 }
-table#LC_browser tr.LC_browser_file,
-table#LC_browser tr.LC_browser_file_published {
-  background: #CCFF88;
+
+table.LC_data_table tr > td.LC_roles_future {
+  background: #FFFF77;
 }
-table#LC_browser tr.LC_browser_file_locked,
-table#LC_browser tr.LC_browser_file_unpublished {
-  background: #FFAA99;
+
+table.LC_data_table tr > td.LC_roles_will {
+  background: #FFAA77;
 }
-table#LC_browser tr.LC_browser_file_obsolete {
-  background: #AAAAAA;
+
+table.LC_data_table tr > td.LC_roles_expired {
+  background: #FF7777;
 }
-table#LC_browser tr.LC_browser_file_modified,
-table#LC_browser tr.LC_browser_file_metamodified {
-  background: #FFFF77;
+
+table.LC_data_table tr > td.LC_roles_will_not {
+  background: #AAFF77;
 }
-table#LC_browser tr.LC_browser_folder {
-  background: #CCCCFF;
+
+table.LC_data_table tr > td.LC_roles_selected {
+  background: #11CC55;
 }
+
 span.LC_current_location {
-  font-size: x-large;
+  font-size:larger;
   background: $pgbg;
 }
 
@@ -4202,58 +5159,70 @@ span.LC_parm_menu_item {
   font-size: larger;
   font-family: $sans;
 }
+
 span.LC_parm_scope_all {
   color: red;
 }
+
 span.LC_parm_scope_folder {
   color: green;
 }
+
 span.LC_parm_scope_resource {
   color: orange;
 }
+
 span.LC_parm_part {
   color: blue;
 }
+
 span.LC_parm_folder, span.LC_parm_symb {
   font-size: x-small;
   font-family: $mono;
   color: #AAAAAA;
 }
 
-td.LC_parm_overview_level_menu, td.LC_parm_overview_map_menu,
-td.LC_parm_overview_parm_selectors, td.LC_parm_overview_parm_restrictions {
+td.LC_parm_overview_level_menu,
+td.LC_parm_overview_map_menu,
+td.LC_parm_overview_parm_selectors,
+td.LC_parm_overview_restrictions  {
   border: 1px solid black;
   border-collapse: collapse;
 }
+
 table.LC_parm_overview_restrictions td {
   border-width: 1px 4px 1px 4px;
   border-style: solid;
   border-color: $pgbg;
   text-align: center;
 }
+
 table.LC_parm_overview_restrictions th {
   background: $tabbg;
   border-width: 1px 4px 1px 4px;
   border-style: solid;
   border-color: $pgbg;
 }
+
 table#LC_helpmenu {
-  border: 0px;
+  border: none;
   height: 55px;
-  border-spacing: 0px;
+  border-spacing: 0;
 }
 
 table#LC_helpmenu fieldset legend {
   font-size: larger;
   font-weight: bold;
 }
+
 table#LC_helpmenu_links {
   width: 100%;
   border: 1px solid black;
   background: $pgbg;
-  padding: 0px;
+  padding: 0;
   border-spacing: 1px;
 }
+
 table#LC_helpmenu_links tr td {
   padding: 1px;
   background: $tabbg;
@@ -4261,11 +5230,13 @@ table#LC_helpmenu_links tr td {
   font-weight: bold;
 }
 
-table#LC_helpmenu_links a:link, table#LC_helpmenu_links a:visited,
+table#LC_helpmenu_links a:link,
+table#LC_helpmenu_links a:visited,
 table#LC_helpmenu_links a:active {
   text-decoration: none;
   color: $font;
 }
+
 table#LC_helpmenu_links a:hover {
   text-decoration: underline;
   color: $vlink;
@@ -4275,65 +5246,143 @@ table#LC_helpmenu_links a:hover {
   border: 1px solid #339933;
   margin: -1px;
 }
+
 .LC_chrt_popup_up {
   border: 1px solid yellow;
   margin: -1px;
 }
+
 .LC_chrt_popup {
   border: 1px solid #8888FF;
   background: #CCCCFF;
 }
 
 table.LC_pick_box {
-  width: 100%;
   border-collapse: separate;
   background: white;
   border: 1px solid black;
   border-spacing: 1px;
 }
+
 table.LC_pick_box td.LC_pick_box_title {
   background: $tabbg;
   font-weight: bold;
   text-align: right;
+  vertical-align: top;
   width: 184px;
   padding: 8px;
 }
+
+table.LC_pick_box td.LC_selfenroll_pick_box_title {
+  background: $tabbg;
+  font-weight: bold;
+  text-align: right;
+  width: 350px;
+  padding: 8px;
+}
+
+table.LC_pick_box td.LC_pick_box_value {
+  text-align: left;
+  padding: 8px;
+}
+
+table.LC_pick_box td.LC_pick_box_select {
+  text-align: left;
+  padding: 8px;
+}
+
 table.LC_pick_box td.LC_pick_box_separator {
-  padding: 0px;
+  padding: 0;
   height: 1px;
   background: black;
 }
+
 table.LC_pick_box td.LC_pick_box_submit {
   text-align: right;
 }
 
+table.LC_pick_box td.LC_evenrow_value {
+  text-align: left;
+  padding: 8px;
+  background-color: $data_table_light;
+}
+
+table.LC_pick_box td.LC_oddrow_value {
+  text-align: left;
+  padding: 8px;
+  background-color: $data_table_light;
+}
+
+table.LC_helpform_receipt {
+  width: 620px;
+  border-collapse: separate;
+  background: white;
+  border: 1px solid black;
+  border-spacing: 1px;
+}
+
+table.LC_helpform_receipt td.LC_pick_box_title {
+  background: $tabbg;
+  font-weight: bold;
+  text-align: right;
+  width: 184px;
+  padding: 8px;
+}
+
+table.LC_helpform_receipt td.LC_evenrow_value {
+  text-align: left;
+  padding: 8px;
+  background-color: $data_table_light;
+}
+
+table.LC_helpform_receipt td.LC_oddrow_value {
+  text-align: left;
+  padding: 8px;
+  background-color: $data_table_light;
+}
+
+table.LC_helpform_receipt td.LC_pick_box_separator {
+  padding: 0;
+  height: 1px;
+  background: black;
+}
+
+span.LC_helpform_receipt_cat {
+  font-weight: bold;
+}
+
 table.LC_group_priv_box {
   background: white;
   border: 1px solid black;
   border-spacing: 1px;
 }
+
 table.LC_group_priv_box td.LC_pick_box_title {
   background: $tabbg;
   font-weight: bold;
   text-align: right;
   width: 184px;
 }
+
 table.LC_group_priv_box td.LC_groups_fixed {
   background: $data_table_light;
   text-align: center;
 }
+
 table.LC_group_priv_box td.LC_groups_optional {
   background: $data_table_dark;
   text-align: center;
 }
+
 table.LC_group_priv_box td.LC_groups_functionality {
   background: $data_table_darker;
   text-align: center;
   font-weight: bold;
 }
+
 table.LC_group_priv td {
   text-align: left;
-  padding: 0px;
+  padding: 0;
 }
 
 table.LC_notify_front_page {
@@ -4341,12 +5390,15 @@ table.LC_notify_front_page {
   border: 1px solid black;
   padding: 8px;
 }
+
 table.LC_notify_front_page td {
   padding: 8px;
 }
+
 .LC_navbuttons {
   margin: 2ex 0ex 2ex 0ex;
 }
+
 .LC_topic_bar {
   font-family: $sans;
   font-weight: bold;
@@ -4354,32 +5406,43 @@ table.LC_notify_front_page td {
   background: $tabbg;
   vertical-align: middle;
   margin: 2ex 0ex 2ex 0ex;
+  padding: 3px;
 }
+
 .LC_topic_bar span {
   vertical-align: middle;
 }
+
 .LC_topic_bar img {
   vertical-align: bottom;
 }
+
 table.LC_course_group_status {
   margin: 20px;
 }
+
 table.LC_status_selector td {
   vertical-align: top;
   text-align: center;
   padding: 4px;
 }
-table.LC_descriptive_input td.LC_description {
-  vertical-align: top;
-  text-align: right;
-  font-weight: bold;
-}
-table.LC_feedback_link {
-    background: $feedback_link_bg;
+
+div.LC_feedback_link {
+  clear: both;
+  background: white;
+  width: 100%;
 }
+
 span.LC_feedback_link {
-    background: $feedback_link_bg;
-    font-size: larger;
+  background: $feedback_link_bg;
+  font-size: larger;
+}
+
+span.LC_message_link {
+  background: $feedback_link_bg;
+  font-size: larger;
+  position: absolute;
+  right: 1em;
 }
 
 table.LC_prior_tries {
@@ -4393,33 +5456,49 @@ table.LC_prior_tries td {
 }
 
 .LC_answer_correct {
-  background: #AAFFAA;
-  color: black;
+  background: lightgreen;
+  font-family: $sans;
+  color: darkgreen;
+  padding: 6px;
 }
+
 .LC_answer_charged_try {
-  background: #FFAAAA ! important;
-  color: black;
+  background: #FFAAAA;
+  font-family: $sans;
+  color: darkred;
+  padding: 6px;
 }
-.LC_answer_not_charged_try, 
+
+.LC_answer_not_charged_try,
 .LC_answer_no_grade,
 .LC_answer_late {
-  background: #FFFFAA;
+  background: lightyellow;
+  font-family: $sans;
   color: black;
+  padding: 6px;
 }
+
 .LC_answer_previous {
-  background: #AAAAFF;
-  color: black;
+  background: lightblue;
+  font-family: $sans;
+  color: darkblue;
+  padding: 6px;
 }
+
 .LC_answer_no_message {
   background: #FFFFFF;
+  font-family: $sans;
   color: black;
+  padding: 6px;
 }
+
 .LC_answer_unknown {
   background: orange;
+  font-family: $sans;
   color: black;
+  padding: 6px;
 }
 
-
 span.LC_prior_numerical,
 span.LC_prior_string,
 span.LC_prior_custom,
@@ -4438,22 +5517,35 @@ table.LC_prior_option {
   width: 100%;
   border-collapse: collapse;
 }
-table.LC_prior_rank, table.LC_prior_match {
+
+table.LC_prior_rank, 
+table.LC_prior_match {
   border-collapse: collapse;
 }
+
 table.LC_prior_option tr td,
 table.LC_prior_rank tr td,
 table.LC_prior_match tr td {
   border: 1px solid #000000;
 }
 
+td.LC_nobreak,
 span.LC_nobreak {
   white-space: nowrap;
 }
 
+span.LC_cusr_emph {
+  font-style: italic;
+}
+
+span.LC_cusr_subheading {
+  font-weight: normal;
+  font-size: 85%;
+}
+
 table.LC_docs_documents {
   background: #BBBBBB;
-  border-width: 0px;
+  border-width: 0;
   border-collapse: collapse;
 }
 
@@ -4462,15 +5554,8 @@ table.LC_docs_documents td.LC_docs_docum
   padding: 4px;
 }
 
-.LC_docs_course_commands div {
-  float: left;
-  border: 4px solid #AAAAAA;
-  padding: 4px;
-  background: #DDDDCC;
-}
-
 .LC_docs_entry_move {
-  border: 0px;
+  border: none;
   border-collapse: collapse;
 }
 
@@ -4483,15 +5568,19 @@ table.LC_docs_documents td.LC_docs_docum
   background: #DDDDDD;
   font-size: x-small;
 }
+
 .LC_docs_copy {
   color: #000099;
 }
+
 .LC_docs_cut {
   color: #550044;
 }
+
 .LC_docs_rename {
   color: #009900;
 }
+
 .LC_docs_remove {
   color: #990000;
 }
@@ -4505,6 +5594,7 @@ table.LC_docs_documents td.LC_docs_docum
 .LC_docs_editor td.LC_docs_entry_icon {
   background: #FFFFBB;
 }
+
 .LC_docs_editor td.LC_docs_entry_parameter {
   background: #BBBBFF;
   font-size: x-small;
@@ -4518,6 +5608,683 @@ table.LC_docs_adddocs th {
   background: #DDDDDD;
 }
 
+table.LC_sty_begin {
+  background: #BBFFBB;
+}
+
+table.LC_sty_end {
+  background: #FFBBBB;
+}
+
+table.LC_double_column {
+  border-width: 0;
+  border-collapse: collapse;
+  width: 100%;
+  padding: 2px;
+}
+
+table.LC_double_column tr td.LC_left_col {
+  top: 2px;
+  left: 2px;
+  width: 47%;
+  vertical-align: top;
+}
+
+table.LC_double_column tr td.LC_right_col {
+  top: 2px;
+  right: 2px;
+  width: 47%;
+  vertical-align: top;
+}
+
+span.LC_role_level {
+  font-weight: bold;
+}
+
+div.LC_left_float {
+  float: left;
+  padding-right: 5%;
+  padding-bottom: 4px;
+}
+
+div.LC_clear_float_header {
+  padding-bottom: 2px;
+}
+
+div.LC_clear_float_footer {
+  padding-top: 10px;
+  clear: both;
+}
+
+div.LC_grade_show_user {
+  margin-top: 20px;
+  border: 1px solid black;
+}
+
+div.LC_grade_user_name {
+  background: #DDDDEE;
+  border-bottom: 1px solid black;
+  font-weight: bold;
+  font-size: large;
+}
+
+div.LC_grade_show_user_odd_row div.LC_grade_user_name {
+  background: #DDEEDD;
+}
+
+div.LC_grade_show_problem,
+div.LC_grade_submissions,
+div.LC_grade_message_center,
+div.LC_grade_info_links,
+div.LC_grade_assign {
+  margin: 5px;
+  width: 99%;
+  background: #FFFFFF;
+}
+
+div.LC_grade_show_problem_header,
+div.LC_grade_submissions_header,
+div.LC_grade_message_center_header,
+div.LC_grade_assign_header {
+  font-weight: bold;
+  font-size: large;
+}
+
+div.LC_grade_show_problem_problem,
+div.LC_grade_submissions_body,
+div.LC_grade_message_center_body,
+div.LC_grade_assign_body {
+  border: 1px solid black;
+  width: 99%;
+  background: #FFFFFF;
+}
+
+span.LC_grade_check_note {
+  font-weight: normal;
+  font-size: medium;
+  display: inline;
+  position: absolute;
+  right: 1em;
+}
+
+table.LC_scantron_action {
+  width: 100%;
+}
+
+table.LC_scantron_action tr th {
+  font-weight:bold;
+  font-style:normal;
+}
+
+.LC_edit_problem_header,
+div.LC_edit_problem_footer {
+  font-weight: normal;
+  font-size:  medium;
+  margin: 2px;
+}
+
+div.LC_edit_problem_header,
+div.LC_edit_problem_header div,
+div.LC_edit_problem_footer,
+div.LC_edit_problem_footer div,
+div.LC_edit_problem_editxml_header,
+div.LC_edit_problem_editxml_header div {
+  margin-top: 5px;
+}
+
+div.LC_edit_problem_header_edit_row {
+  background: $tabbg;
+  padding: 3px;
+  margin-bottom: 5px;
+}
+
+div.LC_edit_problem_header_title {
+  font-weight: bold;
+  font-size: larger;
+  background: $tabbg;
+  padding: 3px;
+}
+
+table.LC_edit_problem_header_title {
+  font-size: larger;
+  font-weight:  bold;
+  width: 100%;
+  border-color: $pgbg;
+  border-style: solid;
+  border-width: $border;
+  background: $tabbg;
+  border-collapse: collapse;
+  padding: 0;
+}
+
+div.LC_edit_problem_discards {
+  float: left;
+  padding-bottom: 5px;
+}
+
+div.LC_edit_problem_saves {
+  float: right;
+  padding-bottom: 5px;
+}
+
+hr.LC_edit_problem_divide {
+  clear: both;
+  color: $tabbg;
+  background-color: $tabbg;
+  height: 3px;
+  border: none;
+}
+
+img.stift{
+  border-width: 0;
+  vertical-align: middle;
+}
+
+table#LC_mainmenu{
+ margin-top:10px;
+ width:80%;
+}
+
+table#LC_mainmenu td.LC_mainmenu_col_fieldset{
+  vertical-align: top;
+  width: 45%;
+}
+
+.LC_mainmenu_fieldset_category {
+  color: $font;
+  background: $pgbg;
+  font-family: $sans;
+  font-size: small;
+  font-weight: bold;
+}
+
+div.LC_createcourse {
+    margin: 10px 10px 10px 10px;
+}
+
+/* ---- Remove when done ----
+# The following styles is part of the redesign of LON-CAPA and are
+# subject to change during this project.
+# Don't rely on their current functionality as they might be 
+# changed or removed.
+# --------------------------*/
+
+a:hover,
+ol.LC_smallMenu a:hover,
+ol#LC_MenuBreadcrumbs a:hover,
+ol#LC_PathBreadcrumbs a:hover,
+ul#LC_TabMainMenuContent a:hover,
+.LC_FormSectionClearButton input:hover
+ul.LC_TabContent   li:hover a {
+	color:#BF2317;
+        text-decoration:none;
+}
+
+h1 {
+	padding:5px 10px 5px 20px;
+	line-height:130%;
+}
+
+h2,h3,h4,h5,h6 {
+	margin: 5px 0 5px 0;
+	padding: 0;
+	line-height:130%;
+}
+
+.LC_hcell {
+        padding:3px 15px 3px 15px;
+        margin: 0;
+	background-color:$tabbg;
+	color:$fontmenu;
+	border-bottom:solid 1px $lg_border_color;
+}
+
+.LC_noBorder {
+        border: 0;
+}
+
+
+/* Main Header with discription of Person, Course, etc. */
+
+.LC_Right {
+        float: right;
+        margin: 0;
+        padding: 0;
+}
+
+.LC_FormSectionClearButton input {
+        background-color:transparent;
+        border: none;
+        cursor:pointer;
+        text-decoration:underline;
+}
+
+.LC_help_open_topic {
+        color: #FFFFFF;
+        background-color: #EEEEFF;
+        margin: 1px;
+        padding: 4px;
+        border: 1px solid #000033;
+        white-space: nowrap;
+/*		vertical-align: middle; */
+}
+
+dl,ul,div,fieldset {
+	margin: 10px 10px 10px 0;
+/*	overflow: hidden; */
+}
+
+ol.LC_smallMenu, ol#LC_PathBreadcrumbs {
+	margin: 0;
+}
+
+ol.LC_smallMenu li {
+	display: inline;
+	padding: 5px 5px 0 10px;
+	vertical-align: top;
+}
+
+ol.LC_smallMenu li img {
+	vertical-align: bottom;
+}
+
+ol.LC_smallMenu a {
+	font-size: 90%;
+	color: RGB(80, 80, 80);
+	text-decoration: none;
+}
+
+ol#LC_TabMainMenuContent, 
+ul.LC_TabContent ,
+ul.LC_TabContentBigger {
+	display:block;
+	list-style:none;
+	margin: 0;
+	padding: 0;
+}
+
+ol#LC_TabMainMenuContent li,
+ul.LC_TabContent li,
+ul.LC_TabContentBigger li {
+	display: inline;
+	border-right: solid 1px $lg_border_color;
+	float:left;
+	line-height:140%;
+	white-space:nowrap;
+}
+
+ol#LC_TabMainMenuContent li {
+	vertical-align: bottom;
+	border-bottom: solid 1px RGB(175, 175, 175);
+	padding: 5px 10px 5px 10px;
+	margin-right:5px;
+	margin-bottom:3px;
+	font-weight: bold;
+	background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
+}
+
+ol#LC_TabMainMenuContent li a {
+	color: RGB(47, 47, 47);
+	text-decoration: none;
+}
+
+ul.LC_TabContent {
+	min-height:1.6em;
+}
+
+ul.LC_TabContent li {
+	vertical-align:middle;
+	padding: 0 10px 0 10px;
+	background-color:$tabbg;
+	border-bottom:solid 1px $lg_border_color;
+}
+
+ul.LC_TabContent li a, ul.LC_TabContent li {
+	color:rgb(47,47,47);
+	text-decoration:none;
+	font-size:95%;
+	font-weight:bold;
+	padding-right: 16px;
+}
+
+ul.LC_TabContent li:hover, ul.LC_TabContent li.active {
+        background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;
+	border-bottom:solid 1px #FFFFFF;
+	padding-right: 16px;
+}
+
+ul.LC_TabContentBigger li {
+	vertical-align:bottom;
+	border-top:solid 1px $lg_border_color;
+	border-left:solid 1px $lg_border_color;
+	padding:5px 10px 5px 10px;
+	margin-left:2px;
+	background:url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
+}
+
+ul.LC_TabContentBigger li:hover, 
+ul.LC_TabContentBigger li.active {
+	background:url(/adm/lonIcons/lightGreyBG.png) repeat-x right bottom;
+}
+
+ul.LC_TabContentBigger li, 
+ul.LC_TabContentBigger li a {
+	font-size:110%;
+	font-weight:bold;
+}
+
+ol#LC_MenuBreadcrumbs, 
+ol#LC_PathBreadcrumbs, 
+ul.LC_CourseBreadcrumbs {
+	border-top: solid 1px RGB(255, 255, 255);
+	height: 20px;
+	line-height: 20px;
+	vertical-align: bottom;
+	margin: 0 0 30px 0;
+	padding-left: 10px;
+	list-style-position: inside;
+	background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
+}
+
+ol#LC_MenuBreadcrumbs li, 
+ol#LC_PathBreadcrumbs li, 
+ul.LC_CourseBreadcrumbs li {
+/*
+	background: url(/adm/lonIcons/arrow_white.png) no-repeat left center;
+*/
+	display: inline;
+	padding: 0 0 0 10px;
+/*	vertical-align: bottom; */
+	overflow:hidden;
+}
+
+ol#LC_MenuBreadcrumbs li a, ul.LC_CourseBreadcrumbs li a {
+	text-decoration: none;
+	font-size:90%;
+}
+
+ol#LC_PathBreadcrumbs li a {
+	text-decoration:none;
+	font-size:100%;
+	font-weight:bold;
+}
+
+.LC_BoxPadding {
+	padding: 10px;
+}
+
+.LC_ContentBoxSpecial {
+	border: solid 1px $lg_border_color;
+}
+
+.LC_ContentBoxSpecialContactInfo {
+	border: solid 1px $lg_border_color;
+	max-width:25%;
+	min-width:25%;
+}
+
+.LC_AboutMe_Image {
+	float:left;
+	margin-right:10px;
+}
+
+.LC_Clear_AboutMe_Image {
+	clear:left;
+}
+
+dl.LC_ListStyleClean dt {
+	padding-right: 5px;
+	display: table-header-group;
+}
+
+dl.LC_ListStyleClean dd {
+	display: table-row;
+}
+
+.LC_ListStyleClean,
+.LC_ListStyleSimple,
+.LC_ListStyleNormal,
+.LC_ListStyle_Border,
+.LC_ListStyleSpecial {
+	/*display:block;	*/
+	list-style-position: inside;
+	list-style-type: none;
+	overflow: hidden;
+	padding: 0;
+}
+
+.LC_ListStyleSimple li,
+.LC_ListStyleSimple dd,
+.LC_ListStyleNormal li,
+.LC_ListStyleNormal dd,
+.LC_ListStyleSpecial li,
+.LC_ListStyleSpecial dd {
+	margin: 0;
+	padding: 5px 5px 5px 10px;
+	clear: both;
+}
+
+.LC_ListStyleClean li,
+.LC_ListStyleClean dd {
+	padding-top: 0;
+	padding-bottom: 0;
+}
+
+.LC_ListStyleSimple dd,
+.LC_ListStyleSimple li {
+	border-bottom: solid 1px $lg_border_color;
+}
+
+.LC_ListStyleSpecial li,
+.LC_ListStyleSpecial dd {
+	list-style-type: none;
+	background-color: RGB(220, 220, 220);
+	margin-bottom: 4px;
+}
+
+table.LC_SimpleTable {
+	margin:5px;
+	border:solid 1px $lg_border_color;
+}
+
+table.LC_SimpleTable tr {
+	padding: 0;
+	border:solid 1px $lg_border_color;
+}
+
+table.LC_SimpleTable thead {
+	 background:rgb(220,220,220);
+}
+
+div.LC_columnSection {
+	display: block;
+	clear: both;
+	overflow: hidden;
+	margin: 0;
+}
+
+div.LC_columnSection>* {
+	float: left;
+	margin: 10px 20px 10px 0;
+	overflow:hidden;
+}
+
+.ContentBoxSpecialTemplate {
+        border: solid 1px $lg_border_color;
+}
+
+.ContentBoxTemplate {
+        padding:10px;
+}
+
+div.LC_columnSection > .ContentBoxTemplate,
+div.LC_columnSection > .ContentBoxSpecialTemplate {
+        width: 600px;
+}
+
+.clear {
+	clear: both;
+	line-height: 0;
+	font-size: 0;
+	height: 0;
+}
+
+.LC_loginpage_container {
+	text-align:left;
+	margin : 0 auto;
+	width:90%;
+	padding: 10px;
+	height: auto;
+	background-color:#FFFFFF;
+	border:1px solid #CCCCCC;
+}
+
+
+.LC_loginpage_loginContainer {
+	float:left;
+	width: 182px;
+	padding: 2px;
+	border:1px solid #CCCCCC;
+	background-color:$loginbg;
+}
+
+.LC_loginpage_loginContainer h2 {
+	margin-top: 0;
+	display:block;
+	background:$bgcol;
+	color:$textcol;
+	padding-left:5px;
+}
+
+.LC_loginpage_loginInfo {
+	float:left;
+	width:182px;
+	border:1px solid #CCCCCC;
+	padding:2px;
+}
+
+.LC_loginpage_space {
+	clear: both;
+	margin-bottom: 20px;
+	border-bottom: 1px solid #CCCCCC;
+}
+
+.LC_loginpage_floatLeft {
+	float: left;
+	width: 200px;
+	margin: 0;
+}
+
+table em {
+	font-weight: bold;
+	font-style: normal;
+}
+
+table.LC_tableBrowseRes,
+table.LC_tableOfContent {
+        border:none;
+	border-spacing: 1;
+	padding: 3px;
+	background-color: #FFFFFF;
+	font-size: 90%;
+}
+
+table.LC_tableOfContent{
+    border-collapse: collapse;
+}
+
+table.LC_tableBrowseRes a,
+table.LC_tableOfContent a {
+        background-color: transparent;
+	text-decoration: none;
+}
+
+table.LC_tableBrowseRes tr.LC_trOdd,
+table.LC_tableOfContent tr.LC_trOdd{
+	background-color: #EEEEEE;
+}
+
+table.LC_tableOfContent img {
+	border: none;
+	height: 1.3em;
+	vertical-align: text-bottom;
+	margin-right: 0.3em;
+}
+
+a#LC_content_toolbar_firsthomework {
+	background-image:url(/res/adm/pages/open-first-problem.gif);
+}
+
+a#LC_content_toolbar_launchnav {
+	background-image:url(/res/adm/pages/start-navigation.gif);
+}
+
+a#LC_content_toolbar_closenav {
+	background-image:url(/res/adm/pages/close-navigation.gif);
+}
+
+a#LC_content_toolbar_everything {
+	background-image:url(/res/adm/pages/show-all.gif);
+}
+
+a#LC_content_toolbar_uncompleted {
+	background-image:url(/res/adm/pages/show-incomplete-problems.gif);
+}
+
+#LC_content_toolbar_clearbubbles {
+	background-image:url(/res/adm/pages/mark-discussionentries-read.gif);
+}
+
+a#LC_content_toolbar_changefolder {
+	background : url(/res/adm/pages/close-all-folders.gif) top center ;
+}
+
+a#LC_content_toolbar_changefolder_toggled {
+	background-image:url(/res/adm/pages/open-all-folders.gif);
+}
+
+ul#LC_toolbar li a:hover {
+	background-position: bottom center;
+}
+
+ul#LC_toolbar {
+	padding: 0;
+	margin: 2px;
+	list-style:none;
+	position:relative;
+	background-color:white;
+}
+
+ul#LC_toolbar li {
+	border:1px solid white;
+	padding: 0;
+	margin: 0;
+        float: left;
+	display:inline;
+	vertical-align:middle;
+} 
+
+
+a.LC_toolbarItem {
+	display:block;
+	padding: 0;
+	margin: 0;
+	height: 32px;
+	width: 32px;
+	color:white;
+	border: none;
+	background-repeat:no-repeat;
+	background-color:transparent;
+}
+
+ul.LC_functionslist li {
+  float: left;
+  white-space: nowrap;
+  height: 35px; /* at least as high as heighest list item */
+  margin: 0 15px 15px 10px;
+}
+
+
 END
 }
 
@@ -4611,10 +6378,7 @@ Inputs: none
 
 sub font_settings {
     my $headerstring='';
-    if (($env{'browser.os'} eq 'mac') && (!$env{'browser.mathml'})) { 
-	$headerstring.=
-	    '<meta Content-Type="text/html; charset=x-mac-roman" />';
-    } elsif (!$env{'browser.mathml'} && $env{'browser.unicode'}) {
+    if (!$env{'browser.mathml'} && $env{'browser.unicode'}) {
 	$headerstring.=
 	    '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
     }
@@ -4634,7 +6398,9 @@ Inputs: none
 sub xml_begin {
     my $output='';
 
-    &Apache::lonhtmlcommon::init_htmlareafields();
+    if ($env{'internal.start_page'}==1) {
+	&Apache::lonhtmlcommon::init_htmlareafields();
+    }
 
     if ($env{'browser.mathml'}) {
 	$output='<?xml version="1.0"?>'
@@ -4671,8 +6437,15 @@ sub endheadtag {
 
 Returns a uniform complete <head>..</head> section for LON-CAPA web pages.
 
-Inputs: $title - optional title for the page
-        $head_extra - optional extra HTML to put inside the <head>
+Inputs:
+
+=over 4
+
+$title - optional title for the page
+
+$head_extra - optional extra HTML to put inside the <head>
+
+=back
 
 =cut
 
@@ -4687,44 +6460,54 @@ sub head {
 
 Returns a complete <html> .. <body> section for LON-CAPA web pages.
 
-Inputs: $title - optional title for the page
-        $head_extra - optional extra HTML to incude inside the <head>
-        $args - additional optional args supported are:
-                  only_body      -> is true will set &bodytag() onlybodytag
+Inputs:
+
+=over 4
+
+$title - optional title for the page
+
+$head_extra - optional extra HTML to incude inside the <head>
+
+$args - additional optional args supported are:
+
+=over 8
+
+             only_body      -> is true will set &bodytag() onlybodytag
                                     arg on
-                  no_nav_bar     -> is true will set &bodytag() notopbar arg on
-                  add_entries    -> additional attributes to add to the  <body>
-                  domain         -> force to color decorate a page for a 
+             no_nav_bar     -> is true will set &bodytag() notopbar arg on
+             add_entries    -> additional attributes to add to the  <body>
+             domain         -> force to color decorate a page for a 
                                     specific domain
-                  function       -> force usage of a specific rolish color
+             function       -> force usage of a specific rolish color
                                     scheme
-                  redirect       -> see &headtag()
-                  bgcolor        -> override the default page bg color
-                  js_ready       -> return a string ready for being used in 
+             redirect       -> see &headtag()
+             bgcolor        -> override the default page bg color
+             js_ready       -> return a string ready for being used in 
                                     a javascript writeln
-                  html_encode    -> return a string ready for being used in 
+             html_encode    -> return a string ready for being used in 
                                     a html attribute
-                  force_register -> if is true will turn on the &bodytag()
+             force_register -> if is true will turn on the &bodytag()
                                     $forcereg arg
-                  body_title     -> alternate text to use instead of $title
+             body_title     -> alternate text to use instead of $title
                                     in the title box that appears, this text
                                     is not auto translated like the $title is
-                  frameset       -> if true will start with a <frameset>
+             frameset       -> if true will start with a <frameset>
                                     rather than <body>
-                  no_title       -> if true the title bar won't be shown
-                  skip_phases    -> hash ref of 
+             no_title       -> if true the title bar won't be shown
+             skip_phases    -> hash ref of 
                                     head -> skip the <html><head> generation
                                     body -> skip all <body> generation
-
-                  no_inline_link -> if true and in remote mode, don't show the 
+             no_inline_link -> if true and in remote mode, don't show the 
                                     'Switch To Inline Menu' link
-
-                  no_auto_mt_title -> prevent &mt()ing the title arg
-
-                  inherit_jsmath -> when creating popup window in a page,
+             no_auto_mt_title -> prevent &mt()ing the title arg
+             inherit_jsmath -> when creating popup window in a page,
                                     should it have jsmath forced on by the
                                     current page
 
+=back
+
+=back
+
 =cut
 
 sub start_page {
@@ -4765,10 +6548,28 @@ sub start_page {
     }
 
     if ($args->{'js_ready'}) {
-	$result = &js_ready($result);
+		$result = &js_ready($result);
     }
     if ($args->{'html_encode'}) {
-	$result = &html_encode($result);
+		$result = &html_encode($result);
+    }
+
+	#Breadcrumbs
+    if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
+		&Apache::lonhtmlcommon::clear_breadcrumbs();
+		#if any br links exists, add them to the breadcrumbs
+		if (exists($args->{'bread_crumbs'}) and ref($args->{'bread_crumbs'}) eq 'ARRAY') {         
+			foreach my $crumb (@{$args->{'bread_crumbs'}}){
+				&Apache::lonhtmlcommon::add_breadcrumb($crumb);
+			}
+		}
+
+		#if bread_crumbs_component exists show it as headline else show only the breadcrumbs
+		if(exists($args->{'bread_crumbs_component'})){
+			$result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'});
+		}else{
+			$result .= &Apache::lonhtmlcommon::breadcrumbs();
+		}
     }
     return $result;
 }
@@ -4811,7 +6612,7 @@ sub end_page {
     if ($args->{'frameset'}) {
 	$result .= '</frameset>';
     } else {
-	$result .= &endbodytag();
+	$result .= &endbodytag($args);
     }
     $result .= "\n</html>";
 
@@ -4883,30 +6684,30 @@ sub simple_error_page {
 }
 
 {
-    my $row_count;
+    my @row_count;
     sub start_data_table {
 	my ($add_class) = @_;
 	my $css_class = (join(' ','LC_data_table',$add_class));
-	undef($row_count);
+	unshift(@row_count,0);
 	return '<table class="'.$css_class.'">'."\n";
     }
 
     sub end_data_table {
-	undef($row_count);
+	shift(@row_count);
 	return '</table>'."\n";;
     }
 
     sub start_data_table_row {
 	my ($add_class) = @_;
-	$row_count++;
-	my $css_class = ($row_count % 2)?'':'LC_even_row';
+	$row_count[0]++;
+	my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
 	$css_class = (join(' ',$css_class,$add_class));
 	return  '<tr class="'.$css_class.'">'."\n";;
     }
     
     sub continue_data_table_row {
 	my ($add_class) = @_;
-	my $css_class = ($row_count % 2)?'':'LC_even_row';
+	my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
 	$css_class = (join(' ',$css_class,$add_class));
 	return  '<tr class="'.$css_class.'">'."\n";;
     }
@@ -4916,7 +6717,7 @@ sub simple_error_page {
     }
 
     sub start_data_table_empty_row {
-	$row_count++;
+#	$row_count[0]++;
 	return  '<tr class="LC_empty_row" >'."\n";;
     }
 
@@ -5188,12 +6989,17 @@ previous, future, or all.
 5. reference to array of section restrictions (optional)
 6. reference to results object (hash of hashes).
 7. reference to optional userdata hash
-Keys of top level hash are roles.
+8. reference to optional statushash
+9. flag if privileged users (except those set to unhide in
+   course settings) should be excluded    
+Keys of top level results hash are roles.
 Keys of inner hashes are username:domain, with 
 values set to access type.
 Optional userdata hash returns an array with arguments in the 
 same order as loncoursedata::get_classlist() for student data.
 
+Optional statushash returns
+
 Entries for end, start, section and status are blank because
 of the possibility of multiple values for non-student roles.
 
@@ -5202,7 +7008,7 @@ of the possibility of multiple values fo
 ###############################################
 
 sub get_course_users {
-    my ($cdom,$cnum,$types,$roles,$sections,$users,$userdata) = @_;
+    my ($cdom,$cnum,$types,$roles,$sections,$users,$userdata,$statushash,$hidepriv) = @_;
     my %idx = ();
     my %seclists;
 
@@ -5222,6 +7028,7 @@ sub get_course_users {
             my $match = 0;
             my $secmatch = 0;
             my $section = $$classlist{$student}[$idx{section}];
+            my $status = $$classlist{$student}[$idx{status}];
             if ($section eq '') {
                 $section = 'none';
             }
@@ -5241,7 +7048,6 @@ sub get_course_users {
                     next;
                 }
             }
-            push(@{$seclists{$student}},$section); 
             if (defined($$types{'active'})) {
                 if ($$classlist{$student}[$idx{status}] eq 'Active') {
                     push(@{$$users{st}{$student}},'active');
@@ -5249,25 +7055,46 @@ sub get_course_users {
                 }
             }
             if (defined($$types{'previous'})) {
-                if ($$classlist{$student}[$idx{end}] <= $now) {
+                if ($$classlist{$student}[$idx{status}] eq 'Expired') {
                     push(@{$$users{st}{$student}},'previous');
                     $match = 1;
                 }
             }
             if (defined($$types{'future'})) {
-                if (($$classlist{$student}[$idx{start}] > $now) && ($$classlist{$student}[$idx{end}] > $now) || ($$classlist{$student}[$idx{end}] == 0) || ($$classlist{$student}[$idx{end}] eq '')) {
+                if ($$classlist{$student}[$idx{status}] eq 'Future') {
                     push(@{$$users{st}{$student}},'future');
                     $match = 1;
                 }
             }
-            if ($match && ref($userdata) eq 'HASH') {
-                $$userdata{$student} = $$classlist{$student};
+            if ($match) {
+                push(@{$seclists{$student}},$section);
+                if (ref($userdata) eq 'HASH') {
+                    $$userdata{$student} = $$classlist{$student};
+                }
+                if (ref($statushash) eq 'HASH') {
+                    $statushash->{$student}{'st'}{$section} = $status;
+                }
             }
         }
     }
     if ((@{$roles} > 1) || ((@{$roles} == 1) && ($$roles[0] ne "st"))) {
         my %coursepersonnel = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
         my $now = time;
+        my %displaystatus = ( previous => 'Expired',
+                              active   => 'Active',
+                              future   => 'Future',
+                            );
+        my %nothide;
+        if ($hidepriv) {
+            my %coursehash=&Apache::lonnet::coursedescription($cdom.'_'.$cnum);
+            foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) {
+                if ($user !~ /:/) {
+                    $nothide{join(':',split(/[\@]/,$user))}=1;
+                } else {
+                    $nothide{$user} = 1;
+                }
+            }
+        }
         foreach my $person (sort(keys(%coursepersonnel))) {
             my $match = 0;
             my $secmatch = 0;
@@ -5301,6 +7128,12 @@ sub get_course_users {
                     $usec = 'none';
                 }
                 if ($uname ne '' && $udom ne '') {
+                    if ($hidepriv) {
+                        if ((&Apache::lonnet::privileged($uname,$udom)) &&
+                            (!$nothide{$uname.':'.$udom})) {
+                            next;
+                        }
+                    }
                     if ($end > 0 && $end < $now) {
                         $status = 'previous';
                     } elsif ($start > $now) {
@@ -5323,6 +7156,9 @@ sub get_course_users {
                         if (!grep(/^\Q$usec\E$/,@{$seclists{$uname.':'.$udom}})) {
                             push(@{$seclists{$uname.':'.$udom}},$usec);
                         }
+                        if (ref($statushash) eq 'HASH') {
+                            $statushash->{$uname.':'.$udom}{$role}{$usec} = $displaystatus{$status};
+                        }
                     }
                 }
             }
@@ -5332,15 +7168,25 @@ sub get_course_users {
                 my %csettings = &Apache::lonnet::get('environment',['internal.courseowner'],$cdom,$cnum);
                 if ( defined($csettings{'internal.courseowner'}) ) {
                     my $owner = $csettings{'internal.courseowner'};
-                    if ($owner !~ /^[^:]+:[^:]+$/) {
-                        $owner = $owner.':'.$cdom;
+                    next if ($owner eq '');
+                    my ($ownername,$ownerdom);
+                    if ($owner =~ /^([^:]+):([^:]+)$/) {
+                        $ownername = $1;
+                        $ownerdom = $2;
+                    } else {
+                        $ownername = $owner;
+                        $ownerdom = $cdom;
+                        $owner = $ownername.':'.$ownerdom;
                     }
                     @{$$users{'ow'}{$owner}} = 'any';
                     if (defined($userdata) && 
-			!exists($$userdata{$owner.':'.$cdom})) {
-			&get_user_info($cdom,$owner,\%idx,$userdata);
-                        if (!grep(/^none$/,@{$seclists{$owner.':'.$cdom}})) {
-                            push(@{$seclists{$owner.':'.$cdom}},'none');
+			!exists($$userdata{$owner})) {
+			&get_user_info($ownerdom,$ownername,\%idx,$userdata);
+                        if (!grep(/^none$/,@{$seclists{$owner}})) {
+                            push(@{$seclists{$owner}},'none');
+                        }
+                        if (ref($statushash) eq 'HASH') {
+                            $statushash->{$owner}{'ow'}{'none'} = 'Any';
                         }
 		    }
                 }
@@ -5360,6 +7206,8 @@ sub get_user_info {
 	&plainname($uname,$udom,'lastname');
     $$userdata{$uname.':'.$udom}[$$idx{uname}] = $uname;
     $$userdata{$uname.':'.$udom}[$$idx{udom}] = $udom;
+    my %idhash =  &Apache::lonnet::idrget($udom,($uname));
+    $$userdata{$uname.':'.$udom}[$$idx{id}] = $idhash{$uname}; 
     return;
 }
 
@@ -5471,6 +7319,8 @@ If the user's status includes multiple t
 the largest default quota which applies to the user determines the
 default quota returned.
 
+=back
+
 =cut
 
 ###############################################
@@ -5480,24 +7330,40 @@ sub default_quota {
     my ($udom,$inststatus) = @_;
     my ($defquota,$settingstatus);
     my %quotahash = &Apache::lonnet::get_dom('configuration',
-                                            ['quota'],$udom);
-    if (ref($quotahash{'quota'}) eq 'HASH') {
+                                            ['quotas'],$udom);
+    if (ref($quotahash{'quotas'}) eq 'HASH') {
         if ($inststatus ne '') {
-            my @statuses = split(/:/,$inststatus);
+            my @statuses = map { &unescape($_); } split(/:/,$inststatus);
             foreach my $item (@statuses) {
-                if ($quotahash{'quota'}{$item} ne '') {
-                    if ($defquota eq '') {
-                        $defquota = $quotahash{'quota'}{$item};
-                        $settingstatus = $item;
-                    } elsif ($quotahash{'quota'}{$item} > $defquota) {
-                        $defquota = $quotahash{'quota'}{$item};
-                        $settingstatus = $item;
+                if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
+                    if ($quotahash{'quotas'}{'defaultquota'}{$item} ne '') {
+                        if ($defquota eq '') {
+                            $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
+                            $settingstatus = $item;
+                        } elsif ($quotahash{'quotas'}{'defaultquota'}{$item} > $defquota) {
+                            $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
+                            $settingstatus = $item;
+                        }
+                    }
+                } else {
+                    if ($quotahash{'quotas'}{$item} ne '') {
+                        if ($defquota eq '') {
+                            $defquota = $quotahash{'quotas'}{$item};
+                            $settingstatus = $item;
+                        } elsif ($quotahash{'quotas'}{$item} > $defquota) {
+                            $defquota = $quotahash{'quotas'}{$item};
+                            $settingstatus = $item;
+                        }
                     }
                 }
             }
         }
         if ($defquota eq '') {
-            $defquota = $quotahash{'quota'}{'default'};
+            if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
+                $defquota = $quotahash{'quotas'}{'defaultquota'}{'default'};
+            } else {
+                $defquota = $quotahash{'quotas'}{'default'};
+            }
             $settingstatus = 'default';
         }
     } else {
@@ -5549,14 +7415,14 @@ sub get_secgrprole_info {
 }
 
 sub user_picker {
-    my ($dom,$srch,$forcenewuser,$caller) = @_;
+    my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype) = @_;
     my $currdom = $dom;
     my %curr_selected = (
                         srchin => 'dom',
-                        srchby => 'uname',
+                        srchby => 'lastname',
                       );
     my $srchterm;
-    if (ref($srch) eq 'HASH') {
+    if ((ref($srch) eq 'HASH') && ($env{'form.origform'} ne 'crtusername')) {
         if ($srch->{'srchby'} ne '') {
             $curr_selected{'srchby'} = $srch->{'srchby'};
         }
@@ -5572,14 +7438,15 @@ sub user_picker {
         $srchterm = $srch->{'srchterm'};
     }
     my %lt=&Apache::lonlocal::texthash(
+                    'usr'       => 'Search criteria',
                     'doma'      => 'Domain/institution to search',
                     'uname'     => 'username',
                     'lastname'  => 'last name',
                     'lastfirst' => 'last name, first name',
                     'crs'       => 'in this course',
-                    'dom'       => 'in this domain', 
+                    'dom'       => 'in selected LON-CAPA domain', 
                     'alc'       => 'all LON-CAPA',
-                    'instd'     => 'in institutional directory',
+                    'instd'     => 'in institutional directory for selected domain',
                     'exact'     => 'is',
                     'contains'  => 'contains',
                     'begins'    => 'begins with',
@@ -5614,7 +7481,7 @@ sub user_picker {
     $srchinsel .= "\n  </select>\n";
 
     my $srchbysel =  ' <select name="srchby">';
-    foreach my $option ('uname','lastname','lastfirst') {
+    foreach my $option ('lastname','lastfirst','uname') {
         if ($curr_selected{'srchby'} eq $option) {
             $srchbysel .= '
    <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
@@ -5626,7 +7493,7 @@ sub user_picker {
     $srchbysel .= "\n  </select>\n";
 
     my $srchtypesel = ' <select name="srchtype">';
-    foreach my $option ('exact','begins','contains') {
+    foreach my $option ('begins','contains','exact') {
         if ($curr_selected{'srchtype'} eq $option) {
             $srchtypesel .= '
    <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
@@ -5640,7 +7507,26 @@ sub user_picker {
     my ($newuserscript,$new_user_create);
 
     if ($forcenewuser) {
-	$new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\','.$caller.');" /> </p>';
+        if (ref($srch) eq 'HASH') {
+            if ($srch->{'srchby'} eq 'uname' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchin'} eq 'dom' && $srch->{'srchdomain'} eq $env{'request.role.domain'}) {
+                if ($cancreate) {
+                    $new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\','.$caller.');" /> </p>';
+                } else {
+                    my $helplink = 'javascript:helpMenu('."'display'".')';
+                    my %usertypetext = (
+                        official   => 'institutional',
+                        unofficial => 'non-institutional',
+                    );
+                    $new_user_create = '<p class="LC_warning">'
+                                      .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.")
+                                      .' '
+                                      .&mt('Please contact the [_1]helpdesk[_2] for assistance.'
+                                          ,'<a href="'.$helplink.'">','</a>')
+                                      .'</p><br />';
+                }
+            }
+        }
+
         $newuserscript = <<"ENDSCRIPT";
 
 function setSearch(createnew,callingForm) {
@@ -5747,16 +7633,18 @@ $new_user_create
 
 <table>
  <tr>
+  <td>$lt{'doma'}:</td>
+  <td>$domform</td>
+  </td>
+ </tr>
+ <tr>
+  <td>$lt{'usr'}:</td>
   <td>$srchbysel
       $srchtypesel 
       <input type="text" size="15" name="srchterm" value="$srchterm" />
       $srchinsel 
   </td>
  </tr>
- <tr>
-  <td>$lt{'doma'}: $domform</td>
-  </td>
- </tr>
 </table>
 <br />
 END_BLOCK
@@ -5764,17 +7652,284 @@ END_BLOCK
     return $output;
 }
 
+sub user_rule_check {
+    my ($usershash,$checks,$alerts,$rulematch,$inst_results,$curr_rules,$got_rules) = @_;
+    my $response;
+    if (ref($usershash) eq 'HASH') {
+        foreach my $user (keys(%{$usershash})) {
+            my ($uname,$udom) = split(/:/,$user);
+            next if ($udom eq '' || $uname eq '');
+            my ($id,$newuser);
+            if (ref($usershash->{$user}) eq 'HASH') {
+                $newuser = $usershash->{$user}->{'newuser'};
+                $id = $usershash->{$user}->{'id'};
+            }
+            my $inst_response;
+            if (ref($checks) eq 'HASH') {
+                if (defined($checks->{'username'})) {
+                    ($inst_response,%{$inst_results->{$user}}) = 
+                        &Apache::lonnet::get_instuser($udom,$uname);
+                } elsif (defined($checks->{'id'})) {
+                    ($inst_response,%{$inst_results->{$user}}) =
+                        &Apache::lonnet::get_instuser($udom,undef,$id);
+                }
+            } else {
+                ($inst_response,%{$inst_results->{$user}}) =
+                    &Apache::lonnet::get_instuser($udom,$uname);
+                return;
+            }
+            if (!$got_rules->{$udom}) {
+                my %domconfig = &Apache::lonnet::get_dom('configuration',
+                                                  ['usercreation'],$udom);
+                if (ref($domconfig{'usercreation'}) eq 'HASH') {
+                    foreach my $item ('username','id') {
+                        if (ref($domconfig{'usercreation'}{$item.'_rule'}) eq 'ARRAY') {
+                            $$curr_rules{$udom}{$item} = 
+                                $domconfig{'usercreation'}{$item.'_rule'};
+                        }
+                    }
+                }
+                $got_rules->{$udom} = 1;  
+            }
+            foreach my $item (keys(%{$checks})) {
+                if (ref($$curr_rules{$udom}) eq 'HASH') {
+                    if (ref($$curr_rules{$udom}{$item}) eq 'ARRAY') {
+                        if (@{$$curr_rules{$udom}{$item}} > 0) {
+                            my %rule_check = &Apache::lonnet::inst_rulecheck($udom,$uname,$id,$item,$$curr_rules{$udom}{$item});
+                            foreach my $rule (@{$$curr_rules{$udom}{$item}}) {
+                                if ($rule_check{$rule}) {
+                                    $$rulematch{$user}{$item} = $rule;
+                                    if ($inst_response eq 'ok') {
+                                        if (ref($inst_results) eq 'HASH') {
+                                            if (ref($inst_results->{$user}) eq 'HASH') {
+                                                if (keys(%{$inst_results->{$user}}) == 0) {
+                                                    $$alerts{$item}{$udom}{$uname} = 1;
+                                                }
+                                            }
+                                        }
+                                    }
+                                    last;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+sub user_rule_formats {
+    my ($domain,$domdesc,$curr_rules,$check) = @_;
+    my %text = ( 
+                 'username' => 'Usernames',
+                 'id'       => 'IDs',
+               );
+    my $output;
+    my ($rules,$ruleorder) = &Apache::lonnet::inst_userrules($domain,$check);
+    if ((ref($rules) eq 'HASH') && (ref($ruleorder) eq 'ARRAY')) {
+        if (@{$ruleorder} > 0) {
+            $output = '<br />'.&mt("$text{$check} with the following format(s) may <span class=\"LC_cusr_emph\">only</span> be used for verified users at [_1]:",$domdesc).' <ul>';
+            foreach my $rule (@{$ruleorder}) {
+                if (ref($curr_rules) eq 'ARRAY') {
+                    if (grep(/^\Q$rule\E$/,@{$curr_rules})) {
+                        if (ref($rules->{$rule}) eq 'HASH') {
+                            $output .= '<li>'.$rules->{$rule}{'name'}.': '.
+                                        $rules->{$rule}{'desc'}.'</li>';
+                        }
+                    }
+                }
+            }
+            $output .= '</ul>';
+        }
+    }
+    return $output;
+}
+
+sub instrule_disallow_msg {
+    my ($checkitem,$domdesc,$count,$mode) = @_;
+    my $response;
+    my %text = (
+                  item   => 'username',
+                  items  => 'usernames',
+                  match  => 'matches',
+                  do     => 'does',
+                  action => 'a username',
+                  one    => 'one',
+               );
+    if ($count > 1) {
+        $text{'item'} = 'usernames';
+        $text{'match'} ='match';
+        $text{'do'} = 'do';
+        $text{'action'} = 'usernames',
+        $text{'one'} = 'ones';
+    }
+    if ($checkitem eq 'id') {
+        $text{'items'} = 'IDs';
+        $text{'item'} = 'ID';
+        $text{'action'} = 'an ID';
+        if ($count > 1) {
+            $text{'item'} = 'IDs';
+            $text{'action'} = 'IDs';
+        }
+    }
+    $response = &mt("The $text{'item'} you chose $text{'match'} the format of $text{'items'} defined for [_1], but the $text{'item'} $text{'do'} not exist in the institutional directory.",'<span class="LC_cusr_emph">'.$domdesc.'</span>').'<br />';
+    if ($mode eq 'upload') {
+        if ($checkitem eq 'username') {
+            $response .= &mt("You will need to modify your upload file so it will include $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}.");
+        } elsif ($checkitem eq 'id') {
+            $response .= &mt("Either upload a file which includes $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or when associating fields with data columns, omit an association for the Student/Employee ID field.");
+        }
+    } elsif ($mode eq 'selfcreate') {
+        if ($checkitem eq 'id') {
+            $response .= &mt("You must either choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or leave the ID field blank.");
+        }
+    } else {
+        if ($checkitem eq 'username') {
+            $response .= &mt("You must choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}.");
+        } elsif ($checkitem eq 'id') {
+            $response .= &mt("You must either choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or leave the ID field blank.");
+        }
+    }
+    return $response;
+}
+
+sub personal_data_fieldtitles {
+    my %fieldtitles = &Apache::lonlocal::texthash (
+                        id => 'Student/Employee ID',
+                        permanentemail => 'E-mail address',
+                        lastname => 'Last Name',
+                        firstname => 'First Name',
+                        middlename => 'Middle Name',
+                        generation => 'Generation',
+                        gen => 'Generation',
+                        inststatus => 'Affiliation',
+                   );
+    return %fieldtitles;
+}
+
+sub sorted_inst_types {
+    my ($dom) = @_;
+    my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
+    my $othertitle = &mt('All users');
+    if ($env{'request.course.id'}) {
+        $othertitle  = &mt('Any users');
+    }
+    my @types;
+    if (ref($order) eq 'ARRAY') {
+        @types = @{$order};
+    }
+    if (@types == 0) {
+        if (ref($usertypes) eq 'HASH') {
+            @types = sort(keys(%{$usertypes}));
+        }
+    }
+    if (keys(%{$usertypes}) > 0) {
+        $othertitle = &mt('Other users');
+    }
+    return ($othertitle,$usertypes,\@types);
+}
+
+sub get_institutional_codes {
+    my ($settings,$allcourses,$LC_code) = @_;
+# Get complete list of course sections to update
+    my @currsections = ();
+    my @currxlists = ();
+    my $coursecode = $$settings{'internal.coursecode'};
 
+    if ($$settings{'internal.sectionnums'} ne '') {
+        @currsections = split(/,/,$$settings{'internal.sectionnums'});
+    }
+
+    if ($$settings{'internal.crosslistings'} ne '') {
+        @currxlists = split(/,/,$$settings{'internal.crosslistings'});
+    }
+
+    if (@currxlists > 0) {
+        foreach (@currxlists) {
+            if (m/^([^:]+):(\w*)$/) {
+                unless (grep/^$1$/,@{$allcourses}) {
+                    push @{$allcourses},$1;
+                    $$LC_code{$1} = $2;
+                }
+            }
+        }
+    }
+ 
+    if (@currsections > 0) {
+        foreach (@currsections) {
+            if (m/^(\w+):(\w*)$/) {
+                my $sec = $coursecode.$1;
+                my $lc_sec = $2;
+                unless (grep/^$sec$/,@{$allcourses}) {
+                    push @{$allcourses},$sec;
+                    $$LC_code{$sec} = $lc_sec;
+                }
+            }
+        }
+    }
+    return;
+}
 
 =pod
 
+=head1 Slot Helpers
+
+=over 4
+
+=item * sorted_slots()
+
+Sorts an array of slot names in order of slot start time (earliest first). 
+
+Inputs:
+
+=over 4
+
+slotsarr  - Reference to array of unsorted slot names.
+
+slots     - Reference to hash of hash, where outer hash keys are slot names.
+
+=back
+
+Returns:
+
+=over 4
+
+sorted   - An array of slot names sorted by the start time of the slot.
+
 =back
 
+=back
+
+=cut
+
+
+sub sorted_slots {
+    my ($slotsarr,$slots) = @_;
+    my @sorted;
+    if ((ref($slotsarr) eq 'ARRAY') && (ref($slots) eq 'HASH')) {
+        @sorted =
+            sort {
+                     if (ref($slots->{$a}) && ref($slots->{$b})) {
+                         return $slots->{$a}{'starttime'} <=> $slots->{$b}{'starttime'}
+                     }
+                     if (ref($slots->{$a})) { return -1;}
+                     if (ref($slots->{$b})) { return 1;}
+                     return 0;
+                 } @{$slotsarr};
+    }
+    return @sorted;
+}
+
+
+=pod
+
 =head1 HTTP Helpers
 
 =over 4
 
-=item * get_unprocessed_cgi($query,$possible_names)
+=item * &get_unprocessed_cgi($query,$possible_names)
 
 Modify the %env hash to contain unprocessed CGI form parameters held in
 $query.  The parameters listed in $possible_names (an array reference),
@@ -5803,7 +7958,7 @@ sub get_unprocessed_cgi {
 
 =pod
 
-=item * cacheheader() 
+=item * &cacheheader() 
 
 returns cache-controlling header code
 
@@ -5820,7 +7975,7 @@ sub cacheheader {
 
 =pod
 
-=item * no_cache($r) 
+=item * &no_cache($r) 
 
 specifies header code to not have cache
 
@@ -5856,7 +8011,7 @@ sub content_type {
 
 =pod
 
-=item * add_to_env($name,$value) 
+=item * &add_to_env($name,$value) 
 
 adds $name to the %env hash with value
 $value, if $name already exists, the entry is converted to an array
@@ -5883,7 +8038,7 @@ sub add_to_env {
 
 =pod
 
-=item * get_env_multiple($name) 
+=item * &get_env_multiple($name) 
 
 gets $name from the %env hash, it seemlessly handles the cases where multiple
 values may be defined and end up as an array ref.
@@ -5906,6 +8061,232 @@ sub get_env_multiple {
     return(@values);
 }
 
+sub ask_for_embedded_content {
+    my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
+    my $upload_output = '
+   <form name="upload_embedded" action="'.$actionurl.'"
+                  method="post" enctype="multipart/form-data">';
+    $upload_output .= $state;
+    $upload_output .= '<b>Upload embedded files</b>:<br />'.&start_data_table();
+
+    my $num = 0;
+    foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%{$allfiles})) {
+        $upload_output .= &start_data_table_row().
+            '<td>'.$embed_file.'</td><td>';
+        if ($args->{'ignore_remote_references'}
+            && $embed_file =~ m{^\w+://}) {
+            $upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';
+        } elsif ($args->{'error_on_invalid_names'}
+            && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
+
+            $upload_output.='<span class="LC_warning">'.&mt("Invalid characters").'</span>';
+
+        } else {
+            $upload_output .='
+           <input name="embedded_item_'.$num.'" type="file" value="" />
+           <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
+            my $attrib = join(':',@{$$allfiles{$embed_file}});
+            $upload_output .=
+                "\n\t\t".
+                '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.
+                $attrib.'" />';
+            if (exists($$codebase{$embed_file})) {
+                $upload_output .=
+                    "\n\t\t".
+                    '<input name="codebase_'.$num.'" type="hidden" value="'.
+                    &escape($$codebase{$embed_file}).'" />';
+            }
+        }
+        $upload_output .= '</td>'.&Apache::loncommon::end_data_table_row();
+        $num++;
+    }
+    $upload_output .= &Apache::loncommon::end_data_table().'<br />
+   <input type ="hidden" name="number_embedded_items" value="'.$num.'" />
+   <input type ="submit" value="'.&mt('Upload Listed Files').'" />
+   '.&mt('(only files for which a location has been provided will be uploaded)').'
+   </form>';
+    return $upload_output;
+}
+
+sub upload_embedded {
+    my ($context,$dirpath,$uname,$udom,$dir_root,$url_root,$group,$disk_quota,
+        $current_disk_usage) = @_;
+    my $output;
+    for (my $i=0; $i<$env{'form.number_embedded_items'}; $i++) {
+        next if (!exists($env{'form.embedded_item_'.$i.'.filename'}));
+        my $orig_uploaded_filename =
+            $env{'form.embedded_item_'.$i.'.filename'};
+
+        $env{'form.embedded_orig_'.$i} =
+            &unescape($env{'form.embedded_orig_'.$i});
+        my ($path,$fname) =
+            ($env{'form.embedded_orig_'.$i} =~ m{(.*/)([^/]*)});
+        # no path, whole string is fname
+        if (!$fname) { $fname = $env{'form.embedded_orig_'.$i} };
+
+        $path = $env{'form.currentpath'}.$path;
+        $fname = &Apache::lonnet::clean_filename($fname);
+        # See if there is anything left
+        next if ($fname eq '');
+
+        # Check if file already exists as a file or directory.
+        my ($state,$msg);
+        if ($context eq 'portfolio') {
+            my $port_path = $dirpath;
+            if ($group ne '') {
+                $port_path = "groups/$group/$port_path";
+            }
+            ($state,$msg) = &check_for_upload($path,$fname,$group,'embedded_item_'.$i,
+                                              $dir_root,$port_path,$disk_quota,
+                                              $current_disk_usage,$uname,$udom);
+            if ($state eq 'will_exceed_quota'
+                || $state eq 'file_locked'
+                || $state eq 'file_exists' ) {
+                $output .= $msg;
+                next;
+            }
+        } elsif (($context eq 'author') || ($context eq 'testbank')) {
+            ($state,$msg) = &check_for_existing($path,$fname,'embedded_item_'.$i);
+            if ($state eq 'exists') {
+                $output .= $msg;
+                next;
+            }
+        }
+        # Check if extension is valid
+        if (($fname =~ /\.(\w+)$/) &&
+            (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
+            $output .= &mt('Invalid file extension ([_1]) - reserved for LONCAPA use - rename the file with a different extension and re-upload. ',$1);
+            next;
+        } elsif (($fname =~ /\.(\w+)$/) &&
+                 (!defined(&Apache::loncommon::fileembstyle($1)))) {
+            $output .= &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1);
+            next;
+        } elsif ($fname=~/\.(\d+)\.(\w+)$/) {
+            $output .= &mt('File name not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2);
+            next;
+        }
+
+        $env{'form.embedded_item_'.$i.'.filename'}=$fname;
+        if ($context eq 'portfolio') {
+            my $result=
+                &Apache::lonnet::userfileupload('embedded_item_'.$i,'',
+                                                $dirpath.$path);
+            if ($result !~ m|^/uploaded/|) {
+                $output .= '<span class="LC_error">'
+                      .&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'
+                           ,$result,$orig_uploaded_filename,$env{'form.embedded_orig_'.$i})
+                      .'</span><br />';
+                next;
+            } else {
+                $output .= '<p>'.&mt('Uploaded [_1]','<span class="LC_filename">'.
+                           $path.$fname.'</span>').'</p>';     
+            }
+        } else {
+# Save the file
+            my $target = $env{'form.embedded_item_'.$i};
+            my $fullpath = $dir_root.$dirpath.'/'.$path;
+            my $dest = $fullpath.$fname;
+            my $url = $url_root.$dirpath.'/'.$path.$fname;
+            my @parts=split(/\//,$fullpath);
+            my $count;
+            my $filepath = $dir_root;
+            for ($count=4;$count<=$#parts;$count++) {
+                $filepath .= "/$parts[$count]";
+                if ((-e $filepath)!=1) {
+                    mkdir($filepath,0770);
+                }
+            }
+            my $fh;
+            if (!open($fh,'>'.$dest)) {
+                &Apache::lonnet::logthis('Failed to create '.$dest);
+                $output .= '<span class="LC_error">'.
+                           &mt('An error occurred while trying to upload [_1] for embedded element [_2].',$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}).
+                           '</span><br />';
+            } else {
+                if (!print $fh $env{'form.embedded_item_'.$i}) {
+                    &Apache::lonnet::logthis('Failed to write to '.$dest);
+                    $output .= '<span class="LC_error">'.
+                              &mt('An error occurred while writing the file [_1] for embedded element [_2].',$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}).
+                              '</span><br />';
+                } else {
+                    if ($context eq 'testbank') {
+                        $output .= &mt('Embedded file uploaded successfully:').
+                                   '&nbsp;<a href="'.$url.'">'.
+                                   $orig_uploaded_filename.'</a><br />';
+                    } else {
+                        $output .= '<span class=\"LC_fontsize_large\">'.
+                                   &mt('View embedded file: [_1]','<a href="'.$url.'">'.
+                                   $orig_uploaded_filename.'</a>').'</span><br />';
+                    }
+                }
+                close($fh);
+            }
+        }
+    }
+    return $output;
+}
+
+sub check_for_existing {
+    my ($path,$fname,$element) = @_;
+    my ($state,$msg);
+    if (-d $path.'/'.$fname) {
+        $state = 'exists';
+        $msg = &mt('Unable to upload [_1]. A directory by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$path);
+    } elsif (-e $path.'/'.$fname) {
+        $state = 'exists';
+        $msg = &mt('Unable to upload [_1]. A file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$path);
+    }
+    if ($state eq 'exists') {
+        $msg = '<span class="LC_error">'.$msg.'</span><br />';
+    }
+    return ($state,$msg);
+}
+
+sub check_for_upload {
+    my ($path,$fname,$group,$element,$portfolio_root,$port_path,
+        $disk_quota,$current_disk_usage,$uname,$udom) = @_;
+    my $filesize = (length($env{'form.'.$element})) / 1000; #express in k (1024?)
+    my $getpropath = 1;
+    my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$path,$udom,$uname,
+                                            $getpropath);
+    my $found_file = 0;
+    my $locked_file = 0;
+    foreach my $line (@dir_list) {
+        my ($file_name)=split(/\&/,$line,2);
+        if ($file_name eq $fname){
+            $file_name = $path.$file_name;
+            if ($group ne '') {
+                $file_name = $group.$file_name;
+            }
+            $found_file = 1;
+            if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
+                $locked_file = 1;
+            }
+        }
+    }
+    if (($current_disk_usage + $filesize) > $disk_quota){
+        my $msg = '<span class="LC_error">'.
+                &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.','<span class="LC_filename">'.$fname.'</span>',$filesize).'</span>'.
+                  '<br />'.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.',$disk_quota,$current_disk_usage);
+        return ('will_exceed_quota',$msg);
+    } elsif ($found_file) {
+        if ($locked_file) {
+            my $msg = '<span class="LC_error">';
+            $msg .= &mt('Unable to upload [_1]. A locked file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>','<span class="LC_filename">'.$port_path.$env{'form.currentpath'}.'</span>');
+            $msg .= '</span><br />';
+            $msg .= &mt('You will be able to rename or delete existing [_1] after a grade has been assigned.','<span class="LC_filename">'.$fname.'</span>');
+            return ('file_locked',$msg);
+        } else {
+            my $msg = '<span class="LC_error">';
+            $msg .= &mt('Unable to upload [_1]. A file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$port_path.$env{'form.currentpath'});
+            $msg .= '</span>';
+            $msg .= '<br />';
+            $msg .= &mt('To upload, rename or delete existing [_1] in [_2].','<span class="LC_filename">'.$fname.'</span>', $port_path.$env{'form.currentpath'});
+            return ('file_exists',$msg);
+        }
+    }
+}
+
 
 =pod
 
@@ -5915,7 +8296,7 @@ sub get_env_multiple {
 
 =over 4
 
-=item * upfile_store($r)
+=item * &upfile_store($r)
 
 Store uploaded file, $r should be the HTTP Request object,
 needs $env{'form.upfile'}
@@ -5945,7 +8326,7 @@ sub upfile_store {
 
 =pod
 
-=item * load_tmp_file($r)
+=item * &load_tmp_file($r)
 
 Load uploaded file from tmp, $r should be the HTTP Request object,
 needs $env{'form.datatoken'},
@@ -5969,7 +8350,7 @@ sub load_tmp_file {
 
 =pod
 
-=item * upfile_record_sep()
+=item * &upfile_record_sep()
 
 Separate uploaded file into records
 returns array of records,
@@ -5991,7 +8372,7 @@ sub upfile_record_sep {
 
 =pod
 
-=item * record_sep($record)
+=item * &record_sep($record)
 
 Separate a record into fields $record should be an item from the upfile_record_sep(), needs $env{'form.upfiletype'}
 
@@ -6076,7 +8457,7 @@ sub record_sep {
 
 =pod
 
-=item * upfile_select_html()
+=item * &upfile_select_html()
 
 Return HTML code to select a file from the users machine and specify 
 the file type.
@@ -6094,7 +8475,7 @@ sub upfile_select_html {
 #                 xml   => &mt('HTML/XML'),
                  );
     my $Str = '<input type="file" name="upfile" size="50" />'.
-        '<br />Type: <select name="upfiletype">';
+        '<br />'.&mt('Type').': <select name="upfiletype">';
     foreach my $type (sort(keys(%Types))) {
         $Str .= '<option value="'.$type.'" >'.$Types{$type}."</option>\n";
     }
@@ -6123,7 +8504,7 @@ sub get_samples {
 
 =pod
 
-=item * csv_print_samples($r,$records)
+=item * &csv_print_samples($r,$records)
 
 Prints a table of sample values from each column uploaded $r is an
 Apache Request ref, $records is an arrayref from
@@ -6135,22 +8516,23 @@ Apache Request ref, $records is an array
 ######################################################
 sub csv_print_samples {
     my ($r,$records) = @_;
-    my $samples = &get_samples($records,3);
+    my $samples = &get_samples($records,5);
 
-    $r->print(&mt('Samples').'<br /><table border="2"><tr>');
+    $r->print(&mt('Samples').'<br />'.&start_data_table().
+              &start_data_table_header_row());
     foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) { 
         $r->print('<th>'.&mt('Column&nbsp;[_1]',($sample+1)).'</th>'); }
-    $r->print('</tr>');
+    $r->print(&end_data_table_header_row());
     foreach my $hash (@$samples) {
-	$r->print('<tr>');
+	$r->print(&start_data_table_row());
 	foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
 	    $r->print('<td>');
 	    if (defined($$hash{$sample})) { $r->print($$hash{$sample}); }
 	    $r->print('</td>');
 	}
-	$r->print('</tr>');
+	$r->print(&end_data_table_row());
     }
-    $r->print('</tr></table><br />'."\n");
+    $r->print(&end_data_table().'<br />'."\n");
 }
 
 ######################################################
@@ -6158,7 +8540,7 @@ sub csv_print_samples {
 
 =pod
 
-=item * csv_print_select_table($r,$records,$d)
+=item * &csv_print_select_table($r,$records,$d)
 
 Prints a table to create associations between values and table columns.
 
@@ -6175,12 +8557,13 @@ sub csv_print_select_table {
     my $i=0;
     my $samples = &get_samples($records,1);
     $r->print(&mt('Associate columns with student attributes.')."\n".
-	     '<table border="2"><tr>'.
+	      &start_data_table().&start_data_table_header_row().
               '<th>'.&mt('Attribute').'</th>'.
-              '<th>'.&mt('Column').'</th></tr>'."\n");
+              '<th>'.&mt('Column').'</th>'.
+              &end_data_table_header_row()."\n");
     foreach my $array_ref (@$d) {
 	my ($value,$display,$defaultcol)=@{ $array_ref };
-	$r->print('<tr><td>'.$display.'</td>');
+	$r->print(&start_data_table_row().'<td>'.$display.'</td>');
 
 	$r->print('<td><select name=f'.$i.
 		  ' onchange="javascript:flip(this.form,'.$i.');">');
@@ -6188,11 +8571,12 @@ sub csv_print_select_table {
 	foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
 	    $r->print('<option value="'.$sample.'"'.
                       ($sample eq $defaultcol ? ' selected="selected" ' : '').
-                      '>Column '.($sample+1).'</option>');
+                      '>'.&mt('Column [_1]',($sample+1)).'</option>');
 	}
-	$r->print('</select></td></tr>'."\n");
+	$r->print('</select></td>'.&end_data_table_row()."\n");
 	$i++;
     }
+    $r->print(&end_data_table());
     $i--;
     return $i;
 }
@@ -6202,7 +8586,7 @@ sub csv_print_select_table {
 
 =pod
 
-=item * csv_samples_select_table($r,$records,$d)
+=item * &csv_samples_select_table($r,$records,$d)
 
 Prints a table of sample values from the upload and can make associate samples to internal names.
 
@@ -6218,12 +8602,15 @@ sub csv_samples_select_table {
     my ($r,$records,$d) = @_;
     my $i=0;
     #
-    my $samples = &get_samples($records,3);
-    $r->print('<table border=2><tr><th>'.
-              &mt('Field').'</th><th>'.&mt('Samples').'</th></tr>');
+    my $max_samples = 5;
+    my $samples = &get_samples($records,$max_samples);
+    $r->print(&start_data_table().
+              &start_data_table_header_row().'<th>'.
+              &mt('Field').'</th><th>'.&mt('Samples').'</th>'.
+              &end_data_table_header_row());
 
     foreach my $key (sort(keys(%{ $samples->[0] }))) {
-	$r->print('<tr><td><select name="f'.$i.'"'.
+	$r->print(&start_data_table_row().'<td><select name="f'.$i.'"'.
 		  ' onchange="javascript:flip(this.form,'.$i.');">');
 	foreach my $option (@$d) {
 	    my ($value,$display,$defaultcol)=@{ $option };
@@ -6232,14 +8619,15 @@ sub csv_samples_select_table {
                       $display.'</option>');
 	}
 	$r->print('</select></td><td>');
-	foreach my $line (0..2) {
+	foreach my $line (0..($max_samples-1)) {
 	    if (defined($samples->[$line]{$key})) { 
 		$r->print($samples->[$line]{$key}."<br />\n"); 
 	    }
 	}
-	$r->print('</td></tr>');
+	$r->print('</td>'.&end_data_table_row());
 	$i++;
     }
+    $r->print(&end_data_table());
     $i--;
     return($i);
 }
@@ -6249,7 +8637,7 @@ sub csv_samples_select_table {
 
 =pod
 
-=item clean_excel_name($name)
+=item * &clean_excel_name($name)
 
 Returns a replacement for $name which does not contain any illegal characters.
 
@@ -6268,7 +8656,7 @@ sub clean_excel_name {
 
 =pod
 
-=item * check_if_partid_hidden($id,$symb,$udom,$uname)
+=item * &check_if_partid_hidden($id,$symb,$udom,$uname)
 
 Returns either 1 or undef
 
@@ -6309,7 +8697,7 @@ sub check_if_partid_hidden {
 
 =over 4
 
-=item get_cgi_id
+=item * &get_cgi_id()
 
 Inputs: none
 
@@ -6333,7 +8721,7 @@ sub get_cgi_id {
 
 =pod
 
-=item DrawBarGraph
+=item * &DrawBarGraph()
 
 Facilitates the plotting of data in a (stacked) bar graph.
 Puts plot definition data into the users environment in order for 
@@ -6468,7 +8856,7 @@ sub DrawBarGraph {
         $ValuesHash{$id.'.'.$key} = $value;
     }
     #
-    &Apache::lonnet::appenv(%ValuesHash);
+    &Apache::lonnet::appenv(\%ValuesHash);
     return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />';
 }
 
@@ -6477,7 +8865,7 @@ sub DrawBarGraph {
 
 =pod
 
-=item DrawXYGraph
+=item * &DrawXYGraph()
 
 Facilitates the plotting of data in an XY graph.
 Puts plot definition data into the users environment in order for 
@@ -6558,7 +8946,7 @@ sub DrawXYGraph {
         $ValuesHash{$id.'.'.$key} = $value;
     }
     #
-    &Apache::lonnet::appenv(%ValuesHash);
+    &Apache::lonnet::appenv(\%ValuesHash);
     return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />';
 }
 
@@ -6567,7 +8955,7 @@ sub DrawXYGraph {
 
 =pod
 
-=item DrawXYYGraph
+=item * &DrawXYYGraph()
 
 Facilitates the plotting of data in an XY graph with two Y axes.
 Puts plot definition data into the users environment in order for 
@@ -6660,7 +9048,7 @@ sub DrawXYYGraph {
         $ValuesHash{$id.'.'.$key} = $value;
     }
     #
-    &Apache::lonnet::appenv(%ValuesHash);
+    &Apache::lonnet::appenv(\%ValuesHash);
     return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />';
 }
 
@@ -6677,7 +9065,7 @@ Bad place for them but what the hell.
 
 =over 4
 
-=item &chartlink
+=item * &chartlink()
 
 Returns a link to the chart for a specific student.  
 
@@ -6716,9 +9104,9 @@ sub chartlink {
 
 =over 4
 
-=item &restore_course_settings 
+=item * &restore_course_settings()
 
-=item &store_course_settings
+=item * &store_course_settings()
 
 Restores/Store indicated form parameters from the course environment.
 Will not overwrite existing values of the form parameters.
@@ -6738,6 +9126,8 @@ a hash ref describing the data to be sto
 
 Returns: both routines return nothing
 
+=back
+
 =cut
 
 #######################################################
@@ -6790,7 +9180,7 @@ sub store_settings {
                                  'got error:'.$put_result);
     }
     # Make sure these settings stick around in this session, too
-    &Apache::lonnet::appenv(%AppHash);
+    &Apache::lonnet::appenv(\%AppHash);
     return;
 }
 
@@ -6818,16 +9208,429 @@ sub restore_settings {
     }
 }
 
+#######################################################
+#######################################################
+
+=pod
+
+=head1 Domain E-mail Routines  
+
+=over 4
+
+=item * &build_recipient_list()
+
+Build recipient lists for four types of e-mail:
+(a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors
+(d) Help requests, generated by
+lonerrorhandler.pm, CHECKRPMS, loncron, and lonsupportreq.pm respectively.
+
+Inputs:
+defmail (scalar - email address of default recipient), 
+mailing type (scalar - errormail, packagesmail, or helpdeskmail), 
+defdom (domain for which to retrieve configuration settings),
+origmail (scalar - email address of recipient from loncapa.conf, 
+i.e., predates configuration by DC via domainprefs.pm 
+
+Returns: comma separated list of addresses to which to send e-mail.
+
+=back
+
+=cut
+
+############################################################
+############################################################
+sub build_recipient_list {
+    my ($defmail,$mailing,$defdom,$origmail) = @_;
+    my @recipients;
+    my $otheremails;
+    my %domconfig =
+         &Apache::lonnet::get_dom('configuration',['contacts'],$defdom);
+    if (ref($domconfig{'contacts'}) eq 'HASH') {
+        if (exists($domconfig{'contacts'}{$mailing})) {
+            if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') {
+                my @contacts = ('adminemail','supportemail');
+                foreach my $item (@contacts) {
+                    if ($domconfig{'contacts'}{$mailing}{$item}) {
+                        my $addr = $domconfig{'contacts'}{$item}; 
+                        if (!grep(/^\Q$addr\E$/,@recipients)) {
+                            push(@recipients,$addr);
+                        }
+                    }
+                    $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
+                }
+            }
+        } elsif ($origmail ne '') {
+            push(@recipients,$origmail);
+        }
+    } elsif ($origmail ne '') {
+        push(@recipients,$origmail);
+    }
+    if (defined($defmail)) {
+        if ($defmail ne '') {
+            push(@recipients,$defmail);
+        }
+    }
+    if ($otheremails) {
+        my @others;
+        if ($otheremails =~ /,/) {
+            @others = split(/,/,$otheremails);
+        } else {
+            push(@others,$otheremails);
+        }
+        foreach my $addr (@others) {
+            if (!grep(/^\Q$addr\E$/,@recipients)) {
+                push(@recipients,$addr);
+            }
+        }
+    }
+    my $recipientlist = join(',',@recipients); 
+    return $recipientlist;
+}
+
 ############################################################
 ############################################################
 
+=pod
+
+=head1 Course Catalog Routines
+
+=over 4
+
+=item * &gather_categories()
+
+Converts category definitions - keys of categories hash stored in  
+coursecategories in configuration.db on the primary library server in a 
+domain - to an array.  Also generates javascript and idx hash used to 
+generate Domain Coordinator interface for editing Course Categories.
+
+Inputs:
+
+categories (reference to hash of category definitions).
+
+cats (reference to array of arrays/hashes which encapsulates hierarchy of
+      categories and subcategories).
+
+idx (reference to hash of counters used in Domain Coordinator interface for 
+      editing Course Categories).
+
+jsarray (reference to array of categories used to create Javascript arrays for
+         Domain Coordinator interface for editing Course Categories).
+
+Returns: nothing
+
+Side effects: populates cats, idx and jsarray. 
+
+=cut
+
+sub gather_categories {
+    my ($categories,$cats,$idx,$jsarray) = @_;
+    my %counters;
+    my $num = 0;
+    foreach my $item (keys(%{$categories})) {
+        my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$item);
+        if ($container eq '' && $depth == 0) {
+            $cats->[$depth][$categories->{$item}] = $cat;
+        } else {
+            $cats->[$depth]{$container}[$categories->{$item}] = $cat;
+        }
+        my ($escitem,$tail) = split(/:/,$item,2);
+        if ($counters{$tail} eq '') {
+            $counters{$tail} = $num;
+            $num ++;
+        }
+        if (ref($idx) eq 'HASH') {
+            $idx->{$item} = $counters{$tail};
+        }
+        if (ref($jsarray) eq 'ARRAY') {
+            push(@{$jsarray->[$counters{$tail}]},$item);
+        }
+    }
+    return;
+}
+
+=pod
+
+=item * &extract_categories()
+
+Used to generate breadcrumb trails for course categories.
+
+Inputs:
+
+categories (reference to hash of category definitions).
+
+cats (reference to array of arrays/hashes which encapsulates hierarchy of
+      categories and subcategories).
+
+trails (reference to array of breacrumb trails for each category).
+
+allitems (reference to hash - key is category key 
+         (format: escaped(name):escaped(parent category):depth in hierarchy).
+
+idx (reference to hash of counters used in Domain Coordinator interface for
+      editing Course Categories).
+
+jsarray (reference to array of categories used to create Javascript arrays for
+         Domain Coordinator interface for editing Course Categories).
+
+subcats (reference to hash of arrays containing all subcategories within each 
+         category, -recursive)
+
+Returns: nothing
+
+Side effects: populates trails and allitems hash references.
+
+=cut
+
+sub extract_categories {
+    my ($categories,$cats,$trails,$allitems,$idx,$jsarray,$subcats) = @_;
+    if (ref($categories) eq 'HASH') {
+        &gather_categories($categories,$cats,$idx,$jsarray);
+        if (ref($cats->[0]) eq 'ARRAY') {
+            for (my $i=0; $i<@{$cats->[0]}; $i++) {
+                my $name = $cats->[0][$i];
+                my $item = &escape($name).'::0';
+                my $trailstr;
+                if ($name eq 'instcode') {
+                    $trailstr = &mt('Official courses (with institutional codes)');
+                } else {
+                    $trailstr = $name;
+                }
+                if ($allitems->{$item} eq '') {
+                    push(@{$trails},$trailstr);
+                    $allitems->{$item} = scalar(@{$trails})-1;
+                }
+                my @parents = ($name);
+                if (ref($cats->[1]{$name}) eq 'ARRAY') {
+                    for (my $j=0; $j<@{$cats->[1]{$name}}; $j++) {
+                        my $category = $cats->[1]{$name}[$j];
+                        if (ref($subcats) eq 'HASH') {
+                            push(@{$subcats->{$item}},&escape($category).':'.&escape($name).':1');
+                        }
+                        &recurse_categories($cats,2,$category,$trails,$allitems,\@parents,$subcats);
+                    }
+                } else {
+                    if (ref($subcats) eq 'HASH') {
+                        $subcats->{$item} = [];
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+=pod
+
+=item *&recurse_categories()
+
+Recursively used to generate breadcrumb trails for course categories.
+
+Inputs:
+
+cats (reference to array of arrays/hashes which encapsulates hierarchy of
+      categories and subcategories).
+
+depth (current depth in hierarchy of categories and sub-categories - 0 indexed).
+
+category (current course category, for which breadcrumb trail is being generated).
+
+trails (reference to array of breadcrumb trails for each category).
+
+allitems (reference to hash - key is category key
+         (format: escaped(name):escaped(parent category):depth in hierarchy).
+
+parents (array containing containers directories for current category, 
+         back to top level). 
+
+Returns: nothing
+
+Side effects: populates trails and allitems hash references
+
+=cut
+
+sub recurse_categories {
+    my ($cats,$depth,$category,$trails,$allitems,$parents,$subcats) = @_;
+    my $shallower = $depth - 1;
+    if (ref($cats->[$depth]{$category}) eq 'ARRAY') {
+        for (my $k=0; $k<@{$cats->[$depth]{$category}}; $k++) {
+            my $name = $cats->[$depth]{$category}[$k];
+            my $item = &escape($category).':'.&escape($parents->[-1]).':'.$shallower;
+            my $trailstr = join(' -&gt; ',(@{$parents},$category));
+            if ($allitems->{$item} eq '') {
+                push(@{$trails},$trailstr);
+                $allitems->{$item} = scalar(@{$trails})-1;
+            }
+            my $deeper = $depth+1;
+            push(@{$parents},$category);
+            if (ref($subcats) eq 'HASH') {
+                my $subcat = &escape($name).':'.$category.':'.$depth;
+                for (my $j=@{$parents}; $j>=0; $j--) {
+                    my $higher;
+                    if ($j > 0) {
+                        $higher = &escape($parents->[$j]).':'.
+                                  &escape($parents->[$j-1]).':'.$j;
+                    } else {
+                        $higher = &escape($parents->[$j]).'::'.$j;
+                    }
+                    push(@{$subcats->{$higher}},$subcat);
+                }
+            }
+            &recurse_categories($cats,$deeper,$name,$trails,$allitems,$parents,
+                                $subcats);
+            pop(@{$parents});
+        }
+    } else {
+        my $item = &escape($category).':'.&escape($parents->[-1]).':'.$shallower;
+        my $trailstr = join(' -&gt; ',(@{$parents},$category));
+        if ($allitems->{$item} eq '') {
+            push(@{$trails},$trailstr);
+            $allitems->{$item} = scalar(@{$trails})-1;
+        }
+    }
+    return;
+}
+
+=pod
+
+=item *&assign_categories_table()
+
+Create a datatable for display of hierarchical categories in a domain,
+with checkboxes to allow a course to be categorized. 
+
+Inputs:
+
+cathash - reference to hash of categories defined for the domain (from
+          configuration.db)
+
+currcat - scalar with an & separated list of categories assigned to a course. 
+
+Returns: $output (markup to be displayed) 
+
+=cut
+
+sub assign_categories_table {
+    my ($cathash,$currcat) = @_;
+    my $output;
+    if (ref($cathash) eq 'HASH') {
+        my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);
+        &extract_categories($cathash,\@cats,\@trails,\%allitems,\%idx,\@jsarray);
+        $maxdepth = scalar(@cats);
+        if (@cats > 0) {
+            my $itemcount = 0;
+            if (ref($cats[0]) eq 'ARRAY') {
+                $output = &Apache::loncommon::start_data_table();
+                my @currcategories;
+                if ($currcat ne '') {
+                    @currcategories = split('&',$currcat);
+                }
+                for (my $i=0; $i<@{$cats[0]}; $i++) {
+                    my $parent = $cats[0][$i];
+                    my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                    next if ($parent eq 'instcode');
+                    my $item = &escape($parent).'::0';
+                    my $checked = '';
+                    if (@currcategories > 0) {
+                        if (grep(/^\Q$item\E$/,@currcategories)) {
+                            $checked = ' checked="checked"';
+                        }
+                    }
+                    $output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
+                               '<input type="checkbox" name="usecategory" value="'.
+                               $item.'"'.$checked.' />'.$parent.'</span>'.
+                               '<input type="hidden" name="catname" value="'.$parent.'" /></td>';
+                    my $depth = 1;
+                    push(@path,$parent);
+                    $output .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
+                    pop(@path);
+                    $output .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
+                    $itemcount ++;
+                }
+                $output .= &Apache::loncommon::end_data_table();
+            }
+        }
+    }
+    return $output;
+}
+
+=pod
+
+=item *&assign_category_rows()
+
+Create a datatable row for display of nested categories in a domain,
+with checkboxes to allow a course to be categorized,called recursively.
+
+Inputs:
+
+itemcount - track row number for alternating colors
+
+cats - reference to array of arrays/hashes which encapsulates hierarchy of
+      categories and subcategories.
+
+depth - current depth in hierarchy of categories and sub-categories - 0 indexed.
+
+parent - parent of current category item
+
+path - Array containing all categories back up through the hierarchy from the
+       current category to the top level.
+
+currcategories - reference to array of current categories assigned to the course
+
+Returns: $output (markup to be displayed).
+
+=cut
+
+sub assign_category_rows {
+    my ($itemcount,$cats,$depth,$parent,$path,$currcategories) = @_;
+    my ($text,$name,$item,$chgstr);
+    if (ref($cats) eq 'ARRAY') {
+        my $maxdepth = scalar(@{$cats});
+        if (ref($cats->[$depth]) eq 'HASH') {
+            if (ref($cats->[$depth]{$parent}) eq 'ARRAY') {
+                my $numchildren = @{$cats->[$depth]{$parent}};
+                my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                $text .= '<td><table class="LC_datatable">';
+                for (my $j=0; $j<$numchildren; $j++) {
+                    $name = $cats->[$depth]{$parent}[$j];
+                    $item = &escape($name).':'.&escape($parent).':'.$depth;
+                    my $deeper = $depth+1;
+                    my $checked = '';
+                    if (ref($currcategories) eq 'ARRAY') {
+                        if (@{$currcategories} > 0) {
+                            if (grep(/^\Q$item\E$/,@{$currcategories})) {
+                                $checked = ' checked="checked"';
+                            }
+                        }
+                    }
+                    $text .= '<tr><td><span class="LC_nobreak"><label>'.
+                             '<input type="checkbox" name="usecategory" value="'.
+                             $item.'"'.$checked.' />'.$name.'</label></span>'.
+                             '<input type="hidden" name="catname" value="'.$name.'" />'.
+                             '</td><td>';
+                    if (ref($path) eq 'ARRAY') {
+                        push(@{$path},$name);
+                        $text .= &assign_category_rows($itemcount,$cats,$deeper,$name,$path,$currcategories);
+                        pop(@{$path});
+                    }
+                    $text .= '</td></tr>';
+                }
+                $text .= '</table></td>';
+            }
+        }
+    }
+    return $text;
+}
+
+############################################################
+############################################################
+
+
 sub commit_customrole {
-    my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_;
-    my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.'@'.$three.' in '.$url.
+    my ($udom,$uname,$url,$three,$four,$five,$start,$end,$context) = @_;
+    my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.':'.$three.' in '.$url.
                          ($start?', '.&mt('starting').' '.localtime($start):'').
                          ($end?', ending '.localtime($end):'').': <b>'.
               &Apache::lonnet::assigncustomrole(
-                 $udom,$uname,$url,$three,$four,$five,$end,$start).
+                 $udom,$uname,$url,$three,$four,$five,$end,$start,undef,undef,$context).
                  '</b><br />';
     return $output;
 }
@@ -6844,8 +9647,8 @@ sub commit_standardrole {
         my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,
                                          $one,$two,$sec,$context);
         if (($result =~ /^error/) || ($result eq 'not_in_class') || 
-            ($result eq 'unknown_course')) {
-            $output = "Error: $result\n"; 
+            ($result eq 'unknown_course') || ($result eq 'refused')) {
+            $output = $logmsg.' '.&mt('Error: ').$result."\n"; 
         } else {
             $output = $logmsg.$linefeed.&mt('Assigning').' '.$three.' in '.$url.
                ($start?', '.&mt('starting').' '.localtime($start):'').
@@ -6862,7 +9665,7 @@ sub commit_standardrole {
         $output = &mt('Assigning').' '.$three.' in '.$url.
                ($start?', '.&mt('starting').' '.localtime($start):'').
                ($end?', '.&mt('ending').' '.localtime($end):'').': ';
-        my $result = &Apache::lonnet::assignrole($udom,$uname,$url,$three,$end,$start);
+        my $result = &Apache::lonnet::assignrole($udom,$uname,$url,$three,$end,$start,'','',$context);
         if ($context eq 'auto') {
             $output .= $result.$linefeed;
         } else {
@@ -6874,7 +9677,7 @@ sub commit_standardrole {
 
 sub commit_studentrole {
     my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_;
-    my ($result,$linefeed);
+    my ($result,$linefeed,$oldsecurl,$newsecurl);
     if ($context eq 'auto') {
         $linefeed = "\n";
     } else {
@@ -6886,37 +9689,92 @@ sub commit_studentrole {
         my $secchange = 0;
         my $expire_role_result;
         my $modify_section_result;
-        unless ($oldsec eq '-1') {
-            unless ($sec eq $oldsec) {
+        if ($oldsec ne '-1') { 
+            if ($oldsec ne $sec) {
                 $secchange = 1;
+                my $now = time;
                 my $uurl='/'.$cid;
                 $uurl=~s/\_/\//g;
                 if ($oldsec) {
                     $uurl.='/'.$oldsec;
                 }
-                $expire_role_result = &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',time);
+                $oldsecurl = $uurl;
+                $expire_role_result = 
+                    &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',$now,'','',$context);
+                if ($env{'request.course.sec'} ne '') { 
+                    if ($expire_role_result eq 'refused') {
+                        my @roles = ('st');
+                        my @statuses = ('previous');
+                        my @roledoms = ($one);
+                        my $withsec = 1;
+                        my %roleshash = 
+                            &Apache::lonnet::get_my_roles($uname,$udom,'userroles',
+                                              \@statuses,\@roles,\@roledoms,$withsec);
+                        if (defined ($roleshash{$two.':'.$one.':st:'.$oldsec})) {
+                            my ($oldstart,$oldend) = 
+                                split(':',$roleshash{$two.':'.$one.':st:'.$oldsec});
+                            if ($oldend > 0 && $oldend <= $now) {
+                                $expire_role_result = 'ok';
+                            }
+                        }
+                    }
+                }
                 $result = $expire_role_result;
             }
         }
         if (($expire_role_result eq 'ok') || ($secchange == 0)) {
-            $modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid);
+            $modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid,'',$context);
             if ($modify_section_result =~ /^ok/) {
                 if ($secchange == 1) {
-                    $$logmsg .= "Section for $uname switched from old section: $oldsec to new section: $sec".$linefeed;
+                    if ($sec eq '') {
+                        $$logmsg .= &mt('Section for [_1] switched from (possibly expired) old section: [_2] to student role without a section.',$uname,$oldsec).$linefeed;
+                    } else {
+                        $$logmsg .= &mt('Section for [_1] switched from (possibly expired) old section: [_2] to new section: [_3].',$uname,$oldsec,$sec).$linefeed;
+                    }
                 } elsif ($oldsec eq '-1') {
-                    $$logmsg .= "New student role for $uname in section $sec in course $cid".$linefeed;
+                    if ($sec eq '') {
+                        $$logmsg .= &mt('New student role without a section for [_1] in course [_2].',$uname,$cid).$linefeed;
+                    } else {
+                        $$logmsg .= &mt('New student role for [_1] in section [_2] in course [_3].',$uname,$sec,$cid).$linefeed;
+                    }
                 } else {
-                    $$logmsg .= "Student $uname assigned to unchanged section $sec in course $cid".$linefeed;
+                    if ($sec eq '') {
+                        $$logmsg .= &mt('Student [_1] assigned to course [_2] without a section.',$uname,$cid).$linefeed;
+                    } else {
+                        $$logmsg .= &mt('Student [_1] assigned to section [_2] in course [_3].',$uname,$sec,$cid).$linefeed;
+                    }
                 }
             } else {
-                $$logmsg .= "Error when attempting section change for $uname from old section $oldsec to new section: $sec in course $cid -error: $modify_section_result".$linefeed;
+                if ($secchange) {       
+                    $$logmsg .= &mt('Error when attempting section change for [_1] from old section "[_2]" to new section: "[_3]" in course [_4] -error:',$uname,$oldsec,$sec,$cid).' '.$modify_section_result.$linefeed;
+                } else {
+                    $$logmsg .= &mt('Error when attempting to modify role for [_1] for section: "[_2]" in course [_3] -error:',$uname,$sec,$cid).' '.$modify_section_result.$linefeed;
+                }
             }
             $result = $modify_section_result;
         } elsif ($secchange == 1) {
-            $$logmsg .= "Error when attempting to expire role for $uname in old section $oldsec in course $cid -error: $expire_role_result".$linefeed;
+            if ($oldsec eq '') {
+                $$logmsg .= &mt('Error when attempting to expire existing role without a section for [_1] in course [_3] -error: ',$uname,$cid).' '.$expire_role_result.$linefeed;
+            } else {
+                $$logmsg .= &mt('Error when attempting to expire existing role for [_1] in section [_2] in course [_3] -error: ',$uname,$oldsec,$cid).' '.$expire_role_result.$linefeed;
+            }
+            if ($expire_role_result eq 'refused') {
+                my $newsecurl = '/'.$cid;
+                $newsecurl =~ s/\_/\//g;
+                if ($sec ne '') {
+                    $newsecurl.='/'.$sec;
+                }
+                if (&Apache::lonnet::allowed('cst',$newsecurl) && !(&Apache::lonnet::allowed('cst',$oldsecurl))) {
+                    if ($sec eq '') {
+                        $$logmsg .= &mt('Although your current role has privileges to add students to section "[_1]", you do not have privileges to modify existing enrollments unaffiliated with any section.',$sec).$linefeed;
+                    } else {
+                        $$logmsg .= &mt('Although your current role has privileges to add students to section "[_1]", you do not have privileges to modify existing enrollments in other sections.',$sec).$linefeed;
+                    }
+                }
+            }
         }
     } else {
-        $$logmsg .= "Incomplete course id defined.  Addition of user $uname from domain $udom to course $one\_$two, section $sec not completed.$linefeed";
+        $$logmsg .= &mt('Incomplete course id defined.').$linefeed.&mt('Addition of user [_1] from domain [_2] to course [_3], section [_4] not completed.',$uname,$udom,$one.'_'.$two,$sec).$linefeed;
         $result = "error: incomplete course id\n";
     }
     return $result;
@@ -6926,7 +9784,7 @@ sub commit_studentrole {
 ############################################################
 
 sub check_clone {
-    my ($args) = @_;
+    my ($args,$linefeed) = @_;
     my $cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'};
     my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid);
     my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
@@ -6934,8 +9792,7 @@ sub check_clone {
     my $can_clone = 0;
 
     if ($clonehome eq 'no_host') {
-	$clonemsg = &mt('Attempting to clone non-existing [_1]',
-			$args->{'crstype'});
+        $clonemsg = &mt('No new course created.').$linefeed.&mt('A new course could not be cloned from the specified original - [_1] - because it is a non-existent course.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});     
     } else {
 	my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
 	if ($env{'request.role.domain'} eq $args->{'clonedomain'}) {
@@ -6944,18 +9801,24 @@ sub check_clone {
 	    my %clonehash = &Apache::lonnet::get('environment',['cloners'],
 						 $args->{'clonedomain'},$args->{'clonecourse'});
 	    my @cloners = split(/,/,$clonehash{'cloners'});
-	    my %roleshash =
-		&Apache::lonnet::get_my_roles($args->{'ccuname'},
-					      $args->{'ccdomain'},'userroles',['active'],['cc'],
-					      [$args->{'clonedomain'}]);
-	    if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':cc'}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
-		$can_clone = 1;
-	    } else {
-		$clonemsg = &mt('The new course was not cloned from an existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
+            if (grep(/^\*$/,@cloners)) {
+                $can_clone = 1;
+            } elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) {
+                $can_clone = 1;
+            } else {
+	        my %roleshash =
+		    &Apache::lonnet::get_my_roles($args->{'ccuname'},
+					 $args->{'ccdomain'},
+                                         'userroles',['active'],['cc'],
+					 [$args->{'clonedomain'}]);
+	        if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':cc'}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
+		    $can_clone = 1;
+	        } else {
+                    $clonemsg = &mt('No new course created.').$linefeed.&mt('The new course could not be cloned from the existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
+	        }
 	    }
-	}
+        }
     }
-
     return ($can_clone, $clonemsg, $cloneid, $clonehome);
 }
 
@@ -6972,9 +9835,11 @@ sub construct_course {
 #
     my ($can_clone, $clonemsg, $cloneid, $clonehome);
     if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) {
-	($can_clone, $clonemsg, $cloneid, $clonehome) = &check_clone($args);
+	($can_clone, $clonemsg, $cloneid, $clonehome) = &check_clone($args,$linefeed);
 	if ($context ne 'auto') {
-	    $clonemsg = '<span class="LC_error">'.$clonemsg.'</span>';
+            if ($clonemsg ne '') {
+	        $clonemsg = '<span class="LC_error">'.$clonemsg.'</span>';
+            }
 	}
 	$outcome .= $clonemsg.$linefeed;
 
@@ -7021,19 +9886,28 @@ sub construct_course {
 	$outcome .= $clonemsg.$linefeed;
 	my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum);
 # Copy all files
-	&Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid);
+	&Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid,$args->{'datemode'},$args->{'dateshift'});
 # Restore URL
 	$cenv{'url'}=$oldcenv{'url'};
 # Restore title
 	$cenv{'description'}=$oldcenv{'description'};
-# restore grading mode
-	if (defined($oldcenv{'grading'})) {
-	    $cenv{'grading'}=$oldcenv{'grading'};
-	}
 # Mark as cloned
 	$cenv{'clonedfrom'}=$cloneid;
-	delete($cenv{'default_enrollment_start_date'});
-	delete($cenv{'default_enrollment_end_date'});
+# Need to clone grading mode
+        my %newenv=&Apache::lonnet::get('environment',['grading'],$$crsudom,$$crsunum);
+        $cenv{'grading'}=$newenv{'grading'};
+# Do not clone these environment entries
+        &Apache::lonnet::del('environment',
+                  ['default_enrollment_start_date',
+                   'default_enrollment_end_date',
+                   'question.email',
+                   'policy.email',
+                   'comment.email',
+                   'pch.users.denied',
+                   'plc.users.denied',
+                   'hidefromcat',
+                   'categories'],
+                   $$crsudom,$$crsunum);
     }
 
 #
@@ -7061,7 +9935,6 @@ sub construct_course {
     } else {
         $cenv{'internal.courseowner'} = $args->{'curruser'};
     }
-
     my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner.
     if ($args->{'crssections'}) {
         $cenv{'internal.sectionnums'} = '';
@@ -7121,7 +9994,7 @@ sub construct_course {
     }
     if ($args->{'notify_dc'}) {
         if ($uname ne '') { 
-            push(@notified,$uname.'@'.$udom);
+            push(@notified,$uname.':'.$udom);
         }
     }
     if (@notified > 0) {
@@ -7261,10 +10134,10 @@ sub construct_course {
         $outcome .= ($fatal?$errtext:'read ok').' - ';
         my $title; my $url;
         if ($args->{'firstres'} eq 'syl') {
-	    $title='Syllabus';
+	    $title=&mt('Syllabus');
             $url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus';
         } else {
-            $title='Navigate Contents';
+            $title=&mt('Navigate Contents');
             $url='/adm/navmaps';
         }
 
@@ -7318,28 +10191,14 @@ sub icon {
     return &lonhttpdurl($iconname);
 } 
 
-sub lonhttpd_port {
-    my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'};
-    if (!defined($lonhttpd_port)) { $lonhttpd_port='8080'; }
-    # IE doesn't like a secure page getting images from a non-secure
-    # port (when logging we haven't parsed the browser type so default
-    # back to secure
-    if ((!exists($env{'browser.type'}) || $env{'browser.type'} eq 'explorer')
-	&& $ENV{'SERVER_PORT'} == 443) {
-	return 443;
-    }
-    return $lonhttpd_port;
-
-}
-
 sub lonhttpdurl {
+#
+# Had been used for "small fry" static images on separate port 8080.
+# Modify here if lightweight http functionality desired again.
+# Currently eliminated due to increasing firewall issues.
+#
     my ($url)=@_;
-
-    my $lonhttpd_port = &lonhttpd_port();
-    if ($lonhttpd_port == 443) {
-	return 'https://'.$ENV{'SERVER_NAME'}.$url;
-    }
-    return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
+    return $url;
 }
 
 sub connection_aborted {
@@ -7417,7 +10276,7 @@ sub init_user_environment {
 	}
 # Give them a new cookie
 	my $id = ($args->{'robot'} ? 'robot'.$args->{'robot'}
-		                   : $now);
+		                   : $now.$$.int(rand(10000)));
 	$cookie="$username\_$id\_$domain\_$authhost";
     
 # Initialize roles
@@ -7505,6 +10364,17 @@ sub init_user_environment {
 	    }
 	}
 
+        foreach my $tool ('aboutme','blog','portfolio') {
+            $userenv{'availabletools.'.$tool} = 
+                &Apache::lonnet::usertools_access($username,$domain,$tool,'reload');
+        }
+
+        foreach my $crstype ('official','unofficial') {
+            $userenv{'canrequest.'.$crstype} =
+                &Apache::lonnet::usertools_access($username,$domain,$crstype,
+                                                  'reload','requestcourses');
+        }
+
 	$env{'user.environment'} = "$lonids/$cookie.id";
 	
 	if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",
@@ -7517,8 +10387,8 @@ sub init_user_environment {
 	    }
 	    untie(%disk_env);
 	} else {
-	    &Apache::lonnet::logthis("<font color=\"blue\">WARNING: ".
-			   'Could not create environment storage in lonauth: '.$!.'</font>');
+	    &Apache::lonnet::logthis("<span style=\"color:blue;\">WARNING: ".
+			   'Could not create environment storage in lonauth: '.$!.'</span>');
 	    return 'error: '.$!;
 	}
     }
@@ -7532,12 +10402,54 @@ sub init_user_environment {
 
 sub _add_to_env {
     my ($idf,$env_data,$prefix) = @_;
-    while (my ($key,$value) = each(%$env_data)) {
-	$idf->{$prefix.$key} = $value;
-	$env{$prefix.$key}   = $value;
+    if (ref($env_data) eq 'HASH') {
+        while (my ($key,$value) = each(%$env_data)) {
+	    $idf->{$prefix.$key} = $value;
+	    $env{$prefix.$key}   = $value;
+        }
     }
 }
 
+# --- Get the symbolic name of a problem and the url
+sub get_symb {
+    my ($request,$silent) = @_;
+    (my $url=$env{'form.url'}) =~ s-^https?\://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+    my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
+    if ($symb eq '') {
+        if (!$silent) {
+            $request->print("Unable to handle ambiguous references:$url:.");
+            return ();
+        }
+    }
+    &Apache::lonenc::check_decrypt(\$symb);
+    return ($symb);
+}
+
+# --------------------------------------------------------------Get annotation
+
+sub get_annotation {
+    my ($symb,$enc) = @_;
+
+    my $key = $symb;
+    if (!$enc) {
+        $key =
+            &Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
+    }
+    my %annotation=&Apache::lonnet::get('nohist_annotations',[$key]);
+    return $annotation{$key};
+}
+
+sub clean_symb {
+    my ($symb,$delete_enc) = @_;
+
+    &Apache::lonenc::check_decrypt(\$symb);
+    my $enc = $env{'request.enc'};
+    if ($delete_enc) {
+        delete($env{'request.enc'});
+    }
+
+    return ($symb,$enc);
+}
 
 =pod