loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.602 and 1.955

-version 1.602, 2007/10/31 01:37:29
+version 1.955, 2010/03/17 20:00:02
  Line 61  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);
- Line 78  my $readit;
+ Line 81  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;
- Line 198  BEGIN {
+ Line 271  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)
- Line 214  BEGIN {
+ Line 287  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
- Line 234  with the given extension.  Can be a comm
+ Line 307  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
- Line 257  sub browser_and_searcher_javascript {
+ Line 330  sub browser_and_searcher_javascript {
          }
          url += 'catalogmode=interactive&';
          url += 'mode=$mode&';
+         url += 'inhibitmenu=yes&';
          url += 'form=' + formname + '&';
          if (only != null) {
              url += 'only=' + only + '&';
- Line 318  sub storeresurl {
+ Line 392  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;
  }
- Line 332  sub studentbrowser_javascript {
+ Line 406  sub studentbrowser_javascript {
           || ($env{'request.role'}=~/^(au|dc|su)/)
            ) { return ''; }
     return (<<'ENDSTDBRW');
- <script type="text/javascript" language="Javascript" >
+ <script type="text/javascript" language="Javascript">
+ // <![CDATA[
      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) {
- Line 348  sub studentbrowser_javascript {
+ Line 423  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';
          stdeditbrowser = open(url,title,options,'1');
          stdeditbrowser.focus();
      }
+ // ]]>
  </script>
  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.
+        if ($courseadvonly)  {
-         '","'.$udomele.'","","1");'."'>".&mt('Select User')."</a>";
+            $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.
+        $callargs .= ",1";
-         '","'.$udomele.'",1);'."'>".&mt('Select User')."</a>";
+        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">
+ // <![CDATA[
+ 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 ($domainfilter,$sec_element,$formname,$role_element,$crstype) = @_;
-     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 $wintitle = 'Course_Browser';
-    my $output = '
+     if ($crstype eq 'Community') {
- <script type="text/javascript">
+         $wintitle = 'Community_Browser';
+     }
+     my $id_functions = &javascript_index_functions();
+     my $output = '
+ <script type="text/javascript" language="JavaScript">
+ // <![CDATA[
      var stdeditbrowser;'."\n";
-    $output .= <<"ENDSTDBRW";
-     function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
+     $output .= <<"ENDSTDBRW";
+     function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,type,type_elem) {
          var url = '/adm/pickcourse?';
-         var domainfilter = '';
          var formid = getFormIdByName(formname);
-         if (formid > -1) {
+         var domainfilter = getDomainFromSelectbox(formname,udom);
-             var domid = getIndexByName(formid,udom);
-             if (domid > -1) {
-                 if (document.forms[formid].elements[domid].type == 'select-one') {
-                     domainfilter=document.forms[formid].elements[domid].options[document.forms[formid].elements[domid].selectedIndex].value;
-                 }
-                 if (document.forms[formid].elements[domid].type == 'hidden') {
-                     domainfilter=document.forms[formid].elements[domid].value;
-                 }
-             }
-         }
          if (domainfilter != null) {
             if (domainfilter != '') {
                 url += 'domainfilter='+domainfilter+'&';
- Line 416  sub coursebrowser_javascript {
+ Line 516  sub coursebrowser_javascript {
              else {
                  if (formname == 'portform') {
                      url += '&setroles='+extra_element;
+                 } else {
+                     if (formname == 'rules') {
+                         url += '&fixeddom='+extra_element;
+                     }
                  }
              }
          }
-         if (multflag !=null && multflag != '') {
+         if (type != null && type != '') {
-             url += '&multiple='+multflag;
+             url += '&type='+type;
          }
-         if (crstype == 'Course/Group') {
+         if (type_elem != null && type_elem != '') {
-             if (formname == 'cu') {
+             url += '&typeelement='+type_elem;
-                 crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value;
-                 if (crstype == "") {
-                     alert("$crs_or_grp_alert");
-                     return;
-                 }
-             }
          }
-         if (crstype !=null && crstype != '') {
+         if (formname == 'ccrs') {
-             url += '&type='+crstype;
+             var ownername = document.forms[formid].ccuname.value;
+             var ownerdom =  document.forms[formid].ccdomain.options[document.forms[formid].ccdomain.selectedIndex].value;
+             url += '&cloner='+ownername+':'+ownerdom;
          }
-         var title = 'Course_Browser';
+         if (multflag !=null && multflag != '') {
+             url += '&multiple='+multflag;
+         }
+         var title = '$wintitle';
          var options = 'scrollbars=1,resizable=1,menubar=0';
          options += ',width=700,height=600';
          stdeditbrowser = open(url,title,options,'1');
          stdeditbrowser.focus();
      }
+ $id_functions
+ ENDSTDBRW
+     if (($sec_element ne '') || ($role_element ne '')) {
+         $output .= &setsec_javascript($sec_element,$formname,$role_element);
+     }
+     $output .= '
+ // ]]>
+ </script>';
+     return $output;
+ }
-     function getFormIdByName(formname) {
+ sub javascript_index_functions {
-         for (var i=0;i<document.forms.length;i++) {
+     return <<"ENDJS";
-             if (document.forms[i].name == formname) {
-                 return i;
+ function getFormIdByName(formname) {
-             }
+     for (var i=0;i<document.forms.length;i++) {
+         if (document.forms[i].name == formname) {
+             return i;
          }
-         return -1;
      }
+     return -1;
+ }
+ function getIndexByName(formid,item) {
+     for (var i=0;i<document.forms[formid].elements.length;i++) {
+         if (document.forms[formid].elements[i].name == item) {
+             return i;
+         }
+     }
+     return -1;
+ }
-     function getIndexByName(formid,item) {
+ function getDomainFromSelectbox(formname,udom) {
-         for (var i=0;i<document.forms[formid].elements.length;i++) {
+     var userdom;
-             if (document.forms[formid].elements[i].name == item) {
+     var formid = getFormIdByName(formname);
-                 return i;
+     if (formid > -1) {
+         var domid = getIndexByName(formid,udom);
+         if (domid > -1) {
+             if (document.forms[formid].elements[domid].type == 'select-one') {
+                 userdom=document.forms[formid].elements[domid].options[document.forms[formid].elements[domid].selectedIndex].value;
+             }
+             if (document.forms[formid].elements[domid].type == 'hidden') {
+                 userdom=document.forms[formid].elements[domid].value;
              }
          }
-         return -1;
      }
- ENDSTDBRW
+     return userdom;
-     if ($sec_element ne '') {
+ }
-         $output .= &setsec_javascript($sec_element,$formname);
+ ENDJS
+ }
+ sub userbrowser_javascript {
+     my $id_functions = &javascript_index_functions();
+     return <<"ENDUSERBRW";
+ function openuserbrowser(formname,uname,udom,ulast,ufirst,uemail,hideudom,crsdom,caller) {
+     var url = '/adm/pickuser?';
+     var userdom = getDomainFromSelectbox(formname,udom);
+     if (userdom != null) {
+        if (userdom != '') {
+            url += 'srchdom='+userdom+'&';
+        }
      }
-     $output .= '
+     url += 'form=' + formname + '&unameelement='+uname+
- </script>';
+                                 '&udomelement='+udom+
-     return $output;
+                                 '&ulastelement='+ulast+
+                                 '&ufirstelement='+ufirst+
+                                 '&uemailelement='+uemail+
+                                 '&hideudomelement='+hideudom+
+                                 '&coursedom='+crsdom;
+     if ((caller != null) && (caller != undefined)) {
+         url += '&caller='+caller;
+     }
+     var title = 'User_Browser';
+     var options = 'scrollbars=1,resizable=1,menubar=0';
+     options += ',width=700,height=600';
+     var stdeditbrowser = open(url,title,options,'1');
+     stdeditbrowser.focus();
+ }
+ function fix_domain (formname,udom,origdom,uname) {
+     var formid = getFormIdByName(formname);
+     if (formid > -1) {
+         var unameid = getIndexByName(formid,uname);
+         var domid = getIndexByName(formid,udom);
+         var hidedomid = getIndexByName(formid,origdom);
+         if (hidedomid > -1) {
+             var fixeddom = document.forms[formid].elements[hidedomid].value;
+             var unameval = document.forms[formid].elements[unameid].value;
+             if ((fixeddom != '') && (fixeddom != undefined) && (fixeddom != null) && (unameval != '') && (unameval != undefined) && (unameval != null)) {
+                 if (domid > -1) {
+                     var slct = document.forms[formid].elements[domid];
+                     if (slct.type == 'select-one') {
+                         var i;
+                         for (i=0;i<slct.length;i++) {
+                             if (slct.options[i].value==fixeddom) { slct.selectedIndex=i; }
+                         }
+                     }
+                     if (slct.type == 'hidden') {
+                         slct.value = fixeddom;
+                     }
+                 }
+             }
+         }
+     }
+     return;
+ }
+ $id_functions
+ ENDUSERBRW
  }
  sub setsec_javascript {
-     my ($sec_element,$formname) = @_;
+     my ($sec_element,$formname,$role_element) = @_;
+     my (@courserolenames,@communityrolenames,$rolestr,$courserolestr,
+         $communityrolestr);
+     if ($role_element ne '') {
+         my @allroles = ('st','ta','ep','in','ad');
+         foreach my $crstype ('Course','Community') {
+             if ($crstype eq 'Community') {
+                 foreach my $role (@allroles) {
+                     push(@communityrolenames,&Apache::lonnet::plaintext($role,$crstype));
+                 }
+                 push(@communityrolenames,&Apache::lonnet::plaintext('co'));
+             } else {
+                 foreach my $role (@allroles) {
+                     push(@courserolenames,&Apache::lonnet::plaintext($role,$crstype));
+                 }
+                 push(@courserolenames,&Apache::lonnet::plaintext('cc'));
+             }
+         }
+         $rolestr = '"'.join('","',@allroles).'"';
+         $courserolestr = '"'.join('","',@courserolenames).'"';
+         $communityrolestr = '"'.join('","',@communityrolenames).'"';
+     }
      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) {
- Line 499  function setSect(sectionlist) {
+ Line 713  function setSect(sectionlist) {
          }
      }
  }
+ function setRole(crstype) {
  |;
+     if ($role_element eq '') {
+         $setsections .= '    return;
+ }
+ ';
+     } else {
+         $setsections .= qq|
+     var elementLength = document.$formname.$role_element.length;
+     var allroles = Array($rolestr);
+     var courserolenames = Array($courserolestr);
+     var communityrolenames = Array($communityrolestr);
+     if (elementLength != undefined) {
+         if (document.$formname.$role_element.options[5].value == 'cc') {
+             if (crstype == 'Course') {
+                 return;
+             } else {
+                 allroles[5] = 'co';
+                 for (var i=0; i<6; i++) {
+                     document.$formname.$role_element.options[i].value = allroles[i];
+                     document.$formname.$role_element.options[i].text = communityrolenames[i];
+                 }
+             }
+         } else {
+             if (crstype == 'Community') {
+                 return;
+             } else {
+                 allroles[5] = 'cc';
+                 for (var i=0; i<6; i++) {
+                     document.$formname.$role_element.options[i].value = allroles[i];
+                     document.$formname.$role_element.options[i].text = courserolenames[i];
+                 }
+             }
+         }
+     }
+     return;
+ }
+ |;
+     }
      return $setsections;
  }
  sub selectcourse_link {
-    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
+    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype,
-    return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
+        $typeelement) = @_;
-         '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select Course')."</a>";
+    my $type = $selecttype;
+    my $linktext = &mt('Select Course');
+    if ($selecttype eq 'Community') {
+        $linktext = &mt('Select Community');
+    } elsif ($selecttype eq 'Course/Community') {
+        $linktext = &mt('Select Course/Community');
+        $type = '';
+    }
+    return '<span class="LC_nobreak">'
+          ."<a href='"
+          .'javascript:opencrsbrowser("'.$form.'","'.$unameele
+          .'","'.$udomele.'","'.$desc.'","'.$extra_element
+          .'","'.$multflag.'","'.$type.'","'.$typeelement.'");'
+          ."'>".$linktext.'</a>'
+          .'</span>';
+ }
+ sub selectauthor_link {
+    my ($form,$udom)=@_;
+    return '<a href="javascript:openauthorbrowser('."'$form','$udom'".');">'.
+           &mt('Select Author').'</a>';
+ }
+ sub selectuser_link {
+     my ($form,$unameelem,$domelem,$lastelem,$firstelem,$emailelem,$hdomelem,
+         $coursedom,$linktext,$caller) = @_;
+     return '<a href="javascript:openuserbrowser('."'$form','$unameelem','$domelem',".
+            "'$lastelem','$firstelem','$emailelem','$hdomelem','$coursedom','$caller'".
+            ');">'.$linktext.'</a>';
  }
  sub check_uncheck_jscript {
- Line 535  ENDSCRT
+ Line 815  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:
- Line 562  linked_select_forms takes the following
+ Line 929  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
- Line 578  $menu{$choice1}->{'select2'}.
+ Line 947  $menu{$choice1}->{'select2'}.
                             B2 => "Choice B2",
                             B3 => "Choice B3",
                             B4 => "Choice B4"
-                            }
+                            },
+                        order => ['B4','B3','B1','B2'],
                     },
                 A2 => { text =>"Choice A2" ,
                         default => "C2",
- Line 586  $menu{$choice1}->{'select2'}.
+ Line 956  $menu{$choice1}->{'select2'}.
                             C1 => "Choice C1",
                             C2 => "Choice C2",
                             C3 => "Choice C3"
-                            }
+                            },
+                        order => ['C2','C1','C3'],
                     },
                 A3 => { text =>"Choice A3" ,
                         default => "D6",
- Line 598  $menu{$choice1}->{'select2'}.
+ Line 969  $menu{$choice1}->{'select2'}.
                             D5 => "Choice D5",
                             D6 => "Choice D6",
                             D7 => "Choice D7"
-                            }
+                            },
+                        order => ['D4','D3','D2','D1','D7','D6','D5'],
                     }
                 );
- Line 610  sub linked_select_forms {
+ Line 982  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.="// <![CDATA[\n";
      $result.="var select2data = new Object();\n";
      $" = '","';
      my $debug = '';
- Line 624  sub linked_select_forms {
+ Line 998  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(";
          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;
- Line 659  function select1_changed() {
+ Line 1036  function select1_changed() {
          }
      }
  }
+ // ]]>
  </script>
  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";
- Line 673  END
+ Line 1055  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";
- Line 685  END
+ Line 1072  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
- Line 711  sub help_open_topic {
+ Line 1098  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;
- Line 731  sub help_open_topic {
+ Line 1115  sub help_open_topic {
      }
      # Add the text
      if ($text ne "") {
- 	$template .=
+ 	$template.='<span class="LC_help_open_topic">'
-             "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
+                   .'<a target="_top" href="'.$link.'">'
-             "<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+                   .$text.'</a>';
      }
-     # Add the graphic
+     # (Always) Add the graphic
      my $title = &mt('Online Help');
-     my $helpicon=&lonhttpdurl("/adm/help/gif/smallHelp.gif");
+     my $helpicon=&lonhttpdurl("/adm/help/help.png");
-     $template .= <<"ENDTEMPLATE";
+     $template.=' <a target="_top" href="'.$link.'" title="'.$title.'">'
-  <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
+               .'<img src="'.$helpicon.'" border="0"'
- ENDTEMPLATE
+               .' alt="'.&mt('Help: [_1]',$topic).'"'
-     if ($text ne '') { $template.='</td></tr></table>' };
+               .' title="'.$title.'" style="vertical-align:middle;"'
+               .' /></a>';
+     if ($text ne "") {
+         $template.='</span>';
+     }
      return $template;
  }
- Line 751  ENDTEMPLATE
+ Line 1139  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) {
+     if ($topic) {
- 	$addOther = Apache::loncommon::help_open_topic($other, shift,
+ 	$addOther = '<span>'.&Apache::loncommon::help_open_topic($topic,&mt($text),
- 						       undef, undef, 600) .
+ 							       undef, undef, 600).
- 							   '</td><td>';
+ 								   '</span> ';
      }
-     return '<table><tr><td>'.
+     $out = '<span>' # Start cheatsheet
- 	$addOther .
+ 	  .$addOther
- 	&Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols',
+           .'<span>'
- 					    undef,undef,600)
+ 	  .&Apache::loncommon::help_open_topic('Greek_Symbols',&mt('Greek Symbols'),
- 	.'</td><td>'.
+ 					       undef,undef,600)
- 	&Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols',
+ 	  .'</span> <span>'
- 					    undef,undef,600)
+ 	  .&Apache::loncommon::help_open_topic('Other_Symbols',&mt('Other Symbols'),
- 	.'</td></tr></table>';
+ 					       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 {
      my $helptopic='Student_Intro';
      if ($env{'request.role'}=~/^(ca|au)/) {
  	$helptopic='Authoring_Intro';
-     } elsif ($env{'request.role'}=~/^cc/) {
+     } elsif ($env{'request.role'}=~/^(cc|co)/) {
  	$helptopic='Course_Coordination_Intro';
+     } elsif ($env{'request.role'}=~/^dc/) {
+         $helptopic='Domain_Coordination_Intro';
      }
      return $helptopic;
  }
- Line 790  sub update_help_link {
+ Line 1190  sub update_help_link {
      my $banner_link = "/adm/helpmenu?page=banner&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp&amp;stayonpage=$stayOnPage";
      my $output .= <<"ENDOUTPUT";
  <script type="text/javascript">
+ // <![CDATA[
  banner_link = '$banner_link';
+ // ]]>
  </script>
  ENDOUTPUT
      return $output;
- Line 800  ENDOUTPUT
+ Line 1202  ENDOUTPUT
  sub help_open_menu {
      my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text)
  	= @_;
-     $stayOnPage = 0 if (not defined $stayOnPage);
+     $stayOnPage = 1;
-     # 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;
-     }
      my $output;
      if ($component_help) {
  	if (!$text) {
- Line 827  sub help_open_menu {
+ Line 1223  sub help_open_menu {
  sub top_nav_help {
      my ($text) = @_;
      $text = &mt($text);
-     my $stay_on_page =
+     my $stay_on_page = 1;
- 	($env{'browser.interface'}  eq 'textual' ||
- 	 $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,$stay_on_page);
- Line 844  END
+ Line 1239  END
  sub help_menu_js {
      my ($text) = @_;
+     my $stayOnPage = 1;
-     my $stayOnPage =
- 	($env{'browser.interface'}  eq 'textual' ||
- 	 $env{'environment.remote'} eq 'off' );
      my $width = 620;
      my $height = 600;
      my $helptopic=&general_help();
- Line 867  sub help_menu_js {
+ Line 1258  sub help_menu_js {
      my $template .= <<"ENDTEMPLATE";
  <script type="text/javascript">
- // <!-- BEGIN LON-CAPA Internal
  // <![CDATA[
+ // <!-- BEGIN LON-CAPA Internal
  var banner_link = '';
  function helpMenu(target) {
      var caller = this;
- Line 893  function writeHelp(caller) {
+ Line 1284  function writeHelp(caller) {
      caller.document.close()
      caller.focus()
  }
- // ]]>
  // END LON-CAPA Internal -->
+ // ]]>
  </script>
  ENDTEMPLATE
      return $template;
- Line 905  sub help_open_bug {
+ Line 1296  sub help_open_bug {
      unless ($env{'user.adv'}) { return ''; }
      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' ) {
  	$stayOnPage=1;
-     }
      $width = 600 if (not defined $width);
      $height = 600 if (not defined $height);
- Line 931  sub help_open_bug {
+ Line 1318  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
- Line 950  sub help_open_faq {
+ Line 1337  sub help_open_faq {
      unless ($env{'user.adv'}) { return ''; }
      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' ) {
  	$stayOnPage=1;
-     }
      $width = 350 if (not defined $width);
      $height = 400 if (not defined $height);
- Line 976  sub help_open_faq {
+ Line 1359  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
- Line 995  ENDTEMPLATE
+ Line 1378  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
- Line 1050  DOMBASED
+ Line 1433  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
- Line 1074  sub changable_area {
+ Line 1457  sub changable_area {
  =pod
- =item * viewport_geometry_js {
+ =item * &viewport_geometry_js
  Provides javascript object (Geometry) which can provide information about the viewport geometry for the client browser.
- Line 1121  GEOMETRY
+ Line 1504  GEOMETRY
  =pod
- =item * viewport_size_js {
+ =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.
- Line 1145  DIMS
+ Line 1528  DIMS
  =pod
- =item * resize_textarea_js
+ =item * &resize_textarea_js()
  emits the needed javascript to resize a textarea to be as big as possible
- Line 1154  the id of the element to resize, second
+ Line 1537  the id of the element to resize, second
  surrounds everything that comes after the textarea, this routine needs
  to be attached to the <body> for the onload and onresize events.
+ =back
  =cut
- Line 1161  sub resize_textarea_js {
+ Line 1545  sub resize_textarea_js {
      my $geometry = &viewport_geometry_js();
      return <<"RESIZE";
      <script type="text/javascript">
+ // <![CDATA[
  $geometry
  function getX(element) {
- Line 1199  function resize_textarea(textarea_id,bot
+ Line 1584  function resize_textarea(textarea_id,bot
      }
      textarea.style.height=new_height+'px';
  }
+ // ]]>
  </script>
  RESIZE
- Line 1206  RESIZE
+ Line 1592  RESIZE
  =pod
- =back
  =head1 Excel and CSV file utility routines
  =over 4
- Line 1219  RESIZE
+ Line 1603  RESIZE
  =pod
- =item * csv_translate($text)
+ =item * &csv_translate($text)
  Translate $text to allow it to be output as a 'comma separated values'
  format.
- Line 1240  sub csv_translate {
+ Line 1624  sub csv_translate {
  =pod
- =item * define_excel_formats
+ =item * &define_excel_formats()
  Define some commonly used Excel cell formats.
- Line 1296  sub define_excel_formats {
+ Line 1680  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.
- Line 1321  sub create_workbook {
+ Line 1705  sub create_workbook {
      my $workbook  = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
      if (! defined($workbook)) {
          $r->log_error("Error creating excel spreadsheet $filename: $!");
-         $r->print('<p>'.&mt("Unable to create new Excel file.  ".
+         $r->print(
-                             "This error has been logged.  ".
+             '<p class="LC_error">'
-                             "Please alert your LON-CAPA administrator").
+            .&mt('Problems occurred in creating the new Excel file.')
-                   '</p>');
+            .' '.&mt('This error has been logged.')
+            .' '.&mt('Please alert your LON-CAPA administrator.')
+            .'</p>'
+         );
          return (undef);
      }
      #
- Line 1339  sub create_workbook {
+ Line 1726  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
- Line 1364  sub create_text_file {
+ Line 1751  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.  ".
+         $r->print(
-                   "This error has been logged.  ".
+             '<p class="LC_error">'
-                   "Please alert your LON-CAPA administrator.");
+            .&mt('Problems occurred in creating the output file.')
+            .' '.&mt('This error has been logged.')
+            .' '.&mt('Please alert your LON-CAPA administrator.')
+            .'</p>'
+         );
      }
      return ($fh,$filename)
  }
- Line 1407  sub domain_select {
+ Line 1798  sub domain_select {
  =over 4
- =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
- Line 1433  sub multiple_select_form {
+ Line 1824  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};
- Line 1457  sub multiple_select_form {
+ Line 1848  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.
- Line 1479  sub select_form {
+ Line 1870  sub select_form {
          $selectform.=
  	    '<option value="'.&HTML::Entities::encode($key,'"<>&').'" '.
              ($key eq $def ? 'selected="selected" ' : '').
-                 ">".&mt($hash{$key})."</option>\n";
+                 ">".$hash{$key}."</option>\n";
      }
      $selectform.="</select>";
      return $selectform;
- Line 1490  sub select_form {
+ Line 1881  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 {
- Line 1544  sub select_level_form {
+ Line 1935  sub select_level_form {
  =pod
- =item * select_dom_form($defdom,$name,$includeempty,$showdomdesc)
+ =item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms)
  Returns a string containing a <select name='$name' size='1'> form to
  allow a user to select the domain to preform an operation in.
- Line 1553  See loncreateuser.pm for an example invo
+ Line 1944  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.
+ The optional $onchange argument specifies what should occur if the domain selector is changed, e.g., 'this.form.submit()' if the form is to be automatically submitted.
+ The optional $incdoms is a reference to an array of domains which will be the only available options.
  =cut
  #-------------------------------------------
  sub select_dom_form {
-     my ($defdom,$name,$includeempty,$showdomdesc) = @_;
+     my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms) = @_;
-     my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
+     if ($onchange) {
+         $onchange = ' onchange="'.$onchange.'"';
+     }
+     my @domains;
+     if (ref($incdoms) eq 'ARRAY') {
+         @domains = sort {lc($a) cmp lc($b)} (@{$incdoms});
+     } else {
+         @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;
- Line 1584  sub select_dom_form {
+ Line 1987  sub select_dom_form {
  =pod
- =item * home_server_form_item($domain,$name,$defaultflag)
+ =item * &home_server_form_item($domain,$name,$defaultflag)
  input: 4 arguments (two required, two optional) -
      $domain - domain of new user
- Line 1618  sub home_server_form_item {
+ Line 2021  sub home_server_form_item {
      if ($numlib > 1) {
          $result .= '<select name="'.$name.'" />'."\n";
          if ($default) {
-             $result .= '<option value="default" selected>'.&mt('default').
+             $result .= '<option value="default" selected="selected">'.&mt('default').
                         '</option>'."\n";
          }
          foreach my $hostid (sort(keys(%servers))) {
- Line 1744  sub decode_user_agent {
+ Line 2147  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
- Line 1768  See loncreateuser.pm for invocation and
+ Line 2169  See loncreateuser.pm for invocation and
  =back
- =back
+ See loncreateuser.pm for invocation and use examples.
  =cut
- Line 1915  sub authform_kerberos {
+ Line 2316  sub authform_kerberos {
          $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'};
      if (defined($in{'curr_authtype'})) {
          if ($in{'curr_authtype'} eq 'krb') {
-             $krbcheck = ' checked="on"';
+             $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="on"';
+                     $check5 = ' checked="checked"';
                      $check4 = '';
                  } else {
-                     $check4 = ' checked="on"';
+                     $check4 = ' checked="checked"';
                      $check5 = '';
                  }
              }
- Line 1949  sub authform_kerberos {
+ Line 2355  sub authform_kerberos {
          }
      } else {
          if ($authnum == 1) {
-             $authtype = '<input type="hidden" name="login" value="krb">';
+             $authtype = '<input type="hidden" name="login" value="krb" />';
          }
      }
      if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) {
- Line 1958  sub authform_kerberos {
+ Line 2364  sub authform_kerberos {
          if (defined($in{'mode'})) {
              if ($in{'mode'} eq 'modifycourse') {
                  if ($authnum == 1) {
-                     $authtype = '<input type="hidden" name="login" value="krb">';
+                     $authtype = '<input type="hidden" name="login" value="krb" />';
                  }
              }
          }
- Line 2019  sub authform_internal{
+ Line 2425  sub authform_internal{
      if (defined($in{'curr_authtype'})) {
          if ($in{'curr_authtype'} eq 'int') {
              if ($can_assign{'int'}) {
-                 $intcheck = 'checked="on" ';
+                 $intcheck = 'checked="checked" ';
+                 if (defined($in{'mode'})) {
+                     if ($in{'mode'} eq 'modifyuser') {
+                         $intcheck = '';
+                     }
+                 }
                  if (defined($in{'curr_autharg'})) {
                      $intarg = $in{'curr_autharg'};
                  }
- Line 2030  sub authform_internal{
+ Line 2441  sub authform_internal{
          }
      } else {
          if ($authnum == 1) {
-             $authtype = '<input type="hidden" name="login" value="int">';
+             $authtype = '<input type="hidden" name="login" value="int" />';
          }
      }
      if (!$can_assign{'int'}) {
- Line 2039  sub authform_internal{
+ Line 2450  sub authform_internal{
          if (defined($in{'mode'})) {
              if ($in{'mode'} eq 'modifycourse') {
                  if ($authnum == 1) {
-                     $authtype = '<input type="hidden" name="login" value="int">';
+                     $authtype = '<input type="hidden" name="login" value="int" />';
                  }
              }
          }
- Line 2049  sub authform_internal{
+ Line 2460  sub authform_internal{
          $authtype = '<input type="radio" name="login" value="int" '.$intcheck.
                      ' onchange="'.$jscall.'" onclick="'.$jscall.'" />';
      }
-     $autharg = '<input type="text" size="10" name="intarg" value="'.
+     $autharg = '<input type="password" size="10" name="intarg" value="'.
                 $intarg.'" onchange="'.$jscall.'" />';
      $result = &mt
          ('[_1] Internally authenticated (with initial password [_2])',
           '<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;
  }
- Line 2068  sub authform_local{
+ Line 2480  sub authform_local{
      if (defined($in{'curr_authtype'})) {
          if ($in{'curr_authtype'} eq 'loc') {
              if ($can_assign{'loc'}) {
-                 $loccheck = 'checked="on" ';
+                 $loccheck = 'checked="checked" ';
+                 if (defined($in{'mode'})) {
+                     if ($in{'mode'} eq 'modifyuser') {
+                         $loccheck = '';
+                     }
+                 }
                  if (defined($in{'curr_autharg'})) {
                      $locarg = $in{'curr_autharg'};
                  }
- Line 2079  sub authform_local{
+ Line 2496  sub authform_local{
          }
      } else {
          if ($authnum == 1) {
-             $authtype = '<input type="hidden" name="login" value="loc">';
+             $authtype = '<input type="hidden" name="login" value="loc" />';
          }
      }
      if (!$can_assign{'loc'}) {
- Line 2088  sub authform_local{
+ Line 2505  sub authform_local{
          if (defined($in{'mode'})) {
              if ($in{'mode'} eq 'modifycourse') {
                  if ($authnum == 1) {
-                     $authtype = '<input type="hidden" name="login" value="loc">';
+                     $authtype = '<input type="hidden" name="login" value="loc" />';
                  }
              }
          }
- Line 2117  sub authform_filesystem{
+ Line 2534  sub authform_filesystem{
      if (defined($in{'curr_authtype'})) {
          if ($in{'curr_authtype'} eq 'fsys') {
              if ($can_assign{'fsys'}) {
-                 $fsyscheck = 'checked="on" ';
+                 $fsyscheck = 'checked="checked" ';
+                 if (defined($in{'mode'})) {
+                     if ($in{'mode'} eq 'modifyuser') {
+                         $fsyscheck = '';
+                     }
+                 }
              } else {
                  $result = &mt('Currently Filesystem Authenticated.');
                  return $result;
- Line 2125  sub authform_filesystem{
+ Line 2547  sub authform_filesystem{
          }
      } else {
          if ($authnum == 1) {
-             $authtype = '<input type="hidden" name="login" value="fsys">';
+             $authtype = '<input type="hidden" name="login" value="fsys" />';
          }
      }
      if (!$can_assign{'fsys'}) {
- Line 2134  sub authform_filesystem{
+ Line 2556  sub authform_filesystem{
          if (defined($in{'mode'})) {
              if ($in{'mode'} eq 'modifycourse') {
                  if ($authnum == 1) {
-                     $authtype = '<input type="hidden" name="login" value="fsys">';
+                     $authtype = '<input type="hidden" name="login" value="fsys" />';
                  }
              }
          }
- Line 2151  sub authform_filesystem{
+ Line 2573  sub authform_filesystem{
          ('[_1] Filesystem Authenticated (with initial password [_2])',
           '<label><input type="radio" name="login" value="fsys" '.
           $fsyscheck.'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
-          '</label><input type="text" size="10" name="fsysarg" value="" '.
+          '</label><input type="password" size="10" name="fsysarg" value="" '.
                    'onchange="'.$jscall.'" />');
      return $result;
  }
- Line 2199  sub get_assignable_auth {
+ Line 2621  sub get_assignable_auth {
  }
  ###############################################################
- ##    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'));
- }
- ###############################################################
- ##   End Get Authentication Defaults for Domain              ##
- ###############################################################
- ###############################################################
  ##    Get Kerberos Defaults for Domain                 ##
  ###############################################################
  ##
- Line 2246  sub get_auth_defaults {
+ Line 2632  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 and domain. If not found, it defaults to version 4 and the
- version 4 and the domain of the server.
+ 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) =
+     my ($krbdef,$krbdefdom);
-         &Apache::loncommon::get_auth_defaults($domain);
+     my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
-     unless ($krbdef =~/^krb/ && $krbdefdom) {
+     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/;
- Line 2270  sub get_kerberos_defaults {
+ Line 2665  sub get_kerberos_defaults {
      return ($krbdef,$krbdefdom);
  }
- =pod
- =back
- =cut
  ###############################################################
  ##                Thesaurus Functions                        ##
- Line 2286  sub get_kerberos_defaults {
+ Line 2676  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.
- Line 2331  sub initialize_keywords {
+ Line 2721  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
- Line 2352  sub keyword {
+ Line 2742  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
- Line 2410  sub get_related_words {
+ Line 2800  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
- Line 2439  sub plainname {
+ Line 2829  sub plainname {
  # -------------------------------------------------------------------- Nickname
  =pod
- =item * nickname($uname,$udom)
+ =item * &nickname($uname,$udom)
  Gets a users name and returns it as a string as
- Line 2489  sub getnames {
+ Line 2879  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') {
- Line 2531  sub flush_email_cache {
+ Line 2924  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
- Line 2550  sub screenname {
+ Line 2980  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 {
- Line 2560  sub messagewrapper {
+ Line 3010  sub messagewrapper {
  	'&amp;subject='.&escape($subject).'&amp;text='.&escape($text).'" '.
          'title="'.&mt('Send message').'">'.$link.'</a>';
  }
  # --------------------------------------------------------------- Notes Wrapper
  sub noteswrapper {
      my ($link,$un,$do)=@_;
      return
- "<a href='/adm/email?recordftf=retrieve&recname=$un&recdom=$do'>$link</a>";
+ "<a href='/adm/email?recordftf=retrieve&amp;recname=$un&amp;recdom=$do'>$link</a>";
  }
  # ------------------------------------------------------------- Aboutme Wrapper
  sub aboutmewrapper {
- Line 2574  sub aboutmewrapper {
+ Line 3026  sub aboutmewrapper {
      if (!defined($username)  && !defined($domain)) {
          return;
      }
-     return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'.
+     return '<a href="/adm/'.$domain.'/'.$username.'/aboutme?forcestudent=1"'.
- 	($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)=@_;
+     my ($linktext,$coursedir,$domain)=@_;
-     if ($fontcolor) {
-         $linktext='<font color="'.$fontcolor.'">'.$linktext.'</font>';
-     }
      return qq{<a href="/public/$domain/$coursedir/syllabus">$linktext</a>};
  }
+ # -----------------------------------------------------------------------------
  sub track_student_link {
-     my ($linktext,$sname,$sdom,$target,$start) = @_;
+     my ($linktext,$sname,$sdom,$target,$start,$only_body) = @_;
      my $link ="/adm/trackstudent?";
      my $title = 'View recent activity';
      if (defined($sname) && $sname !~ /^\s*$/ &&
- Line 2604  sub track_student_link {
+ Line 3054  sub track_student_link {
          $target = '';
      }
      if ($start) { $link.='&amp;start='.$start; }
+     if ($only_body) { $link .= '&amp;only_body=1'; }
      $title = &mt($title);
      $linktext = &mt($linktext);
      return qq{<a href="$link" title="$title" $target>$linktext</a>}.
  	&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
- Line 2631  sub student_image_tag {
+ Line 3103  sub student_image_tag {
  =over 4
- =item * languageids()
+ =item * &languageids()
  returns list of all language ids
- Line 2643  sub languageids {
+ Line 3115  sub languageids {
  =pod
- =item * languagedescription()
+ =item * &languagedescription()
  returns description of a specified language id
- Line 2668  sub supportedlanguagecode {
+ Line 3140  sub supportedlanguagecode {
  =pod
- =item * copyrightids()
+ =item * &copyrightids()
  returns list of all copyrights
- Line 2680  sub copyrightids {
+ Line 3152  sub copyrightids {
  =pod
- =item * copyrightdescription()
+ =item * &copyrightdescription()
  returns description of a specified copyright id
- Line 2692  sub copyrightdescription {
+ Line 3164  sub copyrightdescription {
  =pod
- =item * source_copyrightids()
+ =item * &source_copyrightids()
  returns list of all source copyrights
- Line 2704  sub source_copyrightids {
+ Line 3176  sub source_copyrightids {
  =pod
- =item * source_copyrightdescription()
+ =item * &source_copyrightdescription()
  returns description of a specified source copyright id
- Line 2716  sub source_copyrightdescription {
+ Line 3188  sub source_copyrightdescription {
  =pod
- =item * filecategories()
+ =item * &filecategories()
  returns list of all file categories
- Line 2728  sub filecategories {
+ Line 3200  sub filecategories {
  =pod
- =item * filecategorytypes()
+ =item * &filecategorytypes()
  returns list of file types belonging to a given file
  category
- Line 2742  sub filecategorytypes {
+ Line 3214  sub filecategorytypes {
  =pod
- =item * fileembstyle()
+ =item * &fileembstyle()
  returns embedding style for a specified file type
- Line 2766  sub filecategoryselect {
+ Line 3238  sub filecategoryselect {
  =pod
- =item * filedescription()
+ =item * &filedescription()
  returns description for a specified file type
- Line 2780  sub filedescription {
+ Line 3252  sub filedescription {
  =pod
- =item * filedescriptionex()
+ =item * &filedescriptionex()
  returns description for a specified file type with
  extra formatting
- Line 2812  sub fileextensions {
+ Line 3284  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']);
- Line 2824  sub display_languages {
+ Line 3296  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=$ENV{'HTTP_ACCEPT_LANGUAGE'};
-     if ($browser) {
- 	my @browser =
- 	    map { (split(/\s*;\s*/,$_))[0] } (split(/\s*,\s*/,$browser));
- 	push(@languages,@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]);
- 	}
-     }
-     #uniqueify the languages list
-     my %count;
-     @genlanguages = map { $count{$_}++ == 0 ? $_ : () } @genlanguages;
-     return @genlanguages;
- }
  sub languages {
      my ($possible_langs) = @_;
-     my @preferred_langs = &preferred_languages();
+     my @preferred_langs = &Apache::lonlocal::preferred_languages();
      if (!ref($possible_langs)) {
  	if( wantarray ) {
  	    return @preferred_langs;
- Line 2894  sub languages {
+ Line 3319  sub languages {
      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                     ##
  ###############################################################
- Line 2904  sub languages {
+ Line 3352  sub 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:
- Line 2950  sub get_previous_attempt {
+ Line 3398  sub get_previous_attempt {
        }
        $prevattempts=&start_data_table().&start_data_table_header_row();
        $prevattempts.='<th>'.&mt('History').'</th>';
+       my %typeparts;
+       my $showsurv=&Apache::lonnet::allowed('vas',$env{'request.course.id'});
        foreach my $key (sort(keys(%lasthash))) {
  	my ($ign,@parts) = split(/\./,$key);
  	if ($#parts > 0) {
  	  my $data=$parts[-1];
  	  pop(@parts);
- 	  $prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.'&nbsp;</th>';
+           if ($data eq 'type') {
+               unless ($showsurv) {
+                   my $id = join(',',@parts);
+                   $typeparts{$ign.'.'.$id} = $lasthash{$key};
+               }
+               delete($lasthash{$key});
+           } else {
+ 	      $prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.'&nbsp;</th>';
+           }
  	} else {
  	  if ($#parts == 0) {
  	    $prevattempts.='<th>'.$parts[0].'</th>';
- Line 2965  sub get_previous_attempt {
+ Line 3423  sub get_previous_attempt {
  	}
        }
        $prevattempts.=&end_data_table_header_row();
+       my %lasthidden;
        if ($getattempt eq '') {
  	for ($version=1;$version<=$returnhash{'version'};$version++) {
- 	  $prevattempts.=&start_data_table_row().
+             my @hidden;
- 	      '<td>'.&mt('Transaction [_1]',$version).'</td>';
+             if (%typeparts) {
- 	    foreach my $key (sort(keys(%lasthash))) {
+                 foreach my $id (keys(%typeparts)) {
- 		my $value = &format_previous_attempt_value($key,
+                     if (($returnhash{$version.':'.$id.'.type'} eq 'anonsurvey') || ($returnhash{$version.':'.$id.'.type'} eq 'anonsurveycred')) {
- 							   $returnhash{$version.':'.$key});
+                         push(@hidden,$id);
- 		$prevattempts.='<td>'.$value.'&nbsp;</td>';
+                         $lasthidden{$id} = 1;
- 	    }
+                     } elsif ($lasthidden{$id}) {
- 	  $prevattempts.=&end_data_table_row();
+                         if (exists($returnhash{$version.':'.$id.'.award'})) {
+                             delete($lasthidden{$id});
+                         }
+                     }
+                 }
+             }
+             $prevattempts.=&start_data_table_row().
+                            '<td>'.&mt('Transaction [_1]',$version).'</td>';
+             if (@hidden) {
+                 foreach my $key (sort(keys(%lasthash))) {
+                     my $hide;
+                     foreach my $id (@hidden) {
+                         if ($key =~ /^\Q$id\E/) {
+                             $hide = 1;
+                             last;
+                         }
+                     }
+                     if ($hide) {
+                         my ($id,$data) = ($key =~ /^(.+)\.([^.]+)$/);
+                         if (($data eq 'award') || ($data eq 'awarddetail')) {
+                             my $value = &format_previous_attempt_value($key,
+                                              $returnhash{$version.':'.$key});
+                             $prevattempts.='<td>'.$value.'&nbsp;</td>';
+                         } else {
+                             $prevattempts.='<td>&nbsp;</td>';
+                         }
+                     } else {
+                         if ($key =~ /\./) {
+                             my $value = &format_previous_attempt_value($key,
+                                               $returnhash{$version.':'.$key});
+                             $prevattempts.='<td>'.$value.'&nbsp;</td>';
+                         } else {
+                             $prevattempts.='<td>&nbsp;</td>';
+                         }
+                     }
+                 }
+             } else {
+ 	        foreach my $key (sort(keys(%lasthash))) {
+ 		    my $value = &format_previous_attempt_value($key,
+ 			            $returnhash{$version.':'.$key});
+ 		    $prevattempts.='<td>'.$value.'&nbsp;</td>';
+ 	        }
+             }
+ 	    $prevattempts.=&end_data_table_row();
  	 }
        }
+       my @currhidden = keys(%lasthidden);
        $prevattempts.=&start_data_table_row().'<td>'.&mt('Current').'</td>';
        foreach my $key (sort(keys(%lasthash))) {
- 	my $value = &format_previous_attempt_value($key,$lasthash{$key});
+           if (%typeparts) {
- 	if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)}
+               my $hidden;
- 	$prevattempts.='<td>'.$value.'&nbsp;</td>';
+               foreach my $id (@currhidden) {
+                   if ($key =~ /^\Q$id\E/) {
+                       $hidden = 1;
+                       last;
+                   }
+               }
+               if ($hidden) {
+                   my ($id,$data) = ($key =~ /^(.+)\.([^.]+)$/);
+                   if (($data eq 'award') || ($data eq 'awarddetail')) {
+                       my $value = &format_previous_attempt_value($key,$lasthash{$key});
+                       if ($key =~/$regexp$/ && (defined &$gradesub)) {
+                           $value = &$gradesub($value);
+                       }
+                       $prevattempts.='<td>'.$value.'&nbsp;</td>';
+                   } else {
+                       $prevattempts.='<td>&nbsp;</td>';
+                   }
+               } else {
+                   my $value = &format_previous_attempt_value($key,$lasthash{$key});
+                   if ($key =~/$regexp$/ && (defined &$gradesub)) {
+                       $value = &$gradesub($value);
+                   }
+                   $prevattempts.='<td>'.$value.'&nbsp;</td>';
+               }
+           } else {
+ 	      my $value = &format_previous_attempt_value($key,$lasthash{$key});
+ 	      if ($key =~/$regexp$/ && (defined &$gradesub)) {
+                   $value = &$gradesub($value);
+               }
+ 	      $prevattempts.='<td>'.$value.'&nbsp;</td>';
+           }
        }
        $prevattempts.= &end_data_table_row().&end_data_table();
      } else {
- Line 3032  sub relative_to_absolute {
+ Line 3565  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) ||
- Line 3048  sub relative_to_absolute {
+ Line 3581  sub relative_to_absolute {
  =pod
- =item * get_student_view
+ =item * &get_student_view()
  show a snapshot of what student was looking at
- Line 3067  sub get_student_view {
+ Line 3600  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;
- Line 3076  sub get_student_view {
+ Line 3609  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
- Line 3185  sub pprmlink {
+ Line 3750  sub pprmlink {
  sub timehash {
-     my @ltime=localtime(shift);
+     my ($thistime) = @_;
-     return ( 'seconds' => $ltime[0],
+     my $timezone = &Apache::lonlocal::gettimezone();
-              'minutes' => $ltime[1],
+     my $dt = DateTime->from_epoch(epoch => $thistime)
-              'hours'   => $ltime[2],
+                      ->set_time_zone($timezone);
-              'day'     => $ltime[3],
+     my $wday = $dt->day_of_week();
-              'month'   => $ltime[4]+1,
+     if ($wday == 7) { $wday = 0; }
-              'year'    => $ltime[5]+1900,
+     return ( 'second' => $dt->second(),
-              'weekday' => $ltime[6],
+              'minute' => $dt->minute(),
-              'dayyear' => $ltime[7]+1,
+              'hour'   => $dt->hour(),
-              'dlsav'   => $ltime[8] );
+              '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 {
- Line 3204  sub utc_string {
+ Line 3774  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));
- Line 3228  sub findallcourses {
+ Line 3816  sub findallcourses {
          if (!%roles) {
              %roles = (
                         cc => 1,
+                        co => 1,
                         in => 1,
                         ep => 1,
                         ta => 1,
- Line 3418  sub blockcheck {
+ Line 4007  sub blockcheck {
                   ($env{'request.role'} !~ m{^st\./\Q$cdom\E/\Q$cnum\E}));
          next if ($no_userblock);
-         # Retrieve blocking times and identity of blocker for course
+         # Retrieve blocking times and identity of locker for course
          # of specified user, unless user has 'evb' privilege.
          my ($start,$end)=&get_blocks($setters,$activity,$cdom,$cnum);
- Line 3483  sub parse_block_record {
+ Line 4072  sub parse_block_record {
      return ($setuname,$setudom,$title,$blocks);
  }
- sub build_block_table {
+ sub blocking_status {
-     my ($startblock,$endblock,$setters) = @_;
+   my ($activity,$uname,$udom) = @_;
-     my %lt = &Apache::lonlocal::texthash(
+   my %setters;
-         'cacb' => 'Currently active communication blocks',
-         'cour' => 'Course',
+   # check for active blocking
-         'dura' => 'Duration',
+   my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom);
-         'blse' => 'Block set by'
-     );
+   my $blocked = $startblock && $endblock ? 1 : 0;
-     my $output;
-     $output = '<br />'.$lt{'cacb'}.':<br />';
+   # caller just wants to know whether a block is active
-     $output .= &start_data_table();
+   if (!wantarray) { return $blocked; }
-     $output .= '
- <tr>
+   # build a link to a popup window containing the details
-  <th>'.$lt{'cour'}.'</th>
+   my $querystring  = "?activity=$activity";
-  <th>'.$lt{'dura'}.'</th>
+   # $uname and $udom decide whose portfolio the user is trying to look at
-  <th>'.$lt{'blse'}.'</th>
+      $querystring .= "&amp;udom=$udom"      if $udom;
- </tr>
+      $querystring .= "&amp;uname=$uname"    if $uname;
- ';
-     foreach my $course (keys(%{$setters})) {
+   my $output .= <<'END_MYBLOCK';
-         my %courseinfo=&Apache::lonnet::coursedescription($course);
+     function openWindow(url, wdwName, w, h, toolbar,scrollbar) {
-         for (my $i=0; $i<@{$$setters{$course}{staff}}; $i++) {
+         var options = "width=" + w + ",height=" + h + ",";
-             my ($uname,$udom) = @{$$setters{$course}{staff}[$i]};
+         options += "resizable=yes,scrollbars="+scrollbar+",status=no,";
-             my $fullname = &plainname($uname,$udom);
+         options += "menubar=no,toolbar="+toolbar+",location=no,directories=no";
-             if (defined($env{'user.name'}) && defined($env{'user.domain'})
+         var newWin = window.open(url, wdwName, options);
-                 && $env{'user.name'} ne 'public'
+         newWin.focus();
-                 && $env{'user.domain'} ne 'public') {
+     }
-                 $fullname = &aboutmewrapper($fullname,$uname,$udom);
+ END_MYBLOCK
-             }
-             my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};
+   $output = Apache::lonhtmlcommon::scripttag($output);
-             $openblock = &Apache::lonlocal::locallocaltime($openblock);
-             $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
+   my $popupUrl = "/adm/blockingstatus/$querystring";
-             $output .= &Apache::loncommon::start_data_table_row().
+   my $text = mt('Communication Blocked');
-                        '<td>'.$courseinfo{'description'}.'</td>'.
-                        '<td>'.$openblock.' to '.$closeblock.'</td>'.
+   $output .= <<"END_BLOCK";
-                        '<td>'.$fullname.'</td>'.
+ <div class='LC_comblock'>
-                         &Apache::loncommon::end_data_table_row();
+   <a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring'
-         }
+   title='$text'>
-     }
+   <img class='LC_noBorder LC_middle' title='$text' src='/res/adm/pages/comblock.png' alt='$text'/></a>
-     $output .= &end_data_table();
+   <a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring'
+   title='$text'>$text</a>
+ </div>
+ END_BLOCK
+   return ($blocked, $output);
  }
- sub blocking_status {
+ ###############################################
-     my ($activity,$uname,$udom) = @_;
-     my %setters;
+ sub check_ip_acc {
-     my ($blocked,$output,$ownitem,$is_course);
+     my ($acc)=@_;
-     my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom);
+     &Apache::lonxml::debug("acc is $acc");
-     if ($startblock && $endblock) {
+     if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) {
-         $blocked = 1;
+         return 1;
-         if (wantarray) {
+     }
-             my $category;
+     my $allowed=0;
-             if ($activity eq 'boards') {
+     my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'};
-                 $category = 'Discussion posts in this course';
-             } elsif ($activity eq 'blogs') {
+     my $name;
-                 $category = 'Blogs';
+     foreach my $pattern (split(',',$acc)) {
-             } elsif ($activity eq 'port') {
+         $pattern =~ s/^\s*//;
-                 if (defined($uname) && defined($udom)) {
+         $pattern =~ s/\s*$//;
-                     if ($uname eq $env{'user.name'} &&
+         if ($pattern =~ /\*$/) {
-                         $udom eq $env{'user.domain'}) {
+             #35.8.*
-                         $ownitem = 1;
+             $pattern=~s/\*//;
-                     }
+             if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
-                 }
+         } elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {
-                 $is_course = &Apache::lonnet::is_course($udom,$uname);
+             #35.8.3.[34-56]
-                 if ($ownitem) {
+             my $low=$2;
-                     $category = 'Your portfolio files';
+             my $high=$3;
-                 } elsif ($is_course) {
+             $pattern=$1;
-                     my $coursedesc;
+             if ($ip =~ /^\Q$pattern\E/) {
-                     foreach my $course (keys(%setters)) {
+                 my $last=(split(/\./,$ip))[3];
-                         my %courseinfo =
+                 if ($last <=$high && $last >=$low) { $allowed=1; }
-                              &Apache::lonnet::coursedescription($course);
+             }
-                         $coursedesc = $courseinfo{'description'};
+         } elsif ($pattern =~ /^\*/) {
-                     }
+             #*.msu.edu
-                     $category = "Group files in the course '$coursedesc'";
+             $pattern=~s/\*//;
-                 } else {
+             if (!defined($name)) {
-                     $category = 'Portfolio files belonging to ';
+                 use Socket;
-                     if ($env{'user.name'} eq 'public' &&
+                 my $netaddr=inet_aton($ip);
-                         $env{'user.domain'} eq 'public') {
+                 ($name)=gethostbyaddr($netaddr,AF_INET);
-                         $category .= &plainname($uname,$udom);
+             }
-                     } else {
+             if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
-                         $category .= &aboutmewrapper(&plainname($uname,$udom),$uname,$udom);
+         } elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
-                     }
+             #127.0.0.1
-                 }
+             if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
-             } elsif ($activity eq 'groups') {
+         } else {
-                 $category = 'Groups in this course';
+             #some.name.com
-             }
+             if (!defined($name)) {
-             my $showstart = &Apache::lonlocal::locallocaltime($startblock);
+                 use Socket;
-             my $showend = &Apache::lonlocal::locallocaltime($endblock);
+                 my $netaddr=inet_aton($ip);
-             $output = '<br />'.&mt('[_1] will be inaccessible between [_2] and [_3] because communication is being blocked.',$category,$showstart,$showend).'<br />';
+                 ($name)=gethostbyaddr($netaddr,AF_INET);
-             if (!($activity eq 'port' && !($ownitem) && !($is_course))) {
-                 $output .= &build_block_table($startblock,$endblock,\%setters);
              }
+             if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
          }
+         if ($allowed) { last; }
      }
-     if (wantarray) {
+     return $allowed;
-         return ($blocked,$output);
-     } else {
-         return $blocked;
-     }
  }
  ###############################################
- Line 3603  sub determinedomain {
+ Line 4194  sub determinedomain {
      my $domain=shift;
      if (! $domain) {
          # Determine domain if we have not been given one
-         $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
+         $domain = &Apache::lonnet::default_login_domain();
          if ($env{'user.domain'}) { $domain=$env{'user.domain'}; }
          if ($env{'request.role.domain'}) {
              $domain=$env{'request.role.domain'};
- Line 3626  sub get_domainconf {
+ Line 4217  sub get_domainconf {
      if (defined($cached)) { return %{$result}; }
      my %domconfig = &Apache::lonnet::get_dom('configuration',
- 					     ['login','rolecolors'],$udom);
+ 					     ['login','rolecolors','autoenroll'],$udom);
-     my %designhash;
+     my (%designhash,%legacy);
      if (keys(%domconfig) > 0) {
          if (ref($domconfig{'login'}) eq 'HASH') {
-             foreach my $key (keys(%{$domconfig{'login'}})) {
+             if (keys(%{$domconfig{'login'}})) {
-                 $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
+                 foreach my $key (keys(%{$domconfig{'login'}})) {
+                     if (ref($domconfig{'login'}{$key}) eq 'HASH') {
+                         if ($key eq 'loginvia') {
+                             if (ref($domconfig{'login'}{'loginvia'}) eq 'HASH') {
+                                 my @ids = &Apache::lonnet::current_machine_ids();
+                                 foreach my $hostname (@ids) {
+                                     if (ref($domconfig{'login'}{'loginvia'}{$hostname}) eq 'HASH') {
+                                         if ($domconfig{'login'}{'loginvia'}{$hostname}{'server'}) {
+                                             my $server = $domconfig{'login'}{'loginvia'}{$hostname}{'server'};
+                                             $designhash{$udom.'.login.loginvia'} = $server;
+                                             if ($domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'} eq 'custom') {
+                                                 $designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'custompath'};
+                                             } else {
+                                                  $designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'};
+                                             }
+                                             if ($domconfig{'login'}{'loginvia'}{$hostname}{'exempt'}) {
+                                                 $designhash{$udom.'.login.loginvia_exempt_'.$hostname} = $domconfig{'login'}{'loginvia'}{$hostname}{'exempt'};
+                                             }
+                                         }
+                                     }
+                                 }
+                             }
+                         } else {
+                             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 (keys(%{$domconfig{'rolecolors'}})) {
-                 if (ref($domconfig{'rolecolors'}{$role}) eq 'HASH') {
+                 foreach my $role (keys(%{$domconfig{'rolecolors'}})) {
-                     foreach my $item (keys(%{$domconfig{'rolecolors'}{$role}})) {
+                     if (ref($domconfig{'rolecolors'}{$role}) eq 'HASH') {
-                         $designhash{$udom.'.'.$role.'.'.$item}=$domconfig{'rolecolors'}{$role}{$item};
+                         foreach my $item (keys(%{$domconfig{'rolecolors'}{$role}})) {
+                             $designhash{$udom.'.'.$role.'.'.$item}=$domconfig{'rolecolors'}{$role}{$item};
+                         }
                      }
                  }
+             } else {
+                 $legacy{'rolecolors'} = 1;
              }
+         } else {
+             $legacy{'rolecolors'} = 1;
          }
-     } else {
+         if (ref($domconfig{'autoenroll'}) eq 'HASH') {
-         my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
+             if ($domconfig{'autoenroll'}{'co-owners'}) {
-         my $designfile =  $designdir.'/'.$udom.'.tab';
+                 $designhash{$udom.'.autoassign.co-owners'}=$domconfig{'autoenroll'}{'co-owners'};
-         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; }
-                 }
-                 close($fh);
              }
          }
-         if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') {
+         if (keys(%legacy) > 0) {
-             $designhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif";
+             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};
+                     }
+                 }
+             }
          }
+     } 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()
- Line 3714  Returns: value of designparamter $which
+ Line 4373  Returns: value of designparamter $which
  ##############################################
  sub designparm {
      my ($which,$domain)=@_;
-     if ($env{'browser.blackwhite'} eq 'on') {
- 	if ($which=~/\.(font|alink|vlink|link)$/) {
- 	    return '#000000';
- 	}
- 	if ($which=~/\.(pgbg|sidebg)$/) {
- 	    return '#FFFFFF';
- 	}
- 	if ($which=~/\.tabbg$/) {
- 	    return '#CCCCCC';
- 	}
-     }
      if (exists($env{'environment.color.'.$which})) {
- 	return $env{'environment.color.'.$which};
+         return $env{'environment.color.'.$which};
      }
      $domain=&determinedomain($domain);
      my %domdesign = &get_domainconf($domain);
      my $output;
      if ($domdesign{$domain.'.'.$which} ne '') {
- 	$output = $domdesign{$domain.'.'.$which};
+         $output = $domdesign{$domain.'.'.$which};
      } else {
          $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/}) {
+             if ($output =~ m{^/res/}) {
- 		my $local_name = &Apache::lonnet::filelocation('',$output);
+                 my $local_name = &Apache::lonnet::filelocation('',$output);
- 		&Apache::lonnet::repcopy($local_name);
+                 &Apache::lonnet::repcopy($local_name);
- 	    }
+             }
              $output = &lonhttpdurl($output);
          }
      }
      return $output;
  }
+ ##############################################
+ =pod
+ =item * &authorspace()
+ Inputs: ./.
+ Returns: Path to the Construction Space of the current user's
+          accessed author space
+          The author space will be that of the current user
+          when accessing the own author space
+          and that of the co-author/assistent co-author
+          when accessing the co-author's/assistent co-author's
+          space
+ =cut
+ sub authorspace {
+     my $caname = '';
+     if ($env{'request.role'} =~ /^ca|^aa/) {
+         (undef,$caname) =
+             ($env{'request.role'}=~/($match_domain)\/($match_username)$/);
+     } else {
+         $caname = $env{'user.name'};
+     }
+     return '/priv/'.$caname.'/';
+ }
+ ##############################################
+ =pod
+ =item * &head_subbox()
+ Inputs: $content (contains HTML code with page functions, etc.)
+ Returns: HTML div with $content
+          To be included in page header
+ =cut
+ sub head_subbox {
+     my ($content)=@_;
+     my $output =
+         '<div id="LC_head_subbox">'
+        .$content
+        .'</div>'
+ }
+ ##############################################
+ =pod
+ =item * &CSTR_pageheader()
+ Inputs: ./.
+ Returns: HTML div with CSTR path and recent box
+          To be included on Construction Space pages
+ =cut
+ sub CSTR_pageheader {
+     # this is for resources; directories have customtitle, and crumbs
+             # and select recent are created in lonpubdir.pm
+     my ($uname,$thisdisfn)=
+         ($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
+     my $formaction='/priv/'.$uname.'/'.$thisdisfn;
+     $formaction=~s/\/+/\//g;
+     my $parentpath = '';
+     my $lastitem = '';
+     if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
+         $parentpath = $1;
+         $lastitem = $2;
+     } else {
+         $lastitem = $thisdisfn;
+     }
+     my $output =
+          '<div>'
+         .&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?
+         .'<b>'.&mt('Construction Space:').'</b> '
+         .'<form name="dirs" method="post" action="'.$formaction
+         .'" target="_top">' #FIXME lonpubdir: target="_parent"
+         .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv',undef,undef);
+     if ($lastitem) {
+         $output .=
+              '<span class="LC_filename">'
+             .$lastitem
+             .'</span>';
+     }
+     $output .=
+          '<br />'
+         #FIXME lonpubdir: &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />"
+         .&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
+         .'</form>'
+         .&Apache::lonmenu::constspaceform()
+         .'</div>';
+     return $output;
+ }
  ###############################################
  ###############################################
- Line 3781  Inputs:
+ Line 4531  Inputs:
  =item * $forcereg, if page should register as content page (relevant for
              text interface only)
- =item * $customtitle, alternate text to use instead of $title
+ =item * $no_nav_bar, if true, keep the 'what is this' info but remove the
-                       in the title box that appears, this text
+                      navigational links
-                       is not auto translated like the $title is
- =item * $notopbar, if true, keep the 'what is this' info but remove the
-                    navigational links
  =item * $bgcolor, used to override the bgcolor on a webpage to a specific value
- =item * $notitle, if true keep the nav controls, but remove the title bar
+ #SD
+ #RC =item * $no_inline_link, if true and in remote mode, don't show the
- =item * $no_inline_link, if true and in remote mode, don't show the
+ #RC          'Switch To Inline Menu' link
-          'Switch To Inline Menu' link
+ #RC
  =item * $args, optional argument valid values are
              no_auto_mt_title -> prevents &mt()ing the title arg
              inherit_jsmath -> when creating popup window in a page,
- Line 3811  other decorations will be returned.
+ Line 4556  other decorations will be returned.
  =cut
  sub bodytag {
-     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
+     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
- 	$notopbar,$bgcolor,$notitle,$no_inline_link,$args)=@_;
+         $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
+     my $public;
+     if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
+         || ($env{'user.name'} eq '') && ($env{'user.domain'} eq '')) {
+         $public = 1;
+     }
      if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
      $function = &get_users_function() if (!$function);
- Line 3821  sub bodytag {
+ Line 4571  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),
- Line 3840  sub bodytag {
+ Line 4590  sub bodytag {
          if ($env{'request.role'} !~ /^cr/) {
              $role = &Apache::lonnet::plaintext($role,&course_type());
          }
+         if ($env{'request.course.sec'}) {
+             $role .= ('&nbsp;'x2).'-&nbsp;'.&mt('section:').'&nbsp;'.$env{'request.course.sec'};
+         }
  	$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
      } else {
          $role = &Apache::lonnet::plaintext($role);
- Line 3857  sub bodytag {
+ Line 4610  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') {
+     if ($public) {
  	undef($role);
      } else {
  	$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
      }
-     my $roleinfo=(<<ENDROLE);
+     my $titleinfo = '<h1>'.$title.'</h1>';
- <td class="LC_title_bar_who">
- <div class="LC_title_bar_name">
-     $name
-     &nbsp;
- </div>
- <div class="LC_title_bar_role">
- $role&nbsp;
- </div>
- <div class="LC_title_bar_realm">
- $realm&nbsp;
- </div>
- </td>
- ENDROLE
-     my $titleinfo = '<span class="LC_title_bar_title">'.$title.'</span>';
-     if ($customtitle) {
-         $titleinfo = $customtitle;
-     }
      #
      # Extra info if you are the DC
      my $dc_info = '';
- Line 3900  ENDROLE
+ Line 4627  ENDROLE
                          $env{'course.'.$env{'request.course.id'}.
                                   '.domain'}.'/'})) {
          my $cid = $env{'request.course.id'};
-         $dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
+         $dc_info = $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
          $dc_info =~ s/\s+$//;
-         $dc_info = '('.$dc_info.')';
      }
-     if ($env{'environment.remote'} eq 'off') {
+     $role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
+     &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
          # No Remote
- 	if ($env{'request.state'} eq 'construct') {
+         if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') {
- 	    $forcereg=1;
+             return $bodytag;
- 	}
+         }
- 	if (!$customtitle && $env{'request.state'} eq 'construct') {
+         if ($env{'request.state'} eq 'construct') { $forcereg=1; }
- 	    # this is for resources; directories have customtitle, and crumbs
-             # and select recent are created in lonpubdir.pm
+         #    if ($env{'request.state'} eq 'construct') {
- 	    my ($uname,$thisdisfn)=
+         #        $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
- 		($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
+         #    }
- 	    my $formaction='/priv/'.$uname.'/'.$thisdisfn;
- 	    $formaction=~s/\/+/\//g;
- 	    my $parentpath = '';
+         if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
- 	    my $lastitem = '';
+              if ($dc_info) {
- 	    if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
+                  $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
- 		$parentpath = $1;
+              }
- 		$lastitem = $2;
+              $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
- 	    } else {
+                 <em>$realm</em> $dc_info</div>|;
- 		$lastitem = $thisdisfn;
+             return $bodytag;
- 	    }
+         }
- 	    $titleinfo =
- 		&Apache::loncommon::help_open_menu('','',3,'Authoring').
+         unless ($env{'request.symb'} =~ m/\.page___\d+___/) {
- 		'<b>Construction Space</b>:&nbsp;'.
+             $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>|;
- 		'<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 />"
+         $bodytag .= Apache::lonhtmlcommon::scripttag(
- 		.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
+             Apache::lonmenu::utilityfunctions(), 'start');
- 		.'</form>'
- 		.&Apache::lonmenu::constspaceform();
+         $bodytag .= Apache::lonmenu::primary_menu();
-         }
+         if ($dc_info) {
-         my $titletable;
+             $dc_info = &dc_courseid_toggle($dc_info);
- 	if (!$notitle) {
+         }
- 	    $titletable =
+         $bodytag .= qq|<div id="LC_realm">$realm $dc_info</div>|;
- 		'<table id="LC_title_bar">'.
-                          "<tr><td> $titleinfo $dc_info</td>".$roleinfo.
+         #don't show menus for public users
- 			 '</tr></table>';
+         if (!$public){
- 	}
+             $bodytag .= Apache::lonmenu::secondary_menu();
- 	if ($notopbar) {
+             $bodytag .= Apache::lonmenu::serverform();
- 	    $bodytag .= $titletable;
+             $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
- 	} else {
+             if ($env{'request.state'} eq 'construct') {
- 	    if ($env{'request.state'} eq 'construct') {
+                 $bodytag .= &Apache::lonmenu::innerregister($forcereg,'',
-                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
+                                 $args->{'bread_crumbs'});
- 							  $titletable);
+             } elsif ($forcereg) {
-             } else {
+                 $bodytag .= &Apache::lonmenu::innerregister($forcereg);
-                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg).
- 		    $titletable;
              }
+         }else{
+             # this is to seperate menu from content when there's no secondary
+             # menu. Especially needed for public accessible ressources.
+             $bodytag .= '<hr style="clear:both" />';
+             $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
          }
-         return $bodytag;
-     }
- #
+         return $bodytag;
- # Top frame rendering, Remote is up
+ }
- #
-     my $imgsrc = $img;
+ sub dc_courseid_toggle {
-     if ($img =~ /^\/adm/) {
+     my ($dc_info) = @_;
-         $imgsrc = &lonhttpdurl($img);
+     return ' <span id="dccidtext" class="LC_cusr_subheading">'.
-     }
+            '<a href="javascript:showCourseID();">'.
-     my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
+            &mt('(More ...)').'</a></span>'.
+            '<div id="dccid" class="LC_dccid">'.$dc_info.'</div>';
-     # Explicit link to get inline menu
-     my $menu= ($no_inline_link?''
- 	       :'<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>');
-     #
-     if ($notitle) {
- 	return $bodytag;
-     }
-     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>
- <tr><td>$titleinfo $dc_info $menu</td>
- $roleinfo
- </tr>
- </table>
- ENDBODY
  }
  sub make_attr_string {
- Line 4010  sub make_attr_string {
+ Line 4720  sub make_attr_string {
  		delete($attr_ref->{$key});
  	    }
  	}
- 	$attr_ref->{'onload'}  =
+ 	$attr_ref->{'onload'}  = $on_load;
- 	    &Apache::lonmenu::loadevents().  $on_load;
+ 	$attr_ref->{'onunload'}= $on_unload;
- 	$attr_ref->{'onunload'}=
- 	    &Apache::lonmenu::unloadevents().$on_unload;
-     }
- # Accessibility font enhance
-     if ($env{'browser.fontenhance'} eq 'on') {
- 	my $style;
- 	foreach my $key (keys(%{$attr_ref})) {
- 	    if (lc($key) eq 'style') {
- 		$style.=$attr_ref->{$key}.';';
- 		delete($attr_ref->{$key});
- 	    }
- 	}
- 	$attr_ref->{'style'}=$style.'; font-size: x-large;';
-     }
-     if ($env{'browser.blackwhite'} eq 'on') {
- 	delete($attr_ref->{'font'});
- 	delete($attr_ref->{'link'});
- 	delete($attr_ref->{'alink'});
- 	delete($attr_ref->{'vlink'});
- 	delete($attr_ref->{'bgcolor'});
- 	delete($attr_ref->{'background'});
      }
      my $attr_string;
- Line 4054  sub make_attr_string {
+ Line 4741  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=
+         if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) {
- 	    "<br /><a href=\"$env{'internal.head.redirect'}\">".
+ 	    $endbodytag=
- 	    &mt('Continue').'</a>'.
+ 	        "<br /><a href=\"$env{'internal.head.redirect'}\">".
- 	    $endbodytag;
+ 	        &mt('Continue').'</a>'.
+ 	        $endbodytag;
+         }
      }
      return $endbodytag;
  }
- Line 4090  sub standard_css {
+ Line 4784  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 ||
- Line 4099  sub standard_css {
+ Line 4795  sub standard_css {
      my $vlink  = &designparm($function.'.vlink', $domain);
      my $link   = &designparm($function.'.link',  $domain);
+     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_head      = $sidebg;
-     my $data_table_light     = '#EEEEEE';
+     my $data_table_light     = '#FAFAFA';
-     my $data_table_dark      = '#DDDDDD';
+     my $data_table_dark      = '#F0F0F0';
      my $data_table_darker    = '#CCCCCC';
      my $data_table_highlight = '#FFFF00';
      my $mail_new             = '#FFBB77';
- Line 4116  sub standard_css {
+ Line 4816  sub standard_css {
      my $mail_other_hover     = '#669999';
      my $table_header         = '#DDDDDD';
      my $feedback_link_bg     = '#BBBBBB';
+     my $lg_border_color      = '#C8C8C8';
+     my $button_hover         = '#BF2317';
-     my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px'
+     my $border = ($env{'browser.type'} eq 'explorer' ||
- 	                                              : '0px 3px 0px 4px';
+       $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,
- table.thinborder tr th {
+ /* needed for iframe to allow 100% height in FF */
-   border-style: solid;
+ body, html {
-   border-width: 1px;
+     margin: 0;
-   background: $tabbg;
+     padding: 0 0.5%;
+     height: 99%; /* to avoid scrollbars */
  }
- table.thinborder tr td {
-   border-style: solid;
+ body {
-   border-width: 1px
+   font-family: $sans;
+   line-height:130%;
+   font-size:0.83em;
+   color:$font;
+ }
+ a:focus {
+   color: red;
+   background: yellow;
+ }
+ form, .inline {
+   display: inline;
+ }
+ .LC_right {
+   text-align:right;
+ }
+ .LC_middle {
+   vertical-align:middle;
+ }
+ .LC_400Box {
+   width:400px;
+ }
+ .LC_iframecontainer {
+     width: 98%;
+     margin: 0;
+     position: fixed;
+     top: 8.5em;
+     bottom: 0;
+ }
+ .LC_iframecontainer iframe{
+     border: none;
+     width: 100%;
+     height: 100%;
+ }
+ .LC_filename {
+   font-family: $mono;
+   white-space:pre;
+   font-size: 120%;
+ }
+ .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; white-space:pre;}
  .LC_error {
    color: red;
    font-size: larger;
  }
  .LC_warning,
  .LC_diff_removed {
    color: red;
- Line 4153  form, .inline { display: inline; }
+ Line 4904  form, .inline { display: inline; }
  .LC_diff_added {
    color: green;
  }
- .LC_unknown {
-   color: yellow;
+ div.LC_confirm_box {
+   background-color: #FAFAFA;
+   border: 1px solid $lg_border_color;
+   margin-right: 0;
+   padding: 5px;
  }
- .LC_icon {
+ div.LC_confirm_box .LC_error img,
-   border: 0px;
+ div.LC_confirm_box .LC_success img {
+   vertical-align: middle;
  }
- .LC_indexer_icon {
-   border: 0px;
+ .LC_icon {
-   height: 22px;
+   border: none;
+   vertical-align: middle;
  }
  .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;
+   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 {
- Line 4179  table.LC_pastsubmission {
+ Line 4969  table.LC_pastsubmission {
    margin: 2px;
  }
- table#LC_top_nav, table#LC_menubuttons {
+ table#LC_menubuttons {
    width: 100%;
    background: $pgbg;
    border: 2px;
    border-collapse: separate;
-   padding: 0px;
+   padding: 0;
+ }
+ table#LC_title_bar a {
+   color: $fontmenu;
+ }
+ table#LC_title_bar {
+   clear: both;
+   display: none;
  }
- table#LC_title_bar, table.LC_breadcrumbs, table#LC_nav_location,
+ table#LC_title_bar,
+ table.LC_breadcrumbs, /* obsolete? */
  table#LC_title_bar.LC_with_remote {
    width: 100%;
    border-color: $pgbg;
    border-style: solid;
    border-width: $border;
    background: $pgbg;
-   font-family: $sans;
+   color: $fontmenu;
    border-collapse: collapse;
-   padding: 0px;
+   padding: 0;
+   margin: 0;
  }
- table.LC_docs_path {
+ ul.LC_breadcrumb_tools_outerlist {
-   width: 100%;
+     margin: 0;
-   border: 0;
+     padding: 0;
-   background: $pgbg;
+     position: relative;
-   font-family: $sans;
+     list-style: none;
-   border-collapse: collapse;
-   padding: 0px;
- }
- table#LC_title_bar td {
-   background: $tabbg;
- }
- table#LC_title_bar td.LC_title_bar_who {
-   background: $tabbg;
-   color: $font;
-   font: small $sans;
-   text-align: right;
- }
- span.LC_metadata {
-     font-family: $sans;
  }
- span.LC_title_bar_title {
+ ul.LC_breadcrumb_tools_outerlist li {
-   font: bold x-large $sans;
+     display: inline;
- }
- table#LC_title_bar td.LC_title_bar_domain_logo {
-   background: $sidebg;
-   text-align: right;
-   padding: 0px;
- }
- table#LC_title_bar td.LC_title_bar_role_logo {
-   background: $sidebg;
-   padding: 0px;
  }
- table#LC_menubuttons_mainmenu {
+ .LC_breadcrumb_tools_navigation {
-   width: 100%;
+     padding: 0;
-   border: 0px;
+     margin: 0;
-   border-spacing: 1px;
+     float: left;
-   padding: 0px 1px;
-   margin: 0px;
-   border-collapse: separate;
  }
- table#LC_menubuttons img, table#LC_menubuttons_mainmenu img {
+ .LC_breadcrumb_tools_tools {
-   border: 0px;
+     padding: 0;
+     margin: 0;
+     float: right;
  }
- table#LC_top_nav td {
+ table#LC_title_bar td {
    background: $tabbg;
-   border: 0px;
-   font-size: small;
  }
- table#LC_top_nav td a, div#LC_top_nav a {
-   color: $font;
+ table#LC_menubuttons img {
-   font-family: $sans;
+   border: none;
- }
- 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;
+ .LC_breadcrumbs_component {
-   vertical-align: bottom;
+   float: right;
+   margin: 0 1em;
  }
- table#LC_top_nav td.LC_top_nav_exit,
+ .LC_breadcrumbs_component img {
- table#LC_top_nav td.LC_top_nav_help {
+   vertical-align: middle;
-   width: 2.0em;
  }
- table#LC_top_nav td.LC_top_nav_login {
-   width: 4.0em;
+ td.LC_table_cell_checkbox {
    text-align: center;
  }
- table.LC_breadcrumbs td, table.LC_docs_path td  {
-   background: $tabbg;
+ .LC_fontsize_small {
-   color: $font;
+   font-size: 70%;
-   font-family: $sans;
-   font-size: smaller;
  }
- table.LC_breadcrumbs td.LC_breadcrumbs_component,
- table.LC_docs_path td.LC_docs_path_component {
+ #LC_breadcrumbs {
-   background: $tabbg;
+   clear:both;
-   color: $font;
+   background: $sidebg;
-   font-family: $sans;
+   border-bottom: 1px solid $lg_border_color;
-   font-size: larger;
+   line-height: 2.5em;
-   text-align: right;
+   overflow: hidden;
+   margin: 0;
+   padding: 0;
  }
- td.LC_table_cell_checkbox {
-   text-align: center;
+ #LC_head_subbox {
+   clear:both;
+   background: #F8F8F8; /* $sidebg; */
+   border: 1px solid $sidebg;
+   margin: 0 0 10px 0;
+ }
+ .LC_fontsize_medium {
+   font-size: 85%;
  }
- table#LC_mainmenu td.LC_mainmenu_column {
+ .LC_fontsize_large {
-     vertical-align: top;
+   font-size: 120%;
  }
  .LC_menubuttons_inline_text {
    color: $font;
-   font-family: $sans;
+   font-size: 90%;
-   font-size: smaller;
+   padding-left:3px;
+ }
+ .LC_menubuttons_inline_text img{
+   vertical-align: middle;
+ }
+ li.LC_menubuttons_inline_text img,a {
+   cursor:pointer;
  }
  .LC_menubuttons_link {
- Line 4307  table#LC_mainmenu td.LC_mainmenu_column
+ Line 5091  table#LC_mainmenu td.LC_mainmenu_column
  .LC_menubuttons_category {
    color: $font;
    background: $pgbg;
-   font-family: $sans;
    font-size: larger;
    font-weight: bold;
  }
  td.LC_menubuttons_text {
-   width: 90%;
    color: $font;
-   font-family: $sans;
- }
- td.LC_menubuttons_img {
  }
  .LC_current_location {
-   font-family: $sans;
    background: $tabbg;
  }
- .LC_new_mail {
-   font-family: $sans;
-   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;
- }
- .LC_preferences_labeltext {
-   font-family: $sans;
-   text-align: right;
- }
- table.LC_aboutme_port {
+ table.LC_data_table {
-   border: 0px;
-   border-collapse: collapse;
-   border-spacing: 0px;
- }
- 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: collapse;
-   border-spacing: 0px;
+   border-spacing: 0;
    width: 100%;
  }
+ table.LC_innerpickbox,
  table.LC_nested {
-   border: 0px;
+   border: none;
    border-collapse: collapse;
-   border-spacing: 0px;
+   border-spacing: 0;
    width: 100%;
  }
- table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th,
- table.LC_prior_tries tr th {
+ .ui-accordion,
+ .ui-accordion table.LC_data_table,
+ .ui-accordion table.LC_nested_outer{
+   border: 0px;
+   border-spacing: 0px;
+   margin: 3px;
+ }
+ table.LC_data_table tr th,
+ table.LC_calendar tr th,
+ table.LC_prior_tries tr th,
+ table.LC_innerpickbox tr th {
    font-weight: bold;
    background-color: $data_table_head;
-   font-size: smaller;
+   color:$fontmenu;
+   font-size:90%;
+ }
+ table.LC_innerpickbox tr th,
+ table.LC_innerpickbox tr td {
+   vertical-align: top;
+ }
+ 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_aboutme_port tr td {
+ table.LC_data_table tr.LC_odd_row > td {
    background-color: $data_table_light;
    padding: 2px;
+   vertical-align: top;
  }
- table.LC_data_table tr.LC_even_row td,
- table.LC_aboutme_port tr.LC_even_row td {
+ table.LC_pick_box tr > td.LC_odd_row {
+   background-color: $data_table_light;
+   vertical-align: top;
+ }
+ table.LC_data_table tr.LC_even_row > td {
    background-color: $data_table_dark;
+   padding: 2px;
+   vertical-align: top;
+ }
+ table.LC_pick_box tr > td.LC_even_row {
+   background-color: $data_table_dark;
+   vertical-align: top;
  }
  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;
    font-weight: bold;
    font-style: italic;
    text-align: center;
    padding: 8px;
  }
+ table.LC_data_table tr.LC_empty_row td {
+   background-color: $sidebg;
+ }
+ table.LC_nested tr.LC_empty_row td {
+   background-color: #FFFFFF;
+ }
+ table.LC_caption {
+ }
  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;
- Line 4436  table.LC_nested_outer tr td.LC_subheader
+ Line 5227  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_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,
- Line 4457  table.LC_nested tr td.LC_right_item {
+ Line 5252  table.LC_nested tr td.LC_right_item {
    text-align: right;
  }
+ .ui-accordion table.LC_nested tr.LC_odd_row td.LC_left_item,
+ .ui-accordion table.LC_nested tr.LC_even_row td.LC_left_item {
+   text-align: right;
+   width: 40%;
+   padding-right:10px;
+   vertical-align: top;
+   padding: 5px;
+ }
+ .ui-accordion table.LC_nested tr.LC_odd_row td.LC_right_item,
+ .ui-accordion table.LC_nested tr.LC_even_row td.LC_right_item {
+   text-align: left;
+   width: 60%;
+   padding: 2px 4px;
+ }
  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;
  }
- Line 4477  table.LC_createuser tr.LC_info_row td  {
+ Line 5288  table.LC_createuser tr.LC_info_row td  {
  table.LC_calendar {
    border: 1px solid #000000;
    border-collapse: collapse;
+   width: 98%;
  }
  table.LC_calendar_pickdate {
    font-size: xx-small;
  }
  table.LC_calendar tr td {
    border: 1px solid #000000;
    vertical-align: top;
+   width: 14%;
  }
  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;
  }
- table.LC_mail_list tr.LC_mail_new {
+ table.LC_data_table tr td.LC_mail_new {
    background-color: $mail_new;
  }
- table.LC_mail_list tr.LC_mail_new:hover {
+ table.LC_data_table tr.LC_mail_new:hover {
    background-color: $mail_new_hover;
  }
- table.LC_mail_list tr.LC_mail_read {
+ table.LC_data_table tr td.LC_mail_read {
    background-color: $mail_read;
  }
- table.LC_mail_list tr.LC_mail_read:hover {
+ /*
+ table.LC_data_table tr.LC_mail_read:hover {
    background-color: $mail_read_hover;
  }
- table.LC_mail_list tr.LC_mail_replied {
+ */
+ table.LC_data_table tr td.LC_mail_replied {
    background-color: $mail_replied;
  }
- table.LC_mail_list tr.LC_mail_replied:hover {
+ /*
+ table.LC_data_table tr.LC_mail_replied:hover {
    background-color: $mail_replied_hover;
  }
- table.LC_mail_list tr.LC_mail_other {
+ */
+ table.LC_data_table tr td.LC_mail_other {
    background-color: $mail_other;
  }
- table.LC_mail_list tr.LC_mail_other:hover {
+ /*
+ table.LC_data_table 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_data_table tr > td.LC_browser_file,
- table#LC_portfolio_actions {
+ table.LC_data_table tr > td.LC_browser_file_published {
-   width: auto;
+   background: #AAEE77;
-   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_cstr_controls {
+ table.LC_data_table tr > td.LC_browser_file_locked,
-   width: 100%;
+ table.LC_data_table tr > td.LC_browser_file_unpublished {
-   border-collapse: collapse;
+   background: #FFAA99;
- }
- table#LC_cstr_controls tr td {
-   border: 4px solid $pgbg;
-   padding: 4px;
-   text-align: center;
-   background: $tabbg;
  }
- table#LC_cstr_controls tr th {
-   border: 4px solid $pgbg;
+ table.LC_data_table tr > td.LC_browser_file_obsolete {
-   background: $table_header;
+   background: #888888;
-   text-align: center;
-   font-family: $sans;
-   font-size: smaller;
  }
- table#LC_browser {
+ table.LC_data_table tr > td.LC_browser_file_modified,
+ table.LC_data_table tr > td.LC_browser_file_metamodified {
+   background: #F8F866;
  }
- table#LC_browser tr th {
-   background: $table_header;
+ table.LC_data_table tr.LC_browser_folder > td {
+   background: #E0E8FF;
  }
- 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 {
+ table.LC_data_table tr > td.LC_roles_future {
-   background: #CCFF88;
+   border-right: 8px solid #FFFF77;
  }
- table#LC_browser tr.LC_browser_file_locked,
- table#LC_browser tr.LC_browser_file_unpublished {
+ table.LC_data_table tr > td.LC_roles_will {
-   background: #FFAA99;
+   border-right: 8px solid #FFAA77;
  }
- table#LC_browser tr.LC_browser_file_obsolete {
-   background: #AAAAAA;
+ table.LC_data_table tr > td.LC_roles_expired {
+   border-right: 8px solid #FF7777;
  }
- table#LC_browser tr.LC_browser_file_modified,
- table#LC_browser tr.LC_browser_file_metamodified {
+ table.LC_data_table tr > td.LC_roles_will_not {
-   background: #FFFF77;
+   border-right: 8px solid #AAFF77;
  }
- table#LC_browser tr.LC_browser_folder {
-   background: #CCCCFF;
+ table.LC_data_table tr > td.LC_roles_selected {
+   border-right: 8px solid #11CC55;
  }
  span.LC_current_location {
-   font-size: x-large;
+   font-size:larger;
    background: $pgbg;
  }
  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 {
+ 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_level_menu,
- td.LC_parm_overview_parm_selectors, td.LC_parm_overview_parm_restrictions {
+ 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;
- Line 4652  table#LC_helpmenu_links tr td {
+ Line 5473  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;
- Line 4666  table#LC_helpmenu_links a:hover {
+ Line 5489  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 {
    border-collapse: separate;
    background: white;
    border: 1px solid black;
    border-spacing: 1px;
  }
  table.LC_pick_box td.LC_pick_box_title {
-   background: $tabbg;
+   background: $sidebg;
    font-weight: bold;
-   text-align: right;
+   text-align: left;
+   vertical-align: top;
    width: 184px;
    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: 0px;
-   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 {
- Line 4779  table.LC_notify_front_page {
+ Line 5591  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;
-   width: 100%;
    background: $tabbg;
-   vertical-align: middle;
+   margin: 1em 0em 1em 2em;
-   margin: 2ex 0ex 2ex 0ex;
+   padding: 3px;
+   font-size: 1.2em;
  }
  .LC_topic_bar span {
+   left: 0.5em;
+   position: absolute;
    vertical-align: middle;
+   font-size: 1.2em;
  }
- .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;
- }
  div.LC_feedback_link {
-   background: white;
+   clear: both;
-   width: 100%;
+   background: $sidebg;
+   width: 100%;
+   padding-bottom: 10px;
+   border: 1px $tabbg solid;
+   height: 22px;
+   line-height: 22px;
+   padding-top: 5px;
+ }
+ div.LC_feedback_link img {
+   height: 22px;
+   vertical-align:middle;
+ }
+ div.LC_feedback_link a {
+   text-decoration: none;
  }
+ div.LC_comblock {
+   display:inline;
+   color:$font;
+   font-size:90%;
+ }
+ div.LC_feedback_link div.LC_comblock {
+   padding-left:5px;
+ }
+ div.LC_feedback_link div.LC_comblock a {
+   color:$font;
+ }
  span.LC_feedback_link {
-   background: $feedback_link_bg;
+   /* background: $feedback_link_bg; */
    font-size: larger;
  }
  span.LC_message_link {
-   background: $feedback_link_bg;
+   /* background: $feedback_link_bg; */
    font-size: larger;
    position: absolute;
    right: 1em;
- Line 4838  table.LC_prior_tries td {
+ Line 5682  table.LC_prior_tries td {
  }
  .LC_answer_correct {
-   background: #AAFFAA;
+   background: lightgreen;
-   color: black;
+   color: darkgreen;
+   padding: 6px;
  }
  .LC_answer_charged_try {
-   background: #FFAAAA ! important;
+   background: #FFAAAA;
-   color: black;
+   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;
    color: black;
+   padding: 6px;
  }
  .LC_answer_previous {
-   background: #AAAAFF;
+   background: lightblue;
-   color: black;
+   color: darkblue;
+   padding: 6px;
  }
  .LC_answer_no_message {
    background: #FFFFFF;
    color: black;
+   padding: 6px;
  }
  .LC_answer_unknown {
    background: orange;
    color: black;
+   padding: 6px;
  }
  span.LC_prior_numerical,
  span.LC_prior_string,
  span.LC_prior_custom,
  span.LC_prior_reaction,
  span.LC_prior_math {
-   font-family: monospace;
+   font-family: $mono;
    white-space: pre;
  }
  span.LC_prior_string {
-   font-family: monospace;
+   font-family: $mono;
    white-space: pre;
  }
- Line 4883  table.LC_prior_option {
+ Line 5737  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;
  }
- span.LC_nobreak {
+ .LC_nobreak {
    white-space: nowrap;
  }
- Line 4900  span.LC_cusr_emph {
+ Line 5757  span.LC_cusr_emph {
    font-style: italic;
  }
- table.LC_docs_documents {
+ span.LC_cusr_subheading {
-   background: #BBBBBB;
+   font-weight: normal;
-   border-width: 0px;
+   font-size: 85%;
-   border-collapse: collapse;
- }
- table.LC_docs_documents td.LC_docs_document {
-   border: 2px solid black;
-   padding: 4px;
  }
- .LC_docs_course_commands div {
+ div.LC_docs_entry_move {
-   float: left;
+   border: 1px solid #BBBBBB;
-   border: 4px solid #AAAAAA;
-   padding: 4px;
-   background: #DDDDCC;
- }
- .LC_docs_entry_move {
-   border: 0px;
-   border-collapse: collapse;
- }
- .LC_docs_entry_move td {
-   border: 2px solid #BBBBBB;
    background: #DDDDDD;
+   width: 22px;
+   padding: 1px;
+   margin: 0;
  }
- .LC_docs_editor td.LC_docs_entry_commands {
+ table.LC_data_table tr > td.LC_docs_entry_commands,
+ table.LC_data_table tr > td.LC_docs_entry_parameter {
    background: #DDDDDD;
    font-size: x-small;
  }
+ .LC_docs_entry_parameter {
+   white-space: nowrap;
+ }
  .LC_docs_copy {
    color: #000099;
  }
  .LC_docs_cut {
    color: #550044;
  }
  .LC_docs_rename {
    color: #009900;
  }
  .LC_docs_remove {
    color: #990000;
  }
- Line 4950  table.LC_docs_documents td.LC_docs_docum
+ Line 5801  table.LC_docs_documents td.LC_docs_docum
    font-size: x-small;
  }
- .LC_docs_editor td.LC_docs_entry_title,
- .LC_docs_editor td.LC_docs_entry_icon {
-   background: #FFFFBB;
- }
- .LC_docs_editor td.LC_docs_entry_parameter {
-   background: #BBBBFF;
-   font-size: x-small;
-   white-space: nowrap;
- }
  table.LC_docs_adddocs td,
  table.LC_docs_adddocs th {
    border: 1px solid #BBBBBB;
- Line 4970  table.LC_docs_adddocs th {
+ Line 5811  table.LC_docs_adddocs th {
  table.LC_sty_begin {
    background: #BBFFBB;
  }
  table.LC_sty_end {
    background: #FFBBBB;
  }
  table.LC_double_column {
-   border-width: 0px;
+   border-width: 0;
    border-collapse: collapse;
    width: 100%;
    padding: 2px;
- Line 4990  table.LC_double_column tr td.LC_left_col
+ Line 5832  table.LC_double_column tr td.LC_left_col
  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%;
- Line 5014  div.LC_clear_float_footer {
+ Line 5852  div.LC_clear_float_footer {
    clear: both;
  }
+ div.LC_grade_show_user {
- div.LC_grade_select_mode {
+ /*  border-left: 5px solid $sidebg; */
-   border: 1px solid black;
+   border-top: 5px solid #000000;
-   float: left;
+   margin: 50px 0 0 0;
- }
+   padding: 15px 0 5px 10px;
- div.LC_grade_select_mode div div {
-   margin: 5px;
- }
- div.LC_grade_select_mode_header {
-   font: bold larger $sans;
-   background: $tabbg;
  }
- div.LC_grade_select_mode_selector {
+ div.LC_grade_show_user_odd_row {
-   margin: 5px;
+ /*  border-left: 5px solid #000000; */
-   float: left;
- }
- div.LC_grade_select_mode_selector_header {
-   font: bold medium $sans;
- }
- div.LC_grade_select_mode_type {
-   clear: left;
  }
- div.LC_grade_show_user {
+ div.LC_grade_show_user div.LC_Box {
-   margin-top: 20px;
+   margin-right: 50px;
-   border: 1px solid black;
- }
- div.LC_grade_user_name {
-   background: #DDDDEE;
-   border-bottom: 1px solid black;
-   font: bold large $sans;
- }
- 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_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_message_center_header {
- div.LC_grade_assign_header {
+   font-weight: bold;
-   font: bold large $sans;
+   font-size: large;
  }
- div.LC_grade_show_problem_problem,
  div.LC_grade_submissions_body,
- div.LC_grade_message_center_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: normal medium $sans;
+ table.LC_scantron_action {
-   display: inline;
+   width: 100%;
-   position: absolute;
-   right: 1em;
  }
+ table.LC_scantron_action tr th {
+   font-weight:bold;
+   font-style:normal;
+ }
- div.LC_edit_problem_header {
+ .LC_edit_problem_header,
-   font: normal medium $sans;
+ 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: larger bold $sans;
+   font-weight: bold;
+   font-size: larger;
    background: $tabbg;
    padding: 3px;
  }
  table.LC_edit_problem_header_title {
-   font: larger bold $sans;
    width: 100%;
-   border-color: $pgbg;
-   border-style: solid;
-   border-width: $border;
    background: $tabbg;
-   border-collapse: collapse;
-   padding: 0px
-   margin: -2px;
- }
- td.LC_edit_problem_header_help {
-   text-align: right;
  }
  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 {
+ img.stift {
+   border-width: 0;
+   vertical-align: middle;
+ }
+ table td.LC_mainmenu_col_fieldset {
+   vertical-align: top;
+ }
+ div.LC_createcourse {
+   margin: 10px 10px 10px 10px;
+ }
+ .LC_dccid {
+   margin: 0.2em 0 0 0;
+   padding: 0;
+   font-size: 90%;
+   display:none;
+ }
+ a:hover,
+ ol.LC_primary_menu a:hover,
+ ol#LC_MenuBreadcrumbs a:hover,
+ ol#LC_PathBreadcrumbs a:hover,
+ ul#LC_secondary_menu a:hover,
+ .LC_FormSectionClearButton input:hover
+ ul.LC_TabContent   li:hover a {
+   color:$button_hover;
+   text-decoration:none;
+ }
+ h1 {
+   padding: 0;
+   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_Box > .LC_hcell {
+   margin: 0 -10px 10px -10px;
+ }
+ .LC_noBorder {
+   border: 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; */
+ }
+ fieldset > legend {
+   font-weight: bold;
+   padding: 0 5px 0 5px;
+ }
+ #LC_nav_bar {
+   float: left;
+   margin: 0;
+ }
+ #LC_realm {
+   margin: 0.2em 0 0 0;
+   padding: 0;
+   font-weight: bold;
+   text-align: center;
+ }
+ #LC_nav_bar em {
+   font-weight: bold;
+   font-style: normal;
+ }
+ ol.LC_primary_menu {
+   float: right;
+   margin: 0;
+ }
+ ol#LC_PathBreadcrumbs {
+   margin: 0;
+ }
+ ol.LC_primary_menu li {
+   display: inline;
+   padding: 5px 5px 0 10px;
+   vertical-align: top;
+ }
+ ol.LC_primary_menu li img {
+   vertical-align: bottom;
+   height: 1.1em;
+ }
+ ol.LC_primary_menu a {
+   color: RGB(80, 80, 80);
+   text-decoration: none;
+ }
+ ol.LC_primary_menu a.LC_new_message {
+   font-weight:bold;
+   color: darkred;
+ }
+ ul#LC_secondary_menu {
    clear: both;
-   color: $tabbg;
+   color: $fontmenu;
-   background-color: $tabbg;
+   background: $tabbg;
-   height: 3px;
+   list-style: none;
-   border: 0px;
+   padding: 0;
+   margin: 0;
+   width: 100%;
+ }
+ ul#LC_secondary_menu li {
+   font-weight: bold;
+   line-height: 1.8em;
+   padding: 0 0.8em;
+   border-right: 1px solid black;
+   display: inline;
+   vertical-align: middle;
+ }
+ ul.LC_TabContent {
+   display:block;
+   background: $sidebg;
+   border-bottom: solid 1px $lg_border_color;
+   list-style:none;
+   margin: 0 -10px;
+   padding: 0;
+ }
+ ul.LC_TabContent li,
+ ul.LC_TabContentBigger li {
+   float:left;
+ }
+ ul#LC_secondary_menu li a {
+   color: $fontmenu;
+   text-decoration: none;
+ }
+ ul.LC_TabContent {
+   min-height:20px;
+ }
+ ul.LC_TabContent li {
+   vertical-align:middle;
+   padding: 0 10px 0 10px;
+   background-color:$tabbg;
+   border-bottom:solid 1px $lg_border_color;
+   border-right: solid 1px $font;
+ }
+ ul.LC_TabContent .right {
+   float:right;
+ }
+ 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;
+   min-height:20px;
+ }
+ ul.LC_TabContent li a:hover {
+   color: $button_hover;
+ }
+ ul.LC_TabContent li:hover {
+   color: $button_hover;
+   cursor:pointer;
+ }
+ ul.LC_TabContent li.active {
+   color: $font;
+   background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;
+   border-bottom:solid 1px #FFFFFF;
+   cursor: default;
+ }
+ #maincoursedoc {
+   clear:both;
+ }
+ ul.LC_TabContentBigger {
+   display:block;
+   list-style:none;
+   padding: 0;
+ }
+ ul.LC_TabContentBigger li {
+   vertical-align:bottom;
+   height: 30px;
+   font-size:110%;
+   font-weight:bold;
+   color: #737373;
+ }
+ ul.LC_TabContentBigger li a {
+   background:url('/adm/lonIcons/tabbgleft.gif') left bottom no-repeat;
+   height: 30px;
+   line-height: 30px;
+   text-align: center;
+   display: block;
+   text-decoration: none;
+ }
+ ul.LC_TabContentBigger li:hover a,
+ ul.LC_TabContentBigger li.active a {
+   background:url('/adm/lonIcons/tabbgleft.gif') left top no-repeat;
+   color:$font;
+   text-decoration: underline;
+ }
+ ul.LC_TabContentBigger li b {
+   background: url('/adm/lonIcons/tabbgright.gif') no-repeat right bottom;
+   display: block;
+   float: left;
+   padding: 0 30px;
+ }
+ ul.LC_TabContentBigger li:hover b,
+ ul.LC_TabContentBigger li.active b {
+   background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat;
+   color:$font;
+   border-bottom: 1px solid #FFFFFF;
+ }
+ ul.LC_CourseBreadcrumbs {
+   background: $sidebg;
+   line-height: 32px;
+   padding-left: 10px;
+   margin: 0 0 10px 0;
+   list-style-position: inside;
+ }
+ ol#LC_MenuBreadcrumbs,
+ ol#LC_PathBreadcrumbs {
+   padding-left: 10px;
+   margin: 0;
+   height: 2.5em;  /* equal to #LC_breadcrumbs line-height */
+ }
+ ol#LC_MenuBreadcrumbs li,
+ ol#LC_PathBreadcrumbs li,
+ ul.LC_CourseBreadcrumbs li {
+   display: inline;
+   white-space: normal;
+ }
+ 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_Box {
+   border: solid 1px $lg_border_color;
+   padding: 0 10px 10px 10px;
+ }
+ .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_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;
+ }
+ .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: 1px;
+   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_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_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_funclist {
+     margin: 0;
+     padding: 0.5em 1em 0.5em 0;
+ }
+ ul.LC_funclist > li:first-child {
+     font-weight:bold;
+     margin-left:0.8em;
+ }
+ ul.LC_funclist + ul.LC_funclist {
+     /*
+        left border as a seperator if we have more than
+        one list
+     */
+     border-left: 1px solid $sidebg;
+     /*
+        this hides the left border behind the border of the
+        outer box if element is wrapped to the next 'line'
+     */
+     margin-left: -1px;
+ }
+ ul.LC_funclist li {
+   display: inline;
+   white-space: nowrap;
+   margin: 0 0 0 25px;
+   line-height: 150%;
+ }
+ .ui-accordion .LC_advanced_toggle {
+   float: right;
+   font-size: 90%;
+   padding: 0px 4px
+ }
  END
  }
- Line 5186  sub headtag {
+ Line 6553  sub headtag {
  	$result .= &Apache::lonhtmlcommon::htmlareaheaders();
      }
      if ($args->{'force_register'}) {
- 	$result .= &Apache::lonmenu::registerurl(1);
+ 	$result .= &Apache::lonmenu::registerurl();
      }
      if (!$args->{'no_nav_bar'}
  	&& !$args->{'only_body'}
- Line 5227  Inputs: none
+ Line 6594  Inputs: none
  sub font_settings {
      my $headerstring='';
-     if (($env{'browser.os'} eq 'mac') && (!$env{'browser.mathml'})) {
+     if (!$env{'browser.mathml'} && $env{'browser.unicode'}) {
- 	$headerstring.=
- 	    '<meta Content-Type="text/html; charset=x-mac-roman" />';
-     } elsif (!$env{'browser.mathml'} && $env{'browser.unicode'}) {
  	$headerstring.=
  	    '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
      }
- Line 5264  sub xml_begin {
+ Line 6628  sub xml_begin {
              .'<html xmlns:math="http://www.w3.org/1998/Math/MathML" '
  	    .'xmlns="http://www.w3.org/1999/xhtml">';
      } else {
- 	$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>';
+ 	$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
+            .'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">';
      }
      return $output;
  }
- Line 5289  sub endheadtag {
+ Line 6654  sub endheadtag {
  Returns a uniform complete <head>..</head> section for LON-CAPA web pages.
- Inputs: $title - optional title for the page
+ Inputs:
-         $head_extra - optional extra HTML to put inside the <head>
+ =over 4
+ $title - optional title for the page
+ $head_extra - optional extra HTML to put inside the <head>
+ =back
  =cut
- Line 5305  sub head {
+ Line 6677  sub head {
  Returns a complete <html> .. <body> section for LON-CAPA web pages.
- Inputs: $title - optional title for the page
+ Inputs:
-         $head_extra - optional extra HTML to incude inside the <head>
-         $args - additional optional args supported are:
+ =over 4
-                   only_body      -> is true will set &bodytag() onlybodytag
+ $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
+              no_nav_bar     -> is true will set &bodytag() no_nav_bar arg on
-                   add_entries    -> additional attributes to add to the  <body>
+              add_entries    -> additional attributes to add to the  <body>
-                   domain         -> force to color decorate a page for a
+              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()
+              redirect       -> see &headtag()
-                   bgcolor        -> override the default page bg color
+              bgcolor        -> override the default page bg color
-                   js_ready       -> return a string ready for being used in
+              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
+              frameset       -> if true will start with a <frameset>
-                                     in the title box that appears, this text
-                                     is not auto translated like the $title is
-                   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
-                   skip_phases    -> hash ref of
                                      head -> skip the <html><head> generation
                                      body -> skip all <body> generation
+ #RC             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
+ #RC                                    'Switch To Inline Menu' link
-                                     '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
+              bread_crumbs ->             Array containing breadcrumbs
+              bread_crumbs_components ->  if exists show it as headline else show only the breadcrumbs
+ =back
+ =back
  =cut
- Line 5370  sub start_page {
+ Line 6750  sub start_page {
  	    my $attr_string = &make_attr_string($args->{'force_register'},
  						$args->{'add_entries'});
  	    $result .= "\n<frameset $attr_string>\n";
- 	} else {
+         } else {
- 	    $result .=
+             $result .=
- 		&bodytag($title,
+                 &bodytag($title,
- 			 $args->{'function'},       $args->{'add_entries'},
+                          $args->{'function'},       $args->{'add_entries'},
- 			 $args->{'only_body'},      $args->{'domain'},
+                          $args->{'only_body'},      $args->{'domain'},
- 			 $args->{'force_register'}, $args->{'body_title'},
+                          $args->{'force_register'}, $args->{'no_nav_bar'},
- 			 $args->{'no_nav_bar'},     $args->{'bgcolor'},
+                          $args->{'bgcolor'},        $args->{'no_inline_link'},
- 			 $args->{'no_title'},       $args->{'no_inline_link'},
+                          $args);
- 			 $args);
+         }
- 	}
      }
      if ($args->{'js_ready'}) {
- 	$result = &js_ready($result);
+ 		$result = &js_ready($result);
      }
      if ($args->{'html_encode'}) {
- 	$result = &html_encode($result);
+ 		$result = &html_encode($result);
+     }
+     # Preparation for new and consistent functionlist at top of screen
+     # if ($args->{'functionlist'}) {
+     #            $result .= &build_functionlist();
+     #}
+     # Don't add anything more if only_body wanted
+     return $result if $args->{'only_body'};
+     #Breadcrumbs for Construction Space provided by &bodytag.
+     if (
+         $env{'request.state'} eq 'construct') {
+         return $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;
  }
- Line 5429  sub end_page {
+ Line 6840  sub end_page {
      if ($args->{'frameset'}) {
  	$result .= '</frameset>';
      } else {
- 	$result .= &endbodytag();
+ 	$result .= &endbodytag($args);
      }
      $result .= "\n</html>";
- Line 5501  sub simple_error_page {
+ Line 6912  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++;
+ 	$row_count[0]++;
- 	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));
+ 	$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
  	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));
+ 	$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');;
  	return  '<tr class="'.$css_class.'">'."\n";;
      }
- Line 5534  sub simple_error_page {
+ Line 6945  sub simple_error_page {
      }
      sub start_data_table_empty_row {
- 	$row_count++;
+ #	$row_count[0]++;
  	return  '<tr class="LC_empty_row" >'."\n";;
      }
- Line 5549  sub simple_error_page {
+ Line 6960  sub simple_error_page {
      sub end_data_table_header_row {
  	return '</tr>'."\n";;
      }
+     sub data_table_caption {
+         my $caption = shift;
+         return "<caption class=\"LC_caption\">$caption</caption>";
+     }
  }
  =pod
- Line 5615  Returns either 'student','coordinator','
+ Line 7031  Returns either 'student','coordinator','
  ###############################################
  sub get_users_function {
-     my $function = 'student';
+     my $function = 'norole';
-     if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
+     if ($env{'request.role'}=~/^(st)/) {
+         $function='student';
+     }
+     if ($env{'request.role'}=~/^(cc|co|in|ta|ep)/) {
          $function='coordinator';
      }
      if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
          $function='admin';
      }
-     if (($env{'request.role'}=~/^(au|ca)/) ||
+     if (($env{'request.role'}=~/^(au|ca|aa)/) ||
          ($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
          $function='author';
      }
- Line 5633  sub get_users_function {
+ Line 7052  sub get_users_function {
  =pod
+ =item * &show_course()
+ Used by lonmenu.pm and lonroles.pm to determine whether to use the word
+ 'Courses' or 'Roles' in inline navigation and on screen displaying user's roles.
+ Inputs:
+ None
+ Outputs:
+ Scalar: 1 if 'Course' to be used, 0 otherwise.
+ =cut
+ ###############################################
+ sub show_course {
+     my $course = !$env{'user.adv'};
+     if (!$env{'user.adv'}) {
+         foreach my $env (keys(%env)) {
+             next if ($env !~ m/^user\.priv\./);
+             if ($env !~ m/^user\.priv\.(?:st|cm)/) {
+                 $course = 0;
+                 last;
+             }
+         }
+     }
+     return $course;
+ }
+ ###############################################
+ =pod
  =item * &check_user_status()
  Determines current status of supplied role for a
- Line 5655  sub check_user_status {
+ Line 7106  sub check_user_status {
      my $active_chk = 'none';
      my $now = time;
      if (@uroles > 0) {
-         if (($role eq 'cc') || ($sec eq '') || (!defined($sec))) {
+         if (($role eq 'cc') || ($role eq 'co') || ($sec eq '') || (!defined($sec))) {
              $srchstr = '/'.$cdom.'/'.$crs.'_'.$role;
          } else {
              $srchstr = '/'.$cdom.'/'.$crs.'/'.$sec.'_'.$role;
- Line 5806  previous, future, or all.
+ Line 7257  previous, future, or all.
 . reference to array of section restrictions (optional)
 . reference to results object (hash of hashes).
 . reference to optional userdata hash
- Keys of top level hash are roles.
+. reference to optional statushash
+. 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.
- Line 5820  of the possibility of multiple values fo
+ Line 7276  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;
- Line 5840  sub get_course_users {
+ Line 7296  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';
              }
- Line 5859  sub get_course_users {
+ Line 7316  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');
- Line 5867  sub get_course_users {
+ Line 7323  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') {
+             if ($match) {
-                 $$userdata{$student} = $$classlist{$student};
+                 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;
- Line 5919  sub get_course_users {
+ Line 7396  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) {
- Line 5941  sub get_course_users {
+ Line 7424  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};
+                         }
                      }
                  }
              }
- Line 5950  sub get_course_users {
+ Line 7436  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 !~ /^[^:]+:[^:]+$/) {
+                     next if ($owner eq '');
-                         $owner = $owner.':'.$cdom;
+                     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})) {
+ 			!exists($$userdata{$owner})) {
- 			&get_user_info($cdom,$owner,\%idx,$userdata);
+ 			&get_user_info($ownerdom,$ownername,\%idx,$userdata);
-                         if (!grep(/^none$/,@{$seclists{$owner.':'.$cdom}})) {
+                         if (!grep(/^none$/,@{$seclists{$owner}})) {
-                             push(@{$seclists{$owner.':'.$cdom}},'none');
+                             push(@{$seclists{$owner}},'none');
+                         }
+                         if (ref($statushash) eq 'HASH') {
+                             $statushash->{$owner}{'ow'}{'none'} = 'Any';
                          }
  		    }
                  }
- Line 5978  sub get_user_info {
+ Line 7474  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;
  }
- Line 6089  If the user's status includes multiple t
+ Line 7587  If the user's status includes multiple t
  the largest default quota which applies to the user determines the
  default quota returned.
+ =back
  =cut
  ###############################################
- Line 6098  sub default_quota {
+ Line 7598  sub default_quota {
      my ($udom,$inststatus) = @_;
      my ($defquota,$settingstatus);
      my %quotahash = &Apache::lonnet::get_dom('configuration',
-                                             ['quota'],$udom);
+                                             ['quotas'],$udom);
-     if (ref($quotahash{'quota'}) eq 'HASH') {
+     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 (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
-                     if ($defquota eq '') {
+                     if ($quotahash{'quotas'}{'defaultquota'}{$item} ne '') {
-                         $defquota = $quotahash{'quota'}{$item};
+                         if ($defquota eq '') {
-                         $settingstatus = $item;
+                             $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
-                     } elsif ($quotahash{'quota'}{$item} > $defquota) {
+                             $settingstatus = $item;
-                         $defquota = $quotahash{'quota'}{$item};
+                         } elsif ($quotahash{'quotas'}{'defaultquota'}{$item} > $defquota) {
-                         $settingstatus = $item;
+                             $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 {
- Line 6167  sub get_secgrprole_info {
+ Line 7683  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 => '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'};
          }
- Line 6221  sub user_picker {
+ Line 7737  sub user_picker {
          #       loncreateuser::print_user_query_page()
          #       has been completed.
          next if ($option eq 'alc');
+         next if (($option eq 'crs') && ($env{'form.form'} eq 'requestcrs'));
          next if ($option eq 'crs' && !$env{'request.course.id'});
          if ($curr_selected{'srchin'} eq $option) {
              $srchinsel .= '
- Line 6261  sub user_picker {
+ Line 7778  sub user_picker {
      if ($forcenewuser) {
          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'}) {
- 	        $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 ($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 />';
+                 }
              }
          }
- Line 6297  ENDSCRIPT
+ Line 7828  ENDSCRIPT
      my $output = <<"END_BLOCK";
  <script type="text/javascript">
+ // <![CDATA[
  function validateEntry(callingForm) {
      var checkok = 1;
- Line 6365  function validateEntry(callingForm) {
+ Line 7897  function validateEntry(callingForm) {
  $newuserscript
+ // ]]>
  </script>
  $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>
- </table>
- <br />
  END_BLOCK
+     $output .= &Apache::lonhtmlcommon::start_pick_box().
+                &Apache::lonhtmlcommon::row_title($lt{'doma'}).
+                $domform.
+                &Apache::lonhtmlcommon::row_closure().
+                &Apache::lonhtmlcommon::row_title($lt{'usr'}).
+                $srchbysel.
+                $srchtypesel.
+                '<input type="text" size="15" name="srchterm" value="'.$srchterm.'" />'.
+                $srchinsel.
+                &Apache::lonhtmlcommon::row_closure(1).
+                &Apache::lonhtmlcommon::end_pick_box().
+                '<br />';
      return $output;
  }
- sub username_rule_check {
+ sub user_rule_check {
-     my ($srch,$caller) = @_;
+     my ($usershash,$checks,$alerts,$rulematch,$inst_results,$curr_rules,$got_rules) = @_;
-     my ($response,@curr_rules,%inst_results,$rulematch);
+     my $response;
-     my ($rules,$ruleorder) = &Apache::lonnet::inst_userrules($srch->{'srchdomain'});
+     if (ref($usershash) eq 'HASH') {
-     if (ref($srch) eq 'HASH') {
+         foreach my $user (keys(%{$usershash})) {
-         (my $inst_response,%inst_results) =
+             my ($uname,$udom) = split(/:/,$user);
-             &Apache::lonnet::get_instuser($srch->{'srchdomain'},
+             next if ($udom eq '' || $uname eq '');
-                                           $srch->{'srchterm'});
+             my ($id,$newuser);
-         my %domconfig = &Apache::lonnet::get_dom('configuration',
+             if (ref($usershash->{$user}) eq 'HASH') {
-                               ['usercreation'],$srch->{'srchdomain'});
+                 $newuser = $usershash->{$user}->{'newuser'};
-         if (ref($domconfig{'usercreation'}) eq 'HASH') {
+                 $id = $usershash->{$user}->{'id'};
-             if (ref($domconfig{'usercreation'}{'username_rule'}) eq 'ARRAY') {
+             }
-                 @curr_rules = @{$domconfig{'usercreation'}{'username_rule'}};
+             my $inst_response;
-             }
+             if (ref($checks) eq 'HASH') {
-         }
+                 if (defined($checks->{'username'})) {
-         if (@curr_rules > 0) {
+                     ($inst_response,%{$inst_results->{$user}}) =
-             my $domdesc = &Apache::lonnet::domain($srch->{'srchdomain'},'description');
+                         &Apache::lonnet::get_instuser($udom,$uname);
-             my $instuser_reqd;
+                 } elsif (defined($checks->{'id'})) {
-             my %rule_check = &Apache::lonnet::inst_rulecheck($srch->{'srchdomain'},$srch->{'srchterm'},\@curr_rules);
+                     ($inst_response,%{$inst_results->{$user}}) =
-             foreach my $rule (@curr_rules) {
+                         &Apache::lonnet::get_instuser($udom,undef,$id);
-                 if ($rule_check{$rule}) {
+                 }
-                     $rulematch = $rule;
+             } else {
-                     if ($inst_response eq 'ok') {
+                 ($inst_response,%{$inst_results->{$user}}) =
-                         if (keys(%inst_results) == 0) {
+                     &Apache::lonnet::get_instuser($udom,$uname);
-                             if ($caller eq 'new') {
+                 return;
-                                 $response = &mt('The username you chose matches the format of usernames defined for <span class="LC_cusr_emph">[_1]</span>, but the user does not exist in the institutional directory.',$domdesc).'<br />'.&mt("You must choose a username with a different format -- one that will not conflict with 'official' institutional usernames.");
+             }
-                             }
+             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'};
                          }
                      }
-                     last;
                  }
+                 $got_rules->{$udom} = 1;
              }
-             if ($response) {
+             foreach my $item (keys(%{$checks})) {
-                 if ((ref($rules) eq 'HASH') && (ref($ruleorder) eq 'ARRAY')) {
+                 if (ref($$curr_rules{$udom}) eq 'HASH') {
-                     if (@{$ruleorder} > 0) {
+                     if (ref($$curr_rules{$udom}{$item}) eq 'ARRAY') {
-                         $response .= '<br />'.&mt('Usernames with the following format(s) may <span class="LC_cusr_emph">only</span> be used for verified users at [_1]:',$domdesc).' <ul>';
+                         if (@{$$curr_rules{$udom}{$item}} > 0) {
-                         foreach my $rule (@{$ruleorder}) {
+                             my %rule_check = &Apache::lonnet::inst_rulecheck($udom,$uname,$id,$item,$$curr_rules{$udom}{$item});
-                             if (grep(/^\Q$rule\E$/,@curr_rules)) {
+                             foreach my $rule (@{$$curr_rules{$udom}{$item}}) {
-                                 if (ref($rules->{$rule}) eq 'HASH') {
+                                 if ($rule_check{$rule}) {
-                                     $response .= '<li>'.$rules->{$rule}{'name'}.': '.
+                                     $$rulematch{$user}{$item} = $rule;
-                                                  $rules->{$rule}{'desc'}.'</li>';
+                                     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;
                                  }
                              }
                          }
                      }
-                     $response .= '</ul>';
                  }
              }
          }
      }
-     return ($response,$rulematch,$rules,%inst_results);
+     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),
- Line 6480  sub get_unprocessed_cgi {
+ Line 8225  sub get_unprocessed_cgi {
  =pod
- =item * cacheheader()
+ =item * &cacheheader()
  returns cache-controlling header code
- Line 6497  sub cacheheader {
+ Line 8242  sub cacheheader {
  =pod
- =item * no_cache($r)
+ =item * &no_cache($r)
  specifies header code to not have cache
- Line 6533  sub content_type {
+ Line 8278  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
- Line 6560  sub add_to_env {
+ Line 8305  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.
- Line 6583  sub get_env_multiple {
+ Line 8328  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
- Line 6592  sub get_env_multiple {
+ Line 8563  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'}
- Line 6622  sub upfile_store {
+ Line 8593  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'},
- Line 6646  sub load_tmp_file {
+ Line 8617  sub load_tmp_file {
  =pod
- =item * upfile_record_sep()
+ =item * &upfile_record_sep()
  Separate uploaded file into records
  returns array of records,
- Line 6668  sub upfile_record_sep {
+ Line 8639  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'}
- Line 6753  sub record_sep {
+ Line 8724  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.
- Line 6771  sub upfile_select_html {
+ Line 8742  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";
      }
- Line 6800  sub get_samples {
+ Line 8771  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
- Line 6812  Apache Request ref, $records is an array
+ Line 8783  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 />'.&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('<th>'.&mt('Column [_1]',($sample+1)).'</th>'); }
      $r->print(&end_data_table_header_row());
      foreach my $hash (@$samples) {
  	$r->print(&start_data_table_row());
- Line 6836  sub csv_print_samples {
+ Line 8807  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.
- Line 6859  sub csv_print_select_table {
+ Line 8830  sub csv_print_select_table {
                &end_data_table_header_row()."\n");
      foreach my $array_ref (@$d) {
  	my ($value,$display,$defaultcol)=@{ $array_ref };
- 	$r->print(&start_data_table_row().'<tr><td>'.$display.'</td>');
+ 	$r->print(&start_data_table_row().'<td>'.$display.'</td>');
- 	$r->print('<td><select name=f'.$i.
+ 	$r->print('<td><select name="f'.$i.'"'.
  		  ' onchange="javascript:flip(this.form,'.$i.');">');
  	$r->print('<option value="none"></option>');
  	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>'.&end_data_table_row()."\n");
  	$i++;
- Line 6882  sub csv_print_select_table {
+ Line 8853  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.
- Line 6898  sub csv_samples_select_table {
+ Line 8869  sub csv_samples_select_table {
      my ($r,$records,$d) = @_;
      my $i=0;
      #
-     my $samples = &get_samples($records,3);
+     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>'.
- Line 6914  sub csv_samples_select_table {
+ Line 8886  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");
  	    }
- Line 6932  sub csv_samples_select_table {
+ Line 8904  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.
- Line 6951  sub clean_excel_name {
+ Line 8923  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
- Line 6992  sub check_if_partid_hidden {
+ Line 8964  sub check_if_partid_hidden {
  =over 4
- =item get_cgi_id
+ =item * &get_cgi_id()
  Inputs: none
- Line 7016  sub get_cgi_id {
+ Line 8988  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
- Line 7151  sub DrawBarGraph {
+ Line 9123  sub DrawBarGraph {
          $ValuesHash{$id.'.'.$key} = $value;
      }
      #
-     &Apache::lonnet::appenv(%ValuesHash);
+     &Apache::lonnet::appenv(\%ValuesHash);
      return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />';
  }
- Line 7160  sub DrawBarGraph {
+ Line 9132  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
- Line 7241  sub DrawXYGraph {
+ Line 9213  sub DrawXYGraph {
          $ValuesHash{$id.'.'.$key} = $value;
      }
      #
-     &Apache::lonnet::appenv(%ValuesHash);
+     &Apache::lonnet::appenv(\%ValuesHash);
      return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />';
  }
- Line 7250  sub DrawXYGraph {
+ Line 9222  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
- Line 7343  sub DrawXYYGraph {
+ Line 9315  sub DrawXYYGraph {
          $ValuesHash{$id.'.'.$key} = $value;
      }
      #
-     &Apache::lonnet::appenv(%ValuesHash);
+     &Apache::lonnet::appenv(\%ValuesHash);
      return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />';
  }
- Line 7360  Bad place for them but what the hell.
+ Line 9332  Bad place for them but what the hell.
  =over 4
- =item &chartlink
+ =item * &chartlink()
  Returns a link to the chart for a specific student.
- Line 7399  sub chartlink {
+ Line 9371  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.
- Line 7421  a hash ref describing the data to be sto
+ Line 9393  a hash ref describing the data to be sto
  Returns: both routines return nothing
+ =back
  =cut
  #######################################################
- Line 7473  sub store_settings {
+ Line 9447  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;
  }
- Line 7501  sub restore_settings {
+ Line 9475  sub restore_settings {
      }
  }
+ #######################################################
+ #######################################################
+ =pod
+ =head1 Domain E-mail Routines
+ =over 4
+ =item * &build_recipient_list()
+ Build recipient lists for five types of e-mail:
+ (a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors
+ (d) Help requests, (e) Course requests needing approval,  generated by
+ lonerrorhandler.pm, CHECKRPMS, loncron, lonsupportreq.pm and
+ loncoursequeueadmin.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)');
+                 } elsif ($name eq 'communities') {
+                     $trailstr = &mt('Communities');
+                 } 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.
+ type    - scalar contains course type (Course or Community).
+ Returns: $output (markup to be displayed)
+ =cut
+ sub assign_categories_table {
+     my ($cathash,$currcat,$type) = @_;
+     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') {
+                 my @currcategories;
+                 if ($currcat ne '') {
+                     @currcategories = split('&',$currcat);
+                 }
+                 my $table;
+                 for (my $i=0; $i<@{$cats[0]}; $i++) {
+                     my $parent = $cats[0][$i];
+                     next if ($parent eq 'instcode');
+                     if ($type eq 'Community') {
+                         next unless ($parent eq 'communities');
+                     } else {
+                         next if ($parent eq 'communities');
+                     }
+                     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                     my $item = &escape($parent).'::0';
+                     my $checked = '';
+                     if (@currcategories > 0) {
+                         if (grep(/^\Q$item\E$/,@currcategories)) {
+                             $checked = ' checked="checked"';
+                         }
+                     }
+                     my $parent_title = $parent;
+                     if ($parent eq 'communities') {
+                         $parent_title = &mt('Communities');
+                     }
+                     $table .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
+                               '<input type="checkbox" name="usecategory" value="'.
+                               $item.'"'.$checked.' />'.$parent_title.'</span>'.
+                               '<input type="hidden" name="catname" value="'.$parent.'" /></td>';
+                     my $depth = 1;
+                     push(@path,$parent);
+                     $table .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
+                     pop(@path);
+                     $table .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
+                     $itemcount ++;
+                 }
+                 if ($itemcount) {
+                     $output = &Apache::loncommon::start_data_table().
+                               $table.
+                               &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 ($udom,$uname,$url,$three,$four,$five,$start,$end,$context) = @_;
-     my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.'@'.$three.' in '.$url.
+     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;
  }
- Line 7527  sub commit_standardrole {
+ Line 9932  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')) {
+             ($result eq 'unknown_course') || ($result eq 'refused')) {
-             $output = "Error: $result\n";
+             $output = $logmsg.' '.&mt('Error: ').$result."\n";
          } else {
              $output = $logmsg.$linefeed.&mt('Assigning').' '.$three.' in '.$url.
                 ($start?', '.&mt('starting').' '.localtime($start):'').
- Line 7545  sub commit_standardrole {
+ Line 9950  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 {
- Line 7557  sub commit_standardrole {
+ Line 9962  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 {
- Line 7569  sub commit_studentrole {
+ Line 9974  sub commit_studentrole {
          my $secchange = 0;
          my $expire_role_result;
          my $modify_section_result;
-         unless ($oldsec eq '-1') {
+         if ($oldsec ne '-1') {
-             unless ($sec eq $oldsec) {
+             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;
- Line 7615  sub check_clone {
+ Line 10075  sub check_clone {
      my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
      my $clonemsg;
      my $can_clone = 0;
+     my $lctype = lc($args->{'crstype'});
+     if ($lctype ne 'community') {
+         $lctype = 'course';
+     }
      if ($clonehome eq 'no_host') {
-         $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'});
+         if ($args->{'crstype'} eq 'Community') {
+             $clonemsg = &mt('No new community created.').$linefeed.&mt('A new community could not be cloned from the specified original - [_1] - because it is a non-existent community.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});
+         } else {
+             $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'}) {
+         if ($args->{'crstype'} eq 'Community') {
+             if ($clonedesc{'type'} ne 'Community') {
+                  $clonemsg = &mt('No new community created.').$linefeed.&mt('A new community could not be cloned from the specified original - [_1] - because it is a course not a community.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});
+                 return ($can_clone, $clonemsg, $cloneid, $clonehome);
+             }
+         }
+ 	if (($env{'request.role.domain'} eq $args->{'clonedomain'}) &&
+             (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'}))) {
  	    $can_clone = 1;
  	} else {
  	    my %clonehash = &Apache::lonnet::get('environment',['cloners'],
- Line 7631  sub check_clone {
+ Line 10105  sub check_clone {
              } elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) {
                  $can_clone = 1;
              } else {
+                 my $ccrole = 'cc';
+                 if ($args->{'crstype'} eq 'Community') {
+                     $ccrole = 'co';
+                 }
  	        my %roleshash =
  		    &Apache::lonnet::get_my_roles($args->{'ccuname'},
  					 $args->{'ccdomain'},
-                                          'userroles',['active'],['cc'],
+                                          'userroles',['active'],[$ccrole],
  					 [$args->{'clonedomain'}]);
- 	        if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':cc'}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
+ 	        if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
- 		    $can_clone = 1;
+                     $can_clone = 1;
- 	        } else {
+                 } elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},$args->{'ccuname'},$args->{'ccdomain'})) {
-                     $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'});
+                     $can_clone = 1;
+                 } else {
+                     if ($args->{'crstype'} eq 'Community') {
+                         $clonemsg = &mt('No new community created.').$linefeed.&mt('The new community could not be cloned from the existing community because the new community owner ([_1]) does not have cloning rights in the existing community ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
+                     } 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'});
+                     }
  	        }
  	    }
          }
- Line 7648  sub check_clone {
+ Line 10132  sub check_clone {
  }
  sub construct_course {
-     my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context) = @_;
+     my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context,$cnum,$category) = @_;
      my $outcome;
      my $linefeed =  '<br />'."\n";
      if ($context eq 'auto') {
- Line 7686  sub construct_course {
+ Line 10170  sub construct_course {
                                               $args->{'crscode'},
                                               $args->{'ccuname'}.':'.
                                               $args->{'ccdomain'},
-                                              $args->{'crstype'});
+                                              $args->{'crstype'},
+                                              $cnum,$context,$category);
      # Note: The testing routines depend on this being output; see
      # Utils::Course. This needs to at least be output as a comment
      # if anyone ever decides to not show this, and Utils::Course::new
      # will need to be suitably modified.
      $outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed;
+     if ($$courseid =~ /^error:/) {
+         return (0,$outcome);
+     }
  #
  # Check if created correctly
  #
      ($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid);
      my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom);
+     if ($crsuhome eq 'no_host') {
+         $outcome .= &mt('Course creation failed, unrecognized course home server.').$linefeed;
+         return (0,$outcome);
+     }
      $outcome .= &mt('Created on').': '.$crsuhome.$linefeed;
  #
- Line 7711  sub construct_course {
+ Line 10204  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
+ # Restore creation date, creator and creation context.
- 	if (defined($oldcenv{'grading'})) {
+         $cenv{'internal.created'}=$oldcenv{'internal.created'};
- 	    $cenv{'grading'}=$oldcenv{'grading'};
+         $cenv{'internal.creator'}=$oldcenv{'internal.creator'};
- 	}
+         $cenv{'internal.creationcontext'}=$oldcenv{'internal.creationcontext'};
  # Mark as cloned
  	$cenv{'clonedfrom'}=$cloneid;
- 	delete($cenv{'default_enrollment_start_date'});
+ # Need to clone grading mode
- 	delete($cenv{'default_enrollment_end_date'});
+         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);
      }
  #
- Line 7751  sub construct_course {
+ Line 10257  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'} = '';
- Line 7811  sub construct_course {
+ Line 10316  sub construct_course {
      }
      if ($args->{'notify_dc'}) {
          if ($uname ne '') {
-             push(@notified,$uname.'@'.$udom);
+             push(@notified,$uname.':'.$udom);
          }
      }
      if (@notified > 0) {
- Line 7951  sub construct_course {
+ Line 10456  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';
          }
- Line 7971  sub construct_course {
+ Line 10476  sub construct_course {
  ############################################################
  ############################################################
+ #SD
+ # only Community and Course, or anything else?
  sub course_type {
      my ($cid) = @_;
      if (!defined($cid)) {
- Line 7987  sub group_term {
+ Line 10494  sub group_term {
      my $crstype = &course_type();
      my %names = (
                    'Course' => 'group',
-                   'Group' => 'team',
+                   'Community' => 'group',
                  );
      return $names{$crstype};
  }
+ sub course_types {
+     my @types = ('official','unofficial','community');
+     my %typename = (
+                          official   => 'Official course',
+                          unofficial => 'Unofficial course',
+                          community  => 'Community',
+                    );
+     return (\@types,\%typename);
+ }
  sub icon {
      my ($file)=@_;
      my $curfext = lc((split(/\./,$file))[-1]);
- Line 8008  sub icon {
+ Line 10525  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)=@_;
+     return $url;
-     my $lonhttpd_port = &lonhttpd_port();
-     if ($lonhttpd_port == 443) {
- 	return 'https://'.$ENV{'SERVER_NAME'}.$url;
-     }
-     return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
  }
  sub connection_aborted {
- Line 8065  sub escape_url {
+ Line 10568  sub escape_url {
      return join('/',@urlslices).'/'.$lastitem;
  }
- # -------------------------------------------------------- Initliaze user login
+ sub compare_arrays {
+     my ($arrayref1,$arrayref2) = @_;
+     my (@difference,%count);
+     @difference = ();
+     %count = ();
+     if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) {
+         foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; }
+         foreach my $element (keys(%count)) {
+             if ($count{$element} == 1) {
+                 push(@difference,$element);
+             }
+         }
+     }
+     return @difference;
+ }
+ # -------------------------------------------------------- Initialize user login
  sub init_user_environment {
      my ($r, $username, $domain, $authhost, $form, $args) = @_;
      my $lonids=$Apache::lonnet::perlvar{'lonIDsDir'};
- Line 8107  sub init_user_environment {
+ Line 10626  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
- Line 8119  sub init_user_environment {
+ Line 10638  sub init_user_environment {
      my ($httpbrowser,$clientbrowser,$clientversion,$clientmathml,
          $clientunicode,$clientos) = &decode_user_agent($r);
- # -------------------------------------- Any accessibility options to remember?
-     if (($form->{'interface'}) && ($form->{'remember'} eq 'true')) {
- 	foreach my $option ('imagesuppress','appletsuppress',
- 			    'embedsuppress','fontenhance','blackwhite') {
- 	    if ($form->{$option} eq 'true') {
- 		&Apache::lonnet::put('environment',{$option => 'on'},
- 				     $domain,$username);
- 	    } else {
- 		&Apache::lonnet::del('environment',[$option],
- 				     $domain,$username);
- 	    }
- 	}
-     }
  # ------------------------------------------------------------- Get environment
      my %userenv = &Apache::lonnet::dump('environment',$domain,$username);
      my ($tmp) = keys(%userenv);
      if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
- 	# default remote control to off
- 	if ($userenv{'remote'} ne 'on') { $userenv{'remote'} = 'off'; }
      } else {
  	undef(%userenv);
      }
      if (($userenv{'interface'}) && (!$form->{'interface'})) {
  	$form->{'interface'}=$userenv{'interface'};
      }
-     $env{'environment.remote'}=$userenv{'remote'};
      if ($userenv{'texengine'} eq 'ttm') { $clientmathml=1; }
  # --------------- Do not trust query string to be put directly into environment
-     foreach my $option ('imagesuppress','appletsuppress',
+     foreach my $option ('interface','localpath','localres') {
- 			'embedsuppress','fontenhance','blackwhite',
+         $form->{$option}=~s/[\n\r\=]//gs;
- 			'interface','localpath','localres') {
- 	$form->{$option}=~s/[\n\r\=]//gs;
      }
  # --------------------------------------------------------- Write first profile
- Line 8179  sub init_user_environment {
+ Line 10680  sub init_user_environment {
  	    $initial_env{"browser.localres"}   = $form->{'localres'};
          }
- 	if ($public) {
- 	    $initial_env{"environment.remote"} = "off";
- 	}
  	if ($form->{'interface'}) {
  	    $form->{'interface'}=~s/\W//gs;
  	    $initial_env{"browser.interface"} = $form->{'interface'};
  	    $env{'browser.interface'}=$form->{'interface'};
- 	    foreach my $option ('imagesuppress','appletsuppress',
- 				'embedsuppress','fontenhance','blackwhite') {
- 		if (($form->{$option} eq 'true') ||
- 		    ($userenv{$option} eq 'on')) {
- 		    $initial_env{"browser.$option"} = "on";
- 		}
- 	    }
  	}
+         foreach my $tool ('aboutme','blog','portfolio') {
+             $userenv{'availabletools.'.$tool} =
+                 &Apache::lonnet::usertools_access($username,$domain,$tool,'reload');
+         }
+         foreach my $crstype ('official','unofficial','community') {
+             $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",
- Line 8207  sub init_user_environment {
+ Line 10709  sub init_user_environment {
  	    }
  	    untie(%disk_env);
  	} else {
- 	    &Apache::lonnet::logthis("<font color=\"blue\">WARNING: ".
+ 	    &Apache::lonnet::logthis("<span style=\"color:blue;\">WARNING: ".
- 			   'Could not create environment storage in lonauth: '.$!.'</font>');
+ 			   'Could not create environment storage in lonauth: '.$!.'</span>');
  	    return 'error: '.$!;
  	}
      }
- Line 8222  sub init_user_environment {
+ Line 10724  sub init_user_environment {
  sub _add_to_env {
      my ($idf,$env_data,$prefix) = @_;
-     while (my ($key,$value) = each(%$env_data)) {
+     if (ref($env_data) eq 'HASH') {
- 	$idf->{$prefix.$key} = $value;
+         while (my ($key,$value) = each(%$env_data)) {
- 	$env{$prefix.$key}   = $value;
+ 	    $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

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.602
changed lines
	Added in v.1.955