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.702 and 1.1048

-version 1.702, 2008/12/03 00:09:56
+version 1.1048, 2011/12/27 20:14:32
  Line 154  sub ssi_with_retries {
  # ----------------------------------------------- Filetypes/Languages/Copyright
  my %language;
  my %supported_language;
+ my %latex_language;		# For choosing hyphenation in <transl..>
+ my %latex_language_bykey;	# for choosing hyphenation from metadata
  my %cprtag;
  my %scprtag;
  my %fe; my %fd; my %fm;
- Line 186  BEGIN {
+ Line 188  BEGIN {
              while (my $line = <$fh>) {
                  next if ($line=~/^\#/);
                  chomp($line);
-                 my ($key,$two,$country,$three,$enc,$val,$sup)=(split(/\t/,$line));
+                 my ($key,$two,$country,$three,$enc,$val,$sup,$latex)=(split(/\t/,$line));
                  $language{$key}=$val.' - '.$enc;
                  if ($sup) {
                      $supported_language{$key}=$sup;
                  }
+ 		if ($latex) {
+ 		    $latex_language_bykey{$key} = $latex;
+ 		    $latex_language{$two} = $latex;
+ 		}
              }
              close($fh);
          }
- Line 271  BEGIN {
+ Line 277  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 406  sub studentbrowser_javascript {
+ Line 412  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,clicker,roleflag,ignorefilter,courseadvonly) {
          var url = '/adm/pickstudent?';
          var filter;
  	if (!ignorefilter) {
- Line 420  sub studentbrowser_javascript {
+ Line 427  sub studentbrowser_javascript {
  	   }
          }
          url += 'form=' + formname + '&unameelement='+uname+
-                                     '&udomelement='+udom;
+                                     '&udomelement='+udom+
+                                     '&clicker='+clicker;
  	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 resourcebrowser_javascript {
+    unless ($env{'request.course.id'}) { return ''; }
+    return (<<'ENDRESBRW');
+ <script type="text/javascript" language="Javascript">
+ // <![CDATA[
+     var reseditbrowser;
+     function openresbrowser(formname,reslink) {
+         var url = '/adm/pickresource?form='+formname+'&reslink='+reslink;
+         var title = 'Resource_Browser';
+         var options = 'scrollbars=1,resizable=1,menubar=0';
+         options += ',width=700,height=500';
+         reseditbrowser = open(url,title,options,'1');
+         reseditbrowser.focus();
+     }
+ // ]]>
+ </script>
+ ENDRESBRW
+ }
  sub selectstudent_link {
-    my ($form,$unameele,$udomele)=@_;
+    my ($form,$unameele,$udomele,$courseadvonly,$clickerid)=@_;
+    my $callargs = "'".&Apache::lonhtmlcommon::entity_encode($form)."','".
+                       &Apache::lonhtmlcommon::entity_encode($unameele)."','".
+                       &Apache::lonhtmlcommon::entity_encode($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.
+        $callargs.=",'".&Apache::lonhtmlcommon::entity_encode($clickerid)."'";
-         '","'.$udomele.'");'."'>".&mt('Select User')."</a>";
+        if ($courseadvonly)  {
+            $callargs .= ",'',1,1";
+        }
+        return '<span class="LC_nobreak">'.
+               '<a href="javascript:openstdbrowser('.$callargs.');">'.
+               &mt('Select User').'</a></span>';
     }
     if ($env{'request.role'}=~/^(au|dc|su)/) {
-        return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
+        $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 selectresource_link {
+    my ($form,$reslink,$arg)=@_;
+    my $callargs = "'".&Apache::lonhtmlcommon::entity_encode($form)."','".
+                       &Apache::lonhtmlcommon::entity_encode($reslink)."'";
+    unless ($env{'request.course.id'}) { return $arg; }
+    return '<span class="LC_nobreak">'.
+               '<a href="javascript:openresbrowser('.$callargs.');">'.
+               $arg.'</a></span>';
+ }
  sub authorbrowser_javascript {
      return <<"ENDAUTHORBRW";
- <script type="text/javascript">
+ <script type="text/javascript" language="JavaScript">
+ // <![CDATA[
  var stdeditbrowser;
  function openauthorbrowser(formname,udom) {
- Line 465  function openauthorbrowser(formname,udom
+ Line 518  function openauthorbrowser(formname,udom
      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 509  sub coursebrowser_javascript {
+ Line 558  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 == "") {
+         if (formname == 'ccrs') {
-                     alert("$crs_or_grp_alert");
+             var ownername = document.forms[formid].ccuname.value;
-                     return;
+             var ownerdom =  document.forms[formid].ccdomain.options[document.forms[formid].ccdomain.selectedIndex].value;
-                 }
+             url += '&cloner='+ownername+':'+ownerdom;
-             }
          }
-         if (crstype !=null && crstype != '') {
+         if (multflag !=null && multflag != '') {
-             url += '&type='+crstype;
+             url += '&multiple='+multflag;
          }
-         var title = 'Course_Browser';
+         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;
+ }
+ sub javascript_index_functions {
+     return <<"ENDJS";
+ function getFormIdByName(formname) {
+     for (var i=0;i<document.forms.length;i++) {
+         if (document.forms[i].name == formname) {
+             return i;
+         }
+     }
+     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 getFormIdByName(formname) {
+ function getDomainFromSelectbox(formname,udom) {
-         for (var i=0;i<document.forms.length;i++) {
+     var userdom;
-             if (document.forms[i].name == formname) {
+     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;
      }
+     return userdom;
+ }
-     function getIndexByName(formid,item) {
+ ENDJS
-         for (var i=0;i<document.forms[formid].elements.length;i++) {
-             if (document.forms[formid].elements[i].name == item) {
+ }
-                 return i;
+ sub javascript_array_indexof {
+     return <<ENDJS;
+ <script type="text/javascript" language="JavaScript">
+ // <![CDATA[
+ if (!Array.prototype.indexOf) {
+     Array.prototype.indexOf = function (searchElement /*, fromIndex */ ) {
+         "use strict";
+         if (this === void 0 || this === null) {
+             throw new TypeError();
+         }
+         var t = Object(this);
+         var len = t.length >>> 0;
+         if (len === 0) {
+             return -1;
+         }
+         var n = 0;
+         if (arguments.length > 0) {
+             n = Number(arguments[1]);
+             if (n !== n) { // shortcut for verifying if it's NaN
+                 n = 0;
+             } else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {
+                 n = (n > 0 || -1) * Math.floor(Math.abs(n));
+             }
+         }
+         if (n >= len) {
+             return -1;
+         }
+         var k = n >= 0 ? n : Math.max(len - Math.abs(n), 0);
+         for (; k < len; k++) {
+             if (k in t && t[k] === searchElement) {
+                 return k;
              }
          }
          return -1;
      }
- ENDSTDBRW
+ }
-     if ($sec_element ne '') {
-         $output .= &setsec_javascript($sec_element,$formname);
+ // ]]>
+ </script>
+ 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 = new Array();
- Line 595  function setSect(sectionlist) {
+ Line 800  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 = '';
+    } elsif ($selecttype eq 'Select') {
+        $linktext = &mt('Select');
+        $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 {
- Line 612  sub selectauthor_link {
+ Line 872  sub selectauthor_link {
            &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 {
      my $jscript = <<"ENDSCRT";
  function checkAll(field) {
- Line 710  sub select_datelocale {
+ Line 978  sub select_datelocale {
      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(...)
- Line 796  sub linked_select_forms {
+ Line 1079  sub linked_select_forms {
      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 842  function select1_changed() {
+ Line 1126  function select1_changed() {
          }
      }
  }
+ // ]]>
  </script>
  END
      # output the initial values for the selection lists
- Line 877  END
+ Line 1162  END
  =pod
- =item * &help_open_topic($topic,$text,$stayOnPage,$width,$height)
+ =item * &help_open_topic($topic,$text,$stayOnPage,$width,$height,$imgid)
  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 895  a new window using Javascript. (Default
+ Line 1180  a new window using Javascript. (Default
  $width and $height are optional numerical parameters that will
  override the width and height of the popped up window, which may
  be useful for certain help topics with big pictures included.
+ $imgid is the id of the img tag used for the help icon. This may be
+ used in a javascript call to switch the image src.  See
+ lonhtmlcommon::htmlareaselectactive() for an example.
  =cut
  sub help_open_topic {
-     my ($topic, $text, $stayOnPage, $width, $height) = @_;
+     my ($topic, $text, $stayOnPage, $width, $height, $imgid) = @_;
      $text = "" if (not defined $text);
      $stayOnPage = 0 if (not defined $stayOnPage);
-     if ($env{'browser.interface'} eq 'textual') {
+     $width = 500 if (not defined $width);
- 	$stayOnPage=1;
-     }
-     $width = 350 if (not defined $width);
      $height = 400 if (not defined $height);
      my $filename = $topic;
      $filename =~ s/ /_/g;
- Line 917  sub help_open_topic {
+ Line 1203  sub help_open_topic {
      $topic=~s/\W/\_/g;
      if (!$stayOnPage) {
- 	$link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
+ 	$link = "javascript:openMyModal('/adm/help/${filename}.hlp',$width,$height,'yes');";
+     } elsif ($stayOnPage eq 'popup') {
+         $link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
      } else {
  	$link = "/adm/help/${filename}.hlp";
      }
      # 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'><span class=\"LC_nobreak\"><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/help.png");
-     $template .= <<"ENDTEMPLATE";
+     if ($imgid ne '') {
-  <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
+         $imgid = ' id="'.$imgid.'"';
- ENDTEMPLATE
+     }
-     if ($text ne '') { $template.='</span></td></tr></table>' };
+     $template.=' <a target="_top" href="'.$link.'" title="'.$title.'">'
+               .'<img src="'.$helpicon.'" border="0"'
+               .' alt="'.&mt('Help: [_1]',$topic).'"'
+               .' title="'.$title.'" style="vertical-align:middle;"'.$imgid
+               .' /></a>';
+     if ($text ne "") {
+         $template.='</span>';
+     }
      return $template;
  }
- Line 943  ENDTEMPLATE
+ Line 1238  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,$stayOnPage) = @_;
+     my $out;
      my $addOther = '';
-     if ($other) {
+     if ($topic) {
- 	$addOther = Apache::loncommon::help_open_topic($other, shift,
+ 	$addOther = '<span>'.&help_open_topic($topic,&mt($text),$stayOnPage, undef, 600).'</span> ';
- 						       undef, undef, 600) .
+     }
- 							   '</td><td>';
+     $out = '<span>' # Start cheatsheet
-     }
+ 	  .$addOther
-     return '<table><tr><td>'.
+           .'<span>'
- 	$addOther .
+ 	  .&help_open_topic('Greek_Symbols',&mt('Greek Symbols'),$stayOnPage,undef,600)
- 	&Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),
+ 	  .'</span> <span>'
- 					    undef,undef,600)
+ 	  .&help_open_topic('Other_Symbols',&mt('Other Symbols'),$stayOnPage,undef,600)
- 	.'</td><td>'.
+ 	  .'</span>';
- 	&Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
+     unless ($not_author) {
- 					    undef,undef,600)
+         $out .= ' <span>'
- 	.'</td><td>'.
+ 	       .&help_open_topic('Authoring_Output_Tags',&mt('Output Tags'),$stayOnPage,undef,600)
- 	&Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
+ 	       .'</span>';
- 	                                    undef,undef,600)
+     }
- 	.'</td></tr></table>';
+     $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';
- Line 987  sub update_help_link {
+ Line 1284  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 997  ENDOUTPUT
+ Line 1296  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 1024  sub help_open_menu {
+ Line 1317  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 1041  END
+ Line 1333  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 1064  sub help_menu_js {
+ Line 1352  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 1090  function writeHelp(caller) {
+ Line 1378  function writeHelp(caller) {
      caller.document.close()
      caller.focus()
  }
- // ]]>
  // END LON-CAPA Internal -->
+ // ]]>
  </script>
  ENDTEMPLATE
      return $template;
- Line 1102  sub help_open_bug {
+ Line 1390  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 1128  sub help_open_bug {
+ Line 1412  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 1147  sub help_open_faq {
+ Line 1431  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 1173  sub help_open_faq {
+ Line 1453  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 1359  sub resize_textarea_js {
+ Line 1639  sub resize_textarea_js {
      my $geometry = &viewport_geometry_js();
      return <<"RESIZE";
      <script type="text/javascript">
+ // <![CDATA[
  $geometry
  function getX(element) {
- Line 1397  function resize_textarea(textarea_id,bot
+ Line 1678  function resize_textarea(textarea_id,bot
      }
      textarea.style.height=new_height+'px';
  }
+ // ]]>
  </script>
  RESIZE
- Line 1517  sub create_workbook {
+ Line 1799  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);
      }
      #
-     $workbook->set_tempdir('/home/httpd/perl/tmp');
+     $workbook->set_tempdir(LONCAPA::tempdir());
      #
      my $format = &Apache::loncommon::define_excel_formats($workbook);
      return ($workbook,$filename,$format);
- Line 1560  sub create_text_file {
+ Line 1845  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(&mt('Problems occurred 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 1591  sub domain_select {
+ Line 1880  sub domain_select {
  	return &multiple_select_form($name,$value,4,\%domains);
      } else {
  	$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];
- 	return &select_form($name,$value,%domains);
+ 	return &select_form($name,$value,\%domains);
      }
  }
- Line 1629  sub multiple_select_form {
+ Line 1918  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 1653  sub multiple_select_form {
+ Line 1942  sub multiple_select_form {
  =pod
- =item * &select_form($defdom,$name,%hash)
+ =item * &select_form($defdom,$name,$hashref,$onchange)
  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.
+ allow a user to select options from a ref to a hash containing:
+ option_name => displayed text. An optional $onchange can include
+ a javascript onchange item, e.g., onchange="this.form.submit();"
  See lonrights.pm for an example invocation and use.
  =cut
  #-------------------------------------------
  sub select_form {
-     my ($def,$name,%hash) = @_;
+     my ($def,$name,$hashref,$onchange) = @_;
-     my $selectform = "<select name=\"$name\" size=\"1\">\n";
+     return unless (ref($hashref) eq 'HASH');
+     if ($onchange) {
+         $onchange = ' onchange="'.$onchange.'"';
+     }
+     my $selectform = "<select name=\"$name\" size=\"1\"$onchange>\n";
      my @keys;
-     if (exists($hash{'select_form_order'})) {
+     if (exists($hashref->{'select_form_order'})) {
- 	@keys=@{$hash{'select_form_order'}};
+ 	@keys=@{$hashref->{'select_form_order'}};
      } else {
- 	@keys=sort(keys(%hash));
+ 	@keys=sort(keys(%{$hashref}));
      }
      foreach my $key (@keys) {
          $selectform.=
  	    '<option value="'.&HTML::Entities::encode($key,'"<>&').'" '.
              ($key eq $def ? 'selected="selected" ' : '').
-                 ">".&mt($hash{$key})."</option>\n";
+                 ">".$hashref->{$key}."</option>\n";
      }
      $selectform.="</select>";
      return $selectform;
- Line 1686  sub select_form {
+ Line 1982  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',
+ 			{'currentfolder' => 'Current folder/page',
  			 'containing' => 'Containing phrase',
- 			 'none' => 'None'))).
+ 			 '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 1740  sub select_level_form {
+ Line 2036  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 1749  See loncreateuser.pm for an example invo
+ Line 2045  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 1814  sub home_server_form_item {
+ Line 2122  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 2053  function changed_text(choice,currentform
+ Line 2361  function changed_text(choice,currentform
  }
  function set_auth_radio_buttons(newvalue,currentform) {
+     var numauthchoices = currentform.login.length;
+     if (typeof numauthchoices  == "undefined") {
+         return;
+     }
      var i=0;
-     while (i < currentform.login.length) {
+     while (i < numauthchoices) {
          if (currentform.login[i].value == newvalue) { break; }
          i++;
      }
-     if (i == currentform.login.length) {
+     if (i == numauthchoices) {
          return;
      }
      current.radiovalue = newvalue;
- Line 2109  sub authform_kerberos {
+ Line 2421  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 = '';
- Line 2124  sub authform_kerberos {
+ Line 2436  sub authform_kerberos {
              }
              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 2148  sub authform_kerberos {
+ Line 2460  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 2157  sub authform_kerberos {
+ Line 2469  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 2218  sub authform_internal{
+ Line 2530  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 = '';
- Line 2234  sub authform_internal{
+ Line 2546  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 2243  sub authform_internal{
+ Line 2555  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 2258  sub authform_internal{
+ Line 2570  sub authform_internal{
      $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>';
+     $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 2273  sub authform_local{
+ Line 2585  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 = '';
- Line 2289  sub authform_local{
+ Line 2601  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 2298  sub authform_local{
+ Line 2610  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 2327  sub authform_filesystem{
+ Line 2639  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 = '';
- Line 2340  sub authform_filesystem{
+ Line 2652  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 2349  sub authform_filesystem{
+ Line 2661  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 2717  sub flush_email_cache {
+ Line 3029  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
- Line 2736  sub screenname {
+ Line 3085  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 2746  sub messagewrapper {
+ Line 3115  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 2760  sub aboutmewrapper {
+ Line 3131  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 2790  sub track_student_link {
+ Line 3159  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 2842  sub languagedescription {
+ Line 3233  sub languagedescription {
  	    ($supported_language{$code}?' ('.&mt('interface available').')':'');
  }
+ =pod
+ =item * &plainlanguagedescription
+ Returns both the plain language description (e.g. 'Creoles and Pidgins, English-based (Other)')
+ and the language character encoding (e.g. ISO) separated by a ' - ' string.
+ =cut
  sub plainlanguagedescription {
      my $code=shift;
      return $language{$code};
  }
+ =pod
+ =item * &supportedlanguagecode
+ Returns the supported language code (e.g. sptutf maps to pt) given a language
+ code.
+ =cut
  sub supportedlanguagecode {
      my $code=shift;
      return $supported_language{$code};
- Line 2854  sub supportedlanguagecode {
+ Line 3263  sub supportedlanguagecode {
  =pod
+ =item * &latexlanguage()
+ Given a language key code returns the correspondnig language to use
+ to select the correct hyphenation on LaTeX printouts.  This is undef if there
+ is no supported hyphenation for the language code.
+ =cut
+ sub latexlanguage {
+     my $code = shift;
+     return $latex_language{$code};
+ }
+ =pod
+ =item * &latexhyphenation()
+ Same as above but what's supplied is the language as it might be stored
+ in the metadata.
+ =cut
+ sub latexhyphenation {
+     my $key = shift;
+     return $latex_language_bykey{$key};
+ }
+ =pod
  =item * &copyrightids()
  returns list of all copyrights
- Line 2946  sub filemimetype {
+ Line 3384  sub filemimetype {
  sub filecategoryselect {
      my ($name,$value)=@_;
      return &select_form($value,$name,
- 			'' => &mt('Any category'),
+                         {'' => &mt('Any category'), map { $_,$_ } sort(keys(%category_extensions))});
- 			map { $_,$_ } sort(keys(%category_extensions)));
  }
  =pod
- Line 3033  sub languages {
+ Line 3470  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 3089  sub get_previous_attempt {
+ Line 3549  sub get_previous_attempt {
        }
        $prevattempts=&start_data_table().&start_data_table_header_row();
        $prevattempts.='<th>'.&mt('History').'</th>';
+       my (%typeparts,%lasthidden);
+       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];
+           next if ($data eq 'foilorder');
  	  pop(@parts);
- 	  $prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.'&nbsp;</th>';
+           $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};
+                   if (($lasthash{$key} eq 'anonsurvey') || ($lasthash{$key} eq 'anonsurveycred')) {
+                       $lasthidden{$ign.'.'.$id} = 1;
+                   }
+               }
+           }
  	} else {
  	  if ($#parts == 0) {
  	    $prevattempts.='<th>'.$parts[0].'</th>';
- Line 3106  sub get_previous_attempt {
+ Line 3578  sub get_previous_attempt {
        $prevattempts.=&end_data_table_header_row();
        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>';
+                     }
- 	    }
+                 }
- 	  $prevattempts.=&end_data_table_row();
+             }
+             $prevattempts.=&start_data_table_row().
+                            '<td>'.&mt('Transaction [_1]',$version).'</td>';
+             if (@hidden) {
+                 foreach my $key (sort(keys(%lasthash))) {
+                     next if ($key =~ /\.foilorder$/);
+                     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))) {
+                     next if ($key =~ /\.foilorder$/);
+ 		    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});
+           next if ($key =~ /\.foilorder$/);
- 	if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)}
+           if (%typeparts) {
- 	$prevattempts.='<td>'.$value.'&nbsp;</td>';
+               my $hidden;
+               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 3139  sub get_previous_attempt {
+ Line 3683  sub get_previous_attempt {
  sub format_previous_attempt_value {
      my ($key,$value) = @_;
-     if ($key =~ /timestamp/) {
+     if (($key =~ /timestamp/) || ($key=~/duedate/)) {
  	$value = &Apache::lonlocal::locallocaltime($value);
      } elsif (ref($value) eq 'ARRAY') {
  	$value = '('.join(', ', @{ $value }).')';
+     } elsif ($key =~ /answerstring$/) {
+         my %answers = &Apache::lonnet::str2hash($value);
+         my @anskeys = sort(keys(%answers));
+         if (@anskeys == 1) {
+             my $answer = $answers{$anskeys[0]};
+             if ($answer =~ m{\0}) {
+                 $answer =~ s{\0}{,}g;
+             }
+             my $tag_internal_answer_name = 'INTERNAL';
+             if ($anskeys[0] eq $tag_internal_answer_name) {
+                 $value = $answer;
+             } else {
+                 $value = $anskeys[0].'='.$answer;
+             }
+         } else {
+             foreach my $ans (@anskeys) {
+                 my $answer = $answers{$ans};
+                 if ($answer =~ m{\0}) {
+                     $answer =~ s{\0}{,}g;
+                 }
+                 $value .=  $ans.'='.$answer.'<br />';;
+             }
+         }
      } else {
  	$value = &unescape($value);
      }
- Line 3171  sub relative_to_absolute {
+ Line 3738  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 3293  sub submlink {
+ Line 3860  sub submlink {
      }
      if (!$symb) { $symb=&Apache::lonnet::symbread(); }
      $symb=&escape($symb);
-     if ($target) { $target="target=\"$target\""; }
+     if ($target) { $target=" target=\"$target\""; }
-     return '<a href="/adm/grades?&command=submission&'.
+     return
- 	'symb='.$symb.'&student='.$uname.
+         '<a href="/adm/grades?command=submission'.
- 	'&userdom='.$udom.'" '.$target.'>'.$text.'</a>';
+         '&amp;symb='.$symb.
+         '&amp;student='.$uname.
+         '&amp;userdom='.$udom.'"'.
+         $target.'>'.$text.'</a>';
  }
  ##############################################
- Line 3418  sub findallcourses {
+ Line 3988  sub findallcourses {
          $udom = $env{'user.domain'};
      }
      if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
-         my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname);
+         my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1});
+         my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname,'.',undef,
+                                               $extra);
          if (!%roles) {
              %roles = (
                         cc => 1,
+                        co => 1,
                         in => 1,
                         ep => 1,
                         ta => 1,
- Line 3612  sub blockcheck {
+ Line 4185  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 3677  sub parse_block_record {
+ Line 4250  sub parse_block_record {
      return ($setuname,$setudom,$title,$blocks);
  }
- sub build_block_table {
-     my ($startblock,$endblock,$setters) = @_;
-     my %lt = &Apache::lonlocal::texthash(
-         'cacb' => 'Currently active communication blocks',
-         'cour' => 'Course',
-         'dura' => 'Duration',
-         'blse' => 'Block set by'
-     );
-     my $output;
-     $output = '<br />'.$lt{'cacb'}.':<br />';
-     $output .= &start_data_table();
-     $output .= '
- <tr>
-  <th>'.$lt{'cour'}.'</th>
-  <th>'.$lt{'dura'}.'</th>
-  <th>'.$lt{'blse'}.'</th>
- </tr>
- ';
-     foreach my $course (keys(%{$setters})) {
-         my %courseinfo=&Apache::lonnet::coursedescription($course);
-         for (my $i=0; $i<@{$$setters{$course}{staff}}; $i++) {
-             my ($uname,$udom) = @{$$setters{$course}{staff}[$i]};
-             my $fullname = &plainname($uname,$udom);
-             if (defined($env{'user.name'}) && defined($env{'user.domain'})
-                 && $env{'user.name'} ne 'public'
-                 && $env{'user.domain'} ne 'public') {
-                 $fullname = &aboutmewrapper($fullname,$uname,$udom);
-             }
-             my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};
-             $openblock = &Apache::lonlocal::locallocaltime($openblock);
-             $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
-             $output .= &Apache::loncommon::start_data_table_row().
-                        '<td>'.$courseinfo{'description'}.'</td>'.
-                        '<td>'.$openblock.' to '.$closeblock.'</td>'.
-                        '<td>'.$fullname.'</td>'.
-                         &Apache::loncommon::end_data_table_row();
-         }
-     }
-     $output .= &end_data_table();
- }
  sub blocking_status {
-     my ($activity,$uname,$udom) = @_;
+   my ($activity,$uname,$udom) = @_;
-     my %setters;
+   my %setters;
-     my ($blocked,$output,$ownitem,$is_course);
-     my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom);
+   # check for active blocking
-     if ($startblock && $endblock) {
+   my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom);
-         $blocked = 1;
-         if (wantarray) {
+   my $blocked = $startblock && $endblock ? 1 : 0;
-             my $category;
-             if ($activity eq 'boards') {
+   # caller just wants to know whether a block is active
-                 $category = 'Discussion posts in this course';
+   if (!wantarray) { return $blocked; }
-             } elsif ($activity eq 'blogs') {
-                 $category = 'Blogs';
+   # build a link to a popup window containing the details
-             } elsif ($activity eq 'port') {
+   my $querystring  = "?activity=$activity";
-                 if (defined($uname) && defined($udom)) {
+   # $uname and $udom decide whose portfolio the user is trying to look at
-                     if ($uname eq $env{'user.name'} &&
+      $querystring .= "&amp;udom=$udom"      if $udom;
-                         $udom eq $env{'user.domain'}) {
+      $querystring .= "&amp;uname=$uname"    if $uname;
-                         $ownitem = 1;
-                     }
+   my $output .= <<'END_MYBLOCK';
-                 }
+     function openWindow(url, wdwName, w, h, toolbar,scrollbar) {
-                 $is_course = &Apache::lonnet::is_course($udom,$uname);
+         var options = "width=" + w + ",height=" + h + ",";
-                 if ($ownitem) {
+         options += "resizable=yes,scrollbars="+scrollbar+",status=no,";
-                     $category = 'Your portfolio files';
+         options += "menubar=no,toolbar="+toolbar+",location=no,directories=no";
-                 } elsif ($is_course) {
+         var newWin = window.open(url, wdwName, options);
-                     my $coursedesc;
+         newWin.focus();
-                     foreach my $course (keys(%setters)) {
+     }
-                         my %courseinfo =
+ END_MYBLOCK
-                              &Apache::lonnet::coursedescription($course);
-                         $coursedesc = $courseinfo{'description'};
+   $output = Apache::lonhtmlcommon::scripttag($output);
-                     }
-                     $category = "Group files in the course '$coursedesc'";
+   my $popupUrl = "/adm/blockingstatus/$querystring";
-                 } else {
+   my $text = mt('Communication Blocked');
-                     $category = 'Portfolio files belonging to ';
-                     if ($env{'user.name'} eq 'public' &&
+   $output .= <<"END_BLOCK";
-                         $env{'user.domain'} eq 'public') {
+ <div class='LC_comblock'>
-                         $category .= &plainname($uname,$udom);
+   <a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring'
-                     } else {
+   title='$text'>
-                         $category .= &aboutmewrapper(&plainname($uname,$udom),$uname,$udom);
+   <img class='LC_noBorder LC_middle' title='$text' src='/res/adm/pages/comblock.png' alt='$text'/></a>
-                     }
+   <a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring'
-                 }
+   title='$text'>$text</a>
-             } elsif ($activity eq 'groups') {
+ </div>
-                 $category = 'Groups in this course';
-             }
+ END_BLOCK
-             my $showstart = &Apache::lonlocal::locallocaltime($startblock);
-             my $showend = &Apache::lonlocal::locallocaltime($endblock);
+   return ($blocked, $output);
-             $output = '<br />'.&mt('[_1] will be inaccessible between [_2] and [_3] because communication is being blocked.',$category,$showstart,$showend).'<br />';
-             if (!($activity eq 'port' && !($ownitem) && !($is_course))) {
-                 $output .= &build_block_table($startblock,$endblock,\%setters);
-             }
-         }
-     }
-     if (wantarray) {
-         return ($blocked,$output);
-     } else {
-         return $blocked;
-     }
  }
  ###############################################
- Line 3851  sub determinedomain {
+ Line 4372  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 3874  sub get_domainconf {
+ Line 4395  sub get_domainconf {
      if (defined($cached)) { return %{$result}; }
      my %domconfig = &Apache::lonnet::get_dom('configuration',
- 					     ['login','rolecolors'],$udom);
+ 					     ['login','rolecolors','autoenroll'],$udom);
      my (%designhash,%legacy);
      if (keys(%domconfig) > 0) {
          if (ref($domconfig{'login'}) eq 'HASH') {
              if (keys(%{$domconfig{'login'}})) {
                  foreach my $key (keys(%{$domconfig{'login'}})) {
                      if (ref($domconfig{'login'}{$key}) eq 'HASH') {
-                         foreach my $img (keys(%{$domconfig{'login'}{$key}})) {
+                         if ($key eq 'loginvia') {
-                             $designhash{$udom.'.login.'.$key.'_'.$img} =
+                             if (ref($domconfig{'login'}{'loginvia'}) eq 'HASH') {
-                                 $domconfig{'login'}{$key}{$img};
+                                 foreach my $hostname (keys(%{$domconfig{'login'}{'loginvia'}})) {
+                                     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};
- Line 3910  sub get_domainconf {
+ Line 4453  sub get_domainconf {
          } else {
              $legacy{'rolecolors'} = 1;
          }
+         if (ref($domconfig{'autoenroll'}) eq 'HASH') {
+             if ($domconfig{'autoenroll'}{'co-owners'}) {
+                 $designhash{$udom.'.autoassign.co-owners'}=$domconfig{'autoenroll'}{'co-owners'};
+             }
+         }
          if (keys(%legacy) > 0) {
              my %legacyhash = &get_legacy_domconf($udom);
              foreach my $item (keys(%legacyhash)) {
- Line 3948  sub get_legacy_domconf {
+ Line 4496  sub get_legacy_domconf {
              close($fh);
          }
      }
-     if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') {
+     if (-e $Apache::lonnet::perlvar{'lonDocRoot'}.'/adm/lonDomLogos/'.$udom.'.gif') {
          $legacyhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif";
      }
      return %legacyhash;
- Line 4002  Returns: value of designparamter $which
+ Line 4550  Returns: value of designparamter $which
  ##############################################
  sub designparm {
      my ($which,$domain)=@_;
-     if ($env{'browser.blackwhite'} eq 'on') {
- 	if ($which=~/\.(font|alink|vlink|link|textcol)$/) {
- 	    return '#000000';
- 	}
- 	if ($which=~/\.(pgbg|sidebg|bgcol)$/) {
- 	    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 %domdesign;
+     unless ($domain eq 'public') {
+         %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|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: $url (usually will be undef).
+ Returns: Path to Construction Space containing the resource or
+          directory being viewed (or for which action is being taken).
+          If $url is provided, and begins /priv/<domain>/<uname>
+          the path will be that portion of the $context argument.
+          Otherwise the path will be for the author space of the current
+          user when the current role is author, or for that of the
+          co-author/assistant co-author space when the current role
+          is co-author or assistant co-author.
+ =cut
+ sub authorspace {
+     my ($url) = @_;
+     if ($url ne '') {
+         if ($url =~ m{^(/priv/$match_domain/$match_username/)}) {
+            return $1;
+         }
+     }
+     my $caname = '';
+     my $cadom = '';
+     if ($env{'request.role'} =~ /^(?:ca|aa)/) {
+         ($cadom,$caname) =
+             ($env{'request.role'}=~/($match_domain)\/($match_username)$/);
+     } elsif ($env{'request.role'} =~ m{^au\./($match_domain)/}) {
+         $caname = $env{'user.name'};
+         $cadom = $env{'user.domain'};
+     }
+     if (($caname ne '') && ($cadom ne '')) {
+         return "/priv/$cadom/$caname/";
+     }
+     return;
+ }
+ ##############################################
+ =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 class="LC_head_subbox">'
+        .$content
+        .'</div>'
+ }
+ ##############################################
+ =pod
+ =item * &CSTR_pageheader()
+ Input: (optional) filename from which breadcrumb trail is built.
+        In most cases no input as needed, as $env{'request.filename'}
+        is appropriate for use in building the breadcrumb trail.
+ Returns: HTML div with CSTR path and recent box
+          To be included on Construction Space pages
+ =cut
+ sub CSTR_pageheader {
+     my ($trailfile) = @_;
+     if ($trailfile eq '') {
+         $trailfile = $env{'request.filename'};
+     }
+ # this is for resources; directories have customtitle, and crumbs
+ # and select recent are created in lonpubdir.pm
+     my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+     my ($udom,$uname,$thisdisfn)=
+         ($trailfile =~ m{^\Q$londocroot\E/priv/([^/]+)/([^/]+)/(.*)$});
+     my $formaction = "/priv/$udom/$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/'.$udom,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 4069  Inputs:
+ Line 4732  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
- =item * $no_inline_link, if true and in remote mode, don't show the
-          'Switch To Inline Menu' link
  =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 4099  other decorations will be returned.
+ Line 4753  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,$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 4109  sub bodytag {
+ Line 4768  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 4128  sub bodytag {
+ Line 4787  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);
      }
      if (!$realm) { $realm='&nbsp;'; }
- # Set messages
-     my $messages=&domainlogo($domain);
      my $extra_body_attr = &make_attr_string($forcereg,\%design);
- Line 4145  sub bodytag {
+ Line 4805  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 4188  ENDROLE
+ Line 4822  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') || ($args->{'suppress_header_logos'})) {
+     $role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
-         # No Remote
+     &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
- 	if ($env{'request.state'} eq 'construct') {
- 	    $forcereg=1;
- 	}
- 	if (!$customtitle && $env{'request.state'} eq 'construct') {
+         if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') {
- 	    # this is for resources; directories have customtitle, and crumbs
+             return $bodytag;
-             # and select recent are created in lonpubdir.pm
+         }
- 	    my ($uname,$thisdisfn)=
- 		($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
+         if ($env{'request.state'} eq 'construct') { $forcereg=1; }
- 	    my $formaction='/priv/'.$uname.'/'.$thisdisfn;
- 	    $formaction=~s/\/+/\//g;
+         #    if ($env{'request.state'} eq 'construct') {
+         #        $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
- 	    my $parentpath = '';
+         #    }
- 	    my $lastitem = '';
- 	    if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
- 		$parentpath = $1;
- 		$lastitem = $2;
+         if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
- 	    } else {
+              if ($dc_info) {
- 		$lastitem = $thisdisfn;
+                  $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
- 	    }
+              }
- 	    $titleinfo =
+              $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
- 		&Apache::loncommon::help_open_menu('','',3,'Authoring')
+                 <em>$realm</em> $dc_info</div>|;
- 		.'<b>'.&mt('Construction Space').'</b>:&nbsp;'
+             return $bodytag;
- 		.'<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 />"
+         unless ($env{'request.symb'} =~ m/\.page___\d+___/) {
- 		.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
+             $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>|;
- 		.'</form>'
+         }
- 		.&Apache::lonmenu::constspaceform();
-         }
+         $bodytag .= Apache::lonhtmlcommon::scripttag(
+             Apache::lonmenu::utilityfunctions(), 'start');
-         my $titletable;
- 	if (!$notitle) {
+         $bodytag .= Apache::lonmenu::primary_menu();
- 	    $titletable =
- 		'<table id="LC_title_bar">'.
+         if ($dc_info) {
-                          "<tr><td> $titleinfo $dc_info</td>".$roleinfo.
+             $dc_info = &dc_courseid_toggle($dc_info);
- 			 '</tr></table>';
+         }
- 	}
+         $bodytag .= qq|<div id="LC_realm">$realm $dc_info</div>|;
- 	if ($notopbar) {
- 	    $bodytag .= $titletable;
+         #don't show menus for public users
- 	} else {
+         if (!$public){
- 	    if ($env{'request.state'} eq 'construct') {
+             $bodytag .= Apache::lonmenu::secondary_menu();
-                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
+             $bodytag .= Apache::lonmenu::serverform();
- 							  $titletable);
+             $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
-             } else {
+             if ($env{'request.state'} eq 'construct') {
-                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg).
+                 $bodytag .= &Apache::lonmenu::innerregister($forcereg,
- 		    $titletable;
+                                 $args->{'bread_crumbs'});
+             } elsif ($forcereg) {
+                 $bodytag .= &Apache::lonmenu::innerregister($forcereg);
              }
+         }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 LC_nobreak">'.
-     }
+            '<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 4298  sub make_attr_string {
+ Line 4914  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 4385  sub standard_css {
+ Line 4978  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 4396  sub standard_css {
+ Line 4991  sub standard_css {
      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 4411  sub standard_css {
+ Line 5006  sub standard_css {
      my $mail_other_hover     = '#669999';
      my $table_header         = '#DDDDDD';
      my $feedback_link_bg     = '#BBBBBB';
-     my $lg_border_color	     = '#C8C8C8';
+     my $lg_border_color      = '#C8C8C8';
+     my $button_hover         = '#BF2317';
      my $border = ($env{'browser.type'} eq 'explorer' ||
- 		  $env{'browser.type'} eq 'safari'     ) ? '0px 2px 0px 2px'
+       $env{'browser.type'} eq 'safari'     ) ? '0 2px 0 2px'
- 	                                                 : '0px 3px 0px 4px';
+                                              : '0 3px 0 4px';
      return <<END;
- body{
-      font-family: $sans;
-      line-height:130%;
-      font-size:0.83em;
-      color:$font;
-   }
- a:link, a:visited { font-size:100%; }
- a:focus { color: red; background: yellow }
+ /* needed for iframe to allow 100% height in FF */
- table.thinborder,
+ body, html {
- table.thinborder tr th {
+     margin: 0;
-   border-style: solid;
+     padding: 0 0.5%;
-   border-width: 1px;
+     height: 99%; /* to avoid scrollbars */
-   border-color: $lg_border_color;
-   background: $tabbg;
  }
- table.thinborder tr td {
-   border-style: solid;
+ body {
-   border-width: 1px;
+   font-family: $sans;
-   border-color: $lg_border_color;
+   line-height:130%;
+   font-size:0.83em;
+   color:$font;
+ }
+ a:focus,
+ a:focus img {
+   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;
+ }
+ .LC_setting {
+   text-decoration:underline;
  }
- form, .inline { display: inline; }
- .center { text-align: center; }
- .left { text-align:left; }
- .right {text-align:right;}
- .middle {vertical-align:middle;}
- .top {vertical-align:top;}
- .bottom {vertical-align:bottom;}
- .LC_filename {font-family: $mono; white-space:pre;}
  .LC_error {
    color: red;
    font-size: larger;
  }
  .LC_warning,
  .LC_diff_removed {
    color: red;
- Line 4463  form, .inline { display: inline; }
+ Line 5099  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;
+ }
+ div.LC_confirm_box .LC_error img,
+ div.LC_confirm_box .LC_success img {
+   vertical-align: middle;
  }
  .LC_icon {
-   border: 0px;
+   border: none;
- }
+   vertical-align: middle;
- .LC_indexer_icon {
-   border: 0px;
-   height: 22px;
  }
  .LC_docs_spacer {
    width: 25px;
    height: 1px;
-   border: 0px;
+   border: none;
  }
  .LC_internal_info {
-   color: #999;
+   color: #999999;
+ }
+ .LC_discussion {
+   background: $tabbg;
+   border: 1px solid black;
+   margin: 2px;
+ }
+ .LC_disc_action_links_bar {
+   background: $tabbg;
+   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 4489  table.LC_pastsubmission {
+ Line 5164  table.LC_pastsubmission {
    margin: 2px;
  }
- table#LC_top_nav, table#LC_menubuttons,table#LC_nav_location {
+ 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_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;
-   border-collapse: collapse;
-   padding: 0px;
- }
- table.LC_docs_path {
-   width: 100%;
-   border: 0;
    background: $pgbg;
-   font-family: $sans;
+   color: $fontmenu;
    border-collapse: collapse;
-   padding: 0px;
+   padding: 0;
+   margin: 0;
  }
- table#LC_title_bar td {
+ ul.LC_breadcrumb_tools_outerlist {
-   background: $tabbg;
+     margin: 0;
- }
+     padding: 0;
- table#LC_title_bar td.LC_title_bar_who {
+     position: relative;
-   background: $tabbg;
+     list-style: none;
-   color: $font;
-   font: small $sans;
-   text-align: right;
- }
- span.LC_metadata {
-     font-family: $sans;
- }
- span.LC_title_bar_title {
-   font: bold x-large $sans;
- }
- 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 {
+ ul.LC_breadcrumb_tools_outerlist li {
-   background: $sidebg;
+     display: inline;
-   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;
-   font-family: $sans;
  }
- table#LC_top_nav td.LC_top_nav_logo {
-   background: $tabbg;
+ table#LC_menubuttons img {
-   text-align: left;
+   border: none;
-   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;
+   text-align: left;
  }
- 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;
+   padding: 3px;
+   text-align: left;
+ }
+ .LC_fontsize_medium {
+   font-size: 85%;
  }
- table#LC_mainmenu td.LC_mainmenu_column {
-     vertical-align: top;
+ .LC_fontsize_large {
+   font-size: 120%;
  }
  .LC_menubuttons_inline_text {
    color: $font;
-   font-family: $sans;
    font-size: 90%;
    padding-left:3px;
  }
+ .LC_menubuttons_inline_text img{
+   vertical-align: middle;
+ }
+ li.LC_menubuttons_inline_text img,a {
+   cursor:pointer;
+   text-decoration: none;
+ }
  .LC_menubuttons_link {
    text-decoration: none;
  }
- /*2008--9-5: new menu style sheet.Changed category*/
  .LC_menubuttons_category {
    color: $font;
    background: $pgbg;
-   font-family: $sans;
    font-size: larger;
    font-weight: bold;
  }
  td.LC_menubuttons_text {
-  	color: $font;
+   color: $font;
- }
- td.LC_menubuttons_img {
  }
  .LC_current_location {
-   font-family: $sans;
-   background: $tabbg;
- }
- .LC_new_mail {
-   font-family: $sans;
    background: $tabbg;
-   font-weight: bold;
- }
- .LC_rolesmenu_is {
-   font-family: $sans;
- }
- .LC_rolesmenu_selected {
-   font-family: $sans;
  }
- .LC_rolesmenu_future {
+ table.LC_data_table {
-   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;
- }
- .LC_roleslog_note {
-   font-size: small;
- }
- table.LC_aboutme_port {
-   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 {
+ 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;
+   color:$fontmenu;
    font-size:90%;
  }
- table.LC_data_table tr.LC_odd_row > td,
- table.LC_aboutme_port tr td {
+ 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.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: small;
    border-bottom: 1px solid #000000;
  }
  table.LC_nested_outer tr td.LC_subheader {
    background-color: $data_table_head;
    font-weight: bold;
- Line 4752  table.LC_nested_outer tr td.LC_subheader
+ Line 5418  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 4774  table.LC_nested tr td.LC_right_item {
+ Line 5444  table.LC_nested tr td.LC_right_item {
  }
  table.LC_nested tr.LC_odd_row td {
-   background-color: #EEE;
+   background-color: #EEEEEE;
  }
  table.LC_createuser {
- Line 4785  table.LC_createuser tr.LC_section_row td
+ Line 5455  table.LC_createuser tr.LC_section_row td
  }
  table.LC_createuser tr.LC_info_row td  {
-   background-color: #CCC;
+   background-color: #CCCCCC;
    font-weight: bold;
    text-align: center;
  }
- Line 4793  table.LC_createuser tr.LC_info_row td  {
+ Line 5463  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 {
-   background-color: $mail_other_hover;
- }
- table.LC_mail_list tr.LC_mail_even {
- }
- table.LC_mail_list tr.LC_mail_odd {
- }
- table#LC_cstr_controls {
+ /*
-   width: 100%;
+ table.LC_data_table tr.LC_mail_other:hover {
-   border-collapse: collapse;
+   background-color: $mail_other_hover;
- }
- 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;
-   background: $table_header;
-   text-align: center;
-   font-family: $sans;
-   font-size: smaller;
  }
+ */
  table.LC_data_table tr > td.LC_browser_file,
  table.LC_data_table tr > td.LC_browser_file_published {
-   background: #CCFF88;
+   background: #AAEE77;
  }
  table.LC_data_table tr > td.LC_browser_file_locked,
  table.LC_data_table tr > td.LC_browser_file_unpublished {
    background: #FFAA99;
  }
  table.LC_data_table tr > td.LC_browser_file_obsolete {
-   background: #AAAAAA;
+   background: #888888;
  }
  table.LC_data_table tr > td.LC_browser_file_modified,
  table.LC_data_table tr > td.LC_browser_file_metamodified {
-   background: #FFFF77;
+   background: #F8F866;
  }
  table.LC_data_table tr.LC_browser_folder > td {
-   background: #CCCCFF;
+   background: #E0E8FF;
+ }
+ table.LC_data_table tr > td.LC_roles_is {
+   /* background: #77FF77; */
+ }
+ table.LC_data_table tr > td.LC_roles_future {
+   border-right: 8px solid #FFFF77;
+ }
+ table.LC_data_table tr > td.LC_roles_will {
+   border-right: 8px solid #FFAA77;
+ }
+ table.LC_data_table tr > td.LC_roles_expired {
+   border-right: 8px solid #FF7777;
+ }
+ table.LC_data_table tr > td.LC_roles_will_not {
+   border-right: 8px solid #AAFF77;
+ }
+ table.LC_data_table tr > td.LC_roles_selected {
+   border-right: 8px solid #11CC55;
  }
  span.LC_current_location {
- Line 4879  span.LC_current_location {
+ Line 5574  span.LC_current_location {
    background: $pgbg;
  }
+ span.LC_current_nav_location {
+   font-weight:bold;
+   background: $sidebg;
+ }
  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,
+ ul.LC_parm_parmlist li {
- td.LC_parm_overview_parm_selectors, td.LC_parm_overview_parm_restrictions {
+   display: inline-block;
+   padding: 0.3em 0.8em;
+   vertical-align: top;
+   width: 150px;
+   border-top:1px solid $lg_border_color;
+ }
+ td.LC_parm_overview_level_menu,
+ td.LC_parm_overview_map_menu,
+ td.LC_parm_overview_parm_selectors,
+ td.LC_parm_overview_restrictions  {
    border: 1px solid black;
    border-collapse: collapse;
  }
  table.LC_parm_overview_restrictions td {
    border-width: 1px 4px 1px 4px;
    border-style: solid;
    border-color: $pgbg;
    text-align: center;
  }
  table.LC_parm_overview_restrictions th {
    background: $tabbg;
    border-width: 1px 4px 1px 4px;
    border-style: solid;
    border-color: $pgbg;
  }
  table#LC_helpmenu {
-   border: 0px;
+   border: none;
    height: 55px;
-   border-spacing: 0px;
+   border-spacing: 0;
  }
  table#LC_helpmenu fieldset legend {
    font-size: larger;
-   font-weight: bold;
  }
  table#LC_helpmenu_links {
    width: 100%;
    border: 1px solid black;
    background: $pgbg;
-   padding: 0px;
+   padding: 0;
    border-spacing: 1px;
  }
  table#LC_helpmenu_links tr td {
    padding: 1px;
    background: $tabbg;
- Line 4942  table#LC_helpmenu_links tr td {
+ Line 5661  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 4956  table#LC_helpmenu_links a:hover {
+ Line 5677  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_selfenroll_pick_box_title {
-   background: $tabbg;
-   font-weight: bold;
-   text-align: right;
-   width: 350px;
-   padding: 8px;
- }
  table.LC_pick_box td.LC_pick_box_value {
    text-align: left;
    padding: 8px;
  }
  table.LC_pick_box td.LC_pick_box_select {
    text-align: left;
    padding: 8px;
  }
  table.LC_pick_box td.LC_pick_box_separator {
-   padding: 0px;
+   padding: 0;
    height: 1px;
    background: black;
  }
  table.LC_pick_box td.LC_pick_box_submit {
    text-align: right;
  }
  table.LC_pick_box td.LC_evenrow_value {
    text-align: left;
    padding: 8px;
    background-color: $data_table_light;
  }
  table.LC_pick_box td.LC_oddrow_value {
    text-align: left;
    padding: 8px;
    background-color: $data_table_light;
  }
- table.LC_helpform_receipt {
-   width: 620px;
-   border-collapse: separate;
-   background: white;
-   border: 1px solid black;
-   border-spacing: 1px;
- }
- table.LC_helpform_receipt td.LC_pick_box_title {
-   background: $tabbg;
-   font-weight: bold;
-   text-align: right;
-   width: 184px;
-   padding: 8px;
- }
- table.LC_helpform_receipt td.LC_evenrow_value {
-   text-align: left;
-   padding: 8px;
-   background-color: $data_table_light;
- }
- table.LC_helpform_receipt td.LC_oddrow_value {
-   text-align: left;
-   padding: 8px;
-   background-color: $data_table_light;
- }
- table.LC_helpform_receipt td.LC_pick_box_separator {
-   padding: 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 {
-   background: white;
-   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 {
    clear: both;
-   background: white;
+   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 5137  table.LC_prior_tries td {
+ Line 5860  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 5182  table.LC_prior_option {
+ Line 5915  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 5204  span.LC_cusr_subheading {
+ Line 5940  span.LC_cusr_subheading {
    font-size: 85%;
  }
- table.LC_docs_documents {
+ div.LC_docs_entry_move {
-   background: #BBBBBB;
+   border: 1px solid #BBBBBB;
-   border-width: 0px;
-   border-collapse: collapse;
- }
- table.LC_docs_documents td.LC_docs_document {
-   border: 2px solid black;
-   padding: 4px;
- }
- .LC_docs_course_commands div {
-   float: left;
-   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 5254  table.LC_docs_documents td.LC_docs_docum
+ Line 5979  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 5274  table.LC_docs_adddocs th {
+ Line 5989  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 5294  table.LC_double_column tr td.LC_left_col
+ Line 6010  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 5318  div.LC_clear_float_footer {
+ Line 6030  div.LC_clear_float_footer {
    clear: both;
  }
- div.LC_grade_select_mode {
-   font-family: $sans;
- }
- div.LC_grade_select_mode div div {
-   margin: 5px;
- }
- div.LC_grade_select_mode_selector {
-   margin: 5px;
-   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 {
-   margin-top: 20px;
+ /*  border-left: 5px solid $sidebg; */
-   border: 1px solid black;
+   border-top: 5px solid #000000;
+   margin: 50px 0 0 0;
+   padding: 15px 0 5px 10px;
  }
- div.LC_grade_user_name {
-   background: #DDDDEE;
+ div.LC_grade_show_user_odd_row {
-   border-bottom: 1px solid black;
+ /*  border-left: 5px solid #000000; */
-   font: bold large $sans;
  }
- div.LC_grade_show_user_odd_row div.LC_grade_user_name {
-   background: #DDEEDD;
+ div.LC_grade_show_user div.LC_Box {
+   margin-right: 50px;
  }
- 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;
-   display: inline;
-   position: absolute;
-   right: 1em;
- }
  table.LC_scantron_action {
    width: 100%;
  }
  table.LC_scantron_action tr th {
    font-weight:bold;
    font-style:normal;
  }
- .LC_edit_problem_header,
+ .LC_edit_problem_header,
  div.LC_edit_problem_footer {
-   font: normal medium $sans;
+   font-weight: normal;
+   font-size:  medium;
    margin: 2px;
  }
  div.LC_edit_problem_header,
  div.LC_edit_problem_header div,
  div.LC_edit_problem_footer,
- Line 5399  div.LC_edit_problem_editxml_header,
+ Line 6090  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
  }
  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;
+   background-color: $pgbg_or_bgcolor;
+   margin: 0 0 2px 0;
+ }
+ #LC_realm {
+   margin: 0.2em 0 0 0;
+   padding: 0;
+   font-weight: bold;
+   text-align: center;
+   background-color: $pgbg_or_bgcolor;
+ }
+ #LC_nav_bar em {
+   font-weight: bold;
+   font-style: normal;
+ }
+ ol.LC_primary_menu {
+   float: right;
+   margin: 0;
+   background-color: $pgbg_or_bgcolor;
+ }
+ 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;
+ }
+ ol.LC_docs_parameters {
+   margin-left: 0;
+   padding: 0;
+   list-style: none;
+ }
+ ol.LC_docs_parameters li {
+   margin: 0;
+   padding-right: 20px;
+   display: inline;
+ }
+ ol.LC_docs_parameters li:before {
+   content: "\\002022 \\0020";
+ }
+ li.LC_docs_parameters_title {
+   font-weight: bold;
+ }
+ ol.LC_docs_parameters li.LC_docs_parameters_title:before {
+   content: "";
+ }
+ 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%;
+   text-align: left;
+ }
+ 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: -1px -10px 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;
  }
- img.stift{
-   border-width:0;
+ ul.LC_TabContent li {
    vertical-align:middle;
+   padding: 0 16px 0 10px;
+   background-color:$tabbg;
+   border-bottom:solid 1px $lg_border_color;
+   border-left: solid 1px $font;
  }
- table#LC_mainmenu{
+ ul.LC_TabContent .right {
-  margin-top:10px;
+   float:right;
-  width:80%;
+ }
+ ul.LC_TabContent li a,
+ ul.LC_TabContent li {
+   color:rgb(47,47,47);
+   text-decoration:none;
+   font-size:95%;
+   font-weight:bold;
+   min-height:20px;
  }
- table#LC_mainmenu td.LC_mainmenu_col_fieldset{
+ ul.LC_TabContent li a:hover,
-   vertical-align: top;
+ ul.LC_TabContent li a:focus {
-   width: 45%;
+   color: $button_hover;
+   background:none;
+   outline:none;
+ }
+ ul.LC_TabContent li:hover {
+   color: $button_hover;
+   cursor:pointer;
  }
- .LC_mainmenu_fieldset_category {
+ ul.LC_TabContent li.active {
    color: $font;
-   background: $pgbg;
+   background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;
-   font-family: $sans;
+   border-bottom:solid 1px #FFFFFF;
-   font-size: small;
+   cursor: default;
-   font-weight: bold;
  }
- fieldset#LC_mainmenu_fieldset {
-   margin:0px 10px 10px 0px;
+ ul.LC_TabContent li.active a {
+   color:$font;
+   background:#FFFFFF;
+   outline: none;
  }
- /* ---- Remove when done ----
- # The following styles is part of the redesign of LON-CAPA and are
- # subject to change during this project.
- # Don't rely on their current functionality as they might be
- # changed or removed.
- # --------------------------*/
- a:hover,
+ ul.LC_TabContent li.goback {
- ol.smallMenu a:hover,
+   float: left;
- ol#MenuBreadcrumbs a:hover,
+   border-left: none;
- ul#TabMainMenuContent a:hover,
- .FormSectionClearButton input:hover{
- 	color:#BF2317;
-         text-decoration:none;
  }
- h1 {
+ #maincoursedoc {
- 	padding:5px 10px 5px 0px;
+   clear:both;
- 	line-height:130%;
  }
- h2,h3,h4,h5,h6
+ ul.LC_TabContentBigger {
- {
+   display:block;
- margin:5px 0px 5px 0px;
+   list-style:none;
- line-height:130%;
+   padding: 0;
  }
- .hcell{
-         padding:3px 15px 3px 15px;
+ ul.LC_TabContentBigger li {
-         margin:0px;
+   vertical-align:bottom;
- 	background-color:$pgbg;
+   height: 30px;
- 	background-color:$	border-bottom:solid 1px $lg_border_color;
+   font-size:110%;
+   font-weight:bold;
+   color: #737373;
  }
- .noBorder {
-         border:0px;
+ ul.LC_TabContentBigger li.active {
+   position: relative;
+   top: 1px;
+ }
+ 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;
+   outline: none;
+ }
+ ul.LC_TabContentBigger li.active a {
+   background:url('/adm/lonIcons/tabbgleft.gif') left top no-repeat;
+   color:$font;
+ }
+ ul.LC_TabContentBigger li b {
+   background: url('/adm/lonIcons/tabbgright.gif') no-repeat right bottom;
+   display: block;
+   float: left;
+   padding: 0 30px;
+   border-bottom: 1px solid $lg_border_color;
  }
- /*
- .bgLightGrey { background:URL(images/TabMenuBG.png) repeat-x left top; }
- .bgLightGreyYellow {background-color:#EFECE0;}
- */
+ ul.LC_TabContentBigger li:hover b {
+   color:$button_hover;
+ }
- /* Main Header with discription of Person, Course, etc. */
+ ul.LC_TabContentBigger li.active b {
- .HeadRight {
+   background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat;
- 	text-align: right;
+   color:$font;
- 	float: right;
+   border: 0;
- 	margin: 0px;
- 	padding: 0px;
-         right:0;
-         position:absolute;
-         overflow:hidden;
  }
- p {
- 	padding: 10px;
+ ul.LC_CourseBreadcrumbs {
+   background: $sidebg;
+   height: 2em;
+   padding-left: 10px;
+   margin: 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;
  }
- .FormSectionClearButton input {
-         background-color:transparent;
+ ol#LC_MenuBreadcrumbs li a,
-         border:0px;
+ ul.LC_CourseBreadcrumbs li a {
-         cursor:pointer;
+   text-decoration: none;
-         text-decoration:underline;
+   font-size:90%;
  }
+ ol#LC_MenuBreadcrumbs h1 {
+   display: inline;
+   font-size: 90%;
+   line-height: 2.5em;
+   margin: 0;
+   padding: 0;
+ }
- dl,ul,div,fieldset {
+ ol#LC_PathBreadcrumbs li a {
- 	margin: 10px 10px 10px 0px;
+   text-decoration:none;
- 	overflow:hidden;
+   font-size:100%;
+   font-weight:bold;
  }
- ol.smallMenu {
- 	margin: 0px;
+ .LC_Box {
+   border: solid 1px $lg_border_color;
+   padding: 0 10px 10px 10px;
  }
- ol.smallMenu li {
+ .LC_DocsBox {
- 	display: inline;
+   border: solid 1px $lg_border_color;
- 	padding: 5px 5px 0px 10px;
+   padding: 0 0 10px 10px;
- 	vertical-align: top;
  }
- ol.smallMenu li img {
+ .LC_AboutMe_Image {
- 	vertical-align: bottom;
+   float:left;
+   margin-right:10px;
  }
- ol.smallMenu a {
+ .LC_Clear_AboutMe_Image {
- 	font-size: 90%;
+   clear:left;
- 	color: RGB(80, 80, 80);
- 	text-decoration: none;
  }
- ol#TabMainMenuContent {
+ dl.LC_ListStyleClean dt {
+   padding-right: 5px;
- 	margin: 0px 0px 10px 0px;
+   display: table-header-group;
- 	padding: 0px;
  }
- ol#TabMainMenuContent li {
+ dl.LC_ListStyleClean dd {
- 	display: inline;
+   display: table-row;
- 	vertical-align: bottom;
- 	border-bottom: solid 1px RGB(175, 175, 175);
- 	border-right: solid 1px RGB(175, 175, 175);
- 	padding: 5px 15px 5px 15px;
- 	margin-right:4px;
- 	line-height: 140%;
- 	font-weight: bold;
- 	overflow:hidden;
- /*	background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left top;*/
  }
- ol#TabMainMenuContent li a{
+ .LC_ListStyleClean,
- 	color: RGB(47, 47, 47);
+ .LC_ListStyleSimple,
- 	text-decoration: none;
+ .LC_ListStyleNormal,
+ .LC_ListStyleSpecial {
+   /* display:block; */
+   list-style-position: inside;
+   list-style-type: none;
+   overflow: hidden;
+   padding: 0;
  }
- ol#TabMainMenuContent div.columnSection {
+ .LC_ListStyleSimple li,
- 	margin-bottom: 0px;
+ .LC_ListStyleSimple dd,
+ .LC_ListStyleNormal li,
+ .LC_ListStyleNormal dd,
+ .LC_ListStyleSpecial li,
+ .LC_ListStyleSpecial dd {
+   margin: 0;
+   padding: 5px 5px 5px 10px;
+   clear: both;
  }
- ol#MenuBreadcrumbs, ol#PathBreadcrumbs {
+ .LC_ListStyleClean li,
- 	border-top: solid 1px RGB(255, 255, 255);
+ .LC_ListStyleClean dd {
- 	height: 20px;
+   padding-top: 0;
- 	line-height: 20px;
+   padding-bottom: 0;
- 	vertical-align: bottom;
- 	margin: 0px 0px 30px 0px;
- 	padding-left: 10px;
- 	list-style-position: inside;
- /*	background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left
- 		top;*/
  }
- ol#MenuBreadcrumbs li, ol#PathBreadcrumbs li {
+ .LC_ListStyleSimple dd,
- /*	background: url(images/pfeil_white.png) no-repeat left center;*/
+ .LC_ListStyleSimple li {
- 	display: inline;
+   border-bottom: solid 1px $lg_border_color;
- 	padding: 0px 0px 0px 10px;
- 	vertical-align: bottom;
- 	overflow:hidden;
  }
- ol#MenuBreadcrumbs li a {
+ .LC_ListStyleSpecial li,
- 	text-decoration: none;
+ .LC_ListStyleSpecial dd {
- 	font-size:90%;
+   list-style-type: none;
+   background-color: RGB(220, 220, 220);
+   margin-bottom: 4px;
  }
- ol#PathBreadcrumbs li a{
- 	text-decoration:none;
+ table.LC_SimpleTable {
- 	font-size:100%;
+   margin:5px;
- 	font-weight:bold;
+   border:solid 1px $lg_border_color;
  }
- .ContentBoxSpecial
+ table.LC_SimpleTable tr {
- {
+   padding: 0;
- 	border: solid 1px $lg_border_color;
+   border:solid 1px $lg_border_color;
  }
- .ContentBox {
- 	padding:10px;
+ table.LC_SimpleTable thead {
+   background:rgb(220,220,220);
  }
- .PopUp
- {
+ div.LC_columnSection {
- 	padding:10px;
+   display: block;
- 	border-left:solid 1px $lg_border_color;
+   clear: both;
-  	border-top:solid 1px $lg_border_color;
+   overflow: hidden;
- 	border-bottom:outset 1px $lg_border_color;
+   margin: 0;
- 	border-right:outset 1px $lg_border_color;
- 	display:none;
- 	position:absolute;
- 	right:0;
- 	background-color:white;
- 	z-index:5;
- }
- dl.ListStyleClean dt {
- 	padding-right: 5px;
- 	display: table-header-group;
- }
- dl.ListStyleClean dd {
- 	display: table-row;
- }
- .ListStyleClean,
- .ListStyleSimple,
- .ListStyleNormal,
- .ListStyleNormal_Border,
- .ListStyleSpecial
- 	{
- 	/*display:block;	*/
- 	list-style-position: inside;
- 	list-style-type: none;
- 	overflow: hidden;
- 	padding: 0px;
  }
- .ListStyleSimple li,
+ div.LC_columnSection>* {
- .ListStyleSimple dd,
+   float: left;
- .ListStyleNormal li,
+   margin: 10px 20px 10px 0;
- .ListStyleNormal dd,
+   overflow:hidden;
- .ListStyleSpecial li,
- .ListStyleSpecial dd
- 	{
- 	margin: 0px;
- 	padding: 5px 5px 5px 10px;
- 	clear: both;
  }
- .ListStyleClean li,
+ table em {
- .ListStyleClean dd {
+   font-weight: bold;
- 	padding-top: 0px;
+   font-style: normal;
- 	padding-bottom: 0px;
  }
- .ListStyleSimple dd,
+ table.LC_tableBrowseRes,
- .ListStyleSimple li{
+ table.LC_tableOfContent {
- 	border-bottom: solid 1px $lg_border_color;
+   border:none;
+   border-spacing: 1px;
+   padding: 3px;
+   background-color: #FFFFFF;
+   font-size: 90%;
  }
- .ListStyleSpecial li,
+ table.LC_tableOfContent {
- .ListStyleSpecial dd {
+   border-collapse: collapse;
- 	list-style-type: none;
- 	background-color: RGB(220, 220, 220);
- 	margin-bottom: 4px;
  }
- table.SimpleTable {
+ table.LC_tableBrowseRes a,
- 	margin:5px;
+ table.LC_tableOfContent a {
- 	border:solid 1px $lg_border_color;
+   background-color: transparent;
- 	}
+   text-decoration: none;
+ }
- table.SimpleTable tr {
+ table.LC_tableOfContent img {
- 	padding:0px;
+   border: none;
- 	border:solid 1px $lg_border_color;
+   height: 1.3em;
+   vertical-align: text-bottom;
+   margin-right: 0.3em;
  }
- table.SimpleTable thead{
- 	 background:rgb(220,220,220);
+ a#LC_content_toolbar_firsthomework {
+   background-image:url(/res/adm/pages/open-first-problem.gif);
  }
- div.columnSection {
+ a#LC_content_toolbar_everything {
- 	display: block;
+   background-image:url(/res/adm/pages/show-all.gif);
- 	clear: both;
- 	overflow: hidden;
- 	margin:0px;
  }
- div.columnSection>* {
+ a#LC_content_toolbar_uncompleted {
- 	float: left;
+   background-image:url(/res/adm/pages/show-incomplete-problems.gif);
- 	margin: 10px 20px 10px 0px;
- 	overflow:hidden;
  }
- div.columnSection > .ContentBox,
- div.columnSection > .ContentBoxSpecial
+ #LC_content_toolbar_clearbubbles {
- 	{
+   background-image:url(/res/adm/pages/mark-discussionentries-read.gif);
- 	width: 400px;
  }
- .LC_loginpage_container {
+ a#LC_content_toolbar_changefolder {
- 	text-align:left;
+   background : url(/res/adm/pages/close-all-folders.gif) top center ;
- 	margin : 0 auto;
- 	width:65%;
- 	padding: 10px;
- 	height: auto;
- 	background-color:#FFFFFF;
- 	border:1px solid #CCCCCC;
  }
+ a#LC_content_toolbar_changefolder_toggled {
+   background-image:url(/res/adm/pages/open-all-folders.gif);
+ }
- .LC_loginpage_loginContainer {
+ a#LC_content_toolbar_edittoplevel {
- 	float:left;
+   background-image:url(/res/adm/pages/edittoplevel.gif);
- 	width:60%;
  }
- .LC_loginpage_loginInfo {
+ ul#LC_toolbar li a:hover {
- 	margin-top:20px;
+   background-position: bottom center;
- 	margin-left:20px;
- 	float:left;
- 	width:30%;
- 	border:1px solid #CCCCCC;
- 	padding:10px;
  }
- .LC_loginpage_space {
+ ul#LC_toolbar {
- 	clear:both;
+   padding: 0;
- 	margin-bottom:20px;
+   margin: 2px;
- 	border-bottom: 1px solid #CCCCCC;
+   list-style:none;
+   position:relative;
+   background-color:white;
  }
- .LC_loginpage_fieldset{
+ ul#LC_toolbar li {
- 	border: 1px solid #CCCCCC;
+   border:1px solid white;
- 	margin: 0 auto;
+   padding: 0;
+   margin: 0;
+   float: left;
+   display:inline;
+   vertical-align:middle;
  }
- .LC_loginpage_legend{
- 	padding: 2px;
+ a.LC_toolbarItem {
- 	margin: 0px;
+   display:block;
- 	font-size:14px;
+   padding: 0;
- 	font-weight:bold;
+   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%;
+ }
+ .LC_hidden {
+   display: none;
+ }
+ .LCmodal-overlay {
+ 		position:fixed;
+ 		top:0;
+ 		right:0;
+ 		bottom:0;
+ 		left:0;
+ 		height:100%;
+ 		width:100%;
+ 		margin:0;
+ 		padding:0;
+ 		background:#999;
+ 		opacity:.75;
+ 		filter: alpha(opacity=75);
+ 		-moz-opacity: 0.75;
+ 		z-index:101;
+ }
+ * html .LCmodal-overlay {
+ 		position: absolute;
+ 		height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+ }
+ .LCmodal-window {
+ 		position:fixed;
+ 		top:50%;
+ 		left:50%;
+ 		margin:0;
+ 		padding:0;
+ 		z-index:102;
+ 	}
+ * html .LCmodal-window {
+ 		position:absolute;
+ }
+ .LCclose-window {
+ 		position:absolute;
+ 		width:32px;
+ 		height:32px;
+ 		right:8px;
+ 		top:8px;
+ 		background:transparent url('/res/adm/pages/process-stop.png') no-repeat scroll right top;
+ 		text-indent:-99999px;
+ 		overflow:hidden;
+ 		cursor:pointer;
+ }
  END
  }
- Line 5809  sub headtag {
+ Line 6792  sub headtag {
      if (!$args->{'frameset'}) {
  	$result .= &Apache::lonhtmlcommon::htmlareaheaders();
      }
-     if ($args->{'force_register'}) {
+     if ($args->{'force_register'} && $env{'request.noversionuri'} !~ m{^/res/adm/pages/}) {
- 	$result .= &Apache::lonmenu::registerurl(1);
+         $result .= Apache::lonxml::display_title();
      }
      if (!$args->{'no_nav_bar'}
  	&& !$args->{'only_body'}
  	&& !$args->{'frameset'}) {
  	$result .= &help_menu_js();
+         $result.=&modal_window();
+         $result.=&togglebox_script();
+         $result.=&wishlist_window();
+         $result.=&LCprogressbarUpdate_script();
+     } else {
+         if ($args->{'add_modal'}) {
+            $result.=&modal_window();
+         }
+         if ($args->{'add_wishlist'}) {
+            $result.=&wishlist_window();
+         }
+         if ($args->{'add_togglebox'}) {
+            $result.=&togglebox_script();
+         }
+         if ($args->{'add_progressbar'}) {
+            $result.=&LCprogressbarUpdate_script();
+         }
      }
      if (ref($args->{'redirect'})) {
  	my ($time,$url,$inhibit_continue) = @{$args->{'redirect'}};
  	$url = &Apache::lonenc::check_encrypt($url);
- Line 5836  ADDMETA
+ Line 6835  ADDMETA
      $result .= '<title> LON-CAPA '.$title.'</title>'
  	.'<link rel="stylesheet" type="text/css" href="'.$url.'" />'
  	.$head_extra;
-     return $result;
+     return $result.'</head>';
  }
  =pod
- Line 5871  Inputs: none
+ Line 6870  Inputs: none
  sub xml_begin {
      my $output='';
-     if ($env{'internal.start_page'}==1) {
- 	&Apache::lonhtmlcommon::init_htmlareafields();
-     }
      if ($env{'browser.mathml'}) {
  	$output='<?xml version="1.0"?>'
              #.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'."\n"
- Line 5885  sub xml_begin {
+ Line 6880  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;
  }
  =pod
- =item * &endheadtag()
- Returns a uniform </head> for LON-CAPA web pages.
- Inputs: none
- =cut
- sub endheadtag {
-     return '</head>';
- }
- =pod
- =item * &head()
- Returns a uniform complete <head>..</head> section for LON-CAPA web pages.
- Inputs:
- =over 4
- $title - optional title for the page
- $head_extra - optional extra HTML to put inside the <head>
- =back
- =cut
- sub head {
-     my ($title,$head_extra,$args) = @_;
-     return &headtag($title,$head_extra,$args).&endheadtag();
- }
- =pod
  =item * &start_page()
  Returns a complete <html> .. <body> section for LON-CAPA web pages.
- Line 5947  $args - additional optional args support
+ Line 6906  $args - additional optional args support
               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>
               domain         -> force to color decorate a page for a
                                      specific domain
- Line 5961  $args - additional optional args support
+ Line 6920  $args - additional optional args support
                                      a html attribute
               force_register -> if is true will turn on the &bodytag()
                                      $forcereg arg
-              body_title     -> alternate text to use instead of $title
-                                     in the title box that appears, this text
-                                     is not auto translated like the $title is
               frameset       -> if true will start with a <frameset>
                                      rather than <body>
-              no_title       -> if true the title bar won't be shown
               skip_phases    -> hash ref of
                                      head -> skip the <html><head> generation
                                      body -> skip all <body> generation
-              no_inline_link -> if true and in remote mode, don't show the
-                                     'Switch To Inline Menu' link
               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_component ->  if exists show it as headline else show only the breadcrumbs
  =back
- Line 5986  $args - additional optional args support
+ Line 6941  $args - additional optional args support
  sub start_page {
      my ($title,$head_extra,$args) = @_;
      #&Apache::lonnet::logthis("start_page ".join(':',caller(0)));
-     my %head_args;
-     foreach my $arg ('redirect','force_register','domain','function',
- 		     'bgcolor','frameset','no_nav_bar','only_body',
- 		     'no_auto_mt_title') {
- 	if (defined($args->{$arg})) {
- 	    $head_args{$arg} = $args->{$arg};
- 	}
-     }
      $env{'internal.start_page'}++;
      my $result;
      if (! exists($args->{'skip_phases'}{'head'}) ) {
- 	$result.=
+         $result .= &xml_begin() . &headtag($title, $head_extra, $args);
- 	    &xml_begin().
- 	    &headtag($title,$head_extra,\%head_args).&endheadtag();
      }
      if (! exists($args->{'skip_phases'}{'body'}) ) {
- Line 6008  sub start_page {
+ Line 6954  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);
- 			 $args->{'no_title'},       $args->{'no_inline_link'},
+         }
- 			 $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);
      }
-     return $result;
- }
- =pod
- =item * &head()
- Returns a complete </body></html> section for LON-CAPA web pages.
+     # Preparation for new and consistent functionlist at top of screen
+     # if ($args->{'functionlist'}) {
- Inputs:         $args - additional optional args supported are:
+     #            $result .= &build_functionlist();
-                  js_ready     -> return a string ready for being used in
+     #}
-                                  a javascript writeln
-                  html_encode  -> return a string ready for being used in
+     # Don't add anything more if only_body wanted or in const space
-                                  a html attribute
+     return $result if    $args->{'only_body'}
-                  frameset     -> if true will start with a <frameset>
+                       || $env{'request.state'} eq 'construct';
-                                  rather than <body>
-                  dicsussion   -> if true will get discussion from
+     #Breadcrumbs
-                                   lonxml::xmlend
+     if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
-                                  (you can pass the target and parser arguments
+ 		&Apache::lonhtmlcommon::clear_breadcrumbs();
-                                   through optional 'target' and 'parser' args
+ 		#if any br links exists, add them to the breadcrumbs
-                                   to this routine)
+ 		if (exists($args->{'bread_crumbs'}) and ref($args->{'bread_crumbs'}) eq 'ARRAY') {
+ 			foreach my $crumb (@{$args->{'bread_crumbs'}}){
+ 				&Apache::lonhtmlcommon::add_breadcrumb($crumb);
+ 			}
+ 		}
- =cut
+ 		#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;
+ }
  sub end_page {
      my ($args) = @_;
- Line 6063  sub end_page {
+ Line 7012  sub end_page {
  	}
  	$result .= &Apache::lonxml::xmlend($target,$parser);
      }
      if ($args->{'frameset'}) {
  	$result .= '</frameset>';
      } else {
- Line 6082  sub end_page {
+ Line 7030  sub end_page {
      return $result;
  }
+ sub wishlist_window {
+     return(<<'ENDWISHLIST');
+ <script type="text/javascript">
+ // <![CDATA[
+ // <!-- BEGIN LON-CAPA Internal
+ function set_wishlistlink(title, path) {
+     if (!title) {
+         title = document.title;
+         title = title.replace(/^LON-CAPA /,'');
+     }
+     if (!path) {
+         path = location.pathname;
+     }
+     Win = window.open('/adm/wishlist?mode=newLink&setTitle='+title+'&setPath='+path,
+                       'wishlistNewLink','width=560,height=350,scrollbars=0');
+ }
+ // END LON-CAPA Internal -->
+ // ]]>
+ </script>
+ ENDWISHLIST
+ }
+ sub modal_window {
+     return(<<'ENDMODAL');
+ <script type="text/javascript">
+ // <![CDATA[
+ // <!-- BEGIN LON-CAPA Internal
+ var modalWindow = {
+ 	parent:"body",
+ 	windowId:null,
+ 	content:null,
+ 	width:null,
+ 	height:null,
+ 	close:function()
+ 	{
+ 	        $(".LCmodal-window").remove();
+ 	        $(".LCmodal-overlay").remove();
+ 	},
+ 	open:function()
+ 	{
+ 		var modal = "";
+ 		modal += "<div class=\"LCmodal-overlay\"></div>";
+ 		modal += "<div id=\"" + this.windowId + "\" class=\"LCmodal-window\" style=\"width:" + this.width + "px; height:" + this.height + "px; margin-top:-" + (this.height / 2) + "px; margin-left:-" + (this.width / 2) + "px;\">";
+ 		modal += this.content;
+ 		modal += "</div>";
+ 		$(this.parent).append(modal);
+ 		$(".LCmodal-window").append("<a class=\"LCclose-window\"></a>");
+ 		$(".LCclose-window").click(function(){modalWindow.close();});
+ 		$(".LCmodal-overlay").click(function(){modalWindow.close();});
+ 	}
+ };
+ 	var openMyModal = function(source,width,height,scrolling)
+ 	{
+ 		modalWindow.windowId = "myModal";
+ 		modalWindow.width = width;
+ 		modalWindow.height = height;
+ 		modalWindow.content = "<iframe width='"+width+"' height='"+height+"' frameborder='0' scrolling='"+scrolling+"' allowtransparency='true' src='" + source + "'>&lt/iframe>";
+ 		modalWindow.open();
+ 	};
+ // END LON-CAPA Internal -->
+ // ]]>
+ </script>
+ ENDMODAL
+ }
+ sub modal_link {
+     my ($link,$linktext,$width,$height,$target,$scrolling)=@_;
+     unless ($width) { $width=480; }
+     unless ($height) { $height=400; }
+     unless ($scrolling) { $scrolling='yes'; }
+     return '<a href="'.$link.'" target="'.$target.'" onclick="openMyModal(\''.$link.'\','.$width.','.$height.',\''.$scrolling.'\'); return false;">'.
+            $linktext.'</a>';
+ }
+ sub modal_adhoc_script {
+     my ($funcname,$width,$height,$content)=@_;
+     return (<<ENDADHOC);
+ <script type="text/javascript">
+ // <![CDATA[
+         var $funcname = function()
+         {
+                 modalWindow.windowId = "myModal";
+                 modalWindow.width = $width;
+                 modalWindow.height = $height;
+                 modalWindow.content = '$content';
+                 modalWindow.open();
+         };
+ // ]]>
+ </script>
+ ENDADHOC
+ }
+ sub modal_adhoc_inner {
+     my ($funcname,$width,$height,$content)=@_;
+     my $innerwidth=$width-20;
+     $content=&js_ready(
+                &start_page('Dialog',undef,{'only_body'=>1,'bgcolor'=>'#FFFFFF'}).
+                  &start_scrollbox($width.'px',$innerwidth.'px',$height.'px').
+                     $content.
+                  &end_scrollbox().
+                &end_page()
+              );
+     return &modal_adhoc_script($funcname,$width,$height,$content);
+ }
+ sub modal_adhoc_window {
+     my ($funcname,$width,$height,$content,$linktext)=@_;
+     return &modal_adhoc_inner($funcname,$width,$height,$content).
+            "<a href=\"javascript:$funcname();void(0);\">".$linktext."</a>";
+ }
+ sub modal_adhoc_launch {
+     my ($funcname,$width,$height,$content)=@_;
+     return &modal_adhoc_inner($funcname,$width,$height,$content).(<<ENDLAUNCH);
+ <script type="text/javascript">
+ // <![CDATA[
+ $funcname();
+ // ]]>
+ </script>
+ ENDLAUNCH
+ }
+ sub modal_adhoc_close {
+     return (<<ENDCLOSE);
+ <script type="text/javascript">
+ // <![CDATA[
+ modalWindow.close();
+ // ]]>
+ </script>
+ ENDCLOSE
+ }
+ sub togglebox_script {
+    return(<<ENDTOGGLE);
+ <script type="text/javascript">
+ // <![CDATA[
+ function LCtoggleDisplay(id,hidetext,showtext) {
+    link = document.getElementById(id + "link").childNodes[0];
+    with (document.getElementById(id).style) {
+       if (display == "none" ) {
+           display = "inline";
+           link.nodeValue = hidetext;
+         } else {
+           display = "none";
+           link.nodeValue = showtext;
+        }
+    }
+ }
+ // ]]>
+ </script>
+ ENDTOGGLE
+ }
+ sub start_togglebox {
+     my ($id,$heading,$headerbg,$hidetext,$showtext)=@_;
+     unless ($heading) { $heading=''; } else { $heading.=' '; }
+     unless ($showtext) { $showtext=&mt('show'); }
+     unless ($hidetext) { $hidetext=&mt('hide'); }
+     unless ($headerbg) { $headerbg='#FFFFFF'; }
+     return &start_data_table().
+            &start_data_table_header_row().
+            '<td bgcolor="'.$headerbg.'">'.$heading.
+            '[<a id="'.$id.'link" href="javascript:LCtoggleDisplay(\''.$id.'\',\''.$hidetext.'\',\''.
+            $showtext.'\')">'.$showtext.'</a>]</td>'.
+            &end_data_table_header_row().
+            '<tr id="'.$id.'" style="display:none""><td>';
+ }
+ sub end_togglebox {
+     return '</td></tr>'.&end_data_table();
+ }
+ sub LCprogressbar_script {
+    my ($id)=@_;
+    return(<<ENDPROGRESS);
+ <script type="text/javascript">
+ // <![CDATA[
+ \$('#progressbar$id').progressbar({
+   value: 0,
+   change: function(event, ui) {
+     var newVal = \$(this).progressbar('option', 'value');
+     \$('.pblabel', this).text(LCprogressTxt);
+   }
+ });
+ // ]]>
+ </script>
+ ENDPROGRESS
+ }
+ sub LCprogressbarUpdate_script {
+    return(<<ENDPROGRESSUPDATE);
+ <style type="text/css">
+ .ui-progressbar { position:relative; }
+ .pblabel { position: absolute; width: 100%; text-align: center; line-height: 1.9em; }
+ </style>
+ <script type="text/javascript">
+ // <![CDATA[
+ var LCprogressTxt='---';
+ function LCupdateProgress(percent,progresstext,id) {
+    LCprogressTxt=progresstext;
+    \$('#progressbar'+id).progressbar('value',percent);
+ }
+ // ]]>
+ </script>
+ ENDPROGRESSUPDATE
+ }
+ my $LClastpercent;
+ my $LCidcnt;
+ my $LCcurrentid;
+ sub LCprogressbar {
+     my ($r)=(@_);
+     $LClastpercent=0;
+     $LCidcnt++;
+     $LCcurrentid=$$.'_'.$LCidcnt;
+     my $starting=&mt('Starting');
+     my $content=(<<ENDPROGBAR);
+ <p>
+   <div id="progressbar$LCcurrentid">
+     <span class="pblabel">$starting</span>
+   </div>
+ </p>
+ ENDPROGBAR
+     &r_print($r,$content.&LCprogressbar_script($LCcurrentid));
+ }
+ sub LCprogressbarUpdate {
+     my ($r,$val,$text)=@_;
+     unless ($val) {
+        if ($LClastpercent) {
+            $val=$LClastpercent;
+        } else {
+            $val=0;
+        }
+     }
+     if ($val<0) { $val=0; }
+     if ($val>100) { $val=0; }
+     $LClastpercent=$val;
+     unless ($text) { $text=$val.'%'; }
+     $text=&js_ready($text);
+     &r_print($r,<<ENDUPDATE);
+ <script type="text/javascript">
+ // <![CDATA[
+ LCupdateProgress($val,'$text','$LCcurrentid');
+ // ]]>
+ </script>
+ ENDUPDATE
+ }
+ sub LCprogressbarClose {
+     my ($r)=@_;
+     $LClastpercent=0;
+     &r_print($r,<<ENDCLOSE);
+ <script type="text/javascript">
+ // <![CDATA[
+ \$("#progressbar$LCcurrentid").hide('slow');
+ // ]]>
+ </script>
+ ENDCLOSE
+ }
+ sub r_print {
+     my ($r,$to_print)=@_;
+     if ($r) {
+       $r->print($to_print);
+       $r->rflush();
+     } else {
+       print($to_print);
+     }
+ }
  sub html_encode {
      my ($result) = @_;
- Line 6089  sub html_encode {
+ Line 7312  sub html_encode {
      return $result;
  }
  sub js_ready {
      my ($result) = @_;
- Line 6125  sub validate_page {
+ Line 7349  sub validate_page {
      }
  }
+ sub start_scrollbox {
+     my ($outerwidth,$width,$height,$id)=@_;
+     unless ($outerwidth) { $outerwidth='520px'; }
+     unless ($width) { $width='500px'; }
+     unless ($height) { $height='200px'; }
+     my ($table_id,$div_id);
+     if ($id ne '') {
+         $table_id = " id='table_$id'";
+         $div_id = " id='div_$id'";
+     }
+     return "<table style='width: $outerwidth; border: 1px solid none;'$table_id><tr><td style='width: $width;' bgcolor='#FFFFFF'><div style='overflow:auto; width:$width; height: $height;'$div_id>";
+ }
+ sub end_scrollbox {
+     return '</div></td></tr></table>';
+ }
  sub simple_error_page {
      my ($r,$title,$msg) = @_;
      my $page =
- Line 6140  sub simple_error_page {
+ Line 7382  sub simple_error_page {
  {
      my @row_count;
+     sub start_data_table_count {
+         unshift(@row_count, 0);
+         return;
+     }
+     sub end_data_table_count {
+         shift(@row_count);
+         return;
+     }
      sub start_data_table {
- 	my ($add_class) = @_;
+ 	my ($add_class,$id) = @_;
  	my $css_class = (join(' ','LC_data_table',$add_class));
- 	unshift(@row_count,0);
+         my $table_id;
- 	return '<table class="'.$css_class.'">'."\n";
+         if (defined($id)) {
+             $table_id = ' id="'.$id.'"';
+         }
+ 	&start_data_table_count();
+ 	return '<table class="'.$css_class.'"'.$table_id.'>'."\n";
      }
      sub end_data_table {
- 	shift(@row_count);
+ 	&end_data_table_count();
  	return '</table>'."\n";;
      }
      sub start_data_table_row {
- 	my ($add_class) = @_;
+ 	my ($add_class, $id) = @_;
  	$row_count[0]++;
  	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";;
+         $id = (' id="'.$id.'"') unless ($id eq '');
+         return  '<tr class="'.$css_class.'"'.$id.'>'."\n";
      }
      sub continue_data_table_row {
- 	my ($add_class) = @_;
+ 	my ($add_class, $id) = @_;
  	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";;
+         $id = (' id="'.$id.'"') unless ($id eq '');
+         return  '<tr class="'.$css_class.'"'.$id.'>'."\n";
      }
      sub end_data_table_row {
- Line 6172  sub simple_error_page {
+ Line 7431  sub simple_error_page {
      }
      sub start_data_table_empty_row {
- 	$row_count[0]++;
+ #	$row_count[0]++;
  	return  '<tr class="LC_empty_row" >'."\n";;
      }
- Line 6187  sub simple_error_page {
+ Line 7446  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 6253  Returns either 'student','coordinator','
+ Line 7517  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|\~)/)) {
+         ($ENV{'REQUEST_URI'}=~ m{/^(/priv)})) {
          $function='author';
      }
      return $function;
- Line 6271  sub get_users_function {
+ Line 7538  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 6287  role status: active, previous or future.
+ Line 7586  role status: active, previous or future.
  sub check_user_status {
      my ($udom,$uname,$cdom,$crs,$role,$sec) = @_;
-     my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname);
+     my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1});
+     my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname,'.',undef,$extra);
      my @uroles = keys %userinfo;
      my $srchstr;
      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 6774  If the user's status includes multiple t
+ Line 8074  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 6786  sub default_quota {
+ Line 8088  sub default_quota {
                                              ['quotas'],$udom);
      if (ref($quotahash{'quotas'}) eq 'HASH') {
          if ($inststatus ne '') {
-             my @statuses = split(/:/,$inststatus);
+             my @statuses = map { &unescape($_); } split(/:/,$inststatus);
              foreach my $item (@statuses) {
-                 if ($quotahash{'quotas'}{$item} ne '') {
+                 if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
-                     if ($defquota eq '') {
+                     if ($quotahash{'quotas'}{'defaultquota'}{$item} ne '') {
-                         $defquota = $quotahash{'quotas'}{$item};
+                         if ($defquota eq '') {
-                         $settingstatus = $item;
+                             $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
-                     } elsif ($quotahash{'quotas'}{$item} > $defquota) {
+                             $settingstatus = $item;
-                         $defquota = $quotahash{'quotas'}{$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{'quotas'}{'default'};
+             if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
+                 $defquota = $quotahash{'quotas'}{'defaultquota'}{'default'};
+             } else {
+                 $defquota = $quotahash{'quotas'}{'default'};
+             }
              $settingstatus = 'default';
          }
      } else {
- Line 6852  sub get_secgrprole_info {
+ Line 8170  sub get_secgrprole_info {
  }
  sub user_picker {
-     my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype) = @_;
+     my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype,$context) = @_;
      my $currdom = $dom;
      my %curr_selected = (
                          srchin => 'dom',
- Line 6906  sub user_picker {
+ Line 8224  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 6942  sub user_picker {
+ Line 8261  sub user_picker {
      $srchtypesel .= "\n  </select>\n";
      my ($newuserscript,$new_user_create);
+     my $context_dom = $env{'request.role.domain'};
+     if ($context eq 'requestcrs') {
+         if ($env{'form.coursedom'} ne '') {
+             $context_dom = $env{'form.coursedom'};
+         }
+     }
      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'}) {
+             if ($srch->{'srchby'} eq 'uname' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchin'} eq 'dom' && $srch->{'srchdomain'} eq $context_dom) {
                  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 = ' href="javascript:helpMenu('."'display'".')"';
+                     my $helplink = 'javascript:helpMenu('."'display'".')';
                      my %usertypetext = (
                          official   => 'institutional',
                          unofficial => 'non-institutional',
                      );
-                     $new_user_create = '<br /><span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />';
+                     $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 6979  function setSearch(createnew,callingForm
+ Line 8308  function setSearch(createnew,callingForm
              }
          }
          for (var i=0; i<callingForm.srchdomain.length; i++) {
-             if (callingForm.srchdomain.options[i].value == '$env{'request.role.domain'}') {
+             if (callingForm.srchdomain.options[i].value == '$context_dom') {
                  callingForm.srchdomain.selectedIndex = i;
              }
          }
- Line 6991  ENDSCRIPT
+ Line 8320  ENDSCRIPT
      my $output = <<"END_BLOCK";
  <script type="text/javascript">
+ // <![CDATA[
  function validateEntry(callingForm) {
      var checkok = 1;
- Line 7059  function validateEntry(callingForm) {
+ Line 8389  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;
  }
- Line 7236  sub personal_data_fieldtitles {
+ Line 8563  sub personal_data_fieldtitles {
                          middlename => 'Middle Name',
                          generation => 'Generation',
                          gen => 'Generation',
+                         inststatus => 'Affiliation',
                     );
      return %fieldtitles;
  }
- Line 7303  sub get_institutional_codes {
+ Line 8631  sub get_institutional_codes {
      return;
  }
+ sub get_standard_codeitems {
+     return ('Year','Semester','Department','Number','Section');
+ }
+ =pod
+ =head1 Slot Helpers
+ =over 4
+ =item * sorted_slots()
+ Sorts an array of slot names in order of an optional sort key,
+ default sort is by 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.
+ sortkey   - Name of key in inner hash to be sorted on (e.g., starttime).
+ =back
+ Returns:
+ =over 4
+ sorted   - An array of slot names sorted by a specified sort key
+            (default sort key is start time of the slot).
+ =back
+ =cut
+ sub sorted_slots {
+     my ($slotsarr,$slots,$sortkey) = @_;
+     if ($sortkey eq '') {
+         $sortkey = 'starttime';
+     }
+     my @sorted;
+     if ((ref($slotsarr) eq 'ARRAY') && (ref($slots) eq 'HASH')) {
+         @sorted =
+             sort {
+                      if (ref($slots->{$a}) && ref($slots->{$b})) {
+                          return $slots->{$a}{$sortkey} <=> $slots->{$b}{$sortkey}
+                      }
+                      if (ref($slots->{$a})) { return -1;}
+                      if (ref($slots->{$b})) { return 1;}
+                      return 0;
+                  } @{$slotsarr};
+     }
+     return @sorted;
+ }
  =pod
+ =item * get_future_slots()
+ Inputs:
+ =over 4
+ cnum - course number
+ cdom - course domain
+ now - current UNIX time
+ symb - optional symb
+ =back
+ Returns:
+ =over 4
+ sorted_reservable - ref to array of student_schedulable slots currently
+                     reservable, ordered by end date of reservation period.
+ reservable_now - ref to hash of student_schedulable slots currently
+                  reservable.
+     Keys in inner hash are:
+     (a) symb: either blank or symb to which slot use is restricted.
+     (b) endreserve: end date of reservation period.
+ sorted_future - ref to array of student_schedulable slots reservable in
+                 the future, ordered by start date of reservation period.
+ future_reservable - ref to hash of student_schedulable slots reservable
+                     in the future.
+     Keys in inner hash are:
+     (a) symb: either blank or symb to which slot use is restricted.
+     (b) startreserve:  start date of reservation period.
  =back
+ =cut
+ sub get_future_slots {
+     my ($cnum,$cdom,$now,$symb) = @_;
+     my (%reservable_now,%future_reservable,@sorted_reservable,@sorted_future);
+     my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);
+     foreach my $slot (keys(%slots)) {
+         next unless($slots{$slot}->{'type'} eq 'schedulable_student');
+         if ($symb) {
+             next if (($slots{$slot}->{'symb'} ne '') &&
+                      ($slots{$slot}->{'symb'} ne $symb));
+         }
+         if (($slots{$slot}->{'starttime'} > $now) &&
+             ($slots{$slot}->{'endtime'} > $now)) {
+             if (($slots{$slot}->{'allowedsections'}) || ($slots{$slot}->{'allowedusers'})) {
+                 my $userallowed = 0;
+                 if ($slots{$slot}->{'allowedsections'}) {
+                     my @allowed_sec = split(',',$slots{$slot}->{'allowedsections'});
+                     if (!defined($env{'request.role.sec'})
+                         && grep(/^No section assigned$/,@allowed_sec)) {
+                         $userallowed=1;
+                     } else {
+                         if (grep(/^\Q$env{'request.role.sec'}\E$/,@allowed_sec)) {
+                             $userallowed=1;
+                         }
+                     }
+                     unless ($userallowed) {
+                         if (defined($env{'request.course.groups'})) {
+                             my @groups = split(/:/,$env{'request.course.groups'});
+                             foreach my $group (@groups) {
+                                 if (grep(/^\Q$group\E$/,@allowed_sec)) {
+                                     $userallowed=1;
+                                     last;
+                                 }
+                             }
+                         }
+                     }
+                 }
+                 if ($slots{$slot}->{'allowedusers'}) {
+                     my @allowed_users = split(',',$slots{$slot}->{'allowedusers'});
+                     my $user = $env{'user.name'}.':'.$env{'user.domain'};
+                     if (grep(/^\Q$user\E$/,@allowed_users)) {
+                         $userallowed = 1;
+                     }
+                 }
+                 next unless($userallowed);
+             }
+             my $startreserve = $slots{$slot}->{'startreserve'};
+             my $endreserve = $slots{$slot}->{'endreserve'};
+             my $symb = $slots{$slot}->{'symb'};
+             if (($startreserve < $now) &&
+                 (!$endreserve || $endreserve > $now)) {
+                 my $lastres = $endreserve;
+                 if (!$lastres) {
+                     $lastres = $slots{$slot}->{'starttime'};
+                 }
+                 $reservable_now{$slot} = {
+                                            symb       => $symb,
+                                            endreserve => $lastres
+                                          };
+             } elsif (($startreserve > $now) &&
+                      (!$endreserve || $endreserve > $startreserve)) {
+                 $future_reservable{$slot} = {
+                                               symb         => $symb,
+                                               startreserve => $startreserve
+                                             };
+             }
+         }
+     }
+     my @unsorted_reservable = keys(%reservable_now);
+     if (@unsorted_reservable > 0) {
+         @sorted_reservable =
+             &sorted_slots(\@unsorted_reservable,\%reservable_now,'endreserve');
+     }
+     my @unsorted_future = keys(%future_reservable);
+     if (@unsorted_future > 0) {
+         @sorted_future =
+             &sorted_slots(\@unsorted_future,\%future_reservable,'startreserve');
+     }
+     return (\@sorted_reservable,\%reservable_now,\@sorted_future,\%future_reservable);
+ }
+ =pod
  =head1 HTTP Helpers
  =over 4
- Line 7445  sub get_env_multiple {
+ Line 8956  sub get_env_multiple {
  sub ask_for_embedded_content {
      my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
-     my $upload_output = '
+     my (%subdependencies,%dependencies,%mapping,%existing,%newfiles,%pathchanges);
-    <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})) {
+     my $numremref = 0;
+     my $numinvalid = 0;
+     my $numpathchg = 0;
+     my $numexisting = 0;
+     my ($output,$upload_output,$toplevel,$url,$udom,$uname,$getpropath);
+     if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) {
+         my $current_path='/';
+         if ($env{'form.currentpath'}) {
+             $current_path = $env{'form.currentpath'};
+         }
+         if ($actionurl eq '/adm/coursegrp_portfolio') {
+             $udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+             $uname = $env{'course.'.$env{'request.course.id'}.'.num'};
+             $url = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';
+         } else {
+             $udom = $env{'user.domain'};
+             $uname = $env{'user.name'};
+             $url = '/userfiles/portfolio';
+         }
+         $toplevel = $url.'/';
+         $url .= $current_path;
+         $getpropath = 1;
+     } elsif (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank') ||
+              ($actionurl eq '/adm/imsimport')) {
+         my ($udom,$uname,$rest) = ($args->{'current_path'} =~ m{/priv/($match_domain)/($match_username)/?(.*)$});
+         $url = $Apache::lonnet::perlvar{'lonDocRoot'}."/priv/$udom/$uname/";
+         $toplevel = $url;
+         if ($rest ne '') {
+             $url .= $rest;
+         }
+     } elsif ($actionurl eq '/adm/coursedocs') {
+         if (ref($args) eq 'HASH') {
+            $url = $args->{'docs_url'};
+            $toplevel = $url;
+         }
+     }
+     my $now = time();
+     foreach my $embed_file (keys(%{$allfiles})) {
+         my $absolutepath;
+         if ($embed_file =~ m{^\w+://}) {
+             $newfiles{$embed_file} = 1;
+             $mapping{$embed_file} = $embed_file;
+         } else {
+             if ($embed_file =~ m{^/}) {
+                 $absolutepath = $embed_file;
+                 $embed_file =~ s{^(/+)}{};
+             }
+             if ($embed_file =~ m{/}) {
+                 my ($path,$fname) = ($embed_file =~ m{^(.+)/([^/]*)$});
+                 $path = &check_for_traversal($path,$url,$toplevel);
+                 my $item = $fname;
+                 if ($path ne '') {
+                     $item = $path.'/'.$fname;
+                     $subdependencies{$path}{$fname} = 1;
+                 } else {
+                     $dependencies{$item} = 1;
+                 }
+                 if ($absolutepath) {
+                     $mapping{$item} = $absolutepath;
+                 } else {
+                     $mapping{$item} = $embed_file;
+                 }
+             } else {
+                 $dependencies{$embed_file} = 1;
+                 if ($absolutepath) {
+                     $mapping{$embed_file} = $absolutepath;
+                 } else {
+                     $mapping{$embed_file} = $embed_file;
+                 }
+             }
+         }
+     }
+     foreach my $path (keys(%subdependencies)) {
+         my %currsubfile;
+         if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) {
+             my ($sublistref,$listerror) =
+                 &Apache::lonnet::dirlist($url.$path,$udom,$uname,$getpropath);
+             if (ref($sublistref) eq 'ARRAY') {
+                 foreach my $line (@{$sublistref}) {
+                     my ($file_name,$rest) = split(/\&/,$line,2);
+                     $currsubfile{$file_name} = 1;
+                 }
+             }
+         } elsif (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank')) {
+             if (opendir(my $dir,$url.'/'.$path)) {
+                 my @subdir_list = grep(!/^\./,readdir($dir));
+                 map {$currsubfile{$_} = 1;} @subdir_list;
+             }
+         }
+         foreach my $file (keys(%{$subdependencies{$path}})) {
+             if ($currsubfile{$file}) {
+                 my $item = $path.'/'.$file;
+                 unless ($mapping{$item} eq $item) {
+                     $pathchanges{$item} = 1;
+                 }
+                 $existing{$item} = 1;
+                 $numexisting ++;
+             } else {
+                 $newfiles{$path.'/'.$file} = 1;
+             }
+         }
+     }
+     my %currfile;
+     if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) {
+         my ($dirlistref,$listerror) =
+             &Apache::lonnet::dirlist($url,$udom,$uname,$getpropath);
+         if (ref($dirlistref) eq 'ARRAY') {
+             foreach my $line (@{$dirlistref}) {
+                 my ($file_name,$rest) = split(/\&/,$line,2);
+                 $currfile{$file_name} = 1;
+             }
+         }
+     } elsif (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank')) {
+         if (opendir(my $dir,$url)) {
+             my @dir_list = grep(!/^\./,readdir($dir));
+             map {$currfile{$_} = 1;} @dir_list;
+         }
+     }
+     foreach my $file (keys(%dependencies)) {
+         if ($currfile{$file}) {
+             unless ($mapping{$file} eq $file) {
+                 $pathchanges{$file} = 1;
+             }
+             $existing{$file} = 1;
+             $numexisting ++;
+         } else {
+             $newfiles{$file} = 1;
+         }
+     }
+     foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%newfiles)) {
          $upload_output .= &start_data_table_row().
-             '<td>'.$embed_file.'</td><td>';
+                           '<td><span class="LC_filename">'.$embed_file.'</span>';
+         unless ($mapping{$embed_file} eq $embed_file) {
+             $upload_output .= '<br /><span class="LC_info" style="font-size:smaller;">'.&mt('changed from: [_1]',$mapping{$embed_file}).'</span>';
+         }
+         $upload_output .= '</td><td>';
          if ($args->{'ignore_remote_references'}
              && $embed_file =~ m{^\w+://}) {
              $upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';
+             $numremref++;
          } 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>';
+             $upload_output.='<span class="LC_warning">'.&mt('Invalid characters').'</span>';
+             $numinvalid++;
          } else {
-             $upload_output .='
+             $upload_output .= &embedded_file_element('upload_embedded',$num,
-            <input name="embedded_item_'.$num.'" type="file" value="" />
+                                                      $embed_file,\%mapping,
-            <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
+                                                      $allfiles,$codebase);
-             my $attrib = join(':',@{$$allfiles{$embed_file}});
+             $num++;
-             $upload_output .=
+         }
-                 "\n\t\t".
+         $upload_output .= '</td>'.&Apache::loncommon::end_data_table_row()."\n";
-                 '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.
+     }
-                 $attrib.'" />';
+     foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%existing)) {
-             if (exists($$codebase{$embed_file})) {
+         $upload_output .= &start_data_table_row().
-                 $upload_output .=
+                           '<td><span class="LC_filename">'.$embed_file.'</span></td>'.
-                     "\n\t\t".
+                           '<td><span class="LC_warning">'.&mt('Already exists').'</span></td>'.
-                     '<input name="codebase_'.$num.'" type="hidden" value="'.
+                           &Apache::loncommon::end_data_table_row()."\n";
-                     &escape($$codebase{$embed_file}).'" />';
+     }
-             }
+     if ($upload_output) {
-         }
+         $upload_output = &start_data_table().
-         $upload_output .= '</td>'.&Apache::loncommon::end_data_table_row();
+                          $upload_output.
-         $num++;
+                          &end_data_table()."\n";
      }
-     $upload_output .= &Apache::loncommon::end_data_table().'<br />
+     my $applies = 0;
-    <input type ="hidden" name="number_embedded_items" value="'.$num.'" />
+     if ($numremref) {
-    <input type ="submit" value="'.&mt('Upload Listed Files').'" />
+         $applies ++;
-    '.&mt('(only files for which a location has been provided will be uploaded)').'
+     }
-    </form>';
+     if ($numinvalid) {
-     return $upload_output;
+         $applies ++;
+     }
+     if ($numexisting) {
+         $applies ++;
+     }
+     if ($num) {
+         $output = '<form name="upload_embedded" action="'.$actionurl.'"'.
+                   ' method="post" enctype="multipart/form-data">'."\n".
+                   $state.
+                   '<h3>'.&mt('Upload embedded files').
+                   ':</h3>'.$upload_output.'<br />'."\n".
+                   '<input type ="hidden" name="number_embedded_items" value="'.
+                   $num.'" />'."\n";
+         if ($actionurl eq '') {
+             $output .=  '<input type="hidden" name="phase" value="three" />';
+         }
+     } elsif ($applies) {
+         $output = '<b>'.&mt('Referenced files').'</b>:<br />';
+         if ($applies > 1) {
+             $output .=
+                 &mt('No files need to be uploaded, as one of the following applies to each reference:').'<ul>';
+             if ($numremref) {
+                 $output .= '<li>'.&mt('reference is to a URL which points to another server').'</li>'."\n";
+             }
+             if ($numinvalid) {
+                 $output .= '<li>'.&mt('reference is to file with a name containing invalid characters').'</li>'."\n";
+             }
+             if ($numexisting) {
+                 $output .= '<li>'.&mt('reference is to an existing file at the specified location').'</li>'."\n";
+             }
+             $output .= '</ul><br />';
+         } elsif ($numremref) {
+             $output .= '<p>'.&mt('None to upload, as all references are to URLs pointing to another server.').'</p>';
+         } elsif ($numinvalid) {
+             $output .= '<p>'.&mt('None to upload, as all references are to files with names containing invalid characters.').'</p>';
+         } elsif ($numexisting) {
+             $output .= '<p>'.&mt('None to upload, as all references are to existing files.').'</p>';
+         }
+         $output .= $upload_output.'<br />';
+     }
+     my ($pathchange_output,$chgcount);
+     $chgcount = $num;
+     if (keys(%pathchanges) > 0) {
+         foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%pathchanges)) {
+             if ($num) {
+                 $output .= &embedded_file_element('pathchange',$chgcount,
+                                                   $embed_file,\%mapping,
+                                                   $allfiles,$codebase);
+             } else {
+                 $pathchange_output .=
+                     &start_data_table_row().
+                     '<td><input type ="checkbox" name="namechange" value="'.
+                     $chgcount.'" checked="checked" /></td>'.
+                     '<td>'.$mapping{$embed_file}.'</td>'.
+                     '<td>'.$embed_file.
+                     &embedded_file_element('pathchange',$numpathchg,$embed_file,
+                                            \%mapping,$allfiles,$codebase).
+                     '</td>'.&end_data_table_row();
+             }
+             $numpathchg ++;
+             $chgcount ++;
+         }
+     }
+     if ($num) {
+         if ($numpathchg) {
+             $output .= '<input type ="hidden" name="number_pathchange_items" value="'.
+                        $numpathchg.'" />'."\n";
+         }
+         if (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank') ||
+             ($actionurl eq '/adm/imsimport')) {
+             $output .= '<input type="hidden" name="phase" value="three" />'."\n";
+         } elsif ($actionurl eq '/adm/portfolio' || $actionurl eq '/adm/coursegrp_portfolio') {
+             $output .= '<input type="hidden" name="action" value="upload_embedded" />';
+         }
+         $output .=  '<input type ="submit" value="'.&mt('Upload Listed Files').'" />'."\n".
+                     &mt('(only files for which a location has been provided will be uploaded)').'</form>'."\n";
+     } elsif ($numpathchg) {
+         my %pathchange = ();
+         $output .= &modify_html_form('pathchange',$actionurl,$state,\%pathchange,$pathchange_output);
+         if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) {
+             $output .= '<p>'.&mt('or').'</p>';
+         }
+     }
+     return ($output,$num,$numpathchg);
+ }
+ sub embedded_file_element {
+     my ($context,$num,$embed_file,$mapping,$allfiles,$codebase) = @_;
+     return unless ((ref($mapping) eq 'HASH') && (ref($allfiles) eq 'HASH') &&
+                    (ref($codebase) eq 'HASH'));
+     my $output;
+     if ($context eq 'upload_embedded') {
+        $output = '<input name="embedded_item_'.$num.'" type="file" value="" />'."\n";
+     }
+     $output .= '<input name="embedded_orig_'.$num.'" type="hidden" value="'.
+                &escape($embed_file).'" />';
+     unless (($context eq 'upload_embedded') &&
+             ($mapping->{$embed_file} eq $embed_file)) {
+         $output .='
+         <input name="embedded_ref_'.$num.'" type="hidden" value="'.&escape($mapping->{$embed_file}).'" />';
+     }
+     my $attrib;
+     if (ref($allfiles->{$mapping->{$embed_file}}) eq 'ARRAY') {
+         $attrib = &escape(join(':',@{$allfiles->{$mapping->{$embed_file}}}));
+     }
+     $output .=
+         "\n\t\t".
+         '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.
+         $attrib.'" />';
+     if (exists($codebase->{$mapping->{$embed_file}})) {
+         $output .=
+             "\n\t\t".
+             '<input name="codebase_'.$num.'" type="hidden" value="'.
+             &escape($codebase->{$mapping->{$embed_file}}).'" />';
+     }
+     return $output;
  }
  sub upload_embedded {
      my ($context,$dirpath,$uname,$udom,$dir_root,$url_root,$group,$disk_quota,
-         $current_disk_usage) = @_;
+         $current_disk_usage,$hiddenstate,$actionurl) = @_;
-     my $output;
+     my (%pathchange,$output,$modifyform,$footer,$returnflag);
      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'};
+         foreach my $type ('orig','ref','attrib','codebase') {
-         $env{'form.embedded_orig_'.$i} =
+             if ($env{'form.embedded_'.$type.'_'.$i} ne '') {
-             &unescape($env{'form.embedded_orig_'.$i});
+                 $env{'form.embedded_'.$type.'_'.$i} =
+                     &unescape($env{'form.embedded_'.$type.'_'.$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 '');
- Line 7518  sub upload_embedded {
+ Line 9274  sub upload_embedded {
              if ($group ne '') {
                  $port_path = "groups/$group/$port_path";
              }
-             ($state,$msg) = &check_for_upload($path,$fname,$group,'embedded_item_'.$i,
+             ($state,$msg) = &check_for_upload($env{'form.currentpath'}.$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_locked') {
-                 || $state eq 'file_exists' ) {
                  $output .= $msg;
                  next;
              }
- Line 7537  sub upload_embedded {
+ Line 9293  sub upload_embedded {
          # 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);
+             $output .= &mt('Invalid file extension ([_1]) - reserved for LONCAPA use - rename the file with a different extension and re-upload. ',$1).'<br />';
              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);
+             $output .= &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1).'<br />';
              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);
+             $output .= &mt('File name not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2).'<br />';
              next;
          }
          $env{'form.embedded_item_'.$i.'.filename'}=$fname;
          if ($context eq 'portfolio') {
-             my $result=
+             my $result;
-                 &Apache::lonnet::userfileupload('embedded_item_'.$i,'',
+             if ($state eq 'existingfile') {
-                                                 $dirpath.$path);
+                 $result=
+                     &Apache::lonnet::userfileupload('embedded_item_'.$i,'existingfile',
+                                                     $dirpath.$env{'form.currentpath'}.$path);
+             } else {
+                 $result=
+                     &Apache::lonnet::userfileupload('embedded_item_'.$i,'',
+                                                     $dirpath.
+                                                     $env{'form.currentpath'}.$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 .= &mt('Uploaded [_1]','<span class="LC_filename">'.
+                                $path.$fname.'</span>').'<br />';
+                 }
+             }
+         } elsif ($context eq 'coursedoc') {
+             my $result =
+                 &Apache::lonnet::userfileupload('embedded_item_'.$i,'coursedoc',
+                                                 $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].'
+                            .&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 />';
+                            .'</span><br />';
-                 next;
+                     next;
              } else {
-                 $output .= '<p>'.&mt('Uploaded [_1]','<span class="LC_filename">'.
+                 $output .= &mt('Uploaded [_1]','<span class="LC_filename">'.
-                            $path.$fname.'</span>').'</p>';
+                            $path.$fname.'</span>').'<br />';
              }
          } else {
  # Save the file
- Line 7569  sub upload_embedded {
+ Line 9347  sub upload_embedded {
              my $fullpath = $dir_root.$dirpath.'/'.$path;
              my $dest = $fullpath.$fname;
              my $url = $url_root.$dirpath.'/'.$path.$fname;
-             my @parts=split(/\//,$fullpath);
+             my @parts=split(/\//,"$dirpath/$path");
              my $count;
              my $filepath = $dir_root;
-             for ($count=4;$count<=$#parts;$count++) {
+             foreach my $subdir (@parts) {
-                 $filepath .= "/$parts[$count]";
+                 $filepath .= "/$subdir";
-                 if ((-e $filepath)!=1) {
+                 if (!-e $filepath) {
                      mkdir($filepath,0770);
                  }
              }
- Line 7591  sub upload_embedded {
+ Line 9369  sub upload_embedded {
                                &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('Uploaded [_1]','<span class="LC_filename">'.
-                         $output .= &mt('Embedded file uploaded successfully:').
+                                $url.'</span>').'<br />';
-                                    '&nbsp;<a href="'.$url.'">'.
+                     unless ($context eq 'testbank') {
-                                    $orig_uploaded_filename.'</a><br />';
+                         $footer .= &mt('View embedded file: [_1]',
-                     } else {
+                                        '<a href="'.$url.'">'.$fname.'</a>').'<br />';
-                         $output .= '<font size="+2">'.
-                                    &mt('View embedded file: [_1]','<a href="'.$url.'">'.
-                                    $orig_uploaded_filename.'</a>').'</font><br />';
                      }
                  }
                  close($fh);
              }
          }
+         if ($env{'form.embedded_ref_'.$i}) {
+             $pathchange{$i} = 1;
+         }
+     }
+     if ($output) {
+         $output = '<p>'.$output.'</p>';
+     }
+     $output .= &modify_html_form('upload_embedded',$actionurl,$hiddenstate,\%pathchange);
+     $returnflag = 'ok';
+     if (keys(%pathchange) > 0) {
+         if ($context eq 'portfolio') {
+             $output .= '<p>'.&mt('or').'</p>';
+         } elsif ($context eq 'testbank') {
+             $output .=  '<p>'.&mt('Or [_1]continue[_2] the testbank import without modifying the reference(s).','<a href="javascript:document.testbankForm.submit();">','</a>').'</p>';
+             $returnflag = 'modify_orightml';
+         }
+     }
+     return ($output.$footer,$returnflag);
+ }
+ sub modify_html_form {
+     my ($context,$actionurl,$hiddenstate,$pathchange,$pathchgtable) = @_;
+     my $end = 0;
+     my $modifyform;
+     if ($context eq 'upload_embedded') {
+         return unless (ref($pathchange) eq 'HASH');
+         if ($env{'form.number_embedded_items'}) {
+             $end += $env{'form.number_embedded_items'};
+         }
+         if ($env{'form.number_pathchange_items'}) {
+             $end += $env{'form.number_pathchange_items'};
+         }
+         if ($end) {
+             for (my $i=0; $i<$end; $i++) {
+                 if ($i < $env{'form.number_embedded_items'}) {
+                     next unless($pathchange->{$i});
+                 }
+                 $modifyform .=
+                     &start_data_table_row().
+                     '<td><input type ="checkbox" name="namechange" value="'.$i.'" '.
+                     'checked="checked" /></td>'.
+                     '<td>'.$env{'form.embedded_ref_'.$i}.
+                     '<input type="hidden" name="embedded_ref_'.$i.'" value="'.
+                     &escape($env{'form.embedded_ref_'.$i}).'" />'.
+                     '<input type="hidden" name="embedded_codebase_'.$i.'" value="'.
+                     &escape($env{'form.embedded_codebase_'.$i}).'" />'.
+                     '<input type="hidden" name="embedded_attrib_'.$i.'" value="'.
+                     &escape($env{'form.embedded_attrib_'.$i}).'" /></td>'.
+                     '<td>'.$env{'form.embedded_orig_'.$i}.
+                     '<input type="hidden" name="embedded_orig_'.$i.'" value="'.
+                     &escape($env{'form.embedded_orig_'.$i}).'" /></td>'.
+                     &end_data_table_row();
+             }
+         }
+     } else {
+         $modifyform = $pathchgtable;
+         if (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank')) {
+             $hiddenstate .= '<input type="hidden" name="phase" value="four" />';
+         } elsif (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) {
+             $hiddenstate .= '<input type="hidden" name="action" value="modify_orightml" />';
+         }
+     }
+     if ($modifyform) {
+         return '<h3>'.&mt('Changes in content of HTML file required').'</h3>'."\n".
+                '<p>'.&mt('Changes need to be made to the reference(s) used for one or more of the dependencies, if your HTML file is to work correctly:').'<ol>'."\n".
+                '<li>'.&mt('For consistency between the reference(s) and the location of the corresponding stored file within LON-CAPA.').'</li>'."\n".
+                '<li>'.&mt('To change absolute paths to relative paths, or replace directory traversal via "../" within the original reference.').'</li>'."\n".
+                '</ol></p>'."\n".'<p>'.
+                &mt('LON-CAPA can make the required changes to your HTML file.').'</p>'."\n".
+                '<form method="post" name="refchanger" action="'.$actionurl.'">'.
+                &start_data_table()."\n".
+                &start_data_table_header_row().
+                '<th>'.&mt('Change?').'</th>'.
+                '<th>'.&mt('Current reference').'</th>'.
+                '<th>'.&mt('Required reference').'</th>'.
+                &end_data_table_header_row()."\n".
+                $modifyform.
+                &end_data_table().'<br />'."\n".$hiddenstate.
+                '<input type="submit" name="pathchanges" value="'.&mt('Modify HTML file').'" />'.
+                '</form>'."\n";
+     }
+     return;
+ }
+ sub modify_html_refs {
+     my ($context,$dirpath,$uname,$udom,$dir_root) = @_;
+     my $container;
+     if ($context eq 'portfolio') {
+         $container = $env{'form.container'};
+     } elsif ($context eq 'coursedoc') {
+         $container = $env{'form.primaryurl'};
+     } else {
+         $container = $Apache::lonnet::perlvar{'lonDocRoot'}.$env{'form.filename'};
+     }
+     my (%allfiles,%codebase,$output,$content);
+     my @changes = &get_env_multiple('form.namechange');
+     return unless (@changes > 0);
+     if (($context eq 'portfolio') || ($context eq 'coursedoc')) {
+         return unless ($container =~ m{^/uploaded/\Q$udom\E/\Q$uname\E/});
+         $content = &Apache::lonnet::getfile($container);
+         return if ($content eq '-1');
+     } else {
+         return unless ($container =~ /^\Q$dir_root\E/);
+         if (open(my $fh,"<$container")) {
+             $content = join('', <$fh>);
+             close($fh);
+         } else {
+             return;
+         }
+     }
+     my ($count,$codebasecount) = (0,0);
+     my $mm = new File::MMagic;
+     my $mime_type = $mm->checktype_contents($content);
+     if ($mime_type eq 'text/html') {
+         my $parse_result =
+             &Apache::lonnet::extract_embedded_items($container,\%allfiles,
+                                                     \%codebase,\$content);
+         if ($parse_result eq 'ok') {
+             foreach my $i (@changes) {
+                 my $orig = &unescape($env{'form.embedded_orig_'.$i});
+                 my $ref = &unescape($env{'form.embedded_ref_'.$i});
+                 if ($allfiles{$ref}) {
+                     my $newname =  $orig;
+                     my ($attrib_regexp,$codebase);
+                     $attrib_regexp = &unescape($env{'form.embedded_attrib_'.$i});
+                     if ($attrib_regexp =~ /:/) {
+                         $attrib_regexp =~ s/\:/|/g;
+                     }
+                     if ($content =~ m{($attrib_regexp\s*=\s*['"]?)\Q$ref\E(['"]?)}) {
+                         my $numchg = ($content =~ s{($attrib_regexp\s*=\s*['"]?)\Q$ref\E(['"]?)}{$1$newname$2}gi);
+                         $count += $numchg;
+                     }
+                     if ($env{'form.embedded_codebase_'.$i} ne '') {
+                         $codebase = &unescape($env{'form.embedded_codebase_'.$i});
+                         my $numchg = ($content =~ s/(codebase\s*=\s*["']?)\Q$codebase\E(["']?)/$1.$2/i); #' stupid emacs
+                         $codebasecount ++;
+                     }
+                 }
+             }
+             if ($count || $codebasecount) {
+                 my $saveresult;
+                 if ($context eq 'portfolio' || $context eq 'coursedoc') {
+                     my $url = &Apache::lonnet::store_edited_file($container,$content,$udom,$uname,\$saveresult);
+                     if ($url eq $container) {
+                         my ($fname) = ($container =~ m{/([^/]+)$});
+                         $output = '<p>'.&mt('Updated [quant,_1,reference] in [_2].',
+                                             $count,'<span class="LC_filename">'.
+                                             $fname.'</span>').'</p>';
+                     } else {
+                          $output = '<p class="LC_error">'.
+                                    &mt('Error: update failed for: [_1].',
+                                    '<span class="LC_filename">'.
+                                    $container.'</span>').'</p>';
+                     }
+                 } else {
+                     if (open(my $fh,">$container")) {
+                         print $fh $content;
+                         close($fh);
+                         $output = '<p>'.&mt('Updated [quant,_1,reference] in [_2].',
+                                   $count,'<span class="LC_filename">'.
+                                   $container.'</span>').'</p>';
+                     } else {
+                          $output = '<p class="LC_error">'.
+                                    &mt('Error: could not update [_1].',
+                                    '<span class="LC_filename">'.
+                                    $container.'</span>').'</p>';
+                     }
+                 }
+             }
+         } else {
+             &logthis('Failed to parse '.$container.
+                      ' to modify references: '.$parse_result);
+         }
      }
      return $output;
  }
- Line 7627  sub check_for_existing {
+ Line 9575  sub check_for_existing {
  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 $filesize = length($env{'form.'.$element});
+     if (!$filesize) {
+         my $msg = '<span class="LC_error">'.
+                   &mt('Unable to upload [_1]. (size = [_2] bytes)',
+                       '<span class="LC_filename">'.$fname.'</span>',
+                       $filesize).'<br />'.
+                   &mt('Either the file you attempted to upload was empty, or your web browser was unable to read its contents.').'<br />'.
+                   '</span>';
+         return ('zero_bytes',$msg);
+     }
+     $filesize =  $filesize/1000; #express in k (1024?)
      my $getpropath = 1;
-     my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$path,$udom,$uname,
+     my ($dirlistref,$listerror) =
-                                             $getpropath);
+          &Apache::lonnet::dirlist($portfolio_root.$path,$udom,$uname,$getpropath);
      my $found_file = 0;
      my $locked_file = 0;
-     foreach my $line (@dir_list) {
+     my @lockers;
-         my ($file_name)=split(/\&/,$line,2);
+     my $navmap;
-         if ($file_name eq $fname){
+     if ($env{'request.course.id'}) {
-             $file_name = $path.$file_name;
+         $navmap = Apache::lonnavmaps::navmap->new();
-             if ($group ne '') {
+     }
-                 $file_name = $group.$file_name;
+     if (ref($dirlistref) eq 'ARRAY') {
-             }
+         foreach my $line (@{$dirlistref}) {
-             $found_file = 1;
+             my ($file_name,$rest)=split(/\&/,$line,2);
-             if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
+             if ($file_name eq $fname){
-                 $locked_file = 1;
+                 $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,\@lockers) eq 'true') {
+                     foreach my $lock (@lockers) {
+                         if (ref($lock) eq 'ARRAY') {
+                             my ($symb,$crsid) = @{$lock};
+                             if ($crsid eq $env{'request.course.id'}) {
+                                 if (ref($navmap)) {
+                                     my $res = $navmap->getBySymb($symb);
+                                     foreach my $part (@{$res->parts()}) {
+                                         my ($slot_status,$slot_time,$slot_name)=$res->check_for_slot($part);
+                                         unless (($slot_status == $res->RESERVED) ||
+                                                 ($slot_status == $res->RESERVED_LOCATION)) {
+                                             $locked_file = 1;
+                                         }
+                                     }
+                                 } else {
+                                     $locked_file = 1;
+                                 }
+                             } else {
+                                 $locked_file = 1;
+                             }
+                         }
+                    }
+                 } else {
+                     my @info = split(/\&/,$rest);
+                     my $currsize = $info[6]/1000;
+                     if ($currsize < $filesize) {
+                         my $extra = $filesize - $currsize;
+                         if (($current_disk_usage + $extra) > $disk_quota) {
+                             my $msg = '<span class="LC_error">'.
+                                       &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded if existing (smaller) file with same name (size = [_3] kilobytes) is replaced.',
+                                           '<span class="LC_filename">'.$fname.'</span>',$filesize,$currsize).'</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);
+                         }
+                     }
+                 }
              }
          }
      }
- Line 7660  sub check_for_upload {
+ Line 9659  sub check_for_upload {
              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 .= &mt(' A file by that name: [_1] was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$port_path.$env{'form.currentpath'});
              $msg .= '</span>';
-             $msg .= '<br />';
+             return ('existingfile',$msg);
-             $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);
          }
      }
  }
+ sub check_for_traversal {
+     my ($path,$url,$toplevel) = @_;
+     my @parts=split(/\//,$path);
+     my $cleanpath;
+     my $fullpath = $url;
+     for (my $i=0;$i<@parts;$i++) {
+         next if ($parts[$i] eq '.');
+         if ($parts[$i] eq '..') {
+             $fullpath =~ s{([^/]+/)$}{};
+         } else {
+             $fullpath .= $parts[$i].'/';
+         }
+     }
+     if ($fullpath =~ /^\Q$url\E(.*)$/) {
+         $cleanpath = $1;
+     } elsif ($fullpath =~ /^\Q$toplevel\E(.*)$/) {
+         my $curr_toprel = $1;
+         my @parts = split(/\//,$curr_toprel);
+         my ($url_toprel) = ($url =~ /^\Q$toplevel\E(.*)$/);
+         my @urlparts = split(/\//,$url_toprel);
+         my $doubledots;
+         my $startdiff = -1;
+         for (my $i=0; $i<@urlparts; $i++) {
+             if ($startdiff == -1) {
+                 unless ($urlparts[$i] eq $parts[$i]) {
+                     $startdiff = $i;
+                     $doubledots .= '../';
+                 }
+             } else {
+                 $doubledots .= '../';
+             }
+         }
+         if ($startdiff > -1) {
+             $cleanpath = $doubledots;
+             for (my $i=$startdiff; $i<@parts; $i++) {
+                 $cleanpath .= $parts[$i].'/';
+             }
+         }
+     }
+     $cleanpath =~ s{(/)$}{};
+     return $cleanpath;
+ }
+ =pod
+ =item * &get_turnedin_filepath()
+ Determines path in a user's portfolio file for storage of files uploaded
+ to a specific essayresponse or dropbox item.
+ Inputs: 3 required + 1 optional.
+ $symb is symb for resource, $uname and $udom are for current user (required).
+ $caller is optional (can be "submission", if routine is called when storing
+ an upoaded file when "Submit Answer" button was pressed).
+ Returns array containing $path and $multiresp.
+ $path is path in portfolio.  $multiresp is 1 if this resource contains more
+ than one file upload item.  Callers of routine should append partid as a
+ subdirectory to $path in cases where $multiresp is 1.
+ Called by: homework/essayresponse.pm and homework/structuretags.pm
+ =cut
+ sub get_turnedin_filepath {
+     my ($symb,$uname,$udom,$caller) = @_;
+     my ($map,$resid,$resurl)=&Apache::lonnet::decode_symb($symb);
+     my $turnindir;
+     my %userhash = &Apache::lonnet::userenvironment($udom,$uname,'turnindir');
+     $turnindir = $userhash{'turnindir'};
+     my ($path,$multiresp);
+     if ($turnindir eq '') {
+         if ($caller eq 'submission') {
+             $turnindir = &mt('turned in');
+             $turnindir =~ s/\W+/_/g;
+             my %newhash = (
+                             'turnindir' => $turnindir,
+                           );
+             &Apache::lonnet::put('environment',\%newhash,$udom,$uname);
+         }
+     }
+     if ($turnindir ne '') {
+         $path = '/'.$turnindir.'/';
+         my ($multipart,$turnin,@pathitems);
+         my $navmap = Apache::lonnavmaps::navmap->new();
+         if (defined($navmap)) {
+             my $mapres = $navmap->getResourceByUrl($map);
+             if (ref($mapres)) {
+                 my $pcslist = $mapres->map_hierarchy();
+                 if ($pcslist ne '') {
+                     foreach my $pc (split(/,/,$pcslist)) {
+                         my $res = $navmap->getByMapPc($pc);
+                         if (ref($res)) {
+                             my $title = $res->compTitle();
+                             $title =~ s/\W+/_/g;
+                             if ($title ne '') {
+                                 push(@pathitems,$title);
+                             }
+                         }
+                     }
+                 }
+                 my $maptitle = $mapres->compTitle();
+                 $maptitle =~ s/\W+/_/g;
+                 if ($maptitle ne '') {
+                     push(@pathitems,$maptitle);
+                 }
+                 unless ($env{'request.state'} eq 'construct') {
+                     my $res = $navmap->getBySymb($symb);
+                     if (ref($res)) {
+                         my $partlist = $res->parts();
+                         my $totaluploads = 0;
+                         if (ref($partlist) eq 'ARRAY') {
+                             foreach my $part (@{$partlist}) {
+                                 my @types = $res->responseType($part);
+                                 my @ids = $res->responseIds($part);
+                                 for (my $i=0; $i < scalar(@ids); $i++) {
+                                     if ($types[$i] eq 'essay') {
+                                         my $partid = $part.'_'.$ids[$i];
+                                         if (&Apache::lonnet::EXT("resource.$partid.uploadedfiletypes") ne '') {
+                                             $totaluploads ++;
+                                         }
+                                     }
+                                 }
+                             }
+                             if ($totaluploads > 1) {
+                                 $multiresp = 1;
+                             }
+                         }
+                     }
+                 }
+             } else {
+                 return;
+             }
+         } else {
+             return;
+         }
+         my $restitle=&Apache::lonnet::gettitle($symb);
+         $restitle =~ s/\W+/_/g;
+         if ($restitle eq '') {
+             $restitle = ($resurl =~ m{/[^/]+$});
+             if ($restitle eq '') {
+                 $restitle = time;
+             }
+         }
+         push(@pathitems,$restitle);
+         $path .= join('/',@pathitems);
+     }
+     return ($path,$multiresp);
+ }
  =pod
- Line 7857  sub upfile_select_html {
+ Line 10003  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 7903  sub csv_print_samples {
+ Line 10049  sub csv_print_samples {
      $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 7947  sub csv_print_select_table {
+ Line 10093  sub csv_print_select_table {
  	my ($value,$display,$defaultcol)=@{ $array_ref };
  	$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] }))) {
- Line 8601  sub restore_settings {
+ Line 10747  sub restore_settings {
  =item * &build_recipient_list()
- Build recipient lists for three types of e-mail:
+ Build recipient lists for five types of e-mail:
- (a) Error Reports, (b) Package Updates, (c) Help requests, generated by
+ (a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors
- lonerrorhandler.pm, CHECKRPMS and lonsupportreq.pm respectively.
+ (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),
- Line 8627  sub build_recipient_list {
+ Line 10775  sub build_recipient_list {
      my %domconfig =
           &Apache::lonnet::get_dom('configuration',['contacts'],$defdom);
      if (ref($domconfig{'contacts'}) eq 'HASH') {
-         if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') {
+         if (exists($domconfig{'contacts'}{$mailing})) {
-             my @contacts = ('adminemail','supportemail');
+             if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') {
-             foreach my $item (@contacts) {
+                 my @contacts = ('adminemail','supportemail');
-                 if ($domconfig{'contacts'}{$mailing}{$item}) {
+                 foreach my $item (@contacts) {
-                     my $addr = $domconfig{'contacts'}{$item};
+                     if ($domconfig{'contacts'}{$mailing}{$item}) {
-                     if (!grep(/^\Q$addr\E$/,@recipients)) {
+                         my $addr = $domconfig{'contacts'}{$item};
-                         push(@recipients,$addr);
+                         if (!grep(/^\Q$addr\E$/,@recipients)) {
+                             push(@recipients,$addr);
+                         }
                      }
+                     $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
                  }
-                 $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
              }
+         } elsif ($origmail ne '') {
+             push(@recipients,$origmail);
          }
      } elsif ($origmail ne '') {
          push(@recipients,$origmail);
- Line 8769  sub extract_categories {
+ Line 10921  sub extract_categories {
                  my $trailstr;
                  if ($name eq 'instcode') {
                      $trailstr = &mt('Official courses (with institutional codes)');
+                 } elsif ($name eq 'communities') {
+                     $trailstr = &mt('Communities');
                  } else {
                      $trailstr = $name;
                  }
- Line 8881  cathash - reference to hash of categorie
+ Line 11035  cathash - reference to hash of categorie
  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) = @_;
+     my ($cathash,$currcat,$type) = @_;
      my $output;
      if (ref($cathash) eq 'HASH') {
          my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);
- Line 8895  sub assign_categories_table {
+ Line 11051  sub assign_categories_table {
          if (@cats > 0) {
              my $itemcount = 0;
              if (ref($cats[0]) eq 'ARRAY') {
-                 $output = &Apache::loncommon::start_data_table();
                  my @currcategories;
                  if ($currcat ne '') {
                      @currcategories = split('&',$currcat);
                  }
+                 my $table;
                  for (my $i=0; $i<@{$cats[0]}; $i++) {
                      my $parent = $cats[0][$i];
-                     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
                      next if ($parent eq 'instcode');
+                     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" ';
+                             $checked = ' checked="checked"';
                          }
                      }
-                     $output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
+                     my $parent_title = $parent;
-                                '<input type="checkbox" name="usecategory" value="'.
+                     if ($parent eq 'communities') {
-                                $item.'"'.$checked.' />'.$parent.'</span>'.
+                         $parent_title = &mt('Communities');
-                                '<input type="hidden" name="catname" value="'.$parent.'" /></td>';
+                     }
+                     $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);
-                     $output .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
+                     $table .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
                      pop(@path);
-                     $output .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
+                     $table .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
                      $itemcount ++;
                  }
-                 $output .= &Apache::loncommon::end_data_table();
+                 if ($itemcount) {
+                     $output = &Apache::loncommon::start_data_table().
+                               $table.
+                               &Apache::loncommon::end_data_table();
+                 }
              }
          }
      }
- Line 8974  sub assign_category_rows {
+ Line 11143  sub assign_category_rows {
                      if (ref($currcategories) eq 'ARRAY') {
                          if (@{$currcategories} > 0) {
                              if (grep(/^\Q$item\E$/,@{$currcategories})) {
-                                 $checked = ' checked="checked" ';
+                                 $checked = ' checked="checked"';
                              }
                          }
                      }
- Line 9167  sub check_clone {
+ Line 11336  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 9183  sub check_clone {
+ Line 11366  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 9200  sub check_clone {
+ Line 11393  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 9238  sub construct_course {
+ Line 11431  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 9268  sub construct_course {
+ Line 11470  sub construct_course {
  	$cenv{'url'}=$oldcenv{'url'};
  # Restore title
  	$cenv{'description'}=$oldcenv{'description'};
+ # Restore creation date, creator and creation context.
+         $cenv{'internal.created'}=$oldcenv{'internal.created'};
+         $cenv{'internal.creator'}=$oldcenv{'internal.creator'};
+         $cenv{'internal.creationcontext'}=$oldcenv{'internal.creationcontext'};
  # Mark as cloned
  	$cenv{'clonedfrom'}=$cloneid;
  # Need to clone grading mode
- Line 9281  sub construct_course {
+ Line 11487  sub construct_course {
                     'policy.email',
                     'comment.email',
                     'pch.users.denied',
-                    'plc.users.denied'],
+                    'plc.users.denied',
+                    'hidefromcat',
+                    'categories'],
                     $$crsudom,$$crsunum);
      }
- Line 9512  sub construct_course {
+ Line 11720  sub construct_course {
  	    $title=&mt('Syllabus');
              $url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus';
          } else {
-             $title=&mt('Navigate Contents');
+             $title=&mt('Table of Contents');
              $url='/adm/navmaps';
          }
- Line 9529  sub construct_course {
+ Line 11737  sub construct_course {
  ############################################################
  ############################################################
+ #SD
+ # only Community and Course, or anything else?
  sub course_type {
      my ($cid) = @_;
      if (!defined($cid)) {
- Line 9545  sub group_term {
+ Line 11755  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 9609  sub escape_url {
+ Line 11829  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 9663  sub init_user_environment {
+ Line 11899  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 9723  sub init_user_environment {
+ Line 11941  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";
- 		}
- 	    }
  	}
+         my %is_adv = ( is_adv => $env{'user.adv'} );
+         my %domdef;
+         unless ($domain eq 'public') {
+             %domdef = &Apache::lonnet::get_domain_defaults($domain);
+         }
+         foreach my $tool ('aboutme','blog','portfolio') {
+             $userenv{'availabletools.'.$tool} =
+                 &Apache::lonnet::usertools_access($username,$domain,$tool,'reload',
+                                                   undef,\%userenv,\%domdef,\%is_adv);
+         }
+         foreach my $crstype ('official','unofficial','community') {
+             $userenv{'canrequest.'.$crstype} =
+                 &Apache::lonnet::usertools_access($username,$domain,$crstype,
+                                                   'reload','requestcourses',
+                                                   \%userenv,\%domdef,\%is_adv);
+         }
  	$env{'user.environment'} = "$lonids/$cookie.id";
  	if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",
- Line 9751  sub init_user_environment {
+ Line 11978  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 9777  sub _add_to_env {
+ Line 12004  sub _add_to_env {
  # --- Get the symbolic name of a problem and the url
  sub get_symb {
      my ($request,$silent) = @_;
-     (my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+     (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) {
- Line 9804  sub get_annotation {
+ Line 12031  sub get_annotation {
  }
  sub clean_symb {
-     my ($symb) = @_;
+     my ($symb,$delete_enc) = @_;
      &Apache::lonenc::check_decrypt(\$symb);
      my $enc = $env{'request.enc'};
-     delete($env{'request.enc'});
+     if ($delete_enc) {
+         delete($env{'request.enc'});
+     }
      return ($symb,$enc);
  }
+ sub build_release_hashes {
+     my ($checkparms,$checkresponsetypes,$checkcrstypes,$anonsurvey,$randomizetry) = @_;
+     return unless((ref($checkparms) eq 'HASH') && (ref($checkresponsetypes) eq 'HASH') &&
+                   (ref($checkcrstypes) eq 'HASH') && (ref($anonsurvey) eq 'HASH') &&
+                   (ref($randomizetry) eq 'HASH'));
+     foreach my $key (keys(%Apache::lonnet::needsrelease)) {
+         my ($item,$name,$value) = split(/:/,$key);
+         if ($item eq 'parameter') {
+             if (ref($checkparms->{$name}) eq 'ARRAY') {
+                 unless(grep(/^\Q$name\E$/,@{$checkparms->{$name}})) {
+                     push(@{$checkparms->{$name}},$value);
+                 }
+             } else {
+                 push(@{$checkparms->{$name}},$value);
+             }
+         } elsif ($item eq 'resourcetag') {
+             if ($name eq 'responsetype') {
+                 $checkresponsetypes->{$value} = $Apache::lonnet::needsrelease{$key}
+             }
+         } elsif ($item eq 'course') {
+             if ($name eq 'crstype') {
+                 $checkcrstypes->{$value} = $Apache::lonnet::needsrelease{$key};
+             }
+         }
+     }
+     ($anonsurvey->{major},$anonsurvey->{minor}) = split(/\./,$Apache::lonnet::needsrelease{'parameter:type:anonsurvey'});
+     ($randomizetry->{major},$randomizetry->{minor}) = split(/\./,$Apache::lonnet::needsrelease{'parameter:type:randomizetry'});
+     return;
+ }
  =pod
  =back

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

Removed from v.1.702
changed lines
	Added in v.1.1048