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.662 and 1.792

-version 1.662, 2008/06/24 16:44:22
+version 1.792, 2009/04/24 05:14:09
  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();
- Line 68  use Apache::lontexconvert();
+ Line 69  use Apache::lontexconvert();
  use Apache::lonclonecourse();
  use LONCAPA qw(:DEFAULT :match);
  use DateTime::TimeZone;
+ use DateTime::Locale::Catalog;
  # ---------------------------------------------- Designs
  use vars qw(%defaultdesign);
- Line 269  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 404  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">
      var stdeditbrowser;
      function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) {
          var url = '/adm/pickstudent?';
- Line 450  sub selectstudent_link {
+ Line 452  sub selectstudent_link {
  sub authorbrowser_javascript {
      return <<"ENDAUTHORBRW";
- <script type="text/javascript">
+ <script type="text/javascript" language="JavaScript">
  var stdeditbrowser;
  function openauthorbrowser(formname,udom) {
- Line 471  sub coursebrowser_javascript {
+ Line 473  sub coursebrowser_javascript {
      my ($domainfilter,$sec_element,$formname)=@_;
      my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
     my $output = '
- <script type="text/javascript">
+ <script type="text/javascript" language="JavaScript">
      var stdeditbrowser;'."\n";
     $output .= <<"ENDSTDBRW";
      function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
- Line 600  function setSect(sectionlist) {
+ Line 602  function setSect(sectionlist) {
  sub selectcourse_link {
     my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
-    return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
+    return '<span class="LC_nobreak">'
-         '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select Course')."</a>";
+          ."<a href='"
+          .'javascript:opencrsbrowser("'.$form.'","'.$unameele
+          .'","'.$udomele.'","'.$desc.'","'.$extra_element
+          .'","'.$multflag.'","'.$selecttype.'");'
+          ."'>".&mt('Select Course').'</a>'
+          .'</span>';
  }
  sub selectauthor_link {
- Line 657  sub select_timezone {
+ Line 664  sub select_timezone {
     return $output;
  }
+ sub select_datelocale {
+     my ($name,$selected,$onchange,$includeempty)=@_;
+     my $output='<select name="'.$name.'" '.$onchange.'>'."\n";
+     if ($includeempty) {
+         $output .= '<option value=""';
+         if ($selected eq '') {
+             $output .= ' selected="selected" ';
+         }
+         $output .= '> </option>';
+     }
+     my (@possibles,%locale_names);
+     my @locales = DateTime::Locale::Catalog::Locales;
+     foreach my $locale (@locales) {
+         if (ref($locale) eq 'HASH') {
+             my $id = $locale->{'id'};
+             if ($id ne '') {
+                 my $en_terr = $locale->{'en_territory'};
+                 my $native_terr = $locale->{'native_territory'};
+                 my @languages = &Apache::lonlocal::preferred_languages();
+                 if (grep(/^en$/,@languages) || !@languages) {
+                     if ($en_terr ne '') {
+                         $locale_names{$id} = '('.$en_terr.')';
+                     } elsif ($native_terr ne '') {
+                         $locale_names{$id} = $native_terr;
+                     }
+                 } else {
+                     if ($native_terr ne '') {
+                         $locale_names{$id} = $native_terr.' ';
+                     } elsif ($en_terr ne '') {
+                         $locale_names{$id} = '('.$en_terr.')';
+                     }
+                 }
+                 push (@possibles,$id);
+             }
+         }
+     }
+     foreach my $item (sort(@possibles)) {
+         $output.= '<option value="'.$item.'"';
+         if ($item eq $selected) {
+             $output.=' selected="selected"';
+         }
+         $output.=">$item";
+         if ($locale_names{$item} ne '') {
+             $output.="  $locale_names{$item}</option>\n";
+         }
+         $output.="</option>\n";
+     }
+     $output.="</select>";
+     return $output;
+ }
+ sub select_language {
+     my ($name,$selected,$includeempty) = @_;
+     my %langchoices;
+     if ($includeempty) {
+         %langchoices = ('' => 'No language preference');
+     }
+     foreach my $id (&languageids()) {
+         my $code = &supportedlanguagecode($id);
+         if ($code) {
+             $langchoices{$code} = &plainlanguagedescription($id);
+         }
+     }
+     return &select_form($selected,$name,%langchoices);
+ }
  =pod
  =item * &linked_select_forms(...)
- Line 743  sub linked_select_forms {
+ Line 816  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.="var select2data = new Object();\n";
      $" = '","';
      my $debug = '';
- Line 870  sub help_open_topic {
+ Line 943  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 890  ENDTEMPLATE
+ Line 967  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 {
- Line 913  sub general_help {
+ Line 1000  sub general_help {
  	$helptopic='Authoring_Intro';
      } elsif ($env{'request.role'}=~/^cc/) {
  	$helptopic='Course_Coordination_Intro';
+     } elsif ($env{'request.role'}=~/^dc/) {
+         $helptopic='Domain_Coordination_Intro';
      }
      return $helptopic;
  }
- Line 1070  sub help_open_bug {
+ Line 1159  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 1115  sub help_open_faq {
+ Line 1204  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 1502  sub create_text_file {
+ Line 1591  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 1571  sub multiple_select_form {
+ Line 1660  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 1628  sub select_form {
+ Line 1717  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 1682  sub select_level_form {
+ Line 1771  sub select_level_form {
  =pod
- =item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc)
+ =item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$autosubmit)
  Returns a string containing a <select name='$name' size='1'> form to
  allow a user to select the domain to preform an operation in.
- Line 1691  See loncreateuser.pm for an example invo
+ Line 1780  See loncreateuser.pm for an example invo
  If the $includeempty flag is set, it also includes an empty choice ("no domain
  selected");
  If the $showdomdesc flag is set, the domain name is followed by the domain description.
+ If the $autosubmit flag is set, the form containing the domain selector will be auto-submitted by an onchange action.
  =cut
  #-------------------------------------------
  sub select_dom_form {
-     my ($defdom,$name,$includeempty,$showdomdesc) = @_;
+     my ($defdom,$name,$includeempty,$showdomdesc,$autosubmit) = @_;
+     my $onchange;
+     if ($autosubmit) {
+         $onchange = ' onchange="this.form.submit()"';
+     }
      my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
      if ($includeempty) { @domains=('',@domains); }
-     my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
+     my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";
      foreach my $dom (@domains) {
          $selectdomain.="<option value=\"$dom\" ".
              ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
- Line 2051  sub authform_kerberos {
+ Line 2146  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 2066  sub authform_kerberos {
+ Line 2161  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 2090  sub authform_kerberos {
+ Line 2185  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 2099  sub authform_kerberos {
+ Line 2194  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 2160  sub authform_internal{
+ Line 2255  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 2176  sub authform_internal{
+ Line 2271  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 2185  sub authform_internal{
+ Line 2280  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 2215  sub authform_local{
+ Line 2310  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 2231  sub authform_local{
+ Line 2326  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 2240  sub authform_local{
+ Line 2335  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 2269  sub authform_filesystem{
+ Line 2364  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 2282  sub authform_filesystem{
+ Line 2377  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 2291  sub authform_filesystem{
+ Line 2386  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 2659  sub flush_email_cache {
+ Line 2754  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 2703  sub aboutmewrapper {
+ Line 2835  sub aboutmewrapper {
          return;
      }
      return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'.
- 	($target?' target="$target"':'').' title="'.&mt("View this user's personal page").'">'.$link.'</a>';
+ 	($target?' target="$target"':'').' title="'.&mt("View this user's personal information page").'">'.$link.'</a>';
  }
  # ------------------------------------------------------------ Syllabus Wrapper
  sub syllabuswrapper {
-     my ($linktext,$coursedir,$domain,$fontcolor)=@_;
+     my ($linktext,$coursedir,$domain)=@_;
-     if ($fontcolor) {
-         $linktext='<font color="'.$fontcolor.'">'.$linktext.'</font>';
-     }
      return qq{<a href="/public/$domain/$coursedir/syllabus">$linktext</a>};
  }
- Line 2738  sub track_student_link {
+ Line 2867  sub track_student_link {
  	&help_open_topic('View_recent_activity');
  }
+ sub slot_reservations_link {
+     my ($linktext,$sname,$sdom,$target) = @_;
+     my $link ="/adm/slotrequest?command=showresv&amp;origin=aboutme";
+     my $title = 'View slot reservation history';
+     if (defined($sname) && $sname !~ /^\s*$/ &&
+         defined($sdom)  && $sdom  !~ /^\s*$/) {
+         $link .= "&amp;uname=$sname&amp;udom=$sdom";
+         $title .= ' of this student';
+     }
+     if (defined($target) && $target !~ /^\s*$/) {
+         $target = qq{target="$target"};
+     } else {
+         $target = '';
+     }
+     $title = &mt($title);
+     $linktext = &mt($linktext);
+     return qq{<a href="$link" title="$title" $target>$linktext</a>};
+ # FIXME uncomment when help item created: &help_open_topic('Slot_Reservation_History');
+ }
  # ===================================================== Display a student photo
- Line 2940  sub fileextensions {
+ Line 3090  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 2952  sub display_languages {
+ Line 3102  sub display_languages {
      return %languages;
  }
- sub preferred_languages {
-     my @languages=();
-     if (($env{'request.role.adv'}) && ($env{'form.languages'})) {
-         @languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$env{'form.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 3020  sub languages {
+ Line 3125  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 3158  sub relative_to_absolute {
+ Line 3286  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 3343  sub pprmlink {
+ Line 3471  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 3362  sub utc_string {
+ Line 3495  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 3712  sub blocking_status {
+ Line 3863  sub blocking_status {
                               &Apache::lonnet::coursedescription($course);
                          $coursedesc = $courseinfo{'description'};
                      }
-                     $category = "Group files in the course '$coursedesc'";
+                     $category = "Group portfolio in the course '$coursedesc'";
                  } else {
                      $category = 'Portfolio files belonging to ';
                      if ($env{'user.name'} eq 'public' &&
- Line 3742  sub blocking_status {
+ Line 3893  sub blocking_status {
  ###############################################
+ sub check_ip_acc {
+     my ($acc)=@_;
+     &Apache::lonxml::debug("acc is $acc");
+     if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) {
+         return 1;
+     }
+     my $allowed=0;
+     my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'};
+     my $name;
+     foreach my $pattern (split(',',$acc)) {
+         $pattern =~ s/^\s*//;
+         $pattern =~ s/\s*$//;
+         if ($pattern =~ /\*$/) {
+             #35.8.*
+             $pattern=~s/\*//;
+             if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
+         } elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {
+             #35.8.3.[34-56]
+             my $low=$2;
+             my $high=$3;
+             $pattern=$1;
+             if ($ip =~ /^\Q$pattern\E/) {
+                 my $last=(split(/\./,$ip))[3];
+                 if ($last <=$high && $last >=$low) { $allowed=1; }
+             }
+         } elsif ($pattern =~ /^\*/) {
+             #*.msu.edu
+             $pattern=~s/\*//;
+             if (!defined($name)) {
+                 use Socket;
+                 my $netaddr=inet_aton($ip);
+                 ($name)=gethostbyaddr($netaddr,AF_INET);
+             }
+             if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
+         } elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
+             #127.0.0.1
+             if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
+         } else {
+             #some.name.com
+             if (!defined($name)) {
+                 use Socket;
+                 my $netaddr=inet_aton($ip);
+                 ($name)=gethostbyaddr($netaddr,AF_INET);
+             }
+             if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
+         }
+         if ($allowed) { last; }
+     }
+     return $allowed;
+ }
+ ###############################################
  =pod
  =head1 Domain Template Functions
- Line 3790  sub get_domainconf {
+ Line 3995  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 4080  $realm&nbsp;
+ Line 4292  $realm&nbsp;
  </td>
  ENDROLE
-     my $titleinfo = '<span class="LC_title_bar_title">'.$title.'</span>';
+     my $titleinfo = '<h1>'.$title.'</h1>';
      if ($customtitle) {
          $titleinfo = $customtitle;
      }
- Line 4123  ENDROLE
+ Line 4335  ENDROLE
  		.'<b>'.&mt('Construction Space').'</b>:&nbsp;'
  		.'<form name="dirs" method="post" action="'.$formaction
  		.'" target="_top"><tt><b>'
- 		.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<font size=\"+1\">$lastitem</font></b></tt><br />"
+ 		.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<span class=\"LC_fontsize_big\">$lastitem</span></b></tt><br />"
  		.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
  		.'</form>'
  		.&Apache::lonmenu::constspaceform();
- Line 4170  ENDROLE
+ Line 4382  ENDROLE
      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
- Line 4288  sub standard_css {
+ Line 4500  sub standard_css {
      my $img    = &designparm($function.'.img',   $domain);
      my $tabbg  = &designparm($function.'.tabbg', $domain);
      my $font   = &designparm($function.'.font',  $domain);
+ #second colour for later usage
      my $sidebg = &designparm($function.'.sidebg',$domain);
      my $pgbg_or_bgcolor =
  	         $bgcolor ||
- Line 4297  sub standard_css {
+ Line 4510  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;
- Line 4314  sub standard_css {
+ Line 4531  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'
- Line 4321  sub standard_css {
+ Line 4539  sub standard_css {
      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;
+   }
+ a:link, a:visited { font-size:100%; }
+ a:focus { color: red; background: yellow }
+ table.thinborder,
  table.thinborder tr th {
    border-style: solid;
    border-width: 1px;
+   border-color: $lg_border_color;
    background: $tabbg;
  }
  table.thinborder tr td {
    border-style: solid;
-   border-width: 1px
+   border-width: 1px;
+   border-color: $lg_border_color;
  }
  form, .inline { display: inline; }
- .center { text-align: center; }
- .LC_filename {font-family: $mono; white-space:pre;}
+ .LC_right {text-align:right;}
+ .LC_middle {vertical-align:middle;}
+ /* just for tests */
+ .LC_400Box {width:400px; }
+ /* end */
+ .LC_filename {
+   font-family: $mono;
+   white-space:pre;
+ }
+ .LC_fileicon {
+   border: none;
+   height: 1.3em;
+   vertical-align: text-bottom;
+   margin-right: 0.3em;
+   text-decoration:none;
+ }
  .LC_error {
    color: red;
    font-size: larger;
- Line 4357  form, .inline { display: inline; }
+ Line 4602  form, .inline { display: inline; }
  }
  .LC_icon {
-   border: 0px;
+   border: none;
+   vertical-align: middle;
  }
  .LC_indexer_icon {
    border: 0px;
    height: 22px;
- Line 4366  form, .inline { display: inline; }
+ Line 4613  form, .inline { display: inline; }
  .LC_docs_spacer {
    width: 25px;
    height: 1px;
-   border: 0px;
+   border: none;
  }
  .LC_internal_info {
-   color: #999;
+   color: #999999;
  }
  table.LC_pastsubmission {
- Line 4386  table#LC_top_nav, table#LC_menubuttons,t
+ Line 4633  table#LC_top_nav, table#LC_menubuttons,t
    padding: 0px;
  }
  table#LC_title_bar, table.LC_breadcrumbs,
  table#LC_title_bar.LC_with_remote {
    width: 100%;
    border-color: $pgbg;
- Line 4398  table#LC_title_bar.LC_with_remote {
+ Line 4645  table#LC_title_bar.LC_with_remote {
    border-collapse: collapse;
    padding: 0px;
  }
  table.LC_docs_path {
    width: 100%;
    border: 0;
- Line 4411  table.LC_docs_path {
+ Line 4657  table.LC_docs_path {
  table#LC_title_bar td {
    background: $tabbg;
  }
- table#LC_title_bar td.LC_title_bar_who {
+ table#LC_title_bar .LC_title_bar_who {
    background: $tabbg;
    color: $font;
    font: small $sans;
    text-align: right;
+   margin: 0px;
  }
- span.LC_metadata {
+ table#LC_title_bar .LC_title_bar_name {
-     font-family: $sans;
+   margin: 0px;
  }
- span.LC_title_bar_title {
+ table#LC_title_bar .LC_title_bar_role {
-   font: bold x-large $sans;
+   margin: 0px;
  }
- table#LC_title_bar td.LC_title_bar_domain_logo {
+ table#LC_title_bar .LC_title_bar_realm {
-   background: $sidebg;
+   margin: 0px;
-   text-align: right;
-   padding: 0px;
  }
- table#LC_title_bar td.LC_title_bar_role_logo {
+ span.LC_metadata {
-   background: $sidebg;
+     font-family: $sans;
-   padding: 0px;
  }
- table#LC_menubuttons_mainmenu {
+ table#LC_menubuttons img{
-   width: 100%;
-   border: 0px;
-   border-spacing: 1px;
-   padding: 0px 1px;
-   margin: 0px;
-   border-collapse: separate;
- }
- table#LC_menubuttons img, table#LC_menubuttons_mainmenu img {
    border: 0px;
  }
  table#LC_top_nav td {
    background: $tabbg;
    border: 0px;
    font-size: small;
+   vertical-align:top;
+   padding:2px 5px 2px 5px;
  }
  table#LC_top_nav td a, div#LC_top_nav a {
    color: $font;
- Line 4488  table.LC_docs_path td.LC_docs_path_compo
+ Line 4726  table.LC_docs_path td.LC_docs_path_compo
  td.LC_table_cell_checkbox {
    text-align: center;
  }
  table#LC_mainmenu td.LC_mainmenu_column {
      vertical-align: top;
  }
+ .LC_fontsize_small
+ {
+  font-size: 70%;
+ }
+ .LC_fontsize_medium
+ {
+  font-size: 85%;
+ }
+ .LC_fontsize_large
+ {
+  font-size: 120%;
+ }
  .LC_menubuttons_inline_text {
    color: $font;
    font-family: $sans;
-   font-size: smaller;
+   font-size: 90%;
+   padding-left:3px;
  }
  .LC_menubuttons_link {
    text-decoration: none;
  }
+ /*2008--9-5: new menu style sheet.Changed category*/
  .LC_menubuttons_category {
    color: $font;
    background: $pgbg;
- Line 4512  table#LC_mainmenu td.LC_mainmenu_column
+ Line 4765  table#LC_mainmenu td.LC_mainmenu_column
  }
  td.LC_menubuttons_text {
-   width: 90%;
+  	color: $font;
-   color: $font;
-   font-family: $sans;
  }
- td.LC_menubuttons_img {
- }
  .LC_current_location {
    font-family: $sans;
- Line 4530  td.LC_menubuttons_img {
+ Line 4780  td.LC_menubuttons_img {
    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;
- Line 4569  td.LC_menubuttons_img {
+ Line 4791  td.LC_menubuttons_img {
    text-align: right;
  }
+ .LC_roleslog_note {
+   font-size: small;
+ }
+ .LC_mail_functions {
+     font-weight: bold;
+ }
  table.LC_aboutme_port {
    border: 0px;
    border-collapse: collapse;
- Line 4599  table.LC_data_table tr th, table.LC_cale
+ Line 4829  table.LC_data_table tr th, table.LC_cale
  table.LC_prior_tries tr th {
    font-weight: bold;
    background-color: $data_table_head;
-   font-size: smaller;
+   font-size:90%;
  }
- table.LC_data_table tr.LC_odd_row > td,
+ 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,
+ table.LC_pick_box tr > td.LC_odd_row,
  table.LC_aboutme_port tr td {
    background-color: $data_table_light;
    padding: 2px;
  }
  table.LC_data_table tr.LC_even_row > td,
+ table.LC_pick_box tr > td.LC_even_row,
  table.LC_aboutme_port tr.LC_even_row td {
    background-color: $data_table_dark;
+   padding: 2px;
  }
  table.LC_data_table tr.LC_data_table_highlight td {
    background-color: $data_table_darker;
- Line 4631  table.LC_nested tr.LC_empty_row td {
+ Line 4869  table.LC_nested tr.LC_empty_row td {
  table.LC_nested_outer tr th {
    font-weight: bold;
    background-color: $data_table_head;
-   font-size: smaller;
+   font-size: small;
    border-bottom: 1px solid #000000;
  }
  table.LC_nested_outer tr td.LC_subheader {
- Line 4642  table.LC_nested_outer tr td.LC_subheader
+ Line 4880  table.LC_nested_outer tr td.LC_subheader
    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;
- Line 4652  table.LC_nested_outer tr th.LC_left_item
+ Line 4890  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,
- Line 4663  table.LC_nested tr td.LC_right_item {
+ Line 4901  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 4696  table.LC_calendar tr td.LC_calendar_day_
+ Line 4934  table.LC_calendar tr td.LC_calendar_day_
  table.LC_calendar tr td.LC_calendar_day_current {
    background-color: $data_table_highlight;
  }
  table.LC_mail_list tr.LC_mail_new {
    background-color: $mail_new;
  }
  table.LC_mail_list tr.LC_mail_new:hover {
    background-color: $mail_new_hover;
  }
+ table.LC_mail_list tr.LC_mail_even{
+ }
+ table.LC_mail_list tr.LC_mail_odd{
+ }
  table.LC_mail_list tr.LC_mail_read {
    background-color: $mail_read;
  }
- Line 4721  table.LC_mail_list tr.LC_mail_other {
+ Line 4962  table.LC_mail_list tr.LC_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: #CCFF88;
-   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 {
+ table.LC_data_table tr > td.LC_browser_file_locked,
-   background: $tabbg;
+ table.LC_data_table tr > td.LC_browser_file_unpublished {
+   background: #FFAA99;
  }
+ table.LC_data_table tr > td.LC_browser_file_obsolete {
- table#LC_cstr_controls {
+   background: #AAAAAA;
-   width: 100%;
-   border-collapse: collapse;
  }
- table#LC_cstr_controls tr td {
+ table.LC_data_table tr > td.LC_browser_file_modified,
-   border: 4px solid $pgbg;
+ table.LC_data_table tr > td.LC_browser_file_metamodified {
-   padding: 4px;
+   background: #FFFF77;
-   text-align: center;
-   background: $tabbg;
  }
- table#LC_cstr_controls tr th {
+ table.LC_data_table tr.LC_browser_folder > td {
-   border: 4px solid $pgbg;
+   background: #CCCCFF;
-   background: $table_header;
-   text-align: center;
-   font-family: $sans;
-   font-size: smaller;
  }
- table#LC_browser {
+ table.LC_data_table tr > td.LC_roles_is {
+ /*  background: #77FF77; */
- }
- table#LC_browser tr th {
-   background: $table_header;
  }
- table#LC_browser tr td {
+ table.LC_data_table tr > td.LC_roles_future {
-   padding: 2px;
+   background: #FFFF77;
- }
- table#LC_browser tr.LC_browser_file,
- table#LC_browser tr.LC_browser_file_published {
-   background: #CCFF88;
  }
- table#LC_browser tr.LC_browser_file_locked,
+ table.LC_data_table tr > td.LC_roles_will {
- table#LC_browser tr.LC_browser_file_unpublished {
+   background: #FFAA77;
-   background: #FFAA99;
  }
- table#LC_browser tr.LC_browser_file_obsolete {
+ table.LC_data_table tr > td.LC_roles_expired {
-   background: #AAAAAA;
+   background: #FF7777;
  }
- table#LC_browser tr.LC_browser_file_modified,
+ table.LC_data_table tr > td.LC_roles_will_not {
- table#LC_browser tr.LC_browser_file_metamodified {
+   background: #AAFF77;
-   background: #FFFF77;
  }
- table#LC_browser tr.LC_browser_folder {
+ table.LC_data_table tr > td.LC_roles_selected {
-   background: #CCCCFF;
+   background: #11CC55;
  }
  span.LC_current_location {
-   font-size: x-large;
+   font-size:larger;
    background: $pgbg;
  }
- Line 4817  span.LC_parm_folder, span.LC_parm_symb {
+ Line 5029  span.LC_parm_folder, span.LC_parm_symb {
  }
  td.LC_parm_overview_level_menu, td.LC_parm_overview_map_menu,
- td.LC_parm_overview_parm_selectors, td.LC_parm_overview_parm_restrictions {
+ td.LC_parm_overview_parm_selectors,td.LC_parm_overview_restrictions  {
    border: 1px solid black;
    border-collapse: collapse;
  }
- Line 4889  table.LC_pick_box td.LC_pick_box_title {
+ Line 5101  table.LC_pick_box td.LC_pick_box_title {
    background: $tabbg;
    font-weight: bold;
    text-align: right;
+   vertical-align: top;
    width: 184px;
    padding: 8px;
  }
- Line 5028  table.LC_descriptive_input td.LC_descrip
+ Line 5241  table.LC_descriptive_input td.LC_descrip
  div.LC_feedback_link {
    clear: both;
    background: white;
    width: 100%;
  }
  span.LC_feedback_link {
    background: $feedback_link_bg;
- Line 5059  table.LC_prior_tries td {
+ Line 5272  table.LC_prior_tries td {
    background: #FFAAAA ! important;
    color: black;
  }
  .LC_answer_not_charged_try,
  .LC_answer_no_grade,
  .LC_answer_late {
    background: #FFFFAA;
- Line 5077  table.LC_prior_tries td {
+ Line 5290  table.LC_prior_tries td {
    background: orange;
    color: black;
  }
  span.LC_prior_numerical,
  span.LC_prior_string,
  span.LC_prior_custom,
- Line 5106  table.LC_prior_match tr td {
+ Line 5317  table.LC_prior_match tr td {
    border: 1px solid #000000;
  }
+ td.LC_nobreak,
  span.LC_nobreak {
    white-space: nowrap;
  }
- Line 5124  table.LC_docs_documents {
+ Line 5336  table.LC_docs_documents {
    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;
- Line 5209  table.LC_double_column tr td.LC_left_col
+ Line 5412  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;
  }
- Line 5234  div.LC_clear_float_footer {
+ Line 5437  div.LC_clear_float_footer {
  }
- 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;
- Line 5258  div.LC_grade_show_user {
+ Line 5444  div.LC_grade_show_user {
  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 5277  div.LC_grade_show_problem_header,
+ Line 5464  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,
- Line 5288  div.LC_grade_assign_body {
+ Line 5476  div.LC_grade_assign_body {
    background: #FFFFFF;
  }
  span.LC_grade_check_note {
-   font: normal medium $sans;
+   font-weight: normal;
+   font-size: medium;
    display: inline;
    position: absolute;
    right: 1em;
- Line 5298  table.LC_scantron_action {
+ Line 5487  table.LC_scantron_action {
    width: 100%;
  }
  table.LC_scantron_action tr th {
-   font: normal bold $sans;
+   font-weight:bold;
+   font-style:normal;
  }
+ .LC_edit_problem_header,
- div.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,
- Line 5320  div.LC_edit_problem_header_edit_row {
+ Line 5510  div.LC_edit_problem_header_edit_row {
    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;
- Line 5351  hr.LC_edit_problem_divide {
+ Line 5543  hr.LC_edit_problem_divide {
    height: 3px;
    border: 0px;
  }
+ img.stift{
+   border-width:0;
+   vertical-align:middle;
+ }
+ table#LC_mainmenu{
+  margin-top:10px;
+  width:80%;
+ }
+ table#LC_mainmenu td.LC_mainmenu_col_fieldset{
+   vertical-align: top;
+   width: 45%;
+ }
+ .LC_mainmenu_fieldset_category {
+   color: $font;
+   background: $pgbg;
+   font-family: $sans;
+   font-size: small;
+   font-weight: bold;
+ }
+ div.LC_createcourse {
+     margin: 10px 10px 10px 10px;
+ }
+ /* ---- Remove when done ----
+ # The following styles is part of the redesign of LON-CAPA and are
+ # subject to change during this project.
+ # Don't rely on their current functionality as they might be
+ # changed or removed.
+ # --------------------------*/
+ a:hover,
+ ol.LC_smallMenu a:hover,
+ ol#LC_MenuBreadcrumbs a:hover,
+ ol#LC_PathBreadcrumbs a:hover,
+ ul#LC_TabMainMenuContent a:hover,
+ .LC_FormSectionClearButton input:hover
+ ul.LC_TabContent   li:hover a{
+ 	color:#BF2317;
+         text-decoration:none;
+ }
+ h1 {
+ 	padding:5px 10px 5px 20px;
+ 	line-height:130%;
+ }
+ h2,h3,h4,h5,h6
+ {
+ 	margin:5px 0px 5px 0px;
+ 	padding:0px;
+ 	line-height:130%;
+ }
+ .LC_hcell{
+         padding:3px 15px 3px 15px;
+         margin:0px;
+ 	background-color:$tabbg;
+ 	border-bottom:solid 1px $lg_border_color;
+ }
+ .LC_noBorder {
+         border:0px;
+ }
+ /* Main Header with discription of Person, Course, etc. */
+ .LC_Right {
+         float: right;
+         margin: 0px;
+         padding: 0px;
+ }
+ p, .LC_ContentBox {
+ 	padding: 10px;
+ }
+ .LC_FormSectionClearButton input {
+         background-color:transparent;
+         border:0px;
+         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 0px;
+ 	overflow:hidden;
+ }
+ ol.LC_smallMenu, ol#LC_PathBreadcrumbs {
+ 	margin: 0px;
+ }
+ ol.LC_smallMenu li {
+ 	display: inline;
+ 	padding: 5px 5px 0px 10px;
+ 	vertical-align: top;
+ }
+ ol.LC_smallMenu li img {
+ 	vertical-align: bottom;
+ }
+ ol.LC_smallMenu a {
+ 	font-size: 90%;
+ 	color: RGB(80, 80, 80);
+ 	text-decoration: none;
+ }
+ ol#LC_TabMainMenuContent, ul.LC_TabContent ,
+ ul.LC_TabContentBigger {
+ 	display:block;
+ 	list-style:none;
+ 	margin: 0px;
+ 	padding: 0px;
+ }
+ ol#LC_TabMainMenuContent li, ul.LC_TabContent li,
+ ul.LC_TabContentBigger li{
+ 	display: inline;
+ 	border-right: solid 1px $lg_border_color;
+ 	float:left;
+ 	line-height:140%;
+ 	white-space:nowrap;
+ }
+ ol#LC_TabMainMenuContent li{
+ 	vertical-align: bottom;
+ 	border-bottom: solid 1px RGB(175, 175, 175);
+ 	padding: 5px 10px 5px 10px;
+ 	margin-right:5px;
+ 	margin-bottom:3px;
+ 	font-weight: bold;
+ 	background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
+ }
+ ol#LC_TabMainMenuContent li a{
+ 	color: RGB(47, 47, 47);
+ 	text-decoration: none;
+ }
+ ul.LC_TabContent {
+ 	min-height:1.6em;
+ }
+ ul.LC_TabContent li{
+ 	vertical-align:middle;
+ 	padding:0px 10px 0px 10px;
+ 	background-color:$tabbg;
+ 	border-bottom:solid 1px $lg_border_color;
+ }
+ ul.LC_TabContent li a, ul.LC_TabContent li{
+ 	color:rgb(47,47,47);
+ 	text-decoration:none;
+ 	font-size:95%;
+ 	font-weight:bold;
+ 	padding-right: 16px;
+ }
+ ul.LC_TabContent li:hover, ul.LC_TabContent li.active{
+         background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;
+ 	border-bottom:solid 1px #FFFFFF;
+ 	padding-right: 16px;
+ }
+ ul.LC_TabContentBigger li{
+ 	vertical-align:bottom;
+ 	border-top:solid 1px $lg_border_color;
+ 	border-left:solid 1px $lg_border_color;
+ 	padding:5px 10px 5px 10px;
+ 	margin-left:2px;
+ 	background:url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
+ }
+ ul.LC_TabContentBigger li:hover, ul.LC_TabContentBigger li.active{
+ 	background:url(/adm/lonIcons/lightGreyBG.png) repeat-x right bottom;
+ }
+ ul.LC_TabContentBigger li, ul.LC_TabContentBigger li a{
+ 	font-size:110%;
+ 	font-weight:bold;
+ }
+ ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcrumbs, ul.LC_CourseBreadcrumbs{
+ 	border-top: solid 1px RGB(255, 255, 255);
+ 	height: 20px;
+ 	line-height: 20px;
+ 	vertical-align: bottom;
+ 	margin: 0px 0px 30px 0px;
+ 	padding-left: 10px;
+ 	list-style-position: inside;
+ 	background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
+ }
+ ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li, ul.LC_CourseBreadcrumbs li {
+ /*
+ 	background: url(/adm/lonIcons/arrow_white.png) no-repeat left center;
+ */
+ 	display: inline;
+ 	padding: 0px 0px 0px 10px;
+ /*	vertical-align: bottom; */
+ 	overflow:hidden;
+ }
+ ol#LC_MenuBreadcrumbs li a, ul.LC_CourseBreadcrumbs li a {
+ 	text-decoration: none;
+ 	font-size:90%;
+ }
+ ol#LC_PathBreadcrumbs li a{
+ 	text-decoration:none;
+ 	font-size:100%;
+ 	font-weight:bold;
+ }
+ .LC_BoxPadding
+ {
+ 	padding: 10px;
+ }
+ .LC_ContentBoxSpecial
+ {
+ 	border: solid 1px $lg_border_color;
+ }
+ .LC_ContentBoxSpecialContactInfo
+ {
+ 	border: solid 1px $lg_border_color;
+ 	max-width:25%;
+ 	min-width:25%;
+ }
+ .LC_AboutMe_Image
+ {
+ 	float:left;
+ 	margin-right:10px;
+ }
+ .LC_Clear_AboutMe_Image
+ {
+ 	clear:left;
+ }
+ dl.LC_ListStyleClean dt {
+ 	padding-right: 5px;
+ 	display: table-header-group;
+ }
+ dl.LC_ListStyleClean dd {
+ 	display: table-row;
+ }
+ .LC_ListStyleClean,
+ .LC_ListStyleSimple,
+ .LC_ListStyleNormal,
+ .LC_ListStyle_Border,
+ .LC_ListStyleSpecial
+ 	{
+ 	/*display:block;	*/
+ 	list-style-position: inside;
+ 	list-style-type: none;
+ 	overflow: hidden;
+ 	padding: 0px;
+ }
+ .LC_ListStyleSimple li,
+ .LC_ListStyleSimple dd,
+ .LC_ListStyleNormal li,
+ .LC_ListStyleNormal dd,
+ .LC_ListStyleSpecial li,
+ .LC_ListStyleSpecial dd
+ 	{
+ 	margin: 0px;
+ 	padding: 5px 5px 5px 10px;
+ 	clear: both;
+ }
+ .LC_ListStyleClean li,
+ .LC_ListStyleClean dd {
+ 	padding-top: 0px;
+ 	padding-bottom: 0px;
+ }
+ .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:0px;
+ 	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:0px;
+ }
+ div.LC_columnSection>* {
+ 	float: left;
+ 	margin: 10px 20px 10px 0px;
+ 	overflow:hidden;
+ }
+ .ContentBoxSpecialTemplate
+ {
+         border: solid 1px $lg_border_color;
+ }
+ .ContentBoxTemplate {
+         padding:10px;
+ }
+ div.LC_columnSection > .ContentBoxTemplate,
+ div.LC_columnSection > .ContentBoxSpecialTemplate
+         {
+         width: 600px;
+ }
+ .clear{
+ 	clear: both;
+ 	line-height: 0px;
+ 	font-size: 0px;
+ 	height: 0px;
+ }
+ .LC_loginpage_container {
+ 	text-align:left;
+ 	margin : 0 auto;
+ 	width:90%;
+ 	padding: 10px;
+ 	height: auto;
+ 	background-color:#FFFFFF;
+ 	border:1px solid #CCCCCC;
+ }
+ .LC_loginpage_loginContainer {
+ 	float:left;
+ 	width: 182px;
+ 	padding: 2px;
+ 	border:1px solid #CCCCCC;
+ 	background-color:$loginbg;
+ }
+ .LC_loginpage_loginContainer h2{
+ 	margin-top:0;
+ 	display:block;
+ 	background:$bgcol;
+ 	color:$textcol;
+ 	padding-left:5px;
+ }
+ .LC_loginpage_loginInfo {
+ 	float:left;
+ 	width:182px;
+ 	border:1px solid #CCCCCC;
+ 	padding:2px;
+ }
+ .LC_loginpage_space {
+ 	clear: both;
+ 	margin-bottom: 20px;
+ 	border-bottom: 1px solid #CCCCCC;
+ }
+ .LC_loginpage_floatLeft {
+ 	float: left;
+ 	width: 200px;
+ 	margin: 0;
+ }
+ table em{
+ 	font-weight: bold;
+ 	font-style: normal;
+ }
+ table.LC_tableBrowseRes,
+ table.LC_tableOfContent{
+         border:none;
+ 	border-spacing: 1;
+ 	padding: 3px;
+ 	background-color: #FFFFFF;
+ 	font-size: 90%;
+ }
+ table.LC_tableOfContent{
+     border-collapse: collapse;
+ }
+ table.LC_tableBrowseRes a,
+ table.LC_tableOfContent a {
+         background-color: transparent;
+ 	text-decoration: none;
+ }
+ table.LC_tableBrowseRes tr.LC_trOdd,
+ table.LC_tableOfContent tr.LC_trOdd{
+ 	background-color: #EEEEEE;
+ }
+ table.LC_tableOfContent img{
+ 	border: none;
+ 	height: 1.3em;
+ 	vertical-align: text-bottom;
+ 	margin-right: 0.3em;
+ }
+ a#LC_content_toolbar_firsthomework{
+ 	background-image:url(/res/adm/pages/open-first-problem.gif);
+ }
+ a#LC_content_toolbar_launchnav{
+ 	background-image:url(/res/adm/pages/start-navigation.gif);
+ }
+ a#LC_content_toolbar_closenav{
+ 	background-image:url(/res/adm/pages/close-navigation.gif);
+ }
+ a#LC_content_toolbar_everything{
+ 	background-image:url(/res/adm/pages/show-all.gif);
+ }
+ a#LC_content_toolbar_uncompleted{
+ 	background-image:url(/res/adm/pages/show-incomplete-problems.gif);
+ }
+ #LC_content_toolbar_clearbubbles{
+ 	background-image:url(/res/adm/pages/mark-discussionentries-read.gif);
+ }
+ a#LC_content_toolbar_changefolder{
+ 	background : url(/res/adm/pages/close-all-folders.gif) top center ;
+ }
+ a#LC_content_toolbar_changefolder_toggled{
+ 	background-image:url(/res/adm/pages/open-all-folders.gif);
+ }
+ ul#LC_toolbar li a:hover{
+ 	background-position: bottom center;
+ }
+ ul#LC_toolbar{
+ 	padding:0;
+ 	margin: 2px;
+ 	list-style:none;
+ 	position:relative;
+ 	background-color:white;
+ }
+ ul#LC_toolbar li{
+ 	border:1px solid white;
+ 	padding:0;
+ 	margin: 0;
+     float: left;
+ 	display:inline;
+ 	vertical-align:middle;
+ }
+ a.LC_toolbarItem{
+ 	display:block;
+ 	padding:0;
+ 	margin:0;
+ 	height: 32px;
+ 	width: 32px;
+ 	color:white;
+ 	border:0 none;
+ 	background-repeat:no-repeat;
+ 	background-color:transparent;
+ }
+ ul.LC_functionslist li {
+   float: left;
+   white-space: nowrap;
+   height: 35px; /* at least as high as heighest list item */
+   margin: 0px 15px 15px 10px;
+ }
  END
  }
- Line 5614  sub start_page {
+ Line 6298  sub start_page {
      }
      if ($args->{'js_ready'}) {
- 	$result = &js_ready($result);
+ 		$result = &js_ready($result);
      }
      if ($args->{'html_encode'}) {
- 	$result = &html_encode($result);
+ 		$result = &html_encode($result);
+     }
+ 	#Breadcrumbs
+     if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
+ 		&Apache::lonhtmlcommon::clear_breadcrumbs();
+ 		#if any br links exists, add them to the breadcrumbs
+ 		if (exists($args->{'bread_crumbs'}) and ref($args->{'bread_crumbs'}) eq 'ARRAY') {
+ 			foreach my $crumb (@{$args->{'bread_crumbs'}}){
+ 				&Apache::lonhtmlcommon::add_breadcrumb($crumb);
+ 			}
+ 		}
+ 		#if bread_crumbs_component exists show it as headline else show only the breadcrumbs
+ 		if(exists($args->{'bread_crumbs_component'})){
+ 			$result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'});
+ 		}else{
+ 			$result .= &Apache::lonhtmlcommon::breadcrumbs();
+ 		}
      }
      return $result;
  }
- Line 5765  sub simple_error_page {
+ Line 6467  sub simple_error_page {
      }
      sub start_data_table_empty_row {
- 	$row_count[0]++;
+ #	$row_count[0]++;
  	return  '<tr class="LC_empty_row" >'."\n";;
      }
- Line 6367  If the user's status includes multiple t
+ Line 7069  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 6379  sub default_quota {
+ Line 7083  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 6799  sub instrule_disallow_msg {
+ Line 7519  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 6825  sub personal_data_fieldtitles {
+ Line 7549  sub personal_data_fieldtitles {
                          middlename => 'Middle Name',
                          generation => 'Generation',
                          gen => 'Generation',
+                         inststatus => 'Affiliation',
                     );
      return %fieldtitles;
  }
- Line 6834  sub sorted_inst_types {
+ Line 7559  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 6847  sub sorted_inst_types {
+ Line 7572  sub sorted_inst_types {
      }
      if (keys(%{$usertypes}) > 0) {
          $othertitle = &mt('Other users');
-         if ($env{'request.course.id'}) {
-             $othertitle = 'other';
-         }
      }
      return ($othertitle,$usertypes,\@types);
  }
- Line 6897  sub get_institutional_codes {
+ Line 7619  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 7188  sub upload_embedded {
+ Line 7959  sub upload_embedded {
                                     '&nbsp;<a href="'.$url.'">'.
                                     $orig_uploaded_filename.'</a><br />';
                      } else {
-                         $output .= '<font size="+2">'.
+                         $output .= '<span class=\"LC_fontsize_large\">'.
                                     &mt('View embedded file: [_1]','<a href="'.$url.'">'.
-                                    $orig_uploaded_filename.'</a>').'</font><br />';
+                                    $orig_uploaded_filename.'</a>').'</span><br />';
                      }
                  }
                  close($fh);
- Line 7238  sub check_for_upload {
+ Line 8009  sub check_for_upload {
              }
          }
      }
-     my $getpropath = 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>'.
- Line 7450  sub upfile_select_html {
+ Line 8220  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 7538  sub csv_print_select_table {
+ Line 8308  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.
  		  ' onchange="javascript:flip(this.form,'.$i.');">');
- Line 8194  sub restore_settings {
+ Line 8964  sub restore_settings {
  =item * &build_recipient_list()
- Build recipient lists for three types of e-mail:
+ Build recipient lists for four 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, generated by
+ lonerrorhandler.pm, CHECKRPMS, loncron, and lonsupportreq.pm respectively.
  Inputs:
  defmail (scalar - email address of default recipient),
- Line 8220  sub build_recipient_list {
+ Line 8991  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 8272  domain - to an array.  Also generates ja
+ Line 9049  domain - to an array.  Also generates ja
  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).
- Line 8319  sub gather_categories {
+ Line 9100  sub gather_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.
- Line 8337  Side effects: populates trails and allit
+ Line 9127  Side effects: populates trails and allit
  =cut
  sub extract_categories {
-     my ($categories,$cats,$trails,$allitems,$idx,$jsarray) = @_;
+     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') {
- Line 8358  sub extract_categories {
+ Line 9148  sub extract_categories {
                  if (ref($cats->[1]{$name}) eq 'ARRAY') {
                      for (my $j=0; $j<@{$cats->[1]{$name}}; $j++) {
                          my $category = $cats->[1]{$name}[$j];
-                         &recurse_categories($cats,2,$category,$trails,$allitems,\@parents);
+                         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} = [];
                      }
                  }
              }
- Line 8374  sub extract_categories {
+ Line 9171  sub extract_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 breacrumb trails for each category).
+ 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).
- Line 8388  Returns: nothing
+ Line 9191  Returns: nothing
  Side effects: populates trails and allitems hash references
- =back
  =cut
  sub recurse_categories {
-     my ($cats,$depth,$category,$trails,$allitems,$parents) = @_;
+     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++) {
- Line 8406  sub recurse_categories {
+ Line 9207  sub recurse_categories {
              }
              my $deeper = $depth+1;
              push(@{$parents},$category);
-             &recurse_categories($cats,$deeper,$name,$trails,$allitems,$parents);
+             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 {
- Line 8420  sub recurse_categories {
+ Line 9235  sub recurse_categories {
      return;
  }
+ =pod
+ =item *&assign_categories_table()
+ Create a datatable for display of hierarchical categories in a domain,
+ with checkboxes to allow a course to be categorized.
+ Inputs:
+ cathash - reference to hash of categories defined for the domain (from
+           configuration.db)
+ currcat - scalar with an & separated list of categories assigned to a course.
+ Returns: $output (markup to be displayed)
+ =cut
+ sub assign_categories_table {
+     my ($cathash,$currcat) = @_;
+     my $output;
+     if (ref($cathash) eq 'HASH') {
+         my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);
+         &extract_categories($cathash,\@cats,\@trails,\%allitems,\%idx,\@jsarray);
+         $maxdepth = scalar(@cats);
+         if (@cats > 0) {
+             my $itemcount = 0;
+             if (ref($cats[0]) eq 'ARRAY') {
+                 $output = &Apache::loncommon::start_data_table();
+                 my @currcategories;
+                 if ($currcat ne '') {
+                     @currcategories = split('&',$currcat);
+                 }
+                 for (my $i=0; $i<@{$cats[0]}; $i++) {
+                     my $parent = $cats[0][$i];
+                     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                     next if ($parent eq 'instcode');
+                     my $item = &escape($parent).'::0';
+                     my $checked = '';
+                     if (@currcategories > 0) {
+                         if (grep(/^\Q$item\E$/,@currcategories)) {
+                             $checked = ' checked="checked"';
+                         }
+                     }
+                     $output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
+                                '<input type="checkbox" name="usecategory" value="'.
+                                $item.'"'.$checked.' />'.$parent.'</span>'.
+                                '<input type="hidden" name="catname" value="'.$parent.'" /></td>';
+                     my $depth = 1;
+                     push(@path,$parent);
+                     $output .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
+                     pop(@path);
+                     $output .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
+                     $itemcount ++;
+                 }
+                 $output .= &Apache::loncommon::end_data_table();
+             }
+         }
+     }
+     return $output;
+ }
+ =pod
+ =item *&assign_category_rows()
+ Create a datatable row for display of nested categories in a domain,
+ with checkboxes to allow a course to be categorized,called recursively.
+ Inputs:
+ itemcount - track row number for alternating colors
+ cats - reference to array of arrays/hashes which encapsulates hierarchy of
+       categories and subcategories.
+ depth - current depth in hierarchy of categories and sub-categories - 0 indexed.
+ parent - parent of current category item
+ path - Array containing all categories back up through the hierarchy from the
+        current category to the top level.
+ currcategories - reference to array of current categories assigned to the course
+ Returns: $output (markup to be displayed).
+ =cut
+ sub assign_category_rows {
+     my ($itemcount,$cats,$depth,$parent,$path,$currcategories) = @_;
+     my ($text,$name,$item,$chgstr);
+     if (ref($cats) eq 'ARRAY') {
+         my $maxdepth = scalar(@{$cats});
+         if (ref($cats->[$depth]) eq 'HASH') {
+             if (ref($cats->[$depth]{$parent}) eq 'ARRAY') {
+                 my $numchildren = @{$cats->[$depth]{$parent}};
+                 my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                 $text .= '<td><table class="LC_datatable">';
+                 for (my $j=0; $j<$numchildren; $j++) {
+                     $name = $cats->[$depth]{$parent}[$j];
+                     $item = &escape($name).':'.&escape($parent).':'.$depth;
+                     my $deeper = $depth+1;
+                     my $checked = '';
+                     if (ref($currcategories) eq 'ARRAY') {
+                         if (@{$currcategories} > 0) {
+                             if (grep(/^\Q$item\E$/,@{$currcategories})) {
+                                 $checked = ' checked="checked"';
+                             }
+                         }
+                     }
+                     $text .= '<tr><td><span class="LC_nobreak"><label>'.
+                              '<input type="checkbox" name="usecategory" value="'.
+                              $item.'"'.$checked.' />'.$name.'</label></span>'.
+                              '<input type="hidden" name="catname" value="'.$name.'" />'.
+                              '</td><td>';
+                     if (ref($path) eq 'ARRAY') {
+                         push(@{$path},$name);
+                         $text .= &assign_category_rows($itemcount,$cats,$deeper,$name,$path,$currcategories);
+                         pop(@{$path});
+                     }
+                     $text .= '</td></tr>';
+                 }
+                 $text .= '</table></td>';
+             }
+         }
+     }
+     return $text;
+ }
  ############################################################
  ############################################################
  sub commit_customrole {
-     my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_;
+     my ($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 8704  sub construct_course {
+ Line 9649  sub construct_course {
                     'policy.email',
                     'comment.email',
                     'pch.users.denied',
-                    'plc.users.denied'],
+                    'plc.users.denied',
+                    'hidefromcat',
+                    'categories'],
                     $$crsudom,$$crsunum);
      }
- Line 8932  sub construct_course {
+ Line 9879  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 8989  sub icon {
+ Line 9936  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 9088  sub init_user_environment {
+ Line 10021  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 9176  sub init_user_environment {
+ Line 10109  sub init_user_environment {
  	    }
  	}
+         foreach my $tool ('aboutme','blog','portfolio') {
+             $userenv{'availabletools.'.$tool} =
+                 &Apache::lonnet::usertools_access($username,$domain,$tool,'reload');
+         }
+         foreach my $crstype ('official','unofficial') {
+             $userenv{'canrequest.'.$crstype} =
+                 &Apache::lonnet::usertools_access($username,$domain,$crstype,
+                                                   'reload','requestcourses');
+         }
  	$env{'user.environment'} = "$lonids/$cookie.id";
  	if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",
- Line 9188  sub init_user_environment {
+ Line 10132  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 9203  sub init_user_environment {
+ Line 10147  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.662
changed lines
	Added in v.1.792