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.653 and 1.926

-version 1.653, 2008/05/19 17:00:22
+version 1.926, 2009/12/08 14:44:17
  Line 61  use POSIX qw(strftime mktime);
  use Apache::lonmenu();
  use Apache::lonenc();
  use Apache::lonlocal;
+ use Apache::lonnet();
  use HTML::Entities;
  use Apache::lonhtmlcommon();
  use Apache::loncoursedata();
  use Apache::lontexconvert();
  use Apache::lonclonecourse();
  use LONCAPA qw(:DEFAULT :match);
+ use DateTime::TimeZone;
+ use DateTime::Locale::Catalog;
  # ---------------------------------------------- Designs
  use vars qw(%defaultdesign);
- Line 268  BEGIN {
+ Line 271  BEGIN {
          }
      }
      &Apache::lonnet::logthis(
-               "<font color=yellow>INFO: Read file types</font>");
+              "<span style='color:yellow;'>INFO: Read file types</span>");
      $readit=1;
      }  # end of unless($readit)
- Line 403  sub studentbrowser_javascript {
+ Line 406  sub studentbrowser_javascript {
           || ($env{'request.role'}=~/^(au|dc|su)/)
            ) { return ''; }
     return (<<'ENDSTDBRW');
- <script type="text/javascript" language="Javascript" >
+ <script type="text/javascript" language="Javascript">
+ // <![CDATA[
      var stdeditbrowser;
-     function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) {
+     function openstdbrowser(formname,uname,udom,roleflag,ignorefilter,courseadvonly) {
          var url = '/adm/pickstudent?';
          var filter;
  	if (!ignorefilter) {
- Line 419  sub studentbrowser_javascript {
+ Line 423  sub studentbrowser_javascript {
          url += 'form=' + formname + '&unameelement='+uname+
                                      '&udomelement='+udom;
  	if (roleflag) { url+="&roles=1"; }
+         if (courseadvonly) { url+="&courseadvonly=1"; }
          var title = 'Student_Browser';
          var options = 'scrollbars=1,resizable=1,menubar=0';
          options += ',width=700,height=600';
          stdeditbrowser = open(url,title,options,'1');
          stdeditbrowser.focus();
      }
+ // ]]>
  </script>
  ENDSTDBRW
  }
  sub selectstudent_link {
-    my ($form,$unameele,$udomele)=@_;
+    my ($form,$unameele,$udomele,$courseadvonly)=@_;
+    my $callargs = "'".$form."','".$unameele."','".$udomele."'";
     if ($env{'request.course.id'}) {
         if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
  	   && !&Apache::lonnet::allowed('srm',$env{'request.course.id'}.
  					'/'.$env{'request.course.sec'})) {
  	   return '';
         }
-        return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
+        if ($courseadvonly)  {
-         '","'.$udomele.'");'."'>".&mt('Select User')."</a>";
+            $callargs .= ",'',1,1";
+        }
+        return '<span class="LC_nobreak">'.
+               '<a href="javascript:openstdbrowser('.$callargs.');">'.
+               &mt('Select User').'</a></span>';
     }
     if ($env{'request.role'}=~/^(au|dc|su)/) {
-        return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
+        $callargs .= ",1";
-         '","'.$udomele.'",1);'."'>".&mt('Select User')."</a>";
+        return '<span class="LC_nobreak">'.
+               '<a href="javascript:openstdbrowser('.$callargs.');">'.
+               &mt('Select User').'</a></span>';
     }
     return '';
  }
  sub authorbrowser_javascript {
      return <<"ENDAUTHORBRW";
- <script type="text/javascript">
+ <script type="text/javascript" language="JavaScript">
+ // <![CDATA[
  var stdeditbrowser;
  function openauthorbrowser(formname,udom) {
- Line 462  function openauthorbrowser(formname,udom
+ Line 476  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 = &mt('Course Browser');
-    my $output = '
+     if ($crstype ne '') {
- <script type="text/javascript">
+         $wintitle = &mt($crstype);
+     }
+     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 506  sub coursebrowser_javascript {
+ Line 516  sub coursebrowser_javascript {
              else {
                  if (formname == 'portform') {
                      url += '&setroles='+extra_element;
+                 } else {
+                     if (formname == 'rules') {
+                         url += '&fixeddom='+extra_element;
+                     }
                  }
              }
          }
-         if (multflag !=null && multflag != '') {
+         if (type != null && type != '') {
-             url += '&multiple='+multflag;
+             url += '&type='+type;
          }
-         if (crstype == 'Course/Group') {
+         if (type_elem != null && type_elem != '') {
-             if (formname == 'cu') {
+             url += '&typeelement='+type_elem;
-                 crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value;
+         }
-                 if (crstype == "") {
+         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;
+ }
-     function getFormIdByName(formname) {
+ sub javascript_index_functions {
-         for (var i=0;i<document.forms.length;i++) {
+     return <<"ENDJS";
-             if (document.forms[i].name == formname) {
-                 return i;
+ function getFormIdByName(formname) {
-             }
+     for (var i=0;i<document.forms.length;i++) {
+         if (document.forms[i].name == formname) {
+             return i;
+         }
+     }
+     return -1;
+ }
+ 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;
      }
+     return -1;
+ }
-     function getIndexByName(formid,item) {
+ function getDomainFromSelectbox(formname,udom) {
-         for (var i=0;i<document.forms[formid].elements.length;i++) {
+     var userdom;
-             if (document.forms[formid].elements[i].name == item) {
+     var formid = getFormIdByName(formname);
-                 return i;
+     if (formid > -1) {
+         var domid = getIndexByName(formid,udom);
+         if (domid > -1) {
+             if (document.forms[formid].elements[domid].type == 'select-one') {
+                 userdom=document.forms[formid].elements[domid].options[document.forms[formid].elements[domid].selectedIndex].value;
+             }
+             if (document.forms[formid].elements[domid].type == 'hidden') {
+                 userdom=document.forms[formid].elements[domid].value;
              }
          }
-         return -1;
      }
- ENDSTDBRW
+     return userdom;
-     if ($sec_element ne '') {
+ }
-         $output .= &setsec_javascript($sec_element,$formname);
+ ENDJS
+ }
+ sub userbrowser_javascript {
+     my $id_functions = &javascript_index_functions();
+     return <<"ENDUSERBRW";
+ function openuserbrowser(formname,uname,udom,ulast,ufirst,uemail,hideudom,crsdom,caller) {
+     var url = '/adm/pickuser?';
+     var userdom = getDomainFromSelectbox(formname,udom);
+     if (userdom != null) {
+        if (userdom != '') {
+            url += 'srchdom='+userdom+'&';
+        }
      }
-     $output .= '
+     url += 'form=' + formname + '&unameelement='+uname+
- </script>';
+                                 '&udomelement='+udom+
-     return $output;
+                                 '&ulastelement='+ulast+
+                                 '&ufirstelement='+ufirst+
+                                 '&uemailelement='+uemail+
+                                 '&hideudomelement='+hideudom+
+                                 '&coursedom='+crsdom;
+     if ((caller != null) && (caller != undefined)) {
+         url += '&caller='+caller;
+     }
+     var title = 'User_Browser';
+     var options = 'scrollbars=1,resizable=1,menubar=0';
+     options += ',width=700,height=600';
+     var stdeditbrowser = open(url,title,options,'1');
+     stdeditbrowser.focus();
+ }
+ function fix_domain (formname,udom,origdom,uname) {
+     var formid = getFormIdByName(formname);
+     if (formid > -1) {
+         var unameid = getIndexByName(formid,uname);
+         var domid = getIndexByName(formid,udom);
+         var hidedomid = getIndexByName(formid,origdom);
+         if (hidedomid > -1) {
+             var fixeddom = document.forms[formid].elements[hidedomid].value;
+             var unameval = document.forms[formid].elements[unameid].value;
+             if ((fixeddom != '') && (fixeddom != undefined) && (fixeddom != null) && (unameval != '') && (unameval != undefined) && (unameval != null)) {
+                 if (domid > -1) {
+                     var slct = document.forms[formid].elements[domid];
+                     if (slct.type == 'select-one') {
+                         var i;
+                         for (i=0;i<slct.length;i++) {
+                             if (slct.options[i].value==fixeddom) { slct.selectedIndex=i; }
+                         }
+                     }
+                     if (slct.type == 'hidden') {
+                         slct.value = fixeddom;
+                     }
+                 }
+             }
+         }
+     }
+     return;
+ }
+ $id_functions
+ ENDUSERBRW
  }
  sub setsec_javascript {
-     my ($sec_element,$formname) = @_;
+     my ($sec_element,$formname,$role_element) = @_;
+     my (@courserolenames,@communityrolenames,$rolestr,$courserolestr,
+         $communityrolestr);
+     if ($role_element ne '') {
+         my @allroles = ('st','ta','ep','in','ad');
+         foreach my $crstype ('Course','Community') {
+             if ($crstype eq 'Community') {
+                 foreach my $role (@allroles) {
+                     push(@communityrolenames,&Apache::lonnet::plaintext($role,$crstype));
+                 }
+                 push(@communityrolenames,&Apache::lonnet::plaintext('co'));
+             } else {
+                 foreach my $role (@allroles) {
+                     push(@courserolenames,&Apache::lonnet::plaintext($role,$crstype));
+                 }
+                 push(@courserolenames,&Apache::lonnet::plaintext('cc'));
+             }
+         }
+         $rolestr = '"'.join('","',@allroles).'"';
+         $courserolestr = '"'.join('","',@courserolenames).'"';
+         $communityrolestr = '"'.join('","',@communityrolenames).'"';
+     }
      my $setsections = qq|
  function setSect(sectionlist) {
      var sectionsArray = new Array();
- Line 592  function setSect(sectionlist) {
+ Line 713  function setSect(sectionlist) {
          }
      }
  }
+ function setRole(crstype) {
+ |;
+     if ($role_element eq '') {
+         $setsections .= '    return;
+ }
+ ';
+     } else {
+         $setsections .= qq|
+     var elementLength = document.$formname.$role_element.length;
+     var allroles = Array($rolestr);
+     var courserolenames = Array($courserolestr);
+     var communityrolenames = Array($communityrolestr);
+     if (elementLength != undefined) {
+         if (document.$formname.$role_element.options[5].value == 'cc') {
+             if (crstype == 'Course') {
+                 return;
+             } else {
+                 allroles[5] = 'co';
+                 for (var i=0; i<6; i++) {
+                     document.$formname.$role_element.options[i].value = allroles[i];
+                     document.$formname.$role_element.options[i].text = communityrolenames[i];
+                 }
+             }
+         } else {
+             if (crstype == 'Community') {
+                 return;
+             } else {
+                 allroles[5] = 'cc';
+                 for (var i=0; i<6; i++) {
+                     document.$formname.$role_element.options[i].value = allroles[i];
+                     document.$formname.$role_element.options[i].text = courserolenames[i];
+                 }
+             }
+         }
+     }
+     return;
+ }
  |;
+     }
      return $setsections;
  }
  sub selectcourse_link {
-    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
+    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype,
-    return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
+        $typeelement) = @_;
-         '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select Course')."</a>";
+    my $type = $selecttype;
+    my $linktext = &mt('Select Course');
+    if ($selecttype eq 'Community') {
+        $linktext = &mt('Select Community');
+    } elsif ($selecttype eq 'Course/Community') {
+        $linktext = &mt('Select Course/Community');
+        $type = '';
+    }
+    return '<span class="LC_nobreak">'
+          ."<a href='"
+          .'javascript:opencrsbrowser("'.$form.'","'.$unameele
+          .'","'.$udomele.'","'.$desc.'","'.$extra_element
+          .'","'.$multflag.'","'.$type.'","'.$typeelement.'");'
+          ."'>".$linktext.'</a>'
+          .'</span>';
  }
  sub selectauthor_link {
- Line 609  sub selectauthor_link {
+ Line 782  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 634  ENDSCRT
+ Line 815  ENDSCRT
      return $jscript;
  }
+ sub select_timezone {
+    my ($name,$selected,$onchange,$includeempty)=@_;
+    my $output='<select name="'.$name.'" '.$onchange.'>'."\n";
+    if ($includeempty) {
+        $output .= '<option value=""';
+        if (($selected eq '') || ($selected eq 'local')) {
+            $output .= ' selected="selected" ';
+        }
+        $output .= '> </option>';
+    }
+    my @timezones = DateTime::TimeZone->all_names;
+    foreach my $tzone (@timezones) {
+        $output.= '<option value="'.$tzone.'"';
+        if ($tzone eq $selected) {
+            $output.=' selected="selected"';
+        }
+        $output.=">$tzone</option>\n";
+    }
+    $output.="</select>";
+    return $output;
+ }
+ sub select_datelocale {
+     my ($name,$selected,$onchange,$includeempty)=@_;
+     my $output='<select name="'.$name.'" '.$onchange.'>'."\n";
+     if ($includeempty) {
+         $output .= '<option value=""';
+         if ($selected eq '') {
+             $output .= ' selected="selected" ';
+         }
+         $output .= '> </option>';
+     }
+     my (@possibles,%locale_names);
+     my @locales = DateTime::Locale::Catalog::Locales;
+     foreach my $locale (@locales) {
+         if (ref($locale) eq 'HASH') {
+             my $id = $locale->{'id'};
+             if ($id ne '') {
+                 my $en_terr = $locale->{'en_territory'};
+                 my $native_terr = $locale->{'native_territory'};
+                 my @languages = &Apache::lonlocal::preferred_languages();
+                 if (grep(/^en$/,@languages) || !@languages) {
+                     if ($en_terr ne '') {
+                         $locale_names{$id} = '('.$en_terr.')';
+                     } elsif ($native_terr ne '') {
+                         $locale_names{$id} = $native_terr;
+                     }
+                 } else {
+                     if ($native_terr ne '') {
+                         $locale_names{$id} = $native_terr.' ';
+                     } elsif ($en_terr ne '') {
+                         $locale_names{$id} = '('.$en_terr.')';
+                     }
+                 }
+                 push (@possibles,$id);
+             }
+         }
+     }
+     foreach my $item (sort(@possibles)) {
+         $output.= '<option value="'.$item.'"';
+         if ($item eq $selected) {
+             $output.=' selected="selected"';
+         }
+         $output.=">$item";
+         if ($locale_names{$item} ne '') {
+             $output.="  $locale_names{$item}</option>\n";
+         }
+         $output.="</option>\n";
+     }
+     $output.="</select>";
+     return $output;
+ }
+ sub select_language {
+     my ($name,$selected,$includeempty) = @_;
+     my %langchoices;
+     if ($includeempty) {
+         %langchoices = ('' => 'No language preference');
+     }
+     foreach my $id (&languageids()) {
+         my $code = &supportedlanguagecode($id);
+         if ($code) {
+             $langchoices{$code} = &plainlanguagedescription($id);
+         }
+     }
+     return &select_form($selected,$name,%langchoices);
+ }
  =pod
- Line 721  sub linked_select_forms {
+ Line 989  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 767  function select1_changed() {
+ Line 1036  function select1_changed() {
          }
      }
  }
+ // ]]>
  </script>
  END
      # output the initial values for the selection lists
- Line 828  sub help_open_topic {
+ Line 1098  sub help_open_topic {
      my ($topic, $text, $stayOnPage, $width, $height) = @_;
      $text = "" if (not defined $text);
      $stayOnPage = 0 if (not defined $stayOnPage);
-     if ($env{'browser.interface'} eq 'textual') {
- 	$stayOnPage=1;
-     }
      $width = 350 if (not defined $width);
      $height = 400 if (not defined $height);
      my $filename = $topic;
- Line 848  sub help_open_topic {
+ Line 1115  sub help_open_topic {
      }
      # Add the text
      if ($text ne "") {
- 	$template .=
+ 	$template.='<span class="LC_help_open_topic">'
-             "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
+                   .'<a target="_top" href="'.$link.'">'
-             "<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+                   .$text.'</a>';
      }
-     # Add the graphic
+     # (Always) Add the graphic
      my $title = &mt('Online Help');
-     my $helpicon=&lonhttpdurl("/res/adm/pages/help.png");
+     my $helpicon=&lonhttpdurl("/adm/help/help.png");
-     $template .= <<"ENDTEMPLATE";
+     $template.=' <a target="_top" href="'.$link.'" title="'.$title.'">'
-  <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
+               .'<img src="'.$helpicon.'" border="0"'
- ENDTEMPLATE
+               .' alt="'.&mt('Help: [_1]',$topic).'"'
-     if ($text ne '') { $template.='</td></tr></table>' };
+               .' title="'.$title.'"'
+               .' /></a>';
+     if ($text ne "") {
+         $template.='</span>';
+     }
      return $template;
  }
- Line 868  ENDTEMPLATE
+ Line 1139  ENDTEMPLATE
  # This is a quicky function for Latex cheatsheet editing, since it
  # appears in at least four places
  sub helpLatexCheatsheet {
-     my $other = shift;
+     my ($topic,$text,$not_author) = @_;
+     my $out;
      my $addOther = '';
-     if ($other) {
+     if ($topic) {
- 	$addOther = Apache::loncommon::help_open_topic($other, shift,
+ 	$addOther = '<span>'.&Apache::loncommon::help_open_topic($topic,&mt($text),
- 						       undef, undef, 600) .
+ 							       undef, undef, 600).
- 							   '</td><td>';
+ 								   '</span> ';
      }
-     return '<table><tr><td>'.
+     $out = '<span>' # Start cheatsheet
- 	$addOther .
+ 	  .$addOther
- 	&Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),
+           .'<span>'
- 					    undef,undef,600)
+ 	  .&Apache::loncommon::help_open_topic('Greek_Symbols',&mt('Greek Symbols'),
- 	.'</td><td>'.
+ 					       undef,undef,600)
- 	&Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
+ 	  .'</span> <span>'
- 					    undef,undef,600)
+ 	  .&Apache::loncommon::help_open_topic('Other_Symbols',&mt('Other Symbols'),
- 	.'</td></tr></table>';
+ 					       undef,undef,600)
+ 	  .'</span>';
+     unless ($not_author) {
+         $out .= ' <span>'
+ 	       .&Apache::loncommon::help_open_topic('Authoring_Output_Tags',&mt('Output Tags'),
+ 	                                            undef,undef,600)
+ 	       .'</span>';
+     }
+     $out .= '</span>'; # End cheatsheet
+     return $out;
  }
  sub general_help {
      my $helptopic='Student_Intro';
      if ($env{'request.role'}=~/^(ca|au)/) {
  	$helptopic='Authoring_Intro';
-     } elsif ($env{'request.role'}=~/^cc/) {
+     } elsif ($env{'request.role'}=~/^(cc|co)/) {
  	$helptopic='Course_Coordination_Intro';
+     } elsif ($env{'request.role'}=~/^dc/) {
+         $helptopic='Domain_Coordination_Intro';
      }
      return $helptopic;
  }
- Line 907  sub update_help_link {
+ Line 1190  sub update_help_link {
      my $banner_link = "/adm/helpmenu?page=banner&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp&amp;stayonpage=$stayOnPage";
      my $output .= <<"ENDOUTPUT";
  <script type="text/javascript">
+ // <![CDATA[
  banner_link = '$banner_link';
+ // ]]>
  </script>
  ENDOUTPUT
      return $output;
- Line 920  sub help_open_menu {
+ Line 1205  sub help_open_menu {
      $stayOnPage = 0 if (not defined $stayOnPage);
      # only use pop-up help (stayOnPage == 0)
      # if environment.remote is on (using remote control UI)
-     if ($env{'browser.interface'} eq 'textual' ||
+     if ($env{'environment.remote'} eq 'off' ) {
-     	$env{'environment.remote'} eq 'off' ) {
          $stayOnPage=1;
      }
      my $output;
- Line 945  sub top_nav_help {
+ Line 1229  sub top_nav_help {
      my ($text) = @_;
      $text = &mt($text);
      my $stay_on_page =
- 	($env{'browser.interface'}  eq 'textual' ||
+ 	($env{'environment.remote'} eq 'off' );
- 	 $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 963  sub help_menu_js {
+ Line 1246  sub help_menu_js {
      my ($text) = @_;
      my $stayOnPage =
- 	($env{'browser.interface'}  eq 'textual' ||
+ 	($env{'environment.remote'} eq 'off' );
- 	 $env{'environment.remote'} eq 'off' );
      my $width = 620;
      my $height = 600;
- Line 984  sub help_menu_js {
+ Line 1266  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 1010  function writeHelp(caller) {
+ Line 1292  function writeHelp(caller) {
      caller.document.close()
      caller.focus()
  }
- // ]]>
  // END LON-CAPA Internal -->
+ // ]]>
  </script>
  ENDTEMPLATE
      return $template;
- Line 1023  sub help_open_bug {
+ Line 1305  sub help_open_bug {
      unless ($Apache::lonnet::perlvar{'BugzillaHost'}) { return ''; }
      $text = "" if (not defined $text);
      $stayOnPage = 0 if (not defined $stayOnPage);
-     if ($env{'browser.interface'} eq 'textual' ||
+     if ($env{'environment.remote'} eq 'off' ) {
- 	$env{'environment.remote'} eq 'off' ) {
  	$stayOnPage=1;
      }
      $width = 600 if (not defined $width);
- Line 1048  sub help_open_bug {
+ Line 1329  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 1068  sub help_open_faq {
+ Line 1349  sub help_open_faq {
      unless ($Apache::lonnet::perlvar{'FAQHost'}) { return ''; }
      $text = "" if (not defined $text);
      $stayOnPage = 0 if (not defined $stayOnPage);
-     if ($env{'browser.interface'} eq 'textual' ||
+     if ($env{'environment.remote'} eq 'off' ) {
- 	$env{'environment.remote'} eq 'off' ) {
  	$stayOnPage=1;
      }
      $width = 350 if (not defined $width);
- Line 1093  sub help_open_faq {
+ Line 1373  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 1279  sub resize_textarea_js {
+ Line 1559  sub resize_textarea_js {
      my $geometry = &viewport_geometry_js();
      return <<"RESIZE";
      <script type="text/javascript">
+ // <![CDATA[
  $geometry
  function getX(element) {
- Line 1317  function resize_textarea(textarea_id,bot
+ Line 1598  function resize_textarea(textarea_id,bot
      }
      textarea.style.height=new_height+'px';
  }
+ // ]]>
  </script>
  RESIZE
- Line 1480  sub create_text_file {
+ Line 1762  sub create_text_file {
      $fh = Apache::File->new('>/home/httpd'.$filename);
      if (! defined($fh)) {
          $r->log_error("Couldn't open $filename for output $!");
-         $r->print("Problems occured in creating the output file.  ".
+         $r->print(&mt('Problems occurred in creating the output file. '
-                   "This error has been logged.  ".
+                      .'This error has been logged. '
-                   "Please alert your LON-CAPA administrator.");
+                      .'Please alert your LON-CAPA administrator.'));
      }
      return ($fh,$filename)
  }
- Line 1549  sub multiple_select_form {
+ Line 1831  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 1595  sub select_form {
+ Line 1877  sub select_form {
          $selectform.=
  	    '<option value="'.&HTML::Entities::encode($key,'"<>&').'" '.
              ($key eq $def ? 'selected="selected" ' : '').
-                 ">".&mt($hash{$key})."</option>\n";
+                 ">".$hash{$key}."</option>\n";
      }
      $selectform.="</select>";
      return $selectform;
- Line 1606  sub select_form {
+ Line 1888  sub select_form {
  sub display_filter {
      if (!$env{'form.show'}) { $env{'form.show'}=10; }
      if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; }
-     return '<nobr><label>'.&mt('Records [_1]',
+     return '<span class="LC_nobreak"><label>'.&mt('Records [_1]',
  			       &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
  							   (&mt('all'),10,20,50,100,1000,10000))).
- 	   '</label></nobr> <nobr>'.
+ 	   '</label></span> <span class="LC_nobreak">'.
             &mt('Filter [_1]',
  	   &select_form($env{'form.displayfilter'},
  			'displayfilter',
  			('currentfolder' => 'Current folder/page',
  			 'containing' => 'Containing phrase',
  			 'none' => 'None'))).
- 			 '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></nobr>';
+ 			 '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></span>';
  }
  sub gradeleveldescription {
- Line 1660  sub select_level_form {
+ Line 1942  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 1669  See loncreateuser.pm for an example invo
+ Line 1951  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 1734  sub home_server_form_item {
+ Line 2028  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 2029  sub authform_kerberos {
+ Line 2323  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 2044  sub authform_kerberos {
+ Line 2338  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 2068  sub authform_kerberos {
+ Line 2362  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 2077  sub authform_kerberos {
+ Line 2371  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 2138  sub authform_internal{
+ Line 2432  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 2154  sub authform_internal{
+ Line 2448  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 2163  sub authform_internal{
+ Line 2457  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 2178  sub authform_internal{
+ Line 2472  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 2193  sub authform_local{
+ Line 2487  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 2209  sub authform_local{
+ Line 2503  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 2218  sub authform_local{
+ Line 2512  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 2247  sub authform_filesystem{
+ Line 2541  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 2260  sub authform_filesystem{
+ Line 2554  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 2269  sub authform_filesystem{
+ Line 2563  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 2637  sub flush_email_cache {
+ Line 2931  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 2656  sub screenname {
+ Line 2987  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 2666  sub messagewrapper {
+ Line 3017  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 2680  sub aboutmewrapper {
+ Line 3033  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 2710  sub track_student_link {
+ Line 3061  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 2918  sub fileextensions {
+ Line 3291  sub fileextensions {
  sub display_languages {
      my %languages=();
-     foreach my $lang (&preferred_languages()) {
+     foreach my $lang (&Apache::lonlocal::preferred_languages()) {
  	$languages{$lang}=1;
      }
      &get_unprocessed_cgi($ENV{'QUERY_STRING'},['displaylanguage']);
- Line 2930  sub display_languages {
+ Line 3303  sub display_languages {
      return %languages;
  }
- sub preferred_languages {
-     my @languages=();
-     if ($env{'course.'.$env{'request.course.id'}.'.languages'}) {
- 	@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,
- 	         $env{'course.'.$env{'request.course.id'}.'.languages'}));
-     }
-     if ($env{'environment.languages'}) {
- 	@languages=(@languages,
- 		    split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'}));
-     }
-     my $browser=$ENV{'HTTP_ACCEPT_LANGUAGE'};
-     if ($browser) {
- 	my @browser =
- 	    map { (split(/\s*;\s*/,$_))[0] } (split(/\s*,\s*/,$browser));
- 	push(@languages,@browser);
-     }
-     foreach my $domtype ($env{'user.domain'},$env{'request.role.domain'},
-                          $Apache::lonnet::perlvar{'lonDefDomain'}) {
-         if ($domtype ne '') {
-             my %domdefs = &Apache::lonnet::get_domain_defaults($domtype);
-             if ($domdefs{'lang_def'} ne '') {
-                 push(@languages,$domdefs{'lang_def'});
-             }
-         }
-     }
- # turn "en-ca" into "en-ca,en"
-     my @genlanguages;
-     foreach my $lang (@languages) {
- 	unless ($lang=~/\w/) { next; }
- 	push(@genlanguages,$lang);
- 	if ($lang=~/(\-|\_)/) {
- 	    push(@genlanguages,(split(/(\-|\_)/,$lang))[0]);
- 	}
-     }
-     #uniqueify the languages list
-     my %count;
-     @genlanguages = map { $count{$_}++ == 0 ? $_ : () } @genlanguages;
-     return @genlanguages;
- }
  sub languages {
      my ($possible_langs) = @_;
-     my @preferred_langs = &preferred_languages();
+     my @preferred_langs = &Apache::lonlocal::preferred_languages();
      if (!ref($possible_langs)) {
  	if( wantarray ) {
  	    return @preferred_langs;
- Line 2994  sub languages {
+ Line 3326  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 3132  sub relative_to_absolute {
+ Line 3487  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 3317  sub pprmlink {
+ Line 3672  sub pprmlink {
  sub timehash {
-     my @ltime=localtime(shift);
+     my ($thistime) = @_;
-     return ( 'seconds' => $ltime[0],
+     my $timezone = &Apache::lonlocal::gettimezone();
-              'minutes' => $ltime[1],
+     my $dt = DateTime->from_epoch(epoch => $thistime)
-              'hours'   => $ltime[2],
+                      ->set_time_zone($timezone);
-              'day'     => $ltime[3],
+     my $wday = $dt->day_of_week();
-              'month'   => $ltime[4]+1,
+     if ($wday == 7) { $wday = 0; }
-              'year'    => $ltime[5]+1900,
+     return ( 'second' => $dt->second(),
-              'weekday' => $ltime[6],
+              'minute' => $dt->minute(),
-              'dayyear' => $ltime[7]+1,
+              'hour'   => $dt->hour(),
-              'dlsav'   => $ltime[8] );
+              'day'     => $dt->day_of_month(),
+              'month'   => $dt->month(),
+              'year'    => $dt->year(),
+              'weekday' => $wday,
+              'dayyear' => $dt->day_of_year(),
+              'dlsav'   => $dt->is_dst() );
  }
  sub utc_string {
- Line 3336  sub utc_string {
+ Line 3696  sub utc_string {
  sub maketime {
      my %th=@_;
+     my ($epoch_time,$timezone,$dt);
+     $timezone = &Apache::lonlocal::gettimezone();
+     eval {
+         $dt = DateTime->new( year   => $th{'year'},
+                              month  => $th{'month'},
+                              day    => $th{'day'},
+                              hour   => $th{'hour'},
+                              minute => $th{'minute'},
+                              second => $th{'second'},
+                              time_zone => $timezone,
+                          );
+     };
+     if (!$@) {
+         $epoch_time = $dt->epoch;
+         if ($epoch_time) {
+             return $epoch_time;
+         }
+     }
      return POSIX::mktime(
          ($th{'seconds'},$th{'minutes'},$th{'hours'},
           $th{'day'},$th{'month'}-1,$th{'year'}-1900,0,0,-1));
- Line 3360  sub findallcourses {
+ Line 3738  sub findallcourses {
          if (!%roles) {
              %roles = (
                         cc => 1,
+                        co => 1,
                         in => 1,
                         ep => 1,
                         ta => 1,
- Line 3550  sub blockcheck {
+ Line 3929  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 3615  sub parse_block_record {
+ Line 3994  sub parse_block_record {
      return ($setuname,$setudom,$title,$blocks);
  }
- sub build_block_table {
+ sub blocking_status {
-     my ($startblock,$endblock,$setters) = @_;
+   my ($activity,$uname,$udom) = @_;
-     my %lt = &Apache::lonlocal::texthash(
+   my %setters;
-         'cacb' => 'Currently active communication blocks',
-         'cour' => 'Course',
+   # check for active blocking
-         'dura' => 'Duration',
+   my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom);
-         'blse' => 'Block set by'
-     );
+   my $blocked = $startblock && $endblock ? 1 : 0;
-     my $output;
-     $output = '<br />'.$lt{'cacb'}.':<br />';
+   # caller just wants to know whether a block is active
-     $output .= &start_data_table();
+   if (!wantarray) { return $blocked; }
-     $output .= '
- <tr>
+   # build a link to a popup window containing the details
-  <th>'.$lt{'cour'}.'</th>
+   my $querystring  = "?activity=$activity";
-  <th>'.$lt{'dura'}.'</th>
+   # $uname and $udom decide whose portfolio the user is trying to look at
-  <th>'.$lt{'blse'}.'</th>
+      $querystring .= "&amp;udom=$udom"      if $udom;
- </tr>
+      $querystring .= "&amp;uname=$uname"    if $uname;
- ';
-     foreach my $course (keys(%{$setters})) {
+   my $output .= <<'END_MYBLOCK';
-         my %courseinfo=&Apache::lonnet::coursedescription($course);
+     function openWindow(url, wdwName, w, h, toolbar,scrollbar) {
-         for (my $i=0; $i<@{$$setters{$course}{staff}}; $i++) {
+         var options = "width=" + w + ",height=" + h + ",";
-             my ($uname,$udom) = @{$$setters{$course}{staff}[$i]};
+         options += "resizable=yes,scrollbars="+scrollbar+",status=no,";
-             my $fullname = &plainname($uname,$udom);
+         options += "menubar=no,toolbar="+toolbar+",location=no,directories=no";
-             if (defined($env{'user.name'}) && defined($env{'user.domain'})
+         var newWin = window.open(url, wdwName, options);
-                 && $env{'user.name'} ne 'public'
+         newWin.focus();
-                 && $env{'user.domain'} ne 'public') {
+     }
-                 $fullname = &aboutmewrapper($fullname,$uname,$udom);
+ END_MYBLOCK
-             }
-             my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};
+   $output = Apache::lonhtmlcommon::scripttag($output);
-             $openblock = &Apache::lonlocal::locallocaltime($openblock);
-             $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
+   my $popupUrl = "/adm/blockingstatus/$querystring";
-             $output .= &Apache::loncommon::start_data_table_row().
+   my $text = mt('Communication Blocked');
-                        '<td>'.$courseinfo{'description'}.'</td>'.
-                        '<td>'.$openblock.' to '.$closeblock.'</td>'.
+   $output .= <<"END_BLOCK";
-                        '<td>'.$fullname.'</td>'.
+ <div class='LC_comblock'>
-                         &Apache::loncommon::end_data_table_row();
+   <a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring'
-         }
+   title='$text'>
-     }
+   <img class='LC_noBorder LC_middle' title='$text' src='/res/adm/pages/comblock.png' alt='$text'/></a>
-     $output .= &end_data_table();
+   <a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring'
+   title='$text'>$text</a>
+ </div>
+ END_BLOCK
+   return ($blocked, $output);
  }
- sub blocking_status {
+ ###############################################
-     my ($activity,$uname,$udom) = @_;
-     my %setters;
+ sub check_ip_acc {
-     my ($blocked,$output,$ownitem,$is_course);
+     my ($acc)=@_;
-     my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom);
+     &Apache::lonxml::debug("acc is $acc");
-     if ($startblock && $endblock) {
+     if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) {
-         $blocked = 1;
+         return 1;
-         if (wantarray) {
+     }
-             my $category;
+     my $allowed=0;
-             if ($activity eq 'boards') {
+     my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'};
-                 $category = 'Discussion posts in this course';
-             } elsif ($activity eq 'blogs') {
+     my $name;
-                 $category = 'Blogs';
+     foreach my $pattern (split(',',$acc)) {
-             } elsif ($activity eq 'port') {
+         $pattern =~ s/^\s*//;
-                 if (defined($uname) && defined($udom)) {
+         $pattern =~ s/\s*$//;
-                     if ($uname eq $env{'user.name'} &&
+         if ($pattern =~ /\*$/) {
-                         $udom eq $env{'user.domain'}) {
+             #35.8.*
-                         $ownitem = 1;
+             $pattern=~s/\*//;
-                     }
+             if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
-                 }
+         } elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {
-                 $is_course = &Apache::lonnet::is_course($udom,$uname);
+             #35.8.3.[34-56]
-                 if ($ownitem) {
+             my $low=$2;
-                     $category = 'Your portfolio files';
+             my $high=$3;
-                 } elsif ($is_course) {
+             $pattern=$1;
-                     my $coursedesc;
+             if ($ip =~ /^\Q$pattern\E/) {
-                     foreach my $course (keys(%setters)) {
+                 my $last=(split(/\./,$ip))[3];
-                         my %courseinfo =
+                 if ($last <=$high && $last >=$low) { $allowed=1; }
-                              &Apache::lonnet::coursedescription($course);
+             }
-                         $coursedesc = $courseinfo{'description'};
+         } elsif ($pattern =~ /^\*/) {
-                     }
+             #*.msu.edu
-                     $category = "Group files in the course '$coursedesc'";
+             $pattern=~s/\*//;
-                 } else {
+             if (!defined($name)) {
-                     $category = 'Portfolio files belonging to ';
+                 use Socket;
-                     if ($env{'user.name'} eq 'public' &&
+                 my $netaddr=inet_aton($ip);
-                         $env{'user.domain'} eq 'public') {
+                 ($name)=gethostbyaddr($netaddr,AF_INET);
-                         $category .= &plainname($uname,$udom);
+             }
-                     } else {
+             if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
-                         $category .= &aboutmewrapper(&plainname($uname,$udom),$uname,$udom);
+         } elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
-                     }
+             #127.0.0.1
-                 }
+             if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
-             } elsif ($activity eq 'groups') {
+         } else {
-                 $category = 'Groups in this course';
+             #some.name.com
-             }
+             if (!defined($name)) {
-             my $showstart = &Apache::lonlocal::locallocaltime($startblock);
+                 use Socket;
-             my $showend = &Apache::lonlocal::locallocaltime($endblock);
+                 my $netaddr=inet_aton($ip);
-             $output = '<br />'.&mt('[_1] will be inaccessible between [_2] and [_3] because communication is being blocked.',$category,$showstart,$showend).'<br />';
+                 ($name)=gethostbyaddr($netaddr,AF_INET);
-             if (!($activity eq 'port' && !($ownitem) && !($is_course))) {
-                 $output .= &build_block_table($startblock,$endblock,\%setters);
              }
+             if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
          }
+         if ($allowed) { last; }
      }
-     if (wantarray) {
+     return $allowed;
-         return ($blocked,$output);
-     } else {
-         return $blocked;
-     }
  }
  ###############################################
- Line 3735  sub determinedomain {
+ Line 4116  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 3764  sub get_domainconf {
+ Line 4145  sub get_domainconf {
          if (ref($domconfig{'login'}) eq 'HASH') {
              if (keys(%{$domconfig{'login'}})) {
                  foreach my $key (keys(%{$domconfig{'login'}})) {
-                     $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
+                     if (ref($domconfig{'login'}{$key}) eq 'HASH') {
+                         foreach my $img (keys(%{$domconfig{'login'}{$key}})) {
+                             $designhash{$udom.'.login.'.$key.'_'.$img} =
+                                 $domconfig{'login'}{$key}{$img};
+                         }
+                     } else {
+                         $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
+                     }
                  }
              } else {
                  $legacy{'login'} = 1;
- Line 3879  Returns: value of designparamter $which
+ Line 4267  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 $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: ./.
+ Returns: Path to the Construction Space of the current user's
+          accessed author space
+          The author space will be that of the current user
+          when accessing the own author space
+          and that of the co-author/assistent co-author
+          when accessing the co-author's/assistent co-author's
+          space
+ =cut
+ sub authorspace {
+     my $caname = '';
+     if ($env{'request.role'} =~ /^ca|^aa/) {
+         (undef,$caname) =
+             ($env{'request.role'}=~/($match_domain)\/($match_username)$/);
+     } else {
+         $caname = $env{'user.name'};
+     }
+     return '/priv/'.$caname.'/';
+ }
+ ##############################################
+ =pod
+ =item * &head_subbox()
+ Inputs: $content (contains HTML code with page functions, etc.)
+ Returns: HTML div with $content
+          To be included in page header
+ =cut
+ sub head_subbox {
+     my ($content)=@_;
+     my $output =
+         '<div id="LC_head_subbox">'
+        .$content
+        .'</div>'
+ }
+ ##############################################
+ =pod
+ =item * &CSTR_pageheader()
+ Inputs: ./.
+ Returns: HTML div with CSTR path and recent box
+          To be included on Construction Space pages
+ =cut
+ sub CSTR_pageheader {
+     # this is for resources; directories have customtitle, and crumbs
+             # and select recent are created in lonpubdir.pm
+     my ($uname,$thisdisfn)=
+         ($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
+     my $formaction='/priv/'.$uname.'/'.$thisdisfn;
+     $formaction=~s/\/+/\//g;
+     my $parentpath = '';
+     my $lastitem = '';
+     if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
+         $parentpath = $1;
+         $lastitem = $2;
+     } else {
+         $lastitem = $thisdisfn;
+     }
+     my $output =
+          '<div>'
+         .&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?
+         .'<b>'.&mt('Construction Space:').'</b> '
+         .'<form name="dirs" method="post" action="'.$formaction
+         .'" target="_top">' #FIXME lonpubdir: target="_parent"
+         .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv',undef,undef);
+     if ($lastitem) {
+         $output .=
+              '<span class="LC_filename">'
+             .$lastitem
+             .'</span>';
+     }
+     $output .=
+          '<br />'
+         #FIXME lonpubdir: &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />"
+         .&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
+         .'</form>'
+         .&Apache::lonmenu::constspaceform()
+         .'</div>';
+     return $output;
+ }
  ###############################################
  ###############################################
- Line 3946  Inputs:
+ Line 4425  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
- Line 3976  other decorations will be returned.
+ Line 4449  other decorations will be returned.
  =cut
  sub bodytag {
-     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
+     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
- 	$notopbar,$bgcolor,$notitle,$no_inline_link,$args)=@_;
+         $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
      if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
- Line 3986  sub bodytag {
+ Line 4459  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 4005  sub bodytag {
+ Line 4478  sub bodytag {
          if ($env{'request.role'} !~ /^cr/) {
              $role = &Apache::lonnet::plaintext($role,&course_type());
          }
+         if ($env{'request.course.sec'}) {
+             $role .= ('&nbsp;'x2).'-&nbsp;'.&mt('section:').'&nbsp;'.$env{'request.course.sec'};
+         }
  	$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
      } else {
          $role = &Apache::lonnet::plaintext($role);
- Line 4022  sub bodytag {
+ Line 4498  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') {
- Line 4039  sub bodytag {
+ Line 4507  sub bodytag {
  	$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 4065  ENDROLE
+ Line 4515  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;
+     &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
+     if ($env{'environment.remote'} eq 'off') {
          # No Remote
- 	if ($env{'request.state'} eq 'construct') {
+         if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') {
- 	    $forcereg=1;
+             return $bodytag;
- 	}
+         }
- 	if (!$customtitle && $env{'request.state'} eq 'construct') {
+         if ($env{'request.state'} eq 'construct') { $forcereg=1; }
- 	    # this is for resources; directories have customtitle, and crumbs
-             # and select recent are created in lonpubdir.pm
+         #    if ($env{'request.state'} eq 'construct') {
- 	    my ($uname,$thisdisfn)=
+         #        $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
- 		($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
+         #    }
- 	    my $formaction='/priv/'.$uname.'/'.$thisdisfn;
- 	    $formaction=~s/\/+/\//g;
- 	    my $parentpath = '';
+         if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
- 	    my $lastitem = '';
+              if ($dc_info) {
- 	    if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
+                  $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
- 		$parentpath = $1;
+              }
- 		$lastitem = $2;
+              $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
- 	    } else {
+                 <em>$realm</em> $dc_info</div>|;
- 		$lastitem = $thisdisfn;
+             return $bodytag;
- 	    }
+         }
- 	    $titleinfo =
- 		&Apache::loncommon::help_open_menu('','',3,'Authoring')
+         $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>|;
- 		.'<b>'.&mt('Construction Space').'</b>:&nbsp;'
- 		.'<form name="dirs" method="post" action="'.$formaction
+         $bodytag .= Apache::lonhtmlcommon::scripttag(
- 		.'" target="_top"><tt><b>'
+             Apache::lonmenu::utilityfunctions(), 'start');
- 		.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<font size=\"+1\">$lastitem</font></b></tt><br />"
- 		.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
+         $bodytag .= Apache::lonmenu::primary_menu();
- 		.'</form>'
- 		.&Apache::lonmenu::constspaceform();
+         if ($dc_info) {
-         }
+             $dc_info = &dc_courseid_toggle($dc_info);
+         }
-         my $titletable;
+         $bodytag .= qq|<div id="LC_realm">$realm $dc_info</div>|;
- 	if (!$notitle) {
- 	    $titletable =
+         #don't show menus for public users
- 		'<table id="LC_title_bar">'.
+         if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){
-                          "<tr><td> $titleinfo $dc_info</td>".$roleinfo.
+             $bodytag .= Apache::lonmenu::secondary_menu();
- 			 '</tr></table>';
+             $bodytag .= Apache::lonmenu::serverform();
- 	}
+             $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
- 	if ($notopbar) {
+             if ($env{'request.state'} eq 'construct') {
- 	    $bodytag .= $titletable;
+                 $bodytag .= &Apache::lonmenu::innerregister($forcereg,'',
- 	} else {
+                                 $args->{'bread_crumbs'});
- 	    if ($env{'request.state'} eq 'construct') {
+             } elsif ($forcereg) {
-                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
+                 $bodytag .= &Apache::lonmenu::innerregister($forcereg);
- 							  $titletable);
-             } else {
-                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg).
- 		    $titletable;
              }
+         }else{
+             # this is to seperate menu from content when there's no secondary
+             # menu. Especially needed for public accessible ressources.
+             $bodytag .= '<hr style="clear:both" />';
+             $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
          }
+         #SD testing
+         #$bodytag .= Apache::lonmenu::menubuttons($forcereg);
          return $bodytag;
      }
- Line 4136  ENDROLE
+ Line 4592  ENDROLE
      # 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>');
+ 	       :'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');
-     #
-     if ($notitle) {
+     if ($dc_info) {
- 	return $bodytag;
+         $dc_info = qq|<span class="LC_cusr_subheading">($dc_info)</span>|;
      }
+     $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>
+             <ol class="LC_primary_menu LC_right">
+                 <li>$menu</li>
+             </ol><div id="LC_realm"> $realm $dc_info</div>| unless $env{'form.inhibitmenu'};
      return(<<ENDBODY);
  $bodytag
  <table id="LC_title_bar" class="LC_with_remote">
- <tr><td class="LC_title_bar_role_logo">$upperleft</td>
+ <tr><td>$upperleft</td>
-     <td class="LC_title_bar_domain_logo">$messages&nbsp;</td>
+     <td>$messages&nbsp;</td>
  </tr>
  <tr><td>$titleinfo $dc_info $menu</td>
- $roleinfo
  </tr>
  </table>
  ENDBODY
  }
+ sub dc_courseid_toggle {
+     my ($dc_info) = @_;
+     return ' <span id="dccidtext" class="LC_cusr_subheading">'.
+            '<a href="javascript:showCourseID();">'.
+            &mt('(More ...)').'</a></span>'.
+            '<div id="dccid" class="LC_dccid">'.$dc_info.'</div>';
+ }
  sub make_attr_string {
      my ($register,$attr_ref) = @_;
- Line 4193  sub make_attr_string {
+ Line 4661  sub make_attr_string {
  	$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;
      foreach my $attr (keys(%$attr_ref)) {
  	$attr_string .= " $attr=\"".$attr_ref->{$attr}.'" ';
- Line 4262  sub standard_css {
+ Line 4721  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 4271  sub standard_css {
+ Line 4732  sub standard_css {
      my $vlink  = &designparm($function.'.vlink', $domain);
      my $link   = &designparm($function.'.link',  $domain);
+     my $loginbg = &designparm('login.sidebg',$domain);
+     my $bgcol = &designparm('login.bgcol',$domain);
+     my $textcol = &designparm('login.textcol',$domain);
      my $sans                 = 'Verdana,Arial,Helvetica,sans-serif';
      my $mono                 = 'monospace';
-     my $data_table_head      = $tabbg;
+     my $data_table_head      = $sidebg;
-     my $data_table_light     = '#EEEEEE';
+     my $data_table_light     = '#FAFAFA';
-     my $data_table_dark      = '#DDDDDD';
+     my $data_table_dark      = '#F0F0F0';
      my $data_table_darker    = '#CCCCCC';
      my $data_table_highlight = '#FFFF00';
      my $mail_new             = '#FFBB77';
- Line 4288  sub standard_css {
+ Line 4753  sub standard_css {
      my $mail_other_hover     = '#669999';
      my $table_header         = '#DDDDDD';
      my $feedback_link_bg     = '#BBBBBB';
+     my $lg_border_color      = '#C8C8C8';
      my $border = ($env{'browser.type'} eq 'explorer' ||
- 		  $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;
- h1, h2, h3, th { font-family: $sans }
+ body {
- a:focus { color: red; background: yellow }
+   font-family: $sans;
- table.thinborder,
+   line-height:130%;
+   font-size:0.83em;
+   color:$font;
+ }
- table.thinborder tr th {
+ a:focus {
-   border-style: solid;
+   color: red;
-   border-width: 1px;
+   background: yellow;
-   background: $tabbg;
  }
- table.thinborder tr td {
-   border-style: solid;
+ form, .inline {
-   border-width: 1px
+   display: inline;
+ }
+ .LC_right {
+   text-align:right;
+ }
+ .LC_middle {
+   vertical-align:middle;
+ }
+ /* just for tests */
+ .LC_400Box {
+   width:400px;
+ }
+ /* end */
+ .LC_filename {
+   font-family: $mono;
+   white-space:pre;
+   font-size: 120%;
+ }
+ .LC_fileicon {
+   border: none;
+   height: 1.3em;
+   vertical-align: text-bottom;
+   margin-right: 0.3em;
+   text-decoration:none;
  }
- form, .inline { display: inline; }
- .center { text-align: center; }
- .LC_filename {font-family: $mono; white-space:pre;}
  .LC_error {
    color: red;
    font-size: larger;
  }
  .LC_warning,
  .LC_diff_removed {
    color: red;
- Line 4326  form, .inline { display: inline; }
+ Line 4820  form, .inline { display: inline; }
  .LC_diff_added {
    color: green;
  }
- .LC_unknown {
-   color: yellow;
+ div.LC_confirm_box {
+   background-color: #FAFAFA;
+   border: 1px solid $lg_border_color;
+   margin-right: 0;
+   padding: 5px;
  }
- .LC_icon {
+ div.LC_confirm_box .LC_error img,
-   border: 0px;
+ div.LC_confirm_box .LC_success img {
+   vertical-align: middle;
  }
- .LC_indexer_icon {
-   border: 0px;
+ .LC_icon {
-   height: 22px;
+   border: none;
+   vertical-align: middle;
  }
  .LC_docs_spacer {
    width: 25px;
    height: 1px;
-   border: 0px;
+   border: none;
  }
  .LC_internal_info {
-   color: #999;
+   color: #999999;
+ }
+ .LC_discussion {
+   background: $tabbg;
+   border: 1px solid black;
+   margin: 2px;
+ }
+ .LC_disc_action_links_bar {
+   background: $tabbg;
+   border: none;
+   margin: 4px;
+ }
+ .LC_disc_action_left {
+   text-align: left;
+ }
+ .LC_disc_action_right {
+   text-align: right;
+ }
+ .LC_disc_new_item {
+   background: white;
+   border: 2px solid red;
+   margin: 2px;
+ }
+ .LC_disc_old_item {
+   background: white;
+   border: 1px solid black;
+   margin: 2px;
  }
  table.LC_pastsubmission {
- Line 4352  table.LC_pastsubmission {
+ Line 4885  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, table.LC_breadcrumbs,
+ 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.LC_with_remote {
    width: 100%;
    border-color: $pgbg;
    border-style: solid;
    border-width: $border;
    background: $pgbg;
-   font-family: $sans;
+   color: $fontmenu;
    border-collapse: collapse;
-   padding: 0px;
+   padding: 0;
+   margin: 0;
  }
- table.LC_docs_path {
+ /* #SD START (work in progress)*/
-   width: 100%;
-   border: 0;
-   background: $pgbg;
-   font-family: $sans;
-   border-collapse: collapse;
-   padding: 0px;
- }
- table#LC_title_bar td {
+ ul.LC_bct {
-   background: $tabbg;
+     margin: 0;
+     padding: 0;
  }
- table#LC_title_bar td.LC_title_bar_who {
+ ul.LC_bct ol {
-   background: $tabbg;
+     display: inline;
-   color: $font;
-   font: small $sans;
-   text-align: right;
  }
- span.LC_metadata {
+ ul.LC_bct ul {
-     font-family: $sans;
+     display: inline;
+     padding: 0;
  }
- span.LC_title_bar_title {
+ ul.LC_bct li {
-   font: bold x-large $sans;
+     list-style-type: none;
+     display: inline;
  }
- table#LC_title_bar td.LC_title_bar_domain_logo {
-   background: $sidebg;
-   text-align: right;
+ ul.LC_breadcrumb_tools {
-   padding: 0px;
- }
- table#LC_title_bar td.LC_title_bar_role_logo {
-   background: $sidebg;
-   padding: 0px;
  }
- table#LC_menubuttons_mainmenu {
+ li.LC_breadcrumb_tools {
-   width: 100%;
-   border: 0px;
-   border-spacing: 1px;
-   padding: 0px 1px;
-   margin: 0px;
-   border-collapse: separate;
  }
- table#LC_menubuttons img, table#LC_menubuttons_mainmenu img {
+ li.LC_breadcrumb_tools img{
-   border: 0px;
+     vertical-align: middle;
  }
- table#LC_top_nav td {
-   background: $tabbg;
+ .LC_breadcrumb_tools_A {
-   border: 0px;
+     margin: 0 0 0 1em;
-   font-size: small;
  }
- table#LC_top_nav td a, div#LC_top_nav a {
+ .LC_breadcrumb_tools_B {
-   color: $font;
+     float: right;
-   font-family: $sans;
+     margin-top: 0.4em;
  }
- table#LC_top_nav td.LC_top_nav_logo {
+ .LC_breadcrumb_tools_C {
+     margin: 0 1em 0 0;
+     float: right;
+ }
+ /* #SD END */
+ table#LC_title_bar td {
    background: $tabbg;
-   text-align: left;
-   white-space: nowrap;
-   width: 31px;
  }
- table#LC_top_nav td.LC_top_nav_logo img {
-   border: 0px;
+ table#LC_menubuttons img {
-   vertical-align: bottom;
+   border: none;
  }
- table#LC_top_nav td.LC_top_nav_exit,
- table#LC_top_nav td.LC_top_nav_help {
+ .LC_breadcrumbs_component {
-   width: 2.0em;
+   float: right;
+   margin: 0 1em;
  }
- table#LC_top_nav td.LC_top_nav_login {
+ .LC_breadcrumbs_component img {
-   width: 4.0em;
+   vertical-align: middle;
+ }
+ 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;
+      /* SD working here
+      height: 2.5em;
+      overflow: hidden; */
+   margin: 0;
+   padding: 0;
  }
- td.LC_table_cell_checkbox {
-   text-align: center;
+ /* Preliminary fix to hide breadcrumbs inside remote control window */
+ #LC_remote #LC_breadcrumbs {
+   display:none;
+ }
+ #LC_head_subbox {
+   clear:both;
+   background: #F8F8F8; /* $sidebg; */
+   border: 1px solid $sidebg;
+   margin: 0 0 10px 0;
  }
- table#LC_mainmenu td.LC_mainmenu_column {
+ .LC_fontsize_medium {
-     vertical-align: top;
+   font-size: 85%;
+ }
+ .LC_fontsize_large {
+   font-size: 120%;
  }
  .LC_menubuttons_inline_text {
    color: $font;
-   font-family: $sans;
+   font-size: 90%;
-   font-size: smaller;
+   padding-left:3px;
  }
  .LC_menubuttons_link {
- Line 4480  table#LC_mainmenu td.LC_mainmenu_column
+ Line 5026  table#LC_mainmenu td.LC_mainmenu_column
  .LC_menubuttons_category {
    color: $font;
    background: $pgbg;
-   font-family: $sans;
    font-size: larger;
    font-weight: bold;
  }
  td.LC_menubuttons_text {
-   width: 90%;
    color: $font;
-   font-family: $sans;
- }
- td.LC_menubuttons_img {
  }
  .LC_current_location {
-   font-family: $sans;
-   background: $tabbg;
- }
- .LC_new_mail {
-   font-family: $sans;
    background: $tabbg;
-   font-weight: bold;
- }
- .LC_rolesmenu_is {
-   font-family: $sans;
- }
- .LC_rolesmenu_selected {
-   font-family: $sans;
- }
- .LC_rolesmenu_future {
-   font-family: $sans;
- }
- .LC_rolesmenu_will {
-   font-family: $sans;
- }
- .LC_rolesmenu_will_not {
-   font-family: $sans;
- }
- .LC_rolesmenu_expired {
-   font-family: $sans;
- }
- .LC_rolesinfo {
-   font-family: $sans;
- }
- .LC_dropadd_labeltext {
-   font-family: $sans;
-   text-align: right;
  }
- .LC_preferences_labeltext {
+ table.LC_data_table,
-   font-family: $sans;
+ table.LC_mail_list {
-   text-align: right;
- }
- 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_mail_list tr th,
+ table.LC_prior_tries tr th,
+ table.LC_innerpickbox tr th {
    font-weight: bold;
    background-color: $data_table_head;
-   font-size: smaller;
+   color:$fontmenu;
+   font-size:90%;
+ }
+ table.LC_innerpickbox tr th,
+ table.LC_innerpickbox tr td {
+   vertical-align: top;
+ }
+ table.LC_data_table tr.LC_info_row > td {
+   background-color: #CCCCCC;
+   font-weight: bold;
+   text-align: left;
+ }
+ table.LC_data_table tr.LC_odd_row > td {
+   background-color: $data_table_light;
+   padding: 2px;
+   vertical-align: top;
  }
- table.LC_data_table tr.LC_odd_row > td,
- table.LC_aboutme_port tr 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_data_table tr.LC_even_row > td,
- table.LC_aboutme_port tr.LC_even_row td {
+ 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;
- Line 4599  table.LC_nested tr.LC_empty_row td {
+ Line 5126  table.LC_nested tr.LC_empty_row td {
    text-align: center;
    padding: 8px;
  }
+ table.LC_caption {
+ }
  table.LC_nested tr.LC_empty_row td {
    padding: 4ex
  }
  table.LC_nested_outer tr th {
    font-weight: bold;
+   color:$fontmenu;
    background-color: $data_table_head;
-   font-size: smaller;
+   font-size: small;
    border-bottom: 1px solid #000000;
  }
  table.LC_nested_outer tr td.LC_subheader {
    background-color: $data_table_head;
    font-weight: bold;
- Line 4615  table.LC_nested_outer tr td.LC_subheader
+ Line 5149  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 4637  table.LC_nested tr td.LC_right_item {
+ Line 5175  table.LC_nested tr td.LC_right_item {
  }
  table.LC_nested tr.LC_odd_row td {
-   background-color: #EEE;
+   background-color: #EEEEEE;
  }
  table.LC_createuser {
  }
  table.LC_createuser tr.LC_section_row td {
-   font-size: smaller;
+   font-size: small;
  }
  table.LC_createuser tr.LC_info_row td  {
-   background-color: #CCC;
+   background-color: #CCCCCC;
    font-weight: bold;
    text-align: center;
  }
- Line 4656  table.LC_createuser tr.LC_info_row td  {
+ Line 5194  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;
  }
- Line 4674  table.LC_calendar tr td.LC_calendar_day_
+ Line 5218  table.LC_calendar tr td.LC_calendar_day_
  table.LC_mail_list tr.LC_mail_new {
    background-color: $mail_new;
  }
  table.LC_mail_list tr.LC_mail_new:hover {
    background-color: $mail_new_hover;
  }
  table.LC_mail_list tr.LC_mail_read {
    background-color: $mail_read;
  }
  table.LC_mail_list tr.LC_mail_read:hover {
    background-color: $mail_read_hover;
  }
  table.LC_mail_list tr.LC_mail_replied {
    background-color: $mail_replied;
  }
  table.LC_mail_list tr.LC_mail_replied:hover {
    background-color: $mail_replied_hover;
  }
  table.LC_mail_list tr.LC_mail_other {
    background-color: $mail_other;
  }
  table.LC_mail_list tr.LC_mail_other:hover {
    background-color: $mail_other_hover;
  }
- table.LC_mail_list tr.LC_mail_even {
- }
- table.LC_mail_list tr.LC_mail_odd {
- }
+ table.LC_data_table tr > td.LC_browser_file,
- table#LC_portfolio_actions {
+ table.LC_data_table tr > td.LC_browser_file_published {
-   width: auto;
+   background: #AAEE77;
-   background: $pgbg;
-   border: 0px;
-   border-spacing: 2px 2px;
-   padding: 0px;
-   margin: 0px;
-   border-collapse: separate;
- }
- table#LC_portfolio_actions td.LC_label {
-   background: $tabbg;
-   text-align: right;
- }
- table#LC_portfolio_actions td.LC_value {
-   background: $tabbg;
  }
- table#LC_cstr_controls {
+ table.LC_data_table tr > td.LC_browser_file_locked,
-   width: 100%;
+ table.LC_data_table tr > td.LC_browser_file_unpublished {
-   border-collapse: collapse;
+   background: #FFAA99;
- }
- table#LC_cstr_controls tr td {
-   border: 4px solid $pgbg;
-   padding: 4px;
-   text-align: center;
-   background: $tabbg;
  }
- table#LC_cstr_controls tr th {
-   border: 4px solid $pgbg;
+ table.LC_data_table tr > td.LC_browser_file_obsolete {
-   background: $table_header;
+   background: #888888;
-   text-align: center;
-   font-family: $sans;
-   font-size: smaller;
  }
- table#LC_browser {
+ table.LC_data_table tr > td.LC_browser_file_modified,
+ table.LC_data_table tr > td.LC_browser_file_metamodified {
+   background: #F8F866;
  }
- table#LC_browser tr th {
-   background: $table_header;
+ table.LC_data_table tr.LC_browser_folder > td {
+   background: #E0E8FF;
  }
- table#LC_browser tr td {
-   padding: 2px;
+ table.LC_data_table tr > td.LC_roles_is {
+   /* background: #77FF77; */
  }
- table#LC_browser tr.LC_browser_file,
- table#LC_browser tr.LC_browser_file_published {
+ table.LC_data_table tr > td.LC_roles_future {
-   background: #CCFF88;
+   background: #FFFF77;
  }
- table#LC_browser tr.LC_browser_file_locked,
- table#LC_browser tr.LC_browser_file_unpublished {
+ table.LC_data_table tr > td.LC_roles_will {
-   background: #FFAA99;
+   background: #FFAA77;
  }
- table#LC_browser tr.LC_browser_file_obsolete {
-   background: #AAAAAA;
+ table.LC_data_table tr > td.LC_roles_expired {
+   background: #FF7777;
  }
- table#LC_browser tr.LC_browser_file_modified,
- table#LC_browser tr.LC_browser_file_metamodified {
+ table.LC_data_table tr > td.LC_roles_will_not {
-   background: #FFFF77;
+   background: #AAFF77;
  }
- table#LC_browser tr.LC_browser_folder {
-   background: #CCCCFF;
+ table.LC_data_table tr > td.LC_roles_selected {
+   background: #11CC55;
  }
  span.LC_current_location {
-   font-size: x-large;
+   font-size:larger;
    background: $pgbg;
  }
  span.LC_parm_menu_item {
    font-size: larger;
-   font-family: $sans;
  }
  span.LC_parm_scope_all {
    color: red;
  }
  span.LC_parm_scope_folder {
    color: green;
  }
  span.LC_parm_scope_resource {
    color: orange;
  }
  span.LC_parm_part {
    color: blue;
  }
- span.LC_parm_folder, span.LC_parm_symb {
+ span.LC_parm_folder,
+ span.LC_parm_symb {
    font-size: x-small;
    font-family: $mono;
    color: #AAAAAA;
  }
- td.LC_parm_overview_level_menu, td.LC_parm_overview_map_menu,
+ td.LC_parm_overview_level_menu,
- td.LC_parm_overview_parm_selectors, td.LC_parm_overview_parm_restrictions {
+ td.LC_parm_overview_map_menu,
+ td.LC_parm_overview_parm_selectors,
+ td.LC_parm_overview_restrictions  {
    border: 1px solid black;
    border-collapse: collapse;
  }
  table.LC_parm_overview_restrictions td {
    border-width: 1px 4px 1px 4px;
    border-style: solid;
    border-color: $pgbg;
    text-align: center;
  }
  table.LC_parm_overview_restrictions th {
    background: $tabbg;
    border-width: 1px 4px 1px 4px;
    border-style: solid;
    border-color: $pgbg;
  }
  table#LC_helpmenu {
-   border: 0px;
+   border: none;
    height: 55px;
-   border-spacing: 0px;
+   border-spacing: 0;
  }
  table#LC_helpmenu fieldset legend {
    font-size: larger;
-   font-weight: bold;
  }
  table#LC_helpmenu_links {
    width: 100%;
    border: 1px solid black;
    background: $pgbg;
-   padding: 0px;
+   padding: 0;
    border-spacing: 1px;
  }
  table#LC_helpmenu_links tr td {
    padding: 1px;
    background: $tabbg;
- Line 4831  table#LC_helpmenu_links tr td {
+ Line 5373  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 4845  table#LC_helpmenu_links a:hover {
+ Line 5389  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 {
- Line 4966  table.LC_notify_front_page {
+ Line 5491  table.LC_notify_front_page {
    border: 1px solid black;
    padding: 8px;
  }
  table.LC_notify_front_page td {
    padding: 8px;
  }
  .LC_navbuttons {
    margin: 2ex 0ex 2ex 0ex;
  }
  .LC_topic_bar {
-   font-family: $sans;
    font-weight: bold;
-   width: 100%;
    background: $tabbg;
-   vertical-align: middle;
+   margin: 1em 0em 1em 2em;
-   margin: 2ex 0ex 2ex 0ex;
+   padding: 3px;
+   font-size: 1.2em;
  }
  .LC_topic_bar span {
+   left: 0.5em;
+   position: absolute;
    vertical-align: middle;
+   font-size: 1.2em;
  }
- .LC_topic_bar img {
-   vertical-align: bottom;
- }
  table.LC_course_group_status {
    margin: 20px;
  }
  table.LC_status_selector td {
    vertical-align: top;
    text-align: center;
    padding: 4px;
  }
- table.LC_descriptive_input td.LC_description {
-   vertical-align: top;
-   text-align: right;
-   font-weight: bold;
- }
  div.LC_feedback_link {
    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 5026  table.LC_prior_tries td {
+ Line 5582  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 5071  table.LC_prior_option {
+ Line 5637  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 5093  span.LC_cusr_subheading {
+ Line 5662  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 5143  table.LC_docs_documents td.LC_docs_docum
+ Line 5701  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 5163  table.LC_docs_adddocs th {
+ Line 5711  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 5183  table.LC_double_column tr td.LC_left_col
+ Line 5732  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 5207  div.LC_clear_float_footer {
+ Line 5752  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: 1px solid black;
  }
  div.LC_grade_user_name {
    background: #DDDDEE;
    border-bottom: 1px solid black;
-   font: bold large $sans;
+   font-weight: bold;
+   font-size: large;
  }
  div.LC_grade_show_user_odd_row div.LC_grade_user_name {
    background: #DDEEDD;
  }
- Line 5247  div.LC_grade_assign {
+ Line 5777  div.LC_grade_assign {
    width: 99%;
    background: #FFFFFF;
  }
  div.LC_grade_show_problem_header,
  div.LC_grade_submissions_header,
  div.LC_grade_message_center_header,
  div.LC_grade_assign_header {
-   font: bold large $sans;
+   font-weight: bold;
+   font-size: large;
  }
  div.LC_grade_show_problem_problem,
  div.LC_grade_submissions_body,
  div.LC_grade_message_center_body,
- Line 5261  div.LC_grade_assign_body {
+ Line 5794  div.LC_grade_assign_body {
    width: 99%;
    background: #FFFFFF;
  }
  span.LC_grade_check_note {
-   font: normal medium $sans;
+   font-weight: normal;
+   font-size: medium;
    display: inline;
    position: absolute;
    right: 1em;
- Line 5271  span.LC_grade_check_note {
+ Line 5806  span.LC_grade_check_note {
  table.LC_scantron_action {
    width: 100%;
  }
  table.LC_scantron_action tr th {
-   font: normal bold $sans;
+   font-weight:bold;
+   font-style:normal;
  }
- div.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 5288  div.LC_edit_problem_editxml_header,
+ Line 5827  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;
+   font-size: larger;
+   font-weight:  bold;
    width: 100%;
    border-color: $pgbg;
    border-style: solid;
    border-width: $border;
    background: $tabbg;
    border-collapse: collapse;
-   padding: 0px
+   padding: 0;
  }
  div.LC_edit_problem_discards {
    float: left;
    padding-bottom: 5px;
  }
  div.LC_edit_problem_saves {
    float: right;
    padding-bottom: 5px;
  }
- hr.LC_edit_problem_divide {
+ 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;
+ }
+ /* ---- Remove when done ----
+ # The following styles is part of the redesign of LON-CAPA and are
+ # subject to change during this project.
+ # Don't rely on their current functionality as they might be
+ # changed or removed.
+ # --------------------------*/
+ a:hover,
+ ol.LC_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:#BF2317;
+   text-decoration:none;
+ }
+ h1 {
+   padding: 0;
+   line-height:130%;
+ }
+ h2,
+ h3,
+ h4,
+ h5,
+ h6 {
+   margin: 5px 0 5px 0;
+   padding: 0;
+   line-height:130%;
+ }
+ .LC_hcell {
+   padding:3px 15px 3px 15px;
+   margin: 0;
+   background-color:$tabbg;
+   color:$fontmenu;
+   border-bottom:solid 1px $lg_border_color;
+ }
+ .LC_Box > .LC_hcell {
+   margin: 0 -10px 10px -10px;
+ }
+ .LC_noBorder {
+   border: 0;
+ }
+ .LC_FormSectionClearButton input {
+   background-color:transparent;
+   border: none;
+   cursor:pointer;
+   text-decoration:underline;
+ }
+ .LC_help_open_topic {
+   color: #FFFFFF;
+   background-color: #EEEEFF;
+   margin: 1px;
+   padding: 4px;
+   border: 1px solid #000033;
+   white-space: nowrap;
+   /* vertical-align: middle; */
+ }
+ dl,
+ ul,
+ div,
+ fieldset {
+   margin: 10px 10px 10px 0;
+   /* overflow: hidden; */
+ }
+ fieldset > legend {
+   font-weight: bold;
+   padding: 0 5px 0 5px;
+ }
+ #LC_nav_bar {
+   float: left;
+   margin: 0.2em 0 0 0;
+ }
+ #LC_realm {
+   margin: 0.2em 0 0 0;
+   padding: 0;
+   font-weight: bold;
+   text-align: center;
+ }
+ #LC_nav_bar em {
+   font-weight: bold;
+   font-style: normal;
+ }
+ ol.LC_primary_menu {
+   float: right;
+   margin: 0.2em 0 0 0;
+ }
+ ol#LC_PathBreadcrumbs {
+   margin: 0;
+ }
+ ol.LC_primary_menu li {
+   display: inline;
+   padding: 5px 5px 0 10px;
+   vertical-align: top;
+ }
+ ol.LC_primary_menu li img {
+   vertical-align: bottom;
+ }
+ ol.LC_primary_menu a {
+   font-size: 90%;
+   color: RGB(80, 80, 80);
+   text-decoration: none;
+ }
+ ul#LC_secondary_menu {
    clear: both;
-   color: $tabbg;
+   color: $fontmenu;
-   background-color: $tabbg;
+   background: $tabbg;
-   height: 3px;
+   list-style: none;
-   border: 0px;
+   padding: 0;
+   margin: 0;
+   width: 100%;
+ }
+ ul#LC_secondary_menu li {
+   font-weight: bold;
+   line-height: 1.8em;
+   padding: 0 0.8em;
+   border-right: 1px solid black;
+   display: inline;
+   vertical-align: middle;
+ }
+ ul.LC_TabContent {
+   display:block;
+   background: $sidebg;
+   border-bottom: solid 1px $lg_border_color;
+   list-style:none;
+   margin: 0 -10px;
+   padding: 0;
+ }
+ ul.LC_TabContent li,
+ ul.LC_TabContentBigger li {
+   float:left;
+ }
+ ul#LC_secondary_menu li a {
+   color: $fontmenu;
+   text-decoration: none;
+ }
+ ul.LC_TabContent {
+   min-height:1.5em;
+ }
+ ul.LC_TabContent li {
+   vertical-align:middle;
+   padding: 0 10px 0 10px;
+   background-color:$tabbg;
+   border-bottom:solid 1px $lg_border_color;
+ }
+ ul.LC_TabContent .right {
+   float:right;
+ }
+ ul.LC_TabContent li a,
+ ul.LC_TabContent li {
+   color:rgb(47,47,47);
+   text-decoration:none;
+   font-size:95%;
+   font-weight:bold;
+   padding-right: 16px;
+ }
+ ul.LC_TabContent li:hover,
+ ul.LC_TabContent li.active {
+   background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;
+   border-bottom:solid 2px #FFFFFF;
+   padding-right: 16px;
+ }
+ #maincoursedoc {
+   clear:both;
+ }
+ ul.LC_TabContentBigger {
+   display:block;
+   list-style:none;
+   padding: 0;
+ }
+ ul.LC_TabContentBigger li {
+   vertical-align:bottom;
+   height: 30px;
+   font-size:110%;
+   font-weight:bold;
+   color: #737373;
+ }
+ ul.LC_TabContentBigger li a {
+   background:url('/adm/lonIcons/tabbgleft.gif') left bottom no-repeat;
+   height: 30px;
+   line-height: 30px;
+   text-align: center;
+   display: block;
+   text-decoration: none;
+ }
+ ul.LC_TabContentBigger li:hover a,
+ ul.LC_TabContentBigger li.active a {
+   background:url('/adm/lonIcons/tabbgleft.gif') left top no-repeat;
+   color:$font;
+   text-decoration: underline;
+ }
+ ul.LC_TabContentBigger li b {
+   background: url('/adm/lonIcons/tabbgright.gif') no-repeat right bottom;
+   display: block;
+   float: left;
+   padding: 0 30px;
+ }
+ ul.LC_TabContentBigger li:hover b,
+ ul.LC_TabContentBigger li.active b {
+   background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat;
+   color:$font;
+   border-bottom: 1px solid #FFFFFF;
+ }
+ ul.LC_CourseBreadcrumbs {
+   background: $sidebg;
+   line-height: 32px;
+   padding-left: 10px;
+   margin: 0 0 10px 0;
+   list-style-position: inside;
+ }
+ ol#LC_MenuBreadcrumbs,
+ ol#LC_PathBreadcrumbs {
+   padding-left: 10px;
+   margin: 0;
+   list-style-position: inside;
+     /* SD working here
+     white-space: nowrap; */
+ }
+ ol#LC_MenuBreadcrumbs li,
+ ol#LC_PathBreadcrumbs li,
+ ul.LC_CourseBreadcrumbs li {
+   display: inline;
+   white-space: nowrap;
+     /* SD working here
+     white-space: normal; */
+ }
+ ol#LC_MenuBreadcrumbs li a,
+ ul.LC_CourseBreadcrumbs li a {
+   text-decoration: none;
+   font-size:90%;
+ }
+ ol#LC_PathBreadcrumbs li a {
+   text-decoration:none;
+   font-size:100%;
+   font-weight:bold;
+ }
+ .LC_Box {
+   border: solid 1px $lg_border_color;
+   padding: 0 10px 10px 10px;
+ }
+ .LC_AboutMe_Image {
+   float:left;
+   margin-right:10px;
+ }
+ .LC_Clear_AboutMe_Image {
+   clear:left;
+ }
+ dl.LC_ListStyleClean dt {
+   padding-right: 5px;
+   display: table-header-group;
+ }
+ dl.LC_ListStyleClean dd {
+   display: table-row;
+ }
+ .LC_ListStyleClean,
+ .LC_ListStyleSimple,
+ .LC_ListStyleNormal,
+ .LC_ListStyleSpecial {
+   /* display:block; */
+   list-style-position: inside;
+   list-style-type: none;
+   overflow: hidden;
+   padding: 0;
+ }
+ .LC_ListStyleSimple li,
+ .LC_ListStyleSimple dd,
+ .LC_ListStyleNormal li,
+ .LC_ListStyleNormal dd,
+ .LC_ListStyleSpecial li,
+ .LC_ListStyleSpecial dd {
+   margin: 0;
+   padding: 5px 5px 5px 10px;
+   clear: both;
+ }
+ .LC_ListStyleClean li,
+ .LC_ListStyleClean dd {
+   padding-top: 0;
+   padding-bottom: 0;
+ }
+ .LC_ListStyleSimple dd,
+ .LC_ListStyleSimple li {
+   border-bottom: solid 1px $lg_border_color;
+ }
+ .LC_ListStyleSpecial li,
+ .LC_ListStyleSpecial dd {
+   list-style-type: none;
+   background-color: RGB(220, 220, 220);
+   margin-bottom: 4px;
+ }
+ table.LC_SimpleTable {
+   margin:5px;
+   border:solid 1px $lg_border_color;
+ }
+ table.LC_SimpleTable tr {
+   padding: 0;
+   border:solid 1px $lg_border_color;
+ }
+ table.LC_SimpleTable thead {
+   background:rgb(220,220,220);
+ }
+ div.LC_columnSection {
+   display: block;
+   clear: both;
+   overflow: hidden;
+   margin: 0;
+ }
+ div.LC_columnSection>* {
+   float: left;
+   margin: 10px 20px 10px 0;
+   overflow:hidden;
+ }
+ .LC_loginpage_container {
+   text-align:left;
+   margin : 0 auto;
+   width:90%;
+   padding: 10px;
+   height: auto;
+   background-color:#FFFFFF;
+   border:1px solid #CCCCCC;
+ }
+ .LC_loginpage_loginContainer {
+   float:left;
+   width: 182px;
+   padding: 2px;
+   border:1px solid #CCCCCC;
+   background-color:$loginbg;
+ }
+ .LC_loginpage_loginContainer h2 {
+   margin-top: 0;
+   display:block;
+   background:$bgcol;
+   color:$textcol;
+   padding-left:5px;
+ }
+ .LC_loginpage_loginInfo {
+   float:left;
+   width:182px;
+   border:1px solid #CCCCCC;
+   padding:2px;
+ }
+ .LC_loginpage_space {
+   clear: both;
+   margin-bottom: 20px;
+   border-bottom: 1px solid #CCCCCC;
+ }
+ .LC_loginpage_floatLeft {
+   float: left;
+   width: 200px;
+   margin: 0;
+ }
+ table em {
+   font-weight: bold;
+   font-style: normal;
+ }
+ table.LC_tableBrowseRes,
+ table.LC_tableOfContent {
+   border:none;
+   border-spacing: 1px;
+   padding: 3px;
+   background-color: #FFFFFF;
+   font-size: 90%;
+ }
+ table.LC_tableOfContent {
+   border-collapse: collapse;
+ }
+ table.LC_tableBrowseRes a,
+ table.LC_tableOfContent a {
+   background-color: transparent;
+   text-decoration: none;
+ }
+ table.LC_tableOfContent img {
+   border: none;
+   height: 1.3em;
+   vertical-align: text-bottom;
+   margin-right: 0.3em;
+ }
+ a#LC_content_toolbar_firsthomework {
+   background-image:url(/res/adm/pages/open-first-problem.gif);
+ }
+ a#LC_content_toolbar_launchnav {
+   background-image:url(/res/adm/pages/start-navigation.gif);
+ }
+ a#LC_content_toolbar_closenav {
+   background-image:url(/res/adm/pages/close-navigation.gif);
+ }
+ a#LC_content_toolbar_everything {
+   background-image:url(/res/adm/pages/show-all.gif);
+ }
+ a#LC_content_toolbar_uncompleted {
+   background-image:url(/res/adm/pages/show-incomplete-problems.gif);
+ }
+ #LC_content_toolbar_clearbubbles {
+   background-image:url(/res/adm/pages/mark-discussionentries-read.gif);
+ }
+ a#LC_content_toolbar_changefolder {
+   background : url(/res/adm/pages/close-all-folders.gif) top center ;
+ }
+ a#LC_content_toolbar_changefolder_toggled {
+   background-image:url(/res/adm/pages/open-all-folders.gif);
+ }
+ ul#LC_toolbar li a:hover {
+   background-position: bottom center;
+ }
+ ul#LC_toolbar {
+   padding: 0;
+   margin: 2px;
+   list-style:none;
+   position:relative;
+   background-color:white;
+ }
+ ul#LC_toolbar li {
+   border:1px solid white;
+   padding: 0;
+   margin: 0;
+   float: left;
+   display:inline;
+   vertical-align:middle;
+ }
+ a.LC_toolbarItem {
+   display:block;
+   padding: 0;
+   margin: 0;
+   height: 32px;
+   width: 32px;
+   color:white;
+   border: none;
+   background-repeat:no-repeat;
+   background-color:transparent;
+ }
+ ul.LC_funclist {
+     margin: 0;
+     padding: 0.5em 1em 0.5em 0;
+ }
+ 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%;
  }
  END
  }
- Line 5452  sub xml_begin {
+ Line 6543  sub xml_begin {
              .'<html xmlns:math="http://www.w3.org/1998/Math/MathML" '
  	    .'xmlns="http://www.w3.org/1999/xhtml">';
      } else {
- 	$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>';
+ 	$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
+            .'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">';
      }
      return $output;
  }
- Line 5514  $args - additional optional args support
+ Line 6606  $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 5528  $args - additional optional args support
+ Line 6620  $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
- Line 5543  $args - additional optional args support
+ Line 6631  $args - additional optional args support
               inherit_jsmath -> when creating popup window in a page,
                                      should it have jsmath forced on by the
                                      current page
+              bread_crumbs ->             Array containing breadcrumbs
+              bread_crumbs_components ->  if exists show it as headline else show only the breadcrumbs
  =back
- Line 5575  sub start_page {
+ Line 6665  sub start_page {
  	    my $attr_string = &make_attr_string($args->{'force_register'},
  						$args->{'add_entries'});
  	    $result .= "\n<frameset $attr_string>\n";
- 	} else {
+         } else {
- 	    $result .=
+             $result .=
- 		&bodytag($title,
+                 &bodytag($title,
- 			 $args->{'function'},       $args->{'add_entries'},
+                          $args->{'function'},       $args->{'add_entries'},
- 			 $args->{'only_body'},      $args->{'domain'},
+                          $args->{'only_body'},      $args->{'domain'},
- 			 $args->{'force_register'}, $args->{'body_title'},
+                          $args->{'force_register'}, $args->{'no_nav_bar'},
- 			 $args->{'no_nav_bar'},     $args->{'bgcolor'},
+                          $args->{'bgcolor'},        $args->{'no_inline_link'},
- 			 $args->{'no_title'},       $args->{'no_inline_link'},
+                          $args);
- 			 $args);
+         }
- 	}
      }
      if ($args->{'js_ready'}) {
- 	$result = &js_ready($result);
+ 		$result = &js_ready($result);
      }
      if ($args->{'html_encode'}) {
- 	$result = &html_encode($result);
+ 		$result = &html_encode($result);
+     }
+     # Preparation for new and consistent functionlist at top of screen
+     # if ($args->{'functionlist'}) {
+     #            $result .= &build_functionlist();
+     #}
+     # Don't add anything more if only_body wanted
+     return $result if $args->{'only_body'};
+     #Breadcrumbs for Construction Space provided by &bodytag.
+     if (($env{'environment.remote'} eq 'off') && ($env{'request.state'} eq 'construct')) {
+         return $result;
+     }
+     #Breadcrumbs
+     if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
+ 		&Apache::lonhtmlcommon::clear_breadcrumbs();
+ 		#if any br links exists, add them to the breadcrumbs
+ 		if (exists($args->{'bread_crumbs'}) and ref($args->{'bread_crumbs'}) eq 'ARRAY') {
+ 			foreach my $crumb (@{$args->{'bread_crumbs'}}){
+ 				&Apache::lonhtmlcommon::add_breadcrumb($crumb);
+ 			}
+ 		}
+ 		#if bread_crumbs_component exists show it as headline else show only the breadcrumbs
+ 		if(exists($args->{'bread_crumbs_component'})){
+ 			$result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'});
+ 		}else{
+ 			$result .= &Apache::lonhtmlcommon::breadcrumbs();
+ 		}
      }
      return $result;
  }
- Line 5723  sub simple_error_page {
+ Line 6843  sub simple_error_page {
  	my ($add_class) = @_;
  	$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";;
      }
      sub continue_data_table_row {
  	my ($add_class) = @_;
  	my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
- 	$css_class = (join(' ',$css_class,$add_class));
+ 	$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');;
  	return  '<tr class="'.$css_class.'">'."\n";;
      }
- Line 5739  sub simple_error_page {
+ Line 6859  sub simple_error_page {
      }
      sub start_data_table_empty_row {
- 	$row_count[0]++;
+ #	$row_count[0]++;
  	return  '<tr class="LC_empty_row" >'."\n";;
      }
- Line 5754  sub simple_error_page {
+ Line 6874  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 5820  Returns either 'student','coordinator','
+ Line 6945  Returns either 'student','coordinator','
  ###############################################
  sub get_users_function {
-     my $function = 'student';
+     my $function = 'norole';
-     if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
+     if ($env{'request.role'}=~/^(st)/) {
+         $function='student';
+     }
+     if ($env{'request.role'}=~/^(cc|co|in|ta|ep)/) {
          $function='coordinator';
      }
      if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
          $function='admin';
      }
-     if (($env{'request.role'}=~/^(au|ca)/) ||
+     if (($env{'request.role'}=~/^(au|ca|aa)/) ||
          ($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
          $function='author';
      }
- Line 5838  sub get_users_function {
+ Line 6966  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 5860  sub check_user_status {
+ Line 7020  sub check_user_status {
      my $active_chk = 'none';
      my $now = time;
      if (@uroles > 0) {
-         if (($role eq 'cc') || ($sec eq '') || (!defined($sec))) {
+         if (($role eq 'cc') || ($role eq 'co') || ($sec eq '') || (!defined($sec))) {
              $srchstr = '/'.$cdom.'/'.$crs.'_'.$role;
          } else {
              $srchstr = '/'.$cdom.'/'.$crs.'/'.$sec.'_'.$role;
- Line 6341  If the user's status includes multiple t
+ Line 7501  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 6353  sub default_quota {
+ Line 7515  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 6473  sub user_picker {
+ Line 7651  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 6516  sub user_picker {
+ Line 7695  sub user_picker {
                  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 6558  ENDSCRIPT
+ Line 7742  ENDSCRIPT
      my $output = <<"END_BLOCK";
  <script type="text/javascript">
+ // <![CDATA[
  function validateEntry(callingForm) {
      var checkok = 1;
- Line 6626  function validateEntry(callingForm) {
+ Line 7811  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 6773  sub instrule_disallow_msg {
+ Line 7955  sub instrule_disallow_msg {
              $text{'action'} = 'IDs';
          }
      }
-     $response = &mt("The $text{'item'} you chose $text{'match'} the format of $text{'items'} defined for <span class=\"LC_cusr_emph\">[_1]</span>, but the $text{'item'} $text{'do'} not exist in the institutional directory.",$domdesc).'<br />';
+     $response = &mt("The $text{'item'} you chose $text{'match'} the format of $text{'items'} defined for [_1], but the $text{'item'} $text{'do'} not exist in the institutional directory.",'<span class="LC_cusr_emph">'.$domdesc.'</span>').'<br />';
      if ($mode eq 'upload') {
          if ($checkitem eq 'username') {
              $response .= &mt("You will need to modify your upload file so it will include $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}.");
          } elsif ($checkitem eq 'id') {
-             $response .= &mt("Either upload a file which includes $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or when associating fields with data columns, omit an association for the ID/Student Number field.");
+             $response .= &mt("Either upload a file which includes $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or when associating fields with data columns, omit an association for the Student/Employee ID field.");
+         }
+     } elsif ($mode eq 'selfcreate') {
+         if ($checkitem eq 'id') {
+             $response .= &mt("You must either choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or leave the ID field blank.");
          }
      } else {
          if ($checkitem eq 'username') {
- Line 6799  sub personal_data_fieldtitles {
+ Line 7985  sub personal_data_fieldtitles {
                          middlename => 'Middle Name',
                          generation => 'Generation',
                          gen => 'Generation',
+                         inststatus => 'Affiliation',
                     );
      return %fieldtitles;
  }
- Line 6808  sub sorted_inst_types {
+ Line 7995  sub sorted_inst_types {
      my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
      my $othertitle = &mt('All users');
      if ($env{'request.course.id'}) {
-         $othertitle  = 'any';
+         $othertitle  = &mt('Any users');
      }
      my @types;
      if (ref($order) eq 'ARRAY') {
- Line 6821  sub sorted_inst_types {
+ Line 8008  sub sorted_inst_types {
      }
      if (keys(%{$usertypes}) > 0) {
          $othertitle = &mt('Other users');
-         if ($env{'request.course.id'}) {
-             $othertitle = 'other';
-         }
      }
      return ($othertitle,$usertypes,\@types);
  }
- Line 6871  sub get_institutional_codes {
+ Line 8055  sub get_institutional_codes {
  =pod
+ =head1 Slot Helpers
+ =over 4
+ =item * sorted_slots()
+ Sorts an array of slot names in order of slot start time (earliest first).
+ Inputs:
+ =over 4
+ slotsarr  - Reference to array of unsorted slot names.
+ slots     - Reference to hash of hash, where outer hash keys are slot names.
  =back
+ Returns:
+ =over 4
+ sorted   - An array of slot names sorted by the start time of the slot.
+ =back
+ =back
+ =cut
+ sub sorted_slots {
+     my ($slotsarr,$slots) = @_;
+     my @sorted;
+     if ((ref($slotsarr) eq 'ARRAY') && (ref($slots) eq 'HASH')) {
+         @sorted =
+             sort {
+                      if (ref($slots->{$a}) && ref($slots->{$b})) {
+                          return $slots->{$a}{'starttime'} <=> $slots->{$b}{'starttime'}
+                      }
+                      if (ref($slots->{$a})) { return -1;}
+                      if (ref($slots->{$b})) { return 1;}
+                      return 0;
+                  } @{$slotsarr};
+     }
+     return @sorted;
+ }
+ =pod
  =head1 HTTP Helpers
  =over 4
- Line 7009  sub get_env_multiple {
+ Line 8242  sub get_env_multiple {
      return(@values);
  }
+ sub ask_for_embedded_content {
+     my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
+     my $upload_output = '
+    <form name="upload_embedded" action="'.$actionurl.'"
+                   method="post" enctype="multipart/form-data">';
+     $upload_output .= $state;
+     $upload_output .= '<b>Upload embedded files</b>:<br />'.&start_data_table();
+     my $num = 0;
+     foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%{$allfiles})) {
+         $upload_output .= &start_data_table_row().
+             '<td>'.$embed_file.'</td><td>';
+         if ($args->{'ignore_remote_references'}
+             && $embed_file =~ m{^\w+://}) {
+             $upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';
+         } elsif ($args->{'error_on_invalid_names'}
+             && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
+             $upload_output.='<span class="LC_warning">'.&mt("Invalid characters").'</span>';
+         } else {
+             $upload_output .='
+            <input name="embedded_item_'.$num.'" type="file" value="" />
+            <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
+             my $attrib = join(':',@{$$allfiles{$embed_file}});
+             $upload_output .=
+                 "\n\t\t".
+                 '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.
+                 $attrib.'" />';
+             if (exists($$codebase{$embed_file})) {
+                 $upload_output .=
+                     "\n\t\t".
+                     '<input name="codebase_'.$num.'" type="hidden" value="'.
+                     &escape($$codebase{$embed_file}).'" />';
+             }
+         }
+         $upload_output .= '</td>'.&Apache::loncommon::end_data_table_row();
+         $num++;
+     }
+     $upload_output .= &Apache::loncommon::end_data_table().'<br />
+    <input type ="hidden" name="number_embedded_items" value="'.$num.'" />
+    <input type ="submit" value="'.&mt('Upload Listed Files').'" />
+    '.&mt('(only files for which a location has been provided will be uploaded)').'
+    </form>';
+     return $upload_output;
+ }
+ sub upload_embedded {
+     my ($context,$dirpath,$uname,$udom,$dir_root,$url_root,$group,$disk_quota,
+         $current_disk_usage) = @_;
+     my $output;
+     for (my $i=0; $i<$env{'form.number_embedded_items'}; $i++) {
+         next if (!exists($env{'form.embedded_item_'.$i.'.filename'}));
+         my $orig_uploaded_filename =
+             $env{'form.embedded_item_'.$i.'.filename'};
+         $env{'form.embedded_orig_'.$i} =
+             &unescape($env{'form.embedded_orig_'.$i});
+         my ($path,$fname) =
+             ($env{'form.embedded_orig_'.$i} =~ m{(.*/)([^/]*)});
+         # no path, whole string is fname
+         if (!$fname) { $fname = $env{'form.embedded_orig_'.$i} };
+         $path = $env{'form.currentpath'}.$path;
+         $fname = &Apache::lonnet::clean_filename($fname);
+         # See if there is anything left
+         next if ($fname eq '');
+         # Check if file already exists as a file or directory.
+         my ($state,$msg);
+         if ($context eq 'portfolio') {
+             my $port_path = $dirpath;
+             if ($group ne '') {
+                 $port_path = "groups/$group/$port_path";
+             }
+             ($state,$msg) = &check_for_upload($path,$fname,$group,'embedded_item_'.$i,
+                                               $dir_root,$port_path,$disk_quota,
+                                               $current_disk_usage,$uname,$udom);
+             if ($state eq 'will_exceed_quota'
+                 || $state eq 'file_locked'
+                 || $state eq 'file_exists' ) {
+                 $output .= $msg;
+                 next;
+             }
+         } elsif (($context eq 'author') || ($context eq 'testbank')) {
+             ($state,$msg) = &check_for_existing($path,$fname,'embedded_item_'.$i);
+             if ($state eq 'exists') {
+                 $output .= $msg;
+                 next;
+             }
+         }
+         # Check if extension is valid
+         if (($fname =~ /\.(\w+)$/) &&
+             (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
+             $output .= &mt('Invalid file extension ([_1]) - reserved for LONCAPA use - rename the file with a different extension and re-upload. ',$1);
+             next;
+         } elsif (($fname =~ /\.(\w+)$/) &&
+                  (!defined(&Apache::loncommon::fileembstyle($1)))) {
+             $output .= &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1);
+             next;
+         } elsif ($fname=~/\.(\d+)\.(\w+)$/) {
+             $output .= &mt('File name not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2);
+             next;
+         }
+         $env{'form.embedded_item_'.$i.'.filename'}=$fname;
+         if ($context eq 'portfolio') {
+             my $result=
+                 &Apache::lonnet::userfileupload('embedded_item_'.$i,'',
+                                                 $dirpath.$path);
+             if ($result !~ m|^/uploaded/|) {
+                 $output .= '<span class="LC_error">'
+                       .&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'
+                            ,$result,$orig_uploaded_filename,$env{'form.embedded_orig_'.$i})
+                       .'</span><br />';
+                 next;
+             } else {
+                 $output .= '<p>'.&mt('Uploaded [_1]','<span class="LC_filename">'.
+                            $path.$fname.'</span>').'</p>';
+             }
+         } else {
+ # Save the file
+             my $target = $env{'form.embedded_item_'.$i};
+             my $fullpath = $dir_root.$dirpath.'/'.$path;
+             my $dest = $fullpath.$fname;
+             my $url = $url_root.$dirpath.'/'.$path.$fname;
+             my @parts=split(/\//,$fullpath);
+             my $count;
+             my $filepath = $dir_root;
+             for ($count=4;$count<=$#parts;$count++) {
+                 $filepath .= "/$parts[$count]";
+                 if ((-e $filepath)!=1) {
+                     mkdir($filepath,0770);
+                 }
+             }
+             my $fh;
+             if (!open($fh,'>'.$dest)) {
+                 &Apache::lonnet::logthis('Failed to create '.$dest);
+                 $output .= '<span class="LC_error">'.
+                            &mt('An error occurred while trying to upload [_1] for embedded element [_2].',$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}).
+                            '</span><br />';
+             } else {
+                 if (!print $fh $env{'form.embedded_item_'.$i}) {
+                     &Apache::lonnet::logthis('Failed to write to '.$dest);
+                     $output .= '<span class="LC_error">'.
+                               &mt('An error occurred while writing the file [_1] for embedded element [_2].',$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}).
+                               '</span><br />';
+                 } else {
+                     if ($context eq 'testbank') {
+                         $output .= &mt('Embedded file uploaded successfully:').
+                                    '&nbsp;<a href="'.$url.'">'.
+                                    $orig_uploaded_filename.'</a><br />';
+                     } else {
+                         $output .= '<span class=\"LC_fontsize_large\">'.
+                                    &mt('View embedded file: [_1]','<a href="'.$url.'">'.
+                                    $orig_uploaded_filename.'</a>').'</span><br />';
+                     }
+                 }
+                 close($fh);
+             }
+         }
+     }
+     return $output;
+ }
+ sub check_for_existing {
+     my ($path,$fname,$element) = @_;
+     my ($state,$msg);
+     if (-d $path.'/'.$fname) {
+         $state = 'exists';
+         $msg = &mt('Unable to upload [_1]. A directory by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$path);
+     } elsif (-e $path.'/'.$fname) {
+         $state = 'exists';
+         $msg = &mt('Unable to upload [_1]. A file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$path);
+     }
+     if ($state eq 'exists') {
+         $msg = '<span class="LC_error">'.$msg.'</span><br />';
+     }
+     return ($state,$msg);
+ }
+ sub check_for_upload {
+     my ($path,$fname,$group,$element,$portfolio_root,$port_path,
+         $disk_quota,$current_disk_usage,$uname,$udom) = @_;
+     my $filesize = (length($env{'form.'.$element})) / 1000; #express in k (1024?)
+     my $getpropath = 1;
+     my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$path,$udom,$uname,
+                                             $getpropath);
+     my $found_file = 0;
+     my $locked_file = 0;
+     foreach my $line (@dir_list) {
+         my ($file_name)=split(/\&/,$line,2);
+         if ($file_name eq $fname){
+             $file_name = $path.$file_name;
+             if ($group ne '') {
+                 $file_name = $group.$file_name;
+             }
+             $found_file = 1;
+             if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
+                 $locked_file = 1;
+             }
+         }
+     }
+     if (($current_disk_usage + $filesize) > $disk_quota){
+         my $msg = '<span class="LC_error">'.
+                 &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.','<span class="LC_filename">'.$fname.'</span>',$filesize).'</span>'.
+                   '<br />'.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.',$disk_quota,$current_disk_usage);
+         return ('will_exceed_quota',$msg);
+     } elsif ($found_file) {
+         if ($locked_file) {
+             my $msg = '<span class="LC_error">';
+             $msg .= &mt('Unable to upload [_1]. A locked file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>','<span class="LC_filename">'.$port_path.$env{'form.currentpath'}.'</span>');
+             $msg .= '</span><br />';
+             $msg .= &mt('You will be able to rename or delete existing [_1] after a grade has been assigned.','<span class="LC_filename">'.$fname.'</span>');
+             return ('file_locked',$msg);
+         } else {
+             my $msg = '<span class="LC_error">';
+             $msg .= &mt('Unable to upload [_1]. A file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$port_path.$env{'form.currentpath'});
+             $msg .= '</span>';
+             $msg .= '<br />';
+             $msg .= &mt('To upload, rename or delete existing [_1] in [_2].','<span class="LC_filename">'.$fname.'</span>', $port_path.$env{'form.currentpath'});
+             return ('file_exists',$msg);
+         }
+     }
+ }
  =pod
- Line 7197  sub upfile_select_html {
+ Line 8656  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 7238  Apache Request ref, $records is an array
+ Line 8697  Apache Request ref, $records is an array
  ######################################################
  sub csv_print_samples {
      my ($r,$records) = @_;
-     my $samples = &get_samples($records,3);
+     my $samples = &get_samples($records,5);
      $r->print(&mt('Samples').'<br />'.&start_data_table().
                &start_data_table_header_row());
      foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
-         $r->print('<th>'.&mt('Column&nbsp;[_1]',($sample+1)).'</th>'); }
+         $r->print('<th>'.&mt('Column [_1]',($sample+1)).'</th>'); }
      $r->print(&end_data_table_header_row());
      foreach my $hash (@$samples) {
  	$r->print(&start_data_table_row());
- Line 7285  sub csv_print_select_table {
+ Line 8744  sub csv_print_select_table {
                &end_data_table_header_row()."\n");
      foreach my $array_ref (@$d) {
  	my ($value,$display,$defaultcol)=@{ $array_ref };
- 	$r->print(&start_data_table_row().'<tr><td>'.$display.'</td>');
+ 	$r->print(&start_data_table_row().'<td>'.$display.'</td>');
- 	$r->print('<td><select name=f'.$i.
+ 	$r->print('<td><select name="f'.$i.'"'.
  		  ' onchange="javascript:flip(this.form,'.$i.');">');
  	$r->print('<option value="none"></option>');
  	foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
  	    $r->print('<option value="'.$sample.'"'.
                        ($sample eq $defaultcol ? ' selected="selected" ' : '').
-                       '>Column '.($sample+1).'</option>');
+                       '>'.&mt('Column [_1]',($sample+1)).'</option>');
  	}
  	$r->print('</select></td>'.&end_data_table_row()."\n");
  	$i++;
- Line 7324  sub csv_samples_select_table {
+ Line 8783  sub csv_samples_select_table {
      my ($r,$records,$d) = @_;
      my $i=0;
      #
-     my $samples = &get_samples($records,3);
+     my $max_samples = 5;
+     my $samples = &get_samples($records,$max_samples);
      $r->print(&start_data_table().
                &start_data_table_header_row().'<th>'.
                &mt('Field').'</th><th>'.&mt('Samples').'</th>'.
- Line 7340  sub csv_samples_select_table {
+ Line 8800  sub csv_samples_select_table {
                        $display.'</option>');
  	}
  	$r->print('</select></td><td>');
- 	foreach my $line (0..2) {
+ 	foreach my $line (0..($max_samples-1)) {
  	    if (defined($samples->[$line]{$key})) {
  		$r->print($samples->[$line]{$key}."<br />\n");
  	    }
- Line 7940  sub restore_settings {
+ Line 9400  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 7951  defdom (domain for which to retrieve con
+ Line 9413  defdom (domain for which to retrieve con
  origmail (scalar - email address of recipient from loncapa.conf,
  i.e., predates configuration by DC via domainprefs.pm
  Returns: comma separated list of addresses to which to send e-mail.
+ =back
  =cut
- Line 7964  sub build_recipient_list {
+ Line 9428  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);
      }
-     if ($defmail ne '') {
+     if (defined($defmail)) {
-         push(@recipients,$defmail);
+         if ($defmail ne '') {
+             push(@recipients,$defmail);
+         }
      }
      if ($otheremails) {
          my @others;
- Line 8002  sub build_recipient_list {
+ Line 9472  sub build_recipient_list {
  ############################################################
  ############################################################
+ =pod
+ =head1 Course Catalog Routines
+ =over 4
+ =item * &gather_categories()
+ Converts category definitions - keys of categories hash stored in
+ coursecategories in configuration.db on the primary library server in a
+ domain - to an array.  Also generates javascript and idx hash used to
+ generate Domain Coordinator interface for editing Course Categories.
+ Inputs:
+ categories (reference to hash of category definitions).
+ cats (reference to array of arrays/hashes which encapsulates hierarchy of
+       categories and subcategories).
+ idx (reference to hash of counters used in Domain Coordinator interface for
+       editing Course Categories).
+ jsarray (reference to array of categories used to create Javascript arrays for
+          Domain Coordinator interface for editing Course Categories).
+ Returns: nothing
+ Side effects: populates cats, idx and jsarray.
+ =cut
+ sub gather_categories {
+     my ($categories,$cats,$idx,$jsarray) = @_;
+     my %counters;
+     my $num = 0;
+     foreach my $item (keys(%{$categories})) {
+         my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$item);
+         if ($container eq '' && $depth == 0) {
+             $cats->[$depth][$categories->{$item}] = $cat;
+         } else {
+             $cats->[$depth]{$container}[$categories->{$item}] = $cat;
+         }
+         my ($escitem,$tail) = split(/:/,$item,2);
+         if ($counters{$tail} eq '') {
+             $counters{$tail} = $num;
+             $num ++;
+         }
+         if (ref($idx) eq 'HASH') {
+             $idx->{$item} = $counters{$tail};
+         }
+         if (ref($jsarray) eq 'ARRAY') {
+             push(@{$jsarray->[$counters{$tail}]},$item);
+         }
+     }
+     return;
+ }
+ =pod
+ =item * &extract_categories()
+ Used to generate breadcrumb trails for course categories.
+ Inputs:
+ categories (reference to hash of category definitions).
+ cats (reference to array of arrays/hashes which encapsulates hierarchy of
+       categories and subcategories).
+ trails (reference to array of breacrumb trails for each category).
+ allitems (reference to hash - key is category key
+          (format: escaped(name):escaped(parent category):depth in hierarchy).
+ idx (reference to hash of counters used in Domain Coordinator interface for
+       editing Course Categories).
+ jsarray (reference to array of categories used to create Javascript arrays for
+          Domain Coordinator interface for editing Course Categories).
+ subcats (reference to hash of arrays containing all subcategories within each
+          category, -recursive)
+ Returns: nothing
+ Side effects: populates trails and allitems hash references.
+ =cut
+ sub extract_categories {
+     my ($categories,$cats,$trails,$allitems,$idx,$jsarray,$subcats) = @_;
+     if (ref($categories) eq 'HASH') {
+         &gather_categories($categories,$cats,$idx,$jsarray);
+         if (ref($cats->[0]) eq 'ARRAY') {
+             for (my $i=0; $i<@{$cats->[0]}; $i++) {
+                 my $name = $cats->[0][$i];
+                 my $item = &escape($name).'::0';
+                 my $trailstr;
+                 if ($name eq 'instcode') {
+                     $trailstr = &mt('Official courses (with institutional codes)');
+                 } elsif ($name eq 'communities') {
+                     $trailstr = &mt('Communities');
+                 } else {
+                     $trailstr = $name;
+                 }
+                 if ($allitems->{$item} eq '') {
+                     push(@{$trails},$trailstr);
+                     $allitems->{$item} = scalar(@{$trails})-1;
+                 }
+                 my @parents = ($name);
+                 if (ref($cats->[1]{$name}) eq 'ARRAY') {
+                     for (my $j=0; $j<@{$cats->[1]{$name}}; $j++) {
+                         my $category = $cats->[1]{$name}[$j];
+                         if (ref($subcats) eq 'HASH') {
+                             push(@{$subcats->{$item}},&escape($category).':'.&escape($name).':1');
+                         }
+                         &recurse_categories($cats,2,$category,$trails,$allitems,\@parents,$subcats);
+                     }
+                 } else {
+                     if (ref($subcats) eq 'HASH') {
+                         $subcats->{$item} = [];
+                     }
+                 }
+             }
+         }
+     }
+     return;
+ }
+ =pod
+ =item *&recurse_categories()
+ Recursively used to generate breadcrumb trails for course categories.
+ Inputs:
+ cats (reference to array of arrays/hashes which encapsulates hierarchy of
+       categories and subcategories).
+ depth (current depth in hierarchy of categories and sub-categories - 0 indexed).
+ category (current course category, for which breadcrumb trail is being generated).
+ trails (reference to array of breadcrumb trails for each category).
+ allitems (reference to hash - key is category key
+          (format: escaped(name):escaped(parent category):depth in hierarchy).
+ parents (array containing containers directories for current category,
+          back to top level).
+ Returns: nothing
+ Side effects: populates trails and allitems hash references
+ =cut
+ sub recurse_categories {
+     my ($cats,$depth,$category,$trails,$allitems,$parents,$subcats) = @_;
+     my $shallower = $depth - 1;
+     if (ref($cats->[$depth]{$category}) eq 'ARRAY') {
+         for (my $k=0; $k<@{$cats->[$depth]{$category}}; $k++) {
+             my $name = $cats->[$depth]{$category}[$k];
+             my $item = &escape($category).':'.&escape($parents->[-1]).':'.$shallower;
+             my $trailstr = join(' -&gt; ',(@{$parents},$category));
+             if ($allitems->{$item} eq '') {
+                 push(@{$trails},$trailstr);
+                 $allitems->{$item} = scalar(@{$trails})-1;
+             }
+             my $deeper = $depth+1;
+             push(@{$parents},$category);
+             if (ref($subcats) eq 'HASH') {
+                 my $subcat = &escape($name).':'.$category.':'.$depth;
+                 for (my $j=@{$parents}; $j>=0; $j--) {
+                     my $higher;
+                     if ($j > 0) {
+                         $higher = &escape($parents->[$j]).':'.
+                                   &escape($parents->[$j-1]).':'.$j;
+                     } else {
+                         $higher = &escape($parents->[$j]).'::'.$j;
+                     }
+                     push(@{$subcats->{$higher}},$subcat);
+                 }
+             }
+             &recurse_categories($cats,$deeper,$name,$trails,$allitems,$parents,
+                                 $subcats);
+             pop(@{$parents});
+         }
+     } else {
+         my $item = &escape($category).':'.&escape($parents->[-1]).':'.$shallower;
+         my $trailstr = join(' -&gt; ',(@{$parents},$category));
+         if ($allitems->{$item} eq '') {
+             push(@{$trails},$trailstr);
+             $allitems->{$item} = scalar(@{$trails})-1;
+         }
+     }
+     return;
+ }
+ =pod
+ =item *&assign_categories_table()
+ Create a datatable for display of hierarchical categories in a domain,
+ with checkboxes to allow a course to be categorized.
+ Inputs:
+ cathash - reference to hash of categories defined for the domain (from
+           configuration.db)
+ currcat - scalar with an & separated list of categories assigned to a course.
+ type    - scalar contains course type (Course or Community).
+ Returns: $output (markup to be displayed)
+ =cut
+ sub assign_categories_table {
+     my ($cathash,$currcat,$type) = @_;
+     my $output;
+     if (ref($cathash) eq 'HASH') {
+         my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);
+         &extract_categories($cathash,\@cats,\@trails,\%allitems,\%idx,\@jsarray);
+         $maxdepth = scalar(@cats);
+         if (@cats > 0) {
+             my $itemcount = 0;
+             if (ref($cats[0]) eq 'ARRAY') {
+                 my @currcategories;
+                 if ($currcat ne '') {
+                     @currcategories = split('&',$currcat);
+                 }
+                 my $table;
+                 for (my $i=0; $i<@{$cats[0]}; $i++) {
+                     my $parent = $cats[0][$i];
+                     next if ($parent eq 'instcode');
+                     if ($type eq 'Community') {
+                         next unless ($parent eq 'communities');
+                     } else {
+                         next if ($parent eq 'communities');
+                     }
+                     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                     my $item = &escape($parent).'::0';
+                     my $checked = '';
+                     if (@currcategories > 0) {
+                         if (grep(/^\Q$item\E$/,@currcategories)) {
+                             $checked = ' checked="checked"';
+                         }
+                     }
+                     my $parent_title = $parent;
+                     if ($parent eq 'communities') {
+                         $parent_title = &mt('Communities');
+                     }
+                     $table .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
+                               '<input type="checkbox" name="usecategory" value="'.
+                               $item.'"'.$checked.' />'.$parent_title.'</span>'.
+                               '<input type="hidden" name="catname" value="'.$parent.'" /></td>';
+                     my $depth = 1;
+                     push(@path,$parent);
+                     $table .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
+                     pop(@path);
+                     $table .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
+                     $itemcount ++;
+                 }
+                 if ($itemcount) {
+                     $output = &Apache::loncommon::start_data_table().
+                               $table.
+                               &Apache::loncommon::end_data_table();
+                 }
+             }
+         }
+     }
+     return $output;
+ }
+ =pod
+ =item *&assign_category_rows()
+ Create a datatable row for display of nested categories in a domain,
+ with checkboxes to allow a course to be categorized,called recursively.
+ Inputs:
+ itemcount - track row number for alternating colors
+ cats - reference to array of arrays/hashes which encapsulates hierarchy of
+       categories and subcategories.
+ depth - current depth in hierarchy of categories and sub-categories - 0 indexed.
+ parent - parent of current category item
+ path - Array containing all categories back up through the hierarchy from the
+        current category to the top level.
+ currcategories - reference to array of current categories assigned to the course
+ Returns: $output (markup to be displayed).
+ =cut
+ sub assign_category_rows {
+     my ($itemcount,$cats,$depth,$parent,$path,$currcategories) = @_;
+     my ($text,$name,$item,$chgstr);
+     if (ref($cats) eq 'ARRAY') {
+         my $maxdepth = scalar(@{$cats});
+         if (ref($cats->[$depth]) eq 'HASH') {
+             if (ref($cats->[$depth]{$parent}) eq 'ARRAY') {
+                 my $numchildren = @{$cats->[$depth]{$parent}};
+                 my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                 $text .= '<td><table class="LC_datatable">';
+                 for (my $j=0; $j<$numchildren; $j++) {
+                     $name = $cats->[$depth]{$parent}[$j];
+                     $item = &escape($name).':'.&escape($parent).':'.$depth;
+                     my $deeper = $depth+1;
+                     my $checked = '';
+                     if (ref($currcategories) eq 'ARRAY') {
+                         if (@{$currcategories} > 0) {
+                             if (grep(/^\Q$item\E$/,@{$currcategories})) {
+                                 $checked = ' checked="checked"';
+                             }
+                         }
+                     }
+                     $text .= '<tr><td><span class="LC_nobreak"><label>'.
+                              '<input type="checkbox" name="usecategory" value="'.
+                              $item.'"'.$checked.' />'.$name.'</label></span>'.
+                              '<input type="hidden" name="catname" value="'.$name.'" />'.
+                              '</td><td>';
+                     if (ref($path) eq 'ARRAY') {
+                         push(@{$path},$name);
+                         $text .= &assign_category_rows($itemcount,$cats,$deeper,$name,$path,$currcategories);
+                         pop(@{$path});
+                     }
+                     $text .= '</td></tr>';
+                 }
+                 $text .= '</table></td>';
+             }
+         }
+     }
+     return $text;
+ }
+ ############################################################
+ ############################################################
  sub commit_customrole {
-     my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_;
+     my ($udom,$uname,$url,$three,$four,$five,$start,$end,$context) = @_;
      my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.':'.$three.' in '.$url.
                           ($start?', '.&mt('starting').' '.localtime($start):'').
                           ($end?', ending '.localtime($end):'').': <b>'.
                &Apache::lonnet::assigncustomrole(
-                  $udom,$uname,$url,$three,$four,$five,$end,$start).
+                  $udom,$uname,$url,$three,$four,$five,$end,$start,undef,undef,$context).
                   '</b><br />';
      return $output;
  }
- Line 8168  sub check_clone {
+ Line 9989  sub check_clone {
      my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
      my $clonemsg;
      my $can_clone = 0;
+     my $lctype = lc($args->{'type'});
+     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->{'type'} 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->{'type'} 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 8184  sub check_clone {
+ Line 10019  sub check_clone {
              } elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) {
                  $can_clone = 1;
              } else {
+                 my $ccrole = 'cc';
+                 if ($args->{'type'} 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;
  	        } 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'});
+                     if ($args->{'type'} 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 8201  sub check_clone {
+ Line 10044  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 8239  sub construct_course {
+ Line 10082  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
- Line 8282  sub construct_course {
+ Line 10126  sub construct_course {
                     'policy.email',
                     'comment.email',
                     'pch.users.denied',
-                    'plc.users.denied'],
+                    'plc.users.denied',
+                    'hidefromcat',
+                    'categories'],
                     $$crsudom,$$crsunum);
      }
- Line 8510  sub construct_course {
+ Line 10356  sub construct_course {
          $outcome .= ($fatal?$errtext:'read ok').' - ';
          my $title; my $url;
          if ($args->{'firstres'} eq 'syl') {
- 	    $title='Syllabus';
+ 	    $title=&mt('Syllabus');
              $url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus';
          } else {
-             $title='Navigate Contents';
+             $title=&mt('Navigate Contents');
              $url='/adm/navmaps';
          }
- Line 8546  sub group_term {
+ Line 10392  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 8567  sub icon {
+ Line 10423  sub icon {
      return &lonhttpdurl($iconname);
  }
- sub lonhttpd_port {
-     my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'};
-     if (!defined($lonhttpd_port)) { $lonhttpd_port='8080'; }
-     # IE doesn't like a secure page getting images from a non-secure
-     # port (when logging we haven't parsed the browser type so default
-     # back to secure
-     if ((!exists($env{'browser.type'}) || $env{'browser.type'} eq 'explorer')
- 	&& $ENV{'SERVER_PORT'} == 443) {
- 	return 443;
-     }
-     return $lonhttpd_port;
- }
  sub lonhttpdurl {
+ #
+ # Had been used for "small fry" static images on separate port 8080.
+ # Modify here if lightweight http functionality desired again.
+ # Currently eliminated due to increasing firewall issues.
+ #
      my ($url)=@_;
+     return $url;
-     my $lonhttpd_port = &lonhttpd_port();
-     if ($lonhttpd_port == 443) {
- 	return 'https://'.$ENV{'SERVER_NAME'}.$url;
-     }
-     return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
  }
  sub connection_aborted {
- Line 8624  sub escape_url {
+ Line 10466  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 8666  sub init_user_environment {
+ Line 10524  sub init_user_environment {
  	}
  # Give them a new cookie
  	my $id = ($args->{'robot'} ? 'robot'.$args->{'robot'}
- 		                   : $now);
+ 		                   : $now.$$.int(rand(10000)));
  	$cookie="$username\_$id\_$domain\_$authhost";
  # Initialize roles
- Line 8678  sub init_user_environment {
+ Line 10536  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);
- Line 8708  sub init_user_environment {
+ Line 10553  sub init_user_environment {
      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 8745  sub init_user_environment {
+ Line 10588  sub init_user_environment {
  	    $form->{'interface'}=~s/\W//gs;
  	    $initial_env{"browser.interface"} = $form->{'interface'};
  	    $env{'browser.interface'}=$form->{'interface'};
- 	    foreach my $option ('imagesuppress','appletsuppress',
- 				'embedsuppress','fontenhance','blackwhite') {
- 		if (($form->{$option} eq 'true') ||
- 		    ($userenv{$option} eq 'on')) {
- 		    $initial_env{"browser.$option"} = "on";
- 		}
- 	    }
  	}
+         foreach my $tool ('aboutme','blog','portfolio') {
+             $userenv{'availabletools.'.$tool} =
+                 &Apache::lonnet::usertools_access($username,$domain,$tool,'reload');
+         }
+         foreach my $crstype ('official','unofficial','community') {
+             $userenv{'canrequest.'.$crstype} =
+                 &Apache::lonnet::usertools_access($username,$domain,$crstype,
+                                                   'reload','requestcourses');
+         }
  	$env{'user.environment'} = "$lonids/$cookie.id";
  	if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",
- Line 8766  sub init_user_environment {
+ Line 10613  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 8781  sub init_user_environment {
+ Line 10628  sub init_user_environment {
  sub _add_to_env {
      my ($idf,$env_data,$prefix) = @_;
-     while (my ($key,$value) = each(%$env_data)) {
+     if (ref($env_data) eq 'HASH') {
- 	$idf->{$prefix.$key} = $value;
+         while (my ($key,$value) = each(%$env_data)) {
- 	$env{$prefix.$key}   = $value;
+ 	    $idf->{$prefix.$key} = $value;
+ 	    $env{$prefix.$key}   = $value;
+         }
+     }
+ }
+ # --- Get the symbolic name of a problem and the url
+ sub get_symb {
+     my ($request,$silent) = @_;
+     (my $url=$env{'form.url'}) =~ s-^https?\://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+     my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
+     if ($symb eq '') {
+         if (!$silent) {
+             $request->print("Unable to handle ambiguous references:$url:.");
+             return ();
+         }
      }
+     &Apache::lonenc::check_decrypt(\$symb);
+     return ($symb);
  }
+ # --------------------------------------------------------------Get annotation
+ sub get_annotation {
+     my ($symb,$enc) = @_;
+     my $key = $symb;
+     if (!$enc) {
+         $key =
+             &Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
+     }
+     my %annotation=&Apache::lonnet::get('nohist_annotations',[$key]);
+     return $annotation{$key};
+ }
+ sub clean_symb {
+     my ($symb,$delete_enc) = @_;
+     &Apache::lonenc::check_decrypt(\$symb);
+     my $enc = $env{'request.enc'};
+     if ($delete_enc) {
+         delete($env{'request.enc'});
+     }
+     return ($symb,$enc);
+ }
  =pod

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

Removed from v.1.653
changed lines
	Added in v.1.926