--- loncom/interface/loncommon.pm	2008/05/29 15:39:16	1.656
+++ loncom/interface/loncommon.pm	2009/05/18 16:08:07	1.820
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.656 2008/05/29 15:39:16 www Exp $
+# $Id: loncommon.pm,v 1.820 2009/05/18 16:08:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,12 +61,15 @@ use POSIX qw(strftime mktime);
 use Apache::lonmenu();
 use Apache::lonenc();
 use Apache::lonlocal;
+use Apache::lonnet();
 use HTML::Entities;
 use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
 use Apache::lontexconvert();
 use Apache::lonclonecourse();
 use LONCAPA qw(:DEFAULT :match);
+use DateTime::TimeZone;
+use DateTime::Locale::Catalog;
 
 # ---------------------------------------------- Designs
 use vars qw(%defaultdesign);
@@ -150,7 +153,6 @@ sub ssi_with_retries {
 
 # ----------------------------------------------- Filetypes/Languages/Copyright
 my %language;
-my %timezone;
 my %supported_language;
 my %cprtag;
 my %scprtag;
@@ -193,22 +195,6 @@ BEGIN {
             close($fh);
         }
     }
-# ------------------------------------------------------------------- timezones
-    {
-        my $timetabfile = $Apache::lonnet::perlvar{'lonTabDir'}.
-                                   '/timezone.tab';
-        if ( open(my $fh,"<$timetabfile") ) {
-            while (my $line = <$fh>) {
-                next if ($line=~/^\#/);
-                chomp($line);
-                my $value=$line;
-                $value=~s/\_/ /g;
-                $timezone{$line}=$value;
-            }
-            close($fh);
-        }
-    }
-
 # ------------------------------------------------------------------ copyrights
     {
         my $copyrightfile = $Apache::lonnet::perlvar{'lonIncludes'}.
@@ -285,7 +271,7 @@ BEGIN {
         }
     }
     &Apache::lonnet::logthis(
-              "<font color=yellow>INFO: Read file types</font>");
+             "<span style='color:yellow;'>INFO: Read file types</span>");
     $readit=1;
     }  # end of unless($readit) 
     
@@ -420,9 +406,9 @@ sub studentbrowser_javascript {
          || ($env{'request.role'}=~/^(au|dc|su)/)
           ) { return ''; }  
    return (<<'ENDSTDBRW');
-<script type="text/javascript" language="Javascript" >
+<script type="text/javascript" language="Javascript">
     var stdeditbrowser;
-    function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) {
+    function openstdbrowser(formname,uname,udom,roleflag,ignorefilter,courseadvonly) {
         var url = '/adm/pickstudent?';
         var filter;
 	if (!ignorefilter) {
@@ -436,6 +422,7 @@ sub studentbrowser_javascript {
         url += 'form=' + formname + '&unameelement='+uname+
                                     '&udomelement='+udom;
 	if (roleflag) { url+="&roles=1"; }
+        if (courseadvonly) { url+="&courseadvonly=1"; }
         var title = 'Student_Browser';
         var options = 'scrollbars=1,resizable=1,menubar=0';
         options += ',width=700,height=600';
@@ -447,26 +434,33 @@ ENDSTDBRW
 }
 
 sub selectstudent_link {
-   my ($form,$unameele,$udomele)=@_;
+   my ($form,$unameele,$udomele,$courseadvonly)=@_;
+   my $callargs = "'".$form."','".$unameele."','".$udomele."'";
    if ($env{'request.course.id'}) {  
        if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
 	   && !&Apache::lonnet::allowed('srm',$env{'request.course.id'}.
 					'/'.$env{'request.course.sec'})) {
 	   return '';
        }
-       return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
-        '","'.$udomele.'");'."'>".&mt('Select User')."</a>";
+       if ($courseadvonly)  {
+           $callargs .= ",'',1,1";
+       }
+       return '<span class="LC_nobreak">'.
+              '<a href="javascript:openstdbrowser('.$callargs.');">'.
+              &mt('Select User').'</a></span>';
    }
    if ($env{'request.role'}=~/^(au|dc|su)/) {
-       return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
-        '","'.$udomele.'",1);'."'>".&mt('Select User')."</a>";
+       $callargs .= ",1"; 
+       return '<span class="LC_nobreak">'.
+              '<a href="javascript:openstdbrowser('.$callargs.');">'.
+              &mt('Select User').'</a></span>';
    }
    return '';
 }
 
 sub authorbrowser_javascript {
     return <<"ENDAUTHORBRW";
-<script type="text/javascript">
+<script type="text/javascript" language="JavaScript">
 var stdeditbrowser;
 
 function openauthorbrowser(formname,udom) {
@@ -487,7 +481,7 @@ 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) {
@@ -523,6 +517,10 @@ sub coursebrowser_javascript {
             else {
                 if (formname == 'portform') {
                     url += '&setroles='+extra_element;
+                } else {
+                    if (formname == 'rules') {
+                        url += '&fixeddom='+extra_element; 
+                    }
                 }
             }     
         }
@@ -616,8 +614,13 @@ function setSect(sectionlist) {
 
 sub selectcourse_link {
    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
-   return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
-        '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select Course')."</a>";
+   return '<span class="LC_nobreak">'
+         ."<a href='"
+         .'javascript:opencrsbrowser("'.$form.'","'.$unameele
+         .'","'.$udomele.'","'.$desc.'","'.$extra_element
+         .'","'.$multflag.'","'.$selecttype.'");'
+         ."'>".&mt('Select Course').'</a>'
+         .'</span>';
 }
 
 sub selectauthor_link {
@@ -652,19 +655,93 @@ ENDSCRT
 }
 
 sub select_timezone {
-   my ($name,$selected,$onchange)=@_;
-   my $output="<select name='$name' $onchange>\n";
-   foreach my $key (sort(keys(%timezone))) {
-      $output.="<option value='$timezone{$key}'";
-      if ($key eq $selected) {
-         $output.=" selected='selected'";
-      }
-      $output.=">$timezone{$key}</option>\n";
+   my ($name,$selected,$onchange,$includeempty)=@_;
+   my $output='<select name="'.$name.'" '.$onchange.'>'."\n";
+   if ($includeempty) {
+       $output .= '<option value=""';
+       if (($selected eq '') || ($selected eq 'local')) {
+           $output .= ' selected="selected" ';
+       }
+       $output .= '> </option>';
+   }
+   my @timezones = DateTime::TimeZone->all_names;
+   foreach my $tzone (@timezones) {
+       $output.= '<option value="'.$tzone.'"';
+       if ($tzone eq $selected) {
+           $output.=' selected="selected"';
+       }
+       $output.=">$tzone</option>\n";
    }
    $output.="</select>";
    return $output;
 }
 
+sub select_datelocale {
+    my ($name,$selected,$onchange,$includeempty)=@_;
+    my $output='<select name="'.$name.'" '.$onchange.'>'."\n";
+    if ($includeempty) {
+        $output .= '<option value=""';
+        if ($selected eq '') {
+            $output .= ' selected="selected" ';
+        }
+        $output .= '> </option>';
+    }
+    my (@possibles,%locale_names);
+    my @locales = DateTime::Locale::Catalog::Locales;
+    foreach my $locale (@locales) {
+        if (ref($locale) eq 'HASH') {
+            my $id = $locale->{'id'};
+            if ($id ne '') {
+                my $en_terr = $locale->{'en_territory'};
+                my $native_terr = $locale->{'native_territory'};
+                my @languages = &Apache::lonlocal::preferred_languages();
+                if (grep(/^en$/,@languages) || !@languages) {
+                    if ($en_terr ne '') {
+                        $locale_names{$id} = '('.$en_terr.')';
+                    } elsif ($native_terr ne '') {
+                        $locale_names{$id} = $native_terr;
+                    }
+                } else {
+                    if ($native_terr ne '') {
+                        $locale_names{$id} = $native_terr.' ';
+                    } elsif ($en_terr ne '') {
+                        $locale_names{$id} = '('.$en_terr.')';
+                    }
+                }
+                push (@possibles,$id);
+            }
+        }
+    }
+    foreach my $item (sort(@possibles)) {
+        $output.= '<option value="'.$item.'"';
+        if ($item eq $selected) {
+            $output.=' selected="selected"';
+        }
+        $output.=">$item";
+        if ($locale_names{$item} ne '') {
+            $output.="  $locale_names{$item}</option>\n";
+        }
+        $output.="</option>\n";
+    }
+    $output.="</select>";
+    return $output;
+}
+
+sub select_language {
+    my ($name,$selected,$includeempty) = @_;
+    my %langchoices;
+    if ($includeempty) {
+        %langchoices = ('' => 'No language preference');
+    }
+    foreach my $id (&languageids()) {
+        my $code = &supportedlanguagecode($id);
+        if ($code) {
+            $langchoices{$code} = &plainlanguagedescription($id);
+        }
+    }
+    return &select_form($selected,$name,%langchoices);
+}
+
 =pod
 
 =item * &linked_select_forms(...)
@@ -751,7 +828,7 @@ 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 = '';
@@ -858,9 +935,6 @@ sub help_open_topic {
     my ($topic, $text, $stayOnPage, $width, $height) = @_;
     $text = "" if (not defined $text);
     $stayOnPage = 0 if (not defined $stayOnPage);
-    if ($env{'browser.interface'} eq 'textual') {
-	$stayOnPage=1;
-    }
     $width = 350 if (not defined $width);
     $height = 400 if (not defined $height);
     my $filename = $topic;
@@ -878,19 +952,23 @@ sub help_open_topic {
     }
 
     # Add the text
-    if ($text ne "") {
-	$template .= 
-            "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
-            "<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+    if ($text ne "") {	
+	$template.='<span class="LC_help_open_topic">'
+                  .'<a target="_top" href="'.$link.'">'
+                  .$text.'</a>';
     }
 
-    # Add the graphic
+    # (Always) Add the graphic
     my $title = &mt('Online Help');
-    my $helpicon=&lonhttpdurl("/res/adm/pages/help.png");
-    $template .= <<"ENDTEMPLATE";
- <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
-ENDTEMPLATE
-    if ($text ne '') { $template.='</td></tr></table>' };
+    my $helpicon=&lonhttpdurl("/adm/help/help.png");
+    $template.=' <a target="_top" href="'.$link.'" title="'.$title.'">'
+              .'<img src="'.$helpicon.'" border="0"'
+              .' alt="'.&mt('Help: [_1]',$topic).'"'
+              .' title="'.$title.'"' 
+              .' /></a>';
+    if ($text ne "") {	
+        $template.='</span>';
+    }
     return $template;
 
 }
@@ -898,21 +976,31 @@ ENDTEMPLATE
 # This is a quicky function for Latex cheatsheet editing, since it 
 # appears in at least four places
 sub helpLatexCheatsheet {
-    my $other = shift;
+    my ($topic,$text,$not_author) = @_;
+    my $out;
     my $addOther = '';
-    if ($other) {
-	$addOther = Apache::loncommon::help_open_topic($other, shift,
-						       undef, undef, 600) .
-							   '</td><td>';
-    }
-    return '<table><tr><td>'.
-	$addOther .
-	&Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),
-					    undef,undef,600)
-	.'</td><td>'.
-	&Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
-					    undef,undef,600)
-	.'</td></tr></table>';
+    if ($topic) {
+	$addOther = '<span>'.&Apache::loncommon::help_open_topic($topic,&mt($text),
+							       undef, undef, 600).
+								   '</span> ';
+    }
+    $out = '<span>' # Start cheatsheet
+	  .$addOther
+          .'<span>'
+	  .&Apache::loncommon::help_open_topic('Greek_Symbols',&mt('Greek Symbols'),
+					       undef,undef,600)
+	  .'</span> <span>'
+	  .&Apache::loncommon::help_open_topic('Other_Symbols',&mt('Other Symbols'),
+					       undef,undef,600)
+	  .'</span>';
+    unless ($not_author) {
+        $out .= ' <span>'
+	       .&Apache::loncommon::help_open_topic('Authoring_Output_Tags',&mt('Output Tags'),
+	                                            undef,undef,600)
+	       .'</span>';
+    }
+    $out .= '</span>'; # End cheatsheet
+    return $out;
 }
 
 sub general_help {
@@ -921,6 +1009,8 @@ sub general_help {
 	$helptopic='Authoring_Intro';
     } elsif ($env{'request.role'}=~/^cc/) {
 	$helptopic='Course_Coordination_Intro';
+    } elsif ($env{'request.role'}=~/^dc/) {
+        $helptopic='Domain_Coordination_Intro';
     }
     return $helptopic;
 }
@@ -950,8 +1040,7 @@ 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' ||
-    	$env{'environment.remote'} eq 'off' ) {
+    if ($env{'environment.remote'} eq 'off' ) {
         $stayOnPage=1;
     }
     my $output;
@@ -975,8 +1064,7 @@ 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);
@@ -993,8 +1081,7 @@ sub help_menu_js {
     my ($text) = @_;
 
     my $stayOnPage = 
-	($env{'browser.interface'}  eq 'textual' ||
-	 $env{'environment.remote'} eq 'off' );
+	($env{'environment.remote'} eq 'off' );
 
     my $width = 620;
     my $height = 600;
@@ -1053,8 +1140,7 @@ sub help_open_bug {
     unless ($Apache::lonnet::perlvar{'BugzillaHost'}) { return ''; }
     $text = "" if (not defined $text);
     $stayOnPage = 0 if (not defined $stayOnPage);
-    if ($env{'browser.interface'} eq 'textual' ||
-	$env{'environment.remote'} eq 'off' ) {
+    if ($env{'environment.remote'} eq 'off' ) {
 	$stayOnPage=1;
     }
     $width = 600 if (not defined $width);
@@ -1078,7 +1164,7 @@ sub help_open_bug {
     {
 	$template .= 
   "<table bgcolor='#AA3333' cellspacing='1' cellpadding='1' border='0'><tr>".
-  "<td bgcolor='#FF5555'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+  "<td bgcolor='#FF5555'><a target=\"_top\" href=\"$link\"><span style=\"color:#FFFFFF;font-size:10pt;\">$text</span></a>";
     }
 
     # Add the graphic
@@ -1098,8 +1184,7 @@ sub help_open_faq {
     unless ($Apache::lonnet::perlvar{'FAQHost'}) { return ''; }
     $text = "" if (not defined $text);
     $stayOnPage = 0 if (not defined $stayOnPage);
-    if ($env{'browser.interface'} eq 'textual' ||
-	$env{'environment.remote'} eq 'off' ) {
+    if ($env{'environment.remote'} eq 'off' ) {
 	$stayOnPage=1;
     }
     $width = 350 if (not defined $width);
@@ -1123,7 +1208,7 @@ sub help_open_faq {
     {
 	$template .= 
   "<table bgcolor='#337733' cellspacing='1' cellpadding='1' border='0'><tr>".
-  "<td bgcolor='#448844'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+  "<td bgcolor='#448844'><a target=\"_top\" href=\"$link\"><span style=\"color:#FFFFFF; font-size:10pt;\">$text</span></a>";
     }
 
     # Add the graphic
@@ -1510,9 +1595,9 @@ sub create_text_file {
     $fh = Apache::File->new('>/home/httpd'.$filename);
     if (! defined($fh)) {
         $r->log_error("Couldn't open $filename for output $!");
-        $r->print("Problems occured in creating the output file.  ".
-                  "This error has been logged.  ".
-                  "Please alert your LON-CAPA administrator.");
+        $r->print(&mt('Problems occurred in creating the output file. '
+                     .'This error has been logged. '
+                     .'Please alert your LON-CAPA administrator.'));
     }
     return ($fh,$filename)
 }
@@ -1579,7 +1664,7 @@ sub multiple_select_form {
             $size = scalar(keys(%$hash));
         }
     }
-    $output.="\n<select name='$name' size='$size' multiple='1'>";
+    $output.="\n".'<select name="'.$name.'" size="'.$size.'" multiple="multiple">';
     my @order;
     if (ref($order) eq 'ARRAY')  {
         @order = @{$order};
@@ -1636,17 +1721,17 @@ sub select_form {
 sub display_filter {
     if (!$env{'form.show'}) { $env{'form.show'}=10; }
     if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; }
-    return '<nobr><label>'.&mt('Records [_1]',
+    return '<span class="LC_nobreak"><label>'.&mt('Records [_1]',
 			       &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
 							   (&mt('all'),10,20,50,100,1000,10000))).
-	   '</label></nobr> <nobr>'.
+	   '</label></span> <span class="LC_nobreak">'.
            &mt('Filter [_1]',
 	   &select_form($env{'form.displayfilter'},
 			'displayfilter',
 			('currentfolder' => 'Current folder/page',
 			 'containing' => 'Containing phrase',
 			 'none' => 'None'))).
-			 '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></nobr>';
+			 '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></span>';
 }
 
 sub gradeleveldescription {
@@ -1690,7 +1775,7 @@ sub select_level_form {
 
 =pod
 
-=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc)
+=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$autosubmit)
 
 Returns a string containing a <select name='$name' size='1'> form to 
 allow a user to select the domain to preform an operation in.  
@@ -1699,16 +1784,22 @@ See loncreateuser.pm for an example invo
 If the $includeempty flag is set, it also includes an empty choice ("no domain
 selected");
 
-If the $showdomdesc flag is set, the domain name is followed by the domain description. 
+If the $showdomdesc flag is set, the domain name is followed by the domain description.
+
+If the $autosubmit flag is set, the form containing the domain selector will be auto-submitted by an onchange action.  
 
 =cut
 
 #-------------------------------------------
 sub select_dom_form {
-    my ($defdom,$name,$includeempty,$showdomdesc) = @_;
+    my ($defdom,$name,$includeempty,$showdomdesc,$autosubmit) = @_;
+    my $onchange;
+    if ($autosubmit) {
+        $onchange = ' onchange="this.form.submit()"';
+    }
     my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
     if ($includeempty) { @domains=('',@domains); }
-    my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
+    my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";
     foreach my $dom (@domains) {
         $selectdomain.="<option value=\"$dom\" ".
             ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
@@ -1764,7 +1855,7 @@ 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))) {
@@ -2059,14 +2150,14 @@ 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 = '';
@@ -2074,10 +2165,10 @@ 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 = '';
                 }
             }
@@ -2098,7 +2189,7 @@ 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'}) {
@@ -2107,7 +2198,7 @@ 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" />';
                 }
             }
         }
@@ -2168,7 +2259,7 @@ 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 = '';
@@ -2184,7 +2275,7 @@ 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'}) {
@@ -2193,7 +2284,7 @@ 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" />';
                 }
             }
         }
@@ -2223,7 +2314,7 @@ 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 = '';
@@ -2239,7 +2330,7 @@ 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'}) {
@@ -2248,7 +2339,7 @@ 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" />';
                 }
             }
         }
@@ -2277,7 +2368,7 @@ 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 = '';
@@ -2290,7 +2381,7 @@ 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'}) {
@@ -2299,7 +2390,7 @@ 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" />';
                 }
             }
         }
@@ -2667,6 +2758,43 @@ 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
@@ -2686,6 +2814,26 @@ sub screenname {
 }
 
 
+# ------------------------------------------------------------- Confirm Wrapper
+=pod
+
+=item confirmwrapper
+
+Wrap messages about completion of operation in box
+
+=cut
+
+sub confirmwrapper {
+    my ($message)=@_;
+    if ($message) {
+        return "\n".'<div class="LC_confirm_box">'."\n"
+               .$message."\n"
+               .'</div>'."\n";
+    } else {
+        return $message;
+    }
+}
+
 # ------------------------------------------------------------- Message Wrapper
 
 sub messagewrapper {
@@ -2696,6 +2844,7 @@ sub messagewrapper {
 	'&amp;subject='.&escape($subject).'&amp;text='.&escape($text).'" '.
         'title="'.&mt('Send message').'">'.$link.'</a>';
 }
+
 # --------------------------------------------------------------- Notes Wrapper
 
 sub noteswrapper {
@@ -2703,6 +2852,7 @@ sub noteswrapper {
     return 
 "<a href='/adm/email?recordftf=retrieve&recname=$un&recdom=$do'>$link</a>";
 }
+
 # ------------------------------------------------------------- Aboutme Wrapper
 
 sub aboutmewrapper {
@@ -2711,20 +2861,18 @@ sub aboutmewrapper {
         return;
     }
     return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'.
-	($target?' target="$target"':'').' title="'.&mt("View this user's personal page").'">'.$link.'</a>';
+	($target?' target="$target"':'').' title="'.&mt("View this user's personal information page").'">'.$link.'</a>';
 }
 
 # ------------------------------------------------------------ Syllabus Wrapper
 
-
 sub syllabuswrapper {
-    my ($linktext,$coursedir,$domain,$fontcolor)=@_;
-    if ($fontcolor) { 
-        $linktext='<font color="'.$fontcolor.'">'.$linktext.'</font>'; 
-    }
+    my ($linktext,$coursedir,$domain)=@_;
     return qq{<a href="/public/$domain/$coursedir/syllabus">$linktext</a>};
 }
 
+# -----------------------------------------------------------------------------
+
 sub track_student_link {
     my ($linktext,$sname,$sdom,$target,$start) = @_;
     my $link ="/adm/trackstudent?";
@@ -2746,6 +2894,27 @@ sub track_student_link {
 	&help_open_topic('View_recent_activity');
 }
 
+sub slot_reservations_link {
+    my ($linktext,$sname,$sdom,$target) = @_;
+    my $link ="/adm/slotrequest?command=showresv&amp;origin=aboutme";
+    my $title = 'View slot reservation history';
+    if (defined($sname) && $sname !~ /^\s*$/ &&
+        defined($sdom)  && $sdom  !~ /^\s*$/) {
+        $link .= "&amp;uname=$sname&amp;udom=$sdom";
+        $title .= ' of this student';
+    }
+    if (defined($target) && $target !~ /^\s*$/) {
+        $target = qq{target="$target"};
+    } else {
+        $target = '';
+    }
+    $title = &mt($title);
+    $linktext = &mt($linktext);
+    return qq{<a href="$link" title="$title" $target>$linktext</a>};
+# FIXME uncomment when help item created: &help_open_topic('Slot_Reservation_History');
+
+}
+
 # ===================================================== Display a student photo
 
 
@@ -2948,7 +3117,7 @@ sub fileextensions {
 
 sub display_languages {
     my %languages=();
-    foreach my $lang (&preferred_languages()) {
+    foreach my $lang (&Apache::lonlocal::preferred_languages()) {
 	$languages{$lang}=1;
     }
     &get_unprocessed_cgi($ENV{'QUERY_STRING'},['displaylanguage']);
@@ -2960,54 +3129,9 @@ 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;
@@ -3028,6 +3152,29 @@ 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                     ##
 ###############################################################
@@ -3166,7 +3313,7 @@ sub relative_to_absolute {
     }
     $thisdir=~s-/[^/]*$--;
     foreach my $link (@rlinks) {
-	unless (($link=~/^http:\/\//i) ||
+	unless (($link=~/^https?\:\/\//i) ||
 		($link=~/^\//) ||
 		($link=~/^javascript:/i) ||
 		($link=~/^mailto:/i) ||
@@ -3351,16 +3498,21 @@ sub pprmlink {
 
 
 sub timehash {
-    my @ltime=localtime(shift);
-    return ( 'seconds' => $ltime[0],
-             'minutes' => $ltime[1],
-             'hours'   => $ltime[2],
-             'day'     => $ltime[3],
-             'month'   => $ltime[4]+1,
-             'year'    => $ltime[5]+1900,
-             'weekday' => $ltime[6],
-             'dayyear' => $ltime[7]+1,
-             'dlsav'   => $ltime[8] );
+    my ($thistime) = @_;
+    my $timezone = &Apache::lonlocal::gettimezone();
+    my $dt = DateTime->from_epoch(epoch => $thistime)
+                     ->set_time_zone($timezone);
+    my $wday = $dt->day_of_week();
+    if ($wday == 7) { $wday = 0; }
+    return ( 'second' => $dt->second(),
+             'minute' => $dt->minute(),
+             'hour'   => $dt->hour(),
+             'day'     => $dt->day_of_month(),
+             'month'   => $dt->month(),
+             'year'    => $dt->year(),
+             'weekday' => $wday,
+             'dayyear' => $dt->day_of_year(),
+             'dlsav'   => $dt->is_dst() );
 }
 
 sub utc_string {
@@ -3370,6 +3522,24 @@ sub utc_string {
 
 sub maketime {
     my %th=@_;
+    my ($epoch_time,$timezone,$dt);
+    $timezone = &Apache::lonlocal::gettimezone();
+    eval {
+        $dt = DateTime->new( year   => $th{'year'},
+                             month  => $th{'month'},
+                             day    => $th{'day'},
+                             hour   => $th{'hour'},
+                             minute => $th{'minute'},
+                             second => $th{'second'},
+                             time_zone => $timezone,
+                         );
+    };
+    if (!$@) {
+        $epoch_time = $dt->epoch;
+        if ($epoch_time) {
+            return $epoch_time;
+        }
+    }
     return POSIX::mktime(
         ($th{'seconds'},$th{'minutes'},$th{'hours'},
          $th{'day'},$th{'month'}-1,$th{'year'}-1900,0,0,-1));
@@ -3720,7 +3890,7 @@ sub blocking_status {
                              &Apache::lonnet::coursedescription($course);
                         $coursedesc = $courseinfo{'description'};
                     }
-                    $category = "Group files in the course '$coursedesc'";
+                    $category = "Group portfolio in the course '$coursedesc'";
                 } else {
                     $category = 'Portfolio files belonging to ';
                     if ($env{'user.name'} eq 'public' && 
@@ -3750,6 +3920,60 @@ sub blocking_status {
 
 ###############################################
 
+sub check_ip_acc {
+    my ($acc)=@_;
+    &Apache::lonxml::debug("acc is $acc");
+    if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) {
+        return 1;
+    }
+    my $allowed=0;
+    my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'};
+
+    my $name;
+    foreach my $pattern (split(',',$acc)) {
+        $pattern =~ s/^\s*//;
+        $pattern =~ s/\s*$//;
+        if ($pattern =~ /\*$/) {
+            #35.8.*
+            $pattern=~s/\*//;
+            if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
+        } elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {
+            #35.8.3.[34-56]
+            my $low=$2;
+            my $high=$3;
+            $pattern=$1;
+            if ($ip =~ /^\Q$pattern\E/) {
+                my $last=(split(/\./,$ip))[3];
+                if ($last <=$high && $last >=$low) { $allowed=1; }
+            }
+        } elsif ($pattern =~ /^\*/) {
+            #*.msu.edu
+            $pattern=~s/\*//;
+            if (!defined($name)) {
+                use Socket;
+                my $netaddr=inet_aton($ip);
+                ($name)=gethostbyaddr($netaddr,AF_INET);
+            }
+            if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
+        } elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
+            #127.0.0.1
+            if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
+        } else {
+            #some.name.com
+            if (!defined($name)) {
+                use Socket;
+                my $netaddr=inet_aton($ip);
+                ($name)=gethostbyaddr($netaddr,AF_INET);
+            }
+            if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
+        }
+        if ($allowed) { last; }
+    }
+    return $allowed;
+}
+
+###############################################
+
 =pod
 
 =head1 Domain Template Functions
@@ -3798,7 +4022,14 @@ 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;
@@ -3913,35 +4144,24 @@ 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/}) {
-		my $local_name = &Apache::lonnet::filelocation('',$output);
-		&Apache::lonnet::repcopy($local_name);
-	    }
+            if ($output =~ m{^/res/}) {
+                my $local_name = &Apache::lonnet::filelocation('',$output);
+                &Apache::lonnet::repcopy($local_name);
+            }
             $output = &lonhttpdurl($output);
         }
     }
@@ -3984,13 +4204,11 @@ Inputs:
                       in the title box that appears, this text
                       is not auto translated like the $title is
 
-=item * $notopbar, if true, keep the 'what is this' info but remove the
-                   navigational links
+=item * $no_nav_bar, 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
 
@@ -4011,7 +4229,7 @@ other decorations will be returned.
 
 sub bodytag {
     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
-	$notopbar,$bgcolor,$notitle,$no_inline_link,$args)=@_;
+        $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
 
     if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
 
@@ -4020,7 +4238,7 @@ sub bodytag {
     my $font =   &designparm($function.'.font',$domain);
     my $pgbg   = $bgcolor || &designparm($function.'.pgbg',$domain);
 
-    my %design = ( 'style'   => 'margin-top: 0px',
+    my %design = ( 'style'   => 'margin-top: 0',
 		   'bgcolor' => $pgbg,
 		   'text'    => $font,
                    'alink'   => &designparm($function.'.alink',$domain),
@@ -4056,15 +4274,7 @@ sub bodytag {
 
     if ($bodyonly) {
         return $bodytag;
-    } elsif ($env{'browser.interface'} eq 'textual') {
-# Accessibility
-          
-	$bodytag.=&Apache::lonmenu::menubuttons($forcereg,$forcereg);
-	if (!$notitle) {
-	    $bodytag.='<h1>LON-CAPA: '.$title.'</h1>';
-	}
-	return $bodytag;
-    }
+    } 
 
     my $name = &plainname($env{'user.name'},$env{'user.domain'});
     if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
@@ -4088,7 +4298,7 @@ $realm&nbsp;
 </td>
 ENDROLE
 
-    my $titleinfo = '<span class="LC_title_bar_title">'.$title.'</span>';
+    my $titleinfo = '<h1>'.$title.'</h1>';
     if ($customtitle) {
         $titleinfo = $customtitle;
     }
@@ -4131,22 +4341,21 @@ 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();
         }
 
-        my $titletable;
-	if (!$notitle) {
-	    $titletable =
-		'<table id="LC_title_bar">'.
-                         "<tr><td> $titleinfo $dc_info</td>".$roleinfo.
-			 '</tr></table>';
-	}
-	if ($notopbar) {
+        my $titletable = '<table id="LC_title_bar">'
+                        ."<tr><td> $titleinfo $dc_info</td>".$roleinfo
+                        .'</tr></table>';
+
+	if ($no_nav_bar) {
 	    $bodytag .= $titletable;
 	} else {
+        $bodytag .= qq|<div id="LC_nav_bar">$name ($role)<br />
+            <em>$realm</em> $dc_info</div>|;
 	    if ($env{'request.state'} eq 'construct') {
                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
 							  $titletable);
@@ -4172,14 +4381,11 @@ ENDROLE
     my $menu= ($no_inline_link?''
 	       :'<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>');
     #
-    if ($notitle) {
-	return $bodytag;
-    }
     return(<<ENDBODY);
 $bodytag
 <table id="LC_title_bar" class="LC_with_remote">
-<tr><td class="LC_title_bar_role_logo">$upperleft</td>
-    <td class="LC_title_bar_domain_logo">$messages&nbsp;</td>
+<tr><td>$upperleft</td>
+    <td>$messages&nbsp;</td>
 </tr>
 <tr><td>$titleinfo $dc_info $menu</td>
 $roleinfo
@@ -4227,15 +4433,6 @@ 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}.'" ';
@@ -4296,6 +4493,8 @@ sub standard_css {
     my $img    = &designparm($function.'.img',   $domain);
     my $tabbg  = &designparm($function.'.tabbg', $domain);
     my $font   = &designparm($function.'.font',  $domain);
+    my $fontmenu = &designparm($function.'.fontmenu', $domain);
+#second colour for later usage
     my $sidebg = &designparm($function.'.sidebg',$domain);
     my $pgbg_or_bgcolor =
 	         $bgcolor ||
@@ -4305,6 +4504,10 @@ 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;
@@ -4322,34 +4525,64 @@ 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'
-	                                                 : '0px 3px 0px 4px';
+		  $env{'browser.type'} eq 'safari'     ) ? '0 2px 0 2px'
+	                                                 : '0 3px 0 4px';
 
 
     return <<END;
-h1, h2, h3, th { font-family: $sans }
-a:focus { color: red; background: yellow } 
-table.thinborder,
+body {
+   font-family: $sans;
+   line-height:130%;
+   font-size:0.83em;
+   color:$font;
+}
 
-table.thinborder tr th {
-  border-style: solid;
-  border-width: 1px;
-  background: $tabbg;
+a:link, a:visited { 
+  font-size:100%; 
 }
-table.thinborder tr td {
-  border-style: solid;
-  border-width: 1px
+
+a:focus { 
+  color: red;
+  background: yellow 
+}
+
+form, .inline { 
+   display: inline; 
+}
+
+.LC_right {
+   text-align:right;
+}
+
+.LC_middle {
+   vertical-align:middle;
+}
+
+/* just for tests */
+.LC_400Box {width:400px; }
+/* end */
+
+.LC_filename {
+  font-family: $mono;
+  white-space:pre;
+}
+
+.LC_fileicon {
+  border: none;
+  height: 1.3em;
+  vertical-align: text-bottom;
+  margin-right: 0.3em;
+  text-decoration:none;
 }
 
-form, .inline { display: inline; }
-.center { text-align: center; }
-.LC_filename {font-family: $mono; white-space:pre;}
 .LC_error {
   color: red;
   font-size: larger;
 }
+
 .LC_warning,
 .LC_diff_removed {
   color: red;
@@ -4360,25 +4593,65 @@ 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 {
-  border: 0px;
+div.LC_confirm_box .LC_error img,
+div.LC_confirm_box .LC_success img {
+  vertical-align: middle;
 }
-.LC_indexer_icon {
-  border: 0px;
-  height: 22px;
+
+.LC_icon {
+  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;
+   font-family: $sans;
+   border: none;
+   margin: 4px;
+}
+
+.LC_disc_action_left {
+   text-align: left;
+}
+
+.LC_disc_action_right {
+   text-align: right;
+}
+
+.LC_disc_new_item {
+   background: white;
+   border: 2px solid red;
+   margin: 2px;
+}
+
+.LC_disc_old_item {
+   background: white;
+   border: 1px solid black;
+   margin: 2px;
 }
 
 table.LC_pastsubmission {
@@ -4386,25 +4659,38 @@ table.LC_pastsubmission {
   margin: 2px;
 }
 
-table#LC_top_nav, table#LC_menubuttons,table#LC_nav_location {
+table#LC_top_nav,
+table#LC_menubuttons,
+table#LC_nav_location {
   width: 100%;
   background: $pgbg;
   border: 2px;
   border-collapse: separate;
-  padding: 0px;
+  padding: 0;
 }
 
-table#LC_title_bar, table.LC_breadcrumbs, 
+table#LC_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;
+  color: $fontmenu;
   font-family: $sans;
   border-collapse: collapse;
-  padding: 0px;
+  padding: 0;
+  margin: 0;
 }
 
 table.LC_docs_path {
@@ -4413,86 +4699,94 @@ table.LC_docs_path {
   background: $pgbg;
   font-family: $sans;
   border-collapse: collapse;
-  padding: 0px;
+  padding: 0;
 }
 
 table#LC_title_bar td {
   background: $tabbg;
 }
-table#LC_title_bar td.LC_title_bar_who {
+
+table#LC_title_bar .LC_title_bar_who {
   background: $tabbg;
-  color: $font;
+  color: $fontmenu;
   font: small $sans;
   text-align: right;
+  margin: 0;
 }
-span.LC_metadata {
-    font-family: $sans;
-}
-span.LC_title_bar_title {
-  font: bold x-large $sans;
+
+table#LC_title_bar div.LC_title_bar_name {
+  margin: 0;
 }
-table#LC_title_bar td.LC_title_bar_domain_logo {
-  background: $sidebg;
-  text-align: right;
-  padding: 0px;
+
+table#LC_title_bar div.LC_title_bar_role {
+  margin: 0;
 }
-table#LC_title_bar td.LC_title_bar_role_logo {
-  background: $sidebg;
-  padding: 0px;
+
+table#LC_title_bar div.LC_title_bar_realm {
+  margin: 0;
 }
 
-table#LC_menubuttons_mainmenu {
-  width: 100%;
-  border: 0px;
-  border-spacing: 1px;
-  padding: 0px 1px;
-  margin: 0px;
-  border-collapse: separate;
+span.LC_metadata {
+  font-family: $sans;
 }
-table#LC_menubuttons img, table#LC_menubuttons_mainmenu img {
-  border: 0px;
+
+table#LC_menubuttons img{
+  border: none;
 }
+
 table#LC_top_nav td {
   background: $tabbg;
-  border: 0px;
+  border: none;
   font-size: small;
+  vertical-align:top;
+  padding:2px 5px 2px 5px;
 }
-table#LC_top_nav td a, div#LC_top_nav a {
+
+table#LC_top_nav td a,
+div#LC_top_nav a {
   color: $font;
   font-family: $sans;
 }
+
 table#LC_top_nav td.LC_top_nav_logo {
   background: $tabbg;
   text-align: left;
   white-space: nowrap;
   width: 31px;
 }
+
 table#LC_top_nav td.LC_top_nav_logo img {
-  border: 0px;
+  border: none;
   vertical-align: bottom;
 }
+
 table#LC_top_nav td.LC_top_nav_exit,
 table#LC_top_nav td.LC_top_nav_help {
   width: 2.0em;
 }
+
 table#LC_top_nav td.LC_top_nav_login {
   width: 4.0em;
   text-align: center;
 }
-table.LC_breadcrumbs td, table.LC_docs_path td  {
+
+table.LC_breadcrumbs td,
+table.LC_docs_path td  {
   background: $tabbg;
-  color: $font;
+  color: $fontmenu;
   font-family: $sans;
   font-size: smaller;
 }
+
 table.LC_breadcrumbs td.LC_breadcrumbs_component,
 table.LC_docs_path td.LC_docs_path_component {
   background: $tabbg;
-  color: $font;
+  color: $fontmenu;
   font-family: $sans;
   font-size: larger;
   text-align: right;
 }
+
 td.LC_table_cell_checkbox {
   text-align: center;
 }
@@ -4501,10 +4795,33 @@ table#LC_mainmenu td.LC_mainmenu_column
     vertical-align: top;
 }
 
+.LC_fontsize_small {
+ font-size: 70%;
+}
+
+#LC_head_subbox {
+ clear:both;
+ background: $sidebg;
+ border-bottom: 1px solid #999999;
+ height: 32px;
+ line-height: 32px; 
+ margin: 0 0 10px;
+ padding: 0;
+}
+
+.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 {
@@ -4520,111 +4837,96 @@ table#LC_mainmenu td.LC_mainmenu_column
 }
 
 td.LC_menubuttons_text {
-  width: 90%;
-  color: $font;
-  font-family: $sans;
-}
-
-td.LC_menubuttons_img {
+ 	color: $font;
 }
 
 .LC_current_location {
   font-family: $sans;
   background: $tabbg;
 }
+
 .LC_new_mail {
   font-family: $sans;
   background: $tabbg;
   font-weight: bold;
 }
 
-.LC_rolesmenu_is {
-  font-family: $sans;
-}
-
-.LC_rolesmenu_selected {
-  font-family: $sans;
-}
-
-.LC_rolesmenu_future {
-  font-family: $sans;
-}
-
-
-.LC_rolesmenu_will {
-  font-family: $sans;
-}
-
-.LC_rolesmenu_will_not {
-  font-family: $sans;
-}
-
-.LC_rolesmenu_expired {
-  font-family: $sans;
-}
-
-.LC_rolesinfo {
-  font-family: $sans;
-}
-
-.LC_dropadd_labeltext {
+.LC_preferences_labeltext {
   font-family: $sans;
   text-align: right;
 }
 
-.LC_preferences_labeltext {
-  font-family: $sans;
-  text-align: right;
+.LC_roleslog_note {
+  font-size: small;
 }
 
-table.LC_aboutme_port {
-  border: 0px;
-  border-collapse: collapse;
-  border-spacing: 0px;
+.LC_mail_functions {
+    font-weight: bold;
 }
-table.LC_data_table, table.LC_mail_list {
+
+table.LC_data_table,
+table.LC_mail_list {
   border: 1px solid #000000;
   border-collapse: separate;
   border-spacing: 1px;
   background: $pgbg;
 }
+
 .LC_data_table_dense {
   font-size: small;
 }
+
 table.LC_nested_outer {
   border: 1px solid #000000;
   border-collapse: collapse;
-  border-spacing: 0px;
+  border-spacing: 0;
   width: 100%;
 }
+
 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_data_table tr th, 
+table.LC_calendar tr th, 
+table.LC_mail_list tr th,
 table.LC_prior_tries tr th {
   font-weight: bold;
   background-color: $data_table_head;
-  font-size: smaller;
+  color:$fontmenu;
+  font-size:90%;
+}
+
+table.LC_data_table tr.LC_info_row > td {
+  background-color: #CCCCCC;
+  font-weight: bold;
+  text-align: left;
 }
-table.LC_data_table tr.LC_odd_row > td, 
-table.LC_aboutme_port tr td {
+
+table.LC_data_table tr.LC_odd_row > td,
+table.LC_pick_box tr > td.LC_odd_row {
   background-color: $data_table_light;
   padding: 2px;
 }
+
 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;
+  padding: 2px;
 }
+
 table.LC_data_table tr.LC_data_table_highlight td {
   background-color: $data_table_darker;
 }
+
 table.LC_data_table tr td.LC_leftcol_header {
   background-color: $data_table_head;
   font-weight: bold;
 }
+
 table.LC_data_table tr.LC_empty_row td,
 table.LC_nested tr.LC_empty_row td {
   background-color: #FFFFFF;
@@ -4633,15 +4935,19 @@ table.LC_nested tr.LC_empty_row td {
   text-align: center;
   padding: 8px;
 }
+
 table.LC_nested tr.LC_empty_row td {
   padding: 4ex
 }
+
 table.LC_nested_outer tr th {
   font-weight: bold;
+  color:$fontmenu;
   background-color: $data_table_head;
-  font-size: smaller;
+  font-size: small;
   border-bottom: 1px solid #000000;
 }
+
 table.LC_nested_outer tr td.LC_subheader {
   background-color: $data_table_head;
   font-weight: bold;
@@ -4649,20 +4955,24 @@ table.LC_nested_outer tr td.LC_subheader
   border-bottom: 1px solid #000000;
   text-align: right;
 }
+
 table.LC_nested tr.LC_info_row td {
-  background-color: #CCC;
+  background-color: #CCCCCC;
   font-weight: bold;
   font-size: small;
   text-align: center;
 }
+
 table.LC_nested tr.LC_info_row td.LC_left_item,
 table.LC_nested_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,
@@ -4671,18 +4981,18 @@ table.LC_nested tr td.LC_right_item {
 }
 
 table.LC_nested tr.LC_odd_row td {
-  background-color: #EEE;
+  background-color: #EEEEEE;
 }
 
 table.LC_createuser {
 }
 
 table.LC_createuser tr.LC_section_row td {
-  font-size: smaller;
+  font-size: small;
 }
 
 table.LC_createuser tr.LC_info_row td  {
-  background-color: #CCC;
+  background-color: #CCCCCC;
   font-weight: bold;
   text-align: center;
 }
@@ -4691,16 +5001,20 @@ table.LC_calendar {
   border: 1px solid #000000;
   border-collapse: collapse;
 }
+
 table.LC_calendar_pickdate {
   font-size: xx-small;
 }
+
 table.LC_calendar tr td {
   border: 1px solid #000000;
   vertical-align: top;
 }
+
 table.LC_calendar tr td.LC_calendar_day_empty {
   background-color: $data_table_dark;
 }
+
 table.LC_calendar tr td.LC_calendar_day_current {
   background-color: $data_table_highlight;
 }
@@ -4708,97 +5022,90 @@ table.LC_calendar tr td.LC_calendar_day_
 table.LC_mail_list tr.LC_mail_new {
   background-color: $mail_new;
 }
+
 table.LC_mail_list tr.LC_mail_new:hover {
   background-color: $mail_new_hover;
 }
+
+table.LC_mail_list tr.LC_mail_even {
+}
+
+table.LC_mail_list tr.LC_mail_odd {
+}
+
 table.LC_mail_list tr.LC_mail_read {
   background-color: $mail_read;
 }
+
 table.LC_mail_list tr.LC_mail_read:hover {
   background-color: $mail_read_hover;
 }
+
 table.LC_mail_list tr.LC_mail_replied {
   background-color: $mail_replied;
 }
+
 table.LC_mail_list tr.LC_mail_replied:hover {
   background-color: $mail_replied_hover;
 }
+
 table.LC_mail_list tr.LC_mail_other {
   background-color: $mail_other;
 }
+
 table.LC_mail_list tr.LC_mail_other:hover {
   background-color: $mail_other_hover;
 }
-table.LC_mail_list tr.LC_mail_even {
-}
-table.LC_mail_list tr.LC_mail_odd {
-}
 
-
-table#LC_portfolio_actions {
-  width: auto;
-  background: $pgbg;
-  border: 0px;
-  border-spacing: 2px 2px;
-  padding: 0px;
-  margin: 0px;
-  border-collapse: separate;
-}
-table#LC_portfolio_actions td.LC_label {
-  background: $tabbg;
-  text-align: right;
-}
-table#LC_portfolio_actions td.LC_value {
-  background: $tabbg;
+table.LC_data_table tr > td.LC_browser_file,
+table.LC_data_table tr > td.LC_browser_file_published {
+  background: #CCFF88;
 }
 
-table#LC_cstr_controls {
-  width: 100%;
-  border-collapse: collapse;
-}
-table#LC_cstr_controls tr td {
-  border: 4px solid $pgbg;
-  padding: 4px;
-  text-align: center;
-  background: $tabbg;
+table.LC_data_table tr > td.LC_browser_file_locked,
+table.LC_data_table tr > td.LC_browser_file_unpublished {
+  background: #FFAA99;
 }
-table#LC_cstr_controls tr th {
-  border: 4px solid $pgbg;
-  background: $table_header;
-  text-align: center;
-  font-family: $sans;
-  font-size: smaller;
+
+table.LC_data_table tr > td.LC_browser_file_obsolete {
+  background: #AAAAAA;
 }
 
-table#LC_browser {
- 
+table.LC_data_table tr > td.LC_browser_file_modified,
+table.LC_data_table tr > td.LC_browser_file_metamodified {
+  background: #FFFF77;
 }
-table#LC_browser tr th {
-  background: $table_header;
+
+table.LC_data_table tr.LC_browser_folder > td {
+  background: #CCCCFF;
 }
-table#LC_browser tr td {
-  padding: 2px;
+
+table.LC_data_table tr > td.LC_roles_is {
+/*  background: #77FF77; */
 }
-table#LC_browser tr.LC_browser_file,
-table#LC_browser tr.LC_browser_file_published {
-  background: #CCFF88;
+
+table.LC_data_table tr > td.LC_roles_future {
+  background: #FFFF77;
 }
-table#LC_browser tr.LC_browser_file_locked,
-table#LC_browser tr.LC_browser_file_unpublished {
-  background: #FFAA99;
+
+table.LC_data_table tr > td.LC_roles_will {
+  background: #FFAA77;
 }
-table#LC_browser tr.LC_browser_file_obsolete {
-  background: #AAAAAA;
+
+table.LC_data_table tr > td.LC_roles_expired {
+  background: #FF7777;
 }
-table#LC_browser tr.LC_browser_file_modified,
-table#LC_browser tr.LC_browser_file_metamodified {
-  background: #FFFF77;
+
+table.LC_data_table tr > td.LC_roles_will_not {
+  background: #AAFF77;
 }
-table#LC_browser tr.LC_browser_folder {
-  background: #CCCCFF;
+
+table.LC_data_table tr > td.LC_roles_selected {
+  background: #11CC55;
 }
+
 span.LC_current_location {
-  font-size: x-large;
+  font-size:larger;
   background: $pgbg;
 }
 
@@ -4806,58 +5113,70 @@ span.LC_parm_menu_item {
   font-size: larger;
   font-family: $sans;
 }
+
 span.LC_parm_scope_all {
   color: red;
 }
+
 span.LC_parm_scope_folder {
   color: green;
 }
+
 span.LC_parm_scope_resource {
   color: orange;
 }
+
 span.LC_parm_part {
   color: blue;
 }
+
 span.LC_parm_folder, span.LC_parm_symb {
   font-size: x-small;
   font-family: $mono;
   color: #AAAAAA;
 }
 
-td.LC_parm_overview_level_menu, td.LC_parm_overview_map_menu,
-td.LC_parm_overview_parm_selectors, td.LC_parm_overview_parm_restrictions {
+td.LC_parm_overview_level_menu,
+td.LC_parm_overview_map_menu,
+td.LC_parm_overview_parm_selectors,
+td.LC_parm_overview_restrictions  {
   border: 1px solid black;
   border-collapse: collapse;
 }
+
 table.LC_parm_overview_restrictions td {
   border-width: 1px 4px 1px 4px;
   border-style: solid;
   border-color: $pgbg;
   text-align: center;
 }
+
 table.LC_parm_overview_restrictions th {
   background: $tabbg;
   border-width: 1px 4px 1px 4px;
   border-style: solid;
   border-color: $pgbg;
 }
+
 table#LC_helpmenu {
-  border: 0px;
+  border: none;
   height: 55px;
-  border-spacing: 0px;
+  border-spacing: 0;
 }
 
 table#LC_helpmenu fieldset legend {
   font-size: larger;
   font-weight: bold;
 }
+
 table#LC_helpmenu_links {
   width: 100%;
   border: 1px solid black;
   background: $pgbg;
-  padding: 0px;
+  padding: 0;
   border-spacing: 1px;
 }
+
 table#LC_helpmenu_links tr td {
   padding: 1px;
   background: $tabbg;
@@ -4865,11 +5184,13 @@ table#LC_helpmenu_links tr td {
   font-weight: bold;
 }
 
-table#LC_helpmenu_links a:link, table#LC_helpmenu_links a:visited,
+table#LC_helpmenu_links a:link,
+table#LC_helpmenu_links a:visited,
 table#LC_helpmenu_links a:active {
   text-decoration: none;
   color: $font;
 }
+
 table#LC_helpmenu_links a:hover {
   text-decoration: underline;
   color: $vlink;
@@ -4879,27 +5200,33 @@ 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;
   font-weight: bold;
   text-align: right;
+  vertical-align: top;
   width: 184px;
   padding: 8px;
 }
+
 table.LC_pick_box td.LC_selfenroll_pick_box_title {
   background: $tabbg;
   font-weight: bold;
@@ -4912,28 +5239,34 @@ 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;
@@ -4941,6 +5274,7 @@ table.LC_helpform_receipt {
   border: 1px solid black;
   border-spacing: 1px;
 }
+
 table.LC_helpform_receipt td.LC_pick_box_title {
   background: $tabbg;
   font-weight: bold;
@@ -4948,51 +5282,61 @@ table.LC_helpform_receipt td.LC_pick_box
   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;
+  padding: 0;
   height: 1px;
   background: black;
 }
+
 span.LC_helpform_receipt_cat {
   font-weight: bold;
 }
+
 table.LC_group_priv_box {
   background: white;
   border: 1px solid black;
   border-spacing: 1px;
 }
+
 table.LC_group_priv_box td.LC_pick_box_title {
   background: $tabbg;
   font-weight: bold;
   text-align: right;
   width: 184px;
 }
+
 table.LC_group_priv_box td.LC_groups_fixed {
   background: $data_table_light;
   text-align: center;
 }
+
 table.LC_group_priv_box td.LC_groups_optional {
   background: $data_table_dark;
   text-align: center;
 }
+
 table.LC_group_priv_box td.LC_groups_functionality {
   background: $data_table_darker;
   text-align: center;
   font-weight: bold;
 }
+
 table.LC_group_priv td {
   text-align: left;
-  padding: 0px;
+  padding: 0;
 }
 
 table.LC_notify_front_page {
@@ -5000,12 +5344,15 @@ table.LC_notify_front_page {
   border: 1px solid black;
   padding: 8px;
 }
+
 table.LC_notify_front_page td {
   padding: 8px;
 }
+
 .LC_navbuttons {
   margin: 2ex 0ex 2ex 0ex;
 }
+
 .LC_topic_bar {
   font-family: $sans;
   font-weight: bold;
@@ -5013,35 +5360,38 @@ table.LC_notify_front_page td {
   background: $tabbg;
   vertical-align: middle;
   margin: 2ex 0ex 2ex 0ex;
+  padding: 3px;
 }
+
 .LC_topic_bar span {
   vertical-align: middle;
 }
+
 .LC_topic_bar img {
   vertical-align: bottom;
 }
+
 table.LC_course_group_status {
   margin: 20px;
 }
+
 table.LC_status_selector td {
   vertical-align: top;
   text-align: center;
   padding: 4px;
 }
-table.LC_descriptive_input td.LC_description {
-  vertical-align: top;
-  text-align: right;
-  font-weight: bold;
-}
+
 div.LC_feedback_link {
   clear: both;
   background: white;
-  width: 100%;  
+  width: 100%;
 }
+
 span.LC_feedback_link {
   background: $feedback_link_bg;
   font-size: larger;
 }
+
 span.LC_message_link {
   background: $feedback_link_bg;
   font-size: larger;
@@ -5060,33 +5410,49 @@ table.LC_prior_tries td {
 }
 
 .LC_answer_correct {
-  background: #AAFFAA;
-  color: black;
+  background: lightgreen;
+  font-family: $sans;
+  color: darkgreen;
+  padding: 6px;
 }
+
 .LC_answer_charged_try {
-  background: #FFAAAA ! important;
-  color: black;
+  background: #FFAAAA;
+  font-family: $sans;
+  color: darkred;
+  padding: 6px;
 }
-.LC_answer_not_charged_try, 
+
+.LC_answer_not_charged_try,
 .LC_answer_no_grade,
 .LC_answer_late {
-  background: #FFFFAA;
+  background: lightyellow;
+  font-family: $sans;
   color: black;
+  padding: 6px;
 }
+
 .LC_answer_previous {
-  background: #AAAAFF;
-  color: black;
+  background: lightblue;
+  font-family: $sans;
+  color: darkblue;
+  padding: 6px;
 }
+
 .LC_answer_no_message {
   background: #FFFFFF;
+  font-family: $sans;
   color: black;
+  padding: 6px;
 }
+
 .LC_answer_unknown {
   background: orange;
+  font-family: $sans;
   color: black;
+  padding: 6px;
 }
 
-
 span.LC_prior_numerical,
 span.LC_prior_string,
 span.LC_prior_custom,
@@ -5105,15 +5471,19 @@ table.LC_prior_option {
   width: 100%;
   border-collapse: collapse;
 }
-table.LC_prior_rank, table.LC_prior_match {
+
+table.LC_prior_rank, 
+table.LC_prior_match {
   border-collapse: collapse;
 }
+
 table.LC_prior_option tr td,
 table.LC_prior_rank tr td,
 table.LC_prior_match tr td {
   border: 1px solid #000000;
 }
 
+td.LC_nobreak,
 span.LC_nobreak {
   white-space: nowrap;
 }
@@ -5129,7 +5499,7 @@ span.LC_cusr_subheading {
 
 table.LC_docs_documents {
   background: #BBBBBB;
-  border-width: 0px;
+  border-width: 0;
   border-collapse: collapse;
 }
 
@@ -5138,15 +5508,8 @@ table.LC_docs_documents td.LC_docs_docum
   padding: 4px;
 }
 
-.LC_docs_course_commands div {
-  float: left;
-  border: 4px solid #AAAAAA;
-  padding: 4px;
-  background: #DDDDCC;
-}
-
 .LC_docs_entry_move {
-  border: 0px;
+  border: none;
   border-collapse: collapse;
 }
 
@@ -5159,15 +5522,19 @@ table.LC_docs_documents td.LC_docs_docum
   background: #DDDDDD;
   font-size: x-small;
 }
+
 .LC_docs_copy {
   color: #000099;
 }
+
 .LC_docs_cut {
   color: #550044;
 }
+
 .LC_docs_rename {
   color: #009900;
 }
+
 .LC_docs_remove {
   color: #990000;
 }
@@ -5181,6 +5548,7 @@ table.LC_docs_documents td.LC_docs_docum
 .LC_docs_editor td.LC_docs_entry_icon {
   background: #FFFFBB;
 }
+
 .LC_docs_editor td.LC_docs_entry_parameter {
   background: #BBBBFF;
   font-size: x-small;
@@ -5197,12 +5565,13 @@ 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;
@@ -5217,7 +5586,7 @@ table.LC_double_column tr td.LC_left_col
 
 table.LC_double_column tr td.LC_right_col {
   top: 2px;
-  right: 2px; 
+  right: 2px;
   width: 47%;
   vertical-align: top;
 }
@@ -5241,33 +5610,18 @@ 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;
 }
@@ -5281,12 +5635,15 @@ 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,
@@ -5295,8 +5652,10 @@ 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;
@@ -5305,15 +5664,19 @@ 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,
@@ -5322,43 +5685,574 @@ 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 {
   clear: both;
   color: $tabbg;
   background-color: $tabbg;
   height: 3px;
-  border: 0px;
+  border: none;
+}
+
+img.stift{
+  border-width: 0;
+  vertical-align: middle;
+}
+
+table#LC_mainmenu{
+ margin-top:10px;
+ width:80%;
+}
+
+table#LC_mainmenu td.LC_mainmenu_col_fieldset{
+  vertical-align: top;
+  width: 45%;
+}
+
+.LC_mainmenu_fieldset_category {
+  color: $font;
+  background: $pgbg;
+  font-family: $sans;
+  font-size: small;
+  font-weight: bold;
+}
+
+div.LC_createcourse {
+    margin: 10px 10px 10px 10px;
+}
+
+/* ---- Remove when done ----
+# The following styles is part of the redesign of LON-CAPA and are
+# subject to change during this project.
+# Don't rely on their current functionality as they might be 
+# changed or removed.
+# --------------------------*/
+
+a:hover,
+ol.LC_smallMenu a:hover,
+ol#LC_MenuBreadcrumbs a:hover,
+ol#LC_PathBreadcrumbs a:hover,
+ul#LC_TabMainMenuContent a:hover,
+.LC_FormSectionClearButton input:hover
+ul.LC_TabContent   li:hover a {
+	color:#BF2317;
+        text-decoration:none;
+}
+
+h1 {
+	padding: 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_noBorder {
+        border: 0;
+}
+
+
+/* Main Header with discription of Person, Course, etc. */
+
+.LC_Right {
+        float: right;
+        margin: 0;
+        padding: 0;
+}
+
+.LC_FormSectionClearButton input {
+        background-color:transparent;
+        border: none;
+        cursor:pointer;
+        text-decoration:underline;
+}
+
+.LC_help_open_topic {
+        color: #FFFFFF;
+        background-color: #EEEEFF;
+        margin: 1px;
+        padding: 4px;
+        border: 1px solid #000033;
+        white-space: nowrap;
+/*		vertical-align: middle; */
+}
+
+dl,ul,div,fieldset {
+	margin: 10px 10px 10px 0;
+/*	overflow: hidden; */
+}
+
+#LC_nav_bar {
+    float: left;
+    margin: 0;
+}
+
+#LC_nav_bar em{
+    font-weight: bold;
+    font-style: normal;
+}
+
+ol.LC_smallMenu {
+    float: right;
+}
+
+ol.LC_smallMenu, ol#LC_PathBreadcrumbs {
+	margin: 0;
+}
+
+ol.LC_smallMenu li {
+	display: inline;
+	padding: 5px 5px 0 10px;
+	vertical-align: top;
+}
+
+ol.LC_smallMenu li img {
+	vertical-align: bottom;
+}
+
+ol.LC_smallMenu a {
+	font-size: 90%;
+	color: RGB(80, 80, 80);
+	text-decoration: none;
+}
+
+ul#LC_TabMainMenuContent {
+    clear: both;
+    color: $fontmenu;
+    background: $tabbg;
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    float:left;
+    width: 100%;
+}
+
+ul#LC_TabMainMenuContent li {
+    float: left;
+    font-weight: bold;
+    line-height: 1.8em;
+    padding: 0 0.8em; 
+    border-right: 1px solid black;
+    display: inline;
+    vertical-align: middle;
+}
+
+ul.LC_TabContent ,
+ul.LC_TabContentBigger {
+	display:block;
+	list-style:none;
+	margin: 0;
+	padding: 0;
+}
+
+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;
+}
+
+ul#LC_TabMainMenuContent li a {
+    color: $fontmenu;
+	text-decoration: none;
+}
+
+ul.LC_TabContent {
+	min-height:1.6em;
+}
+
+ul.LC_TabContent li {
+	vertical-align:middle;
+	padding: 0 10px 0 10px;
+	background-color:$tabbg;
+	border-bottom:solid 1px $lg_border_color;
+}
+
+ul.LC_TabContent li a, ul.LC_TabContent li {
+	color:rgb(47,47,47);
+	text-decoration:none;
+	font-size:95%;
+	font-weight:bold;
+	padding-right: 16px;
+}
+
+ul.LC_TabContent li:hover, ul.LC_TabContent li.active {
+        background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;
+	border-bottom:solid 1px #FFFFFF;
+	padding-right: 16px;
+}
+
+ul.LC_TabContentBigger li {
+	vertical-align:bottom;
+	border-top:solid 1px $lg_border_color;
+	border-left:solid 1px $lg_border_color;
+	padding:5px 10px 5px 10px;
+	margin-left:2px;
+	background:url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
+}
+
+ul.LC_TabContentBigger li:hover, 
+ul.LC_TabContentBigger li.active {
+	background:url(/adm/lonIcons/lightGreyBG.png) repeat-x right bottom;
+}
+
+ul.LC_TabContentBigger li, 
+ul.LC_TabContentBigger li a {
+	font-size:110%;
+	font-weight:bold;
+}
+
+ol#LC_MenuBreadcrumbs, 
+ol#LC_PathBreadcrumbs, 
+ul.LC_CourseBreadcrumbs {
+	padding-left: 10px;
+	margin: 0;
+	list-style-position: inside;
+}
+
+ol#LC_MenuBreadcrumbs li, 
+ol#LC_PathBreadcrumbs li, 
+ul.LC_CourseBreadcrumbs li {
+	display: inline;
+	padding: 0 0 0 10px;
+	overflow:hidden;
+}
+
+ol#LC_MenuBreadcrumbs li a, ul.LC_CourseBreadcrumbs li a {
+	text-decoration: none;
+	font-size:90%;
+}
+
+ol#LC_PathBreadcrumbs li a {
+	text-decoration:none;
+	font-size:100%;
+	font-weight:bold;
+}
+
+.LC_BoxPadding {
+	padding: 10px;
+}
+
+.LC_ContentBoxSpecial {
+	border: solid 1px $lg_border_color;
+}
+
+.LC_ContentBoxSpecialContactInfo {
+	border: solid 1px $lg_border_color;
+	max-width:25%;
+	min-width:25%;
+}
+
+.LC_AboutMe_Image {
+	float:left;
+	margin-right:10px;
+}
+
+.LC_Clear_AboutMe_Image {
+	clear:left;
+}
+
+dl.LC_ListStyleClean dt {
+	padding-right: 5px;
+	display: table-header-group;
+}
+
+dl.LC_ListStyleClean dd {
+	display: table-row;
+}
+
+.LC_ListStyleClean,
+.LC_ListStyleSimple,
+.LC_ListStyleNormal,
+.LC_ListStyle_Border,
+.LC_ListStyleSpecial {
+	/*display:block;	*/
+	list-style-position: inside;
+	list-style-type: none;
+	overflow: hidden;
+	padding: 0;
+}
+
+.LC_ListStyleSimple li,
+.LC_ListStyleSimple dd,
+.LC_ListStyleNormal li,
+.LC_ListStyleNormal dd,
+.LC_ListStyleSpecial li,
+.LC_ListStyleSpecial dd {
+	margin: 0;
+	padding: 5px 5px 5px 10px;
+	clear: both;
+}
+
+.LC_ListStyleClean li,
+.LC_ListStyleClean dd {
+	padding-top: 0;
+	padding-bottom: 0;
+}
+
+.LC_ListStyleSimple dd,
+.LC_ListStyleSimple li {
+	border-bottom: solid 1px $lg_border_color;
+}
+
+.LC_ListStyleSpecial li,
+.LC_ListStyleSpecial dd {
+	list-style-type: none;
+	background-color: RGB(220, 220, 220);
+	margin-bottom: 4px;
+}
+
+table.LC_SimpleTable {
+	margin:5px;
+	border:solid 1px $lg_border_color;
+}
+
+table.LC_SimpleTable tr {
+	padding: 0;
+	border:solid 1px $lg_border_color;
+}
+
+table.LC_SimpleTable thead {
+	 background:rgb(220,220,220);
+}
+
+div.LC_columnSection {
+	display: block;
+	clear: both;
+	overflow: hidden;
+	margin: 0;
+}
+
+div.LC_columnSection>* {
+	float: left;
+	margin: 10px 20px 10px 0;
+	overflow:hidden;
+}
+
+.ContentBoxSpecialTemplate {
+        border: solid 1px $lg_border_color;
+}
+
+.ContentBoxTemplate {
+        padding:10px;
+}
+
+div.LC_columnSection > .ContentBoxTemplate,
+div.LC_columnSection > .ContentBoxSpecialTemplate {
+        width: 600px;
+}
+
+.clear {
+	clear: both;
+	line-height: 0;
+	font-size: 0;
+	height: 0;
+}
+
+.LC_loginpage_container {
+	text-align:left;
+	margin : 0 auto;
+	width:90%;
+	padding: 10px;
+	height: auto;
+	background-color:#FFFFFF;
+	border:1px solid #CCCCCC;
+}
+
+
+.LC_loginpage_loginContainer {
+	float:left;
+	width: 182px;
+	padding: 2px;
+	border:1px solid #CCCCCC;
+	background-color:$loginbg;
+}
+
+.LC_loginpage_loginContainer h2 {
+	margin-top: 0;
+	display:block;
+	background:$bgcol;
+	color:$textcol;
+	padding-left:5px;
+}
+
+.LC_loginpage_loginInfo {
+	float:left;
+	width:182px;
+	border:1px solid #CCCCCC;
+	padding:2px;
+}
+
+.LC_loginpage_space {
+	clear: both;
+	margin-bottom: 20px;
+	border-bottom: 1px solid #CCCCCC;
+}
+
+.LC_loginpage_floatLeft {
+	float: left;
+	width: 200px;
+	margin: 0;
+}
+
+table em {
+	font-weight: bold;
+	font-style: normal;
+}
+
+table.LC_tableBrowseRes,
+table.LC_tableOfContent {
+        border:none;
+	border-spacing: 1;
+	padding: 3px;
+	background-color: #FFFFFF;
+	font-size: 90%;
+}
+
+table.LC_tableOfContent{
+    border-collapse: collapse;
+}
+
+table.LC_tableBrowseRes a,
+table.LC_tableOfContent a {
+        background-color: transparent;
+	text-decoration: none;
+}
+
+table.LC_tableBrowseRes tr.LC_trOdd,
+table.LC_tableOfContent tr.LC_trOdd{
+	background-color: #EEEEEE;
+}
+
+table.LC_tableOfContent img {
+	border: none;
+	height: 1.3em;
+	vertical-align: text-bottom;
+	margin-right: 0.3em;
+}
+
+a#LC_content_toolbar_firsthomework {
+	background-image:url(/res/adm/pages/open-first-problem.gif);
+}
+
+a#LC_content_toolbar_launchnav {
+	background-image:url(/res/adm/pages/start-navigation.gif);
+}
+
+a#LC_content_toolbar_closenav {
+	background-image:url(/res/adm/pages/close-navigation.gif);
+}
+
+a#LC_content_toolbar_everything {
+	background-image:url(/res/adm/pages/show-all.gif);
+}
+
+a#LC_content_toolbar_uncompleted {
+	background-image:url(/res/adm/pages/show-incomplete-problems.gif);
+}
+
+#LC_content_toolbar_clearbubbles {
+	background-image:url(/res/adm/pages/mark-discussionentries-read.gif);
+}
+
+a#LC_content_toolbar_changefolder {
+	background : url(/res/adm/pages/close-all-folders.gif) top center ;
+}
+
+a#LC_content_toolbar_changefolder_toggled {
+	background-image:url(/res/adm/pages/open-all-folders.gif);
+}
+
+ul#LC_toolbar li a:hover {
+	background-position: bottom center;
 }
+
+ul#LC_toolbar {
+	padding: 0;
+	margin: 2px;
+	list-style:none;
+	position:relative;
+	background-color:white;
+}
+
+ul#LC_toolbar li {
+	border:1px solid white;
+	padding: 0;
+	margin: 0;
+        float: left;
+	display:inline;
+	vertical-align:middle;
+} 
+
+
+a.LC_toolbarItem {
+	display:block;
+	padding: 0;
+	margin: 0;
+	height: 32px;
+	width: 32px;
+	color:white;
+	border: none;
+	background-repeat:no-repeat;
+	background-color:transparent;
+}
+
+ul.LC_functionslist li {
+  float: left;
+  white-space: nowrap;
+  height: 35px; /* at least as high as heighest list item */
+  margin: 0 15px 15px 10px;
+}
+
+
 END
 }
 
@@ -5548,7 +6442,7 @@ $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
@@ -5567,7 +6461,6 @@ $args - additional optional args support
                                     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
@@ -5616,16 +6509,42 @@ sub start_page {
 			 $args->{'only_body'},      $args->{'domain'},
 			 $args->{'force_register'}, $args->{'body_title'},
 			 $args->{'no_nav_bar'},     $args->{'bgcolor'},
-			 $args->{'no_title'},       $args->{'no_inline_link'},
+			 $args->{'no_inline_link'},
 			 $args);
 	}
     }
 
     if ($args->{'js_ready'}) {
-	$result = &js_ready($result);
+		$result = &js_ready($result);
     }
     if ($args->{'html_encode'}) {
-	$result = &html_encode($result);
+		$result = &html_encode($result);
+    }
+
+    # 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
+    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;
 }
@@ -5773,7 +6692,7 @@ sub simple_error_page {
     }
 
     sub start_data_table_empty_row {
-	$row_count[0]++;
+#	$row_count[0]++;
 	return  '<tr class="LC_empty_row" >'."\n";;
     }
 
@@ -5854,7 +6773,10 @@ Returns either 'student','coordinator','
 
 ###############################################
 sub get_users_function {
-    my $function = 'student';
+    my $function = 'norole';
+    if ($env{'request.role'}=~/^(st)/) {
+        $function='student';
+    }
     if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
         $function='coordinator';
     }
@@ -6375,6 +7297,8 @@ If the user's status includes multiple t
 the largest default quota which applies to the user determines the
 default quota returned.
 
+=back
+
 =cut
 
 ###############################################
@@ -6387,21 +7311,37 @@ 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 ($defquota eq '') {
-                        $defquota = $quotahash{'quotas'}{$item};
-                        $settingstatus = $item;
-                    } elsif ($quotahash{'quotas'}{$item} > $defquota) {
-                        $defquota = $quotahash{'quotas'}{$item};
-                        $settingstatus = $item;
+                if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
+                    if ($quotahash{'quotas'}{'defaultquota'}{$item} ne '') {
+                        if ($defquota eq '') {
+                            $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
+                            $settingstatus = $item;
+                        } elsif ($quotahash{'quotas'}{'defaultquota'}{$item} > $defquota) {
+                            $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
+                            $settingstatus = $item;
+                        }
+                    }
+                } else {
+                    if ($quotahash{'quotas'}{$item} ne '') {
+                        if ($defquota eq '') {
+                            $defquota = $quotahash{'quotas'}{$item};
+                            $settingstatus = $item;
+                        } elsif ($quotahash{'quotas'}{$item} > $defquota) {
+                            $defquota = $quotahash{'quotas'}{$item};
+                            $settingstatus = $item;
+                        }
                     }
                 }
             }
         }
         if ($defquota eq '') {
-            $defquota = $quotahash{'quotas'}{'default'};
+            if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
+                $defquota = $quotahash{'quotas'}{'defaultquota'}{'default'};
+            } else {
+                $defquota = $quotahash{'quotas'}{'default'};
+            }
             $settingstatus = 'default';
         }
     } else {
@@ -6550,12 +7490,17 @@ 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 />';
                 }
             }
         }
@@ -6807,12 +7752,16 @@ 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') {
@@ -6833,6 +7782,7 @@ sub personal_data_fieldtitles {
                         middlename => 'Middle Name',
                         generation => 'Generation',
                         gen => 'Generation',
+                        inststatus => 'Affiliation',
                    );
     return %fieldtitles;
 }
@@ -6842,7 +7792,7 @@ 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') {
@@ -6855,9 +7805,6 @@ sub sorted_inst_types {
     }
     if (keys(%{$usertypes}) > 0) {
         $othertitle = &mt('Other users');
-        if ($env{'request.course.id'}) {
-            $othertitle = 'other';
-        }
     }
     return ($othertitle,$usertypes,\@types);
 }
@@ -6905,8 +7852,57 @@ 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
@@ -7043,6 +8039,232 @@ sub get_env_multiple {
     return(@values);
 }
 
+sub ask_for_embedded_content {
+    my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
+    my $upload_output = '
+   <form name="upload_embedded" action="'.$actionurl.'"
+                  method="post" enctype="multipart/form-data">';
+    $upload_output .= $state;
+    $upload_output .= '<b>Upload embedded files</b>:<br />'.&start_data_table();
+
+    my $num = 0;
+    foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%{$allfiles})) {
+        $upload_output .= &start_data_table_row().
+            '<td>'.$embed_file.'</td><td>';
+        if ($args->{'ignore_remote_references'}
+            && $embed_file =~ m{^\w+://}) {
+            $upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';
+        } elsif ($args->{'error_on_invalid_names'}
+            && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
+
+            $upload_output.='<span class="LC_warning">'.&mt("Invalid characters").'</span>';
+
+        } else {
+            $upload_output .='
+           <input name="embedded_item_'.$num.'" type="file" value="" />
+           <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
+            my $attrib = join(':',@{$$allfiles{$embed_file}});
+            $upload_output .=
+                "\n\t\t".
+                '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.
+                $attrib.'" />';
+            if (exists($$codebase{$embed_file})) {
+                $upload_output .=
+                    "\n\t\t".
+                    '<input name="codebase_'.$num.'" type="hidden" value="'.
+                    &escape($$codebase{$embed_file}).'" />';
+            }
+        }
+        $upload_output .= '</td>'.&Apache::loncommon::end_data_table_row();
+        $num++;
+    }
+    $upload_output .= &Apache::loncommon::end_data_table().'<br />
+   <input type ="hidden" name="number_embedded_items" value="'.$num.'" />
+   <input type ="submit" value="'.&mt('Upload Listed Files').'" />
+   '.&mt('(only files for which a location has been provided will be uploaded)').'
+   </form>';
+    return $upload_output;
+}
+
+sub upload_embedded {
+    my ($context,$dirpath,$uname,$udom,$dir_root,$url_root,$group,$disk_quota,
+        $current_disk_usage) = @_;
+    my $output;
+    for (my $i=0; $i<$env{'form.number_embedded_items'}; $i++) {
+        next if (!exists($env{'form.embedded_item_'.$i.'.filename'}));
+        my $orig_uploaded_filename =
+            $env{'form.embedded_item_'.$i.'.filename'};
+
+        $env{'form.embedded_orig_'.$i} =
+            &unescape($env{'form.embedded_orig_'.$i});
+        my ($path,$fname) =
+            ($env{'form.embedded_orig_'.$i} =~ m{(.*/)([^/]*)});
+        # no path, whole string is fname
+        if (!$fname) { $fname = $env{'form.embedded_orig_'.$i} };
+
+        $path = $env{'form.currentpath'}.$path;
+        $fname = &Apache::lonnet::clean_filename($fname);
+        # See if there is anything left
+        next if ($fname eq '');
+
+        # Check if file already exists as a file or directory.
+        my ($state,$msg);
+        if ($context eq 'portfolio') {
+            my $port_path = $dirpath;
+            if ($group ne '') {
+                $port_path = "groups/$group/$port_path";
+            }
+            ($state,$msg) = &check_for_upload($path,$fname,$group,'embedded_item_'.$i,
+                                              $dir_root,$port_path,$disk_quota,
+                                              $current_disk_usage,$uname,$udom);
+            if ($state eq 'will_exceed_quota'
+                || $state eq 'file_locked'
+                || $state eq 'file_exists' ) {
+                $output .= $msg;
+                next;
+            }
+        } elsif (($context eq 'author') || ($context eq 'testbank')) {
+            ($state,$msg) = &check_for_existing($path,$fname,'embedded_item_'.$i);
+            if ($state eq 'exists') {
+                $output .= $msg;
+                next;
+            }
+        }
+        # Check if extension is valid
+        if (($fname =~ /\.(\w+)$/) &&
+            (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
+            $output .= &mt('Invalid file extension ([_1]) - reserved for LONCAPA use - rename the file with a different extension and re-upload. ',$1);
+            next;
+        } elsif (($fname =~ /\.(\w+)$/) &&
+                 (!defined(&Apache::loncommon::fileembstyle($1)))) {
+            $output .= &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1);
+            next;
+        } elsif ($fname=~/\.(\d+)\.(\w+)$/) {
+            $output .= &mt('File name not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2);
+            next;
+        }
+
+        $env{'form.embedded_item_'.$i.'.filename'}=$fname;
+        if ($context eq 'portfolio') {
+            my $result=
+                &Apache::lonnet::userfileupload('embedded_item_'.$i,'',
+                                                $dirpath.$path);
+            if ($result !~ m|^/uploaded/|) {
+                $output .= '<span class="LC_error">'
+                      .&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'
+                           ,$result,$orig_uploaded_filename,$env{'form.embedded_orig_'.$i})
+                      .'</span><br />';
+                next;
+            } else {
+                $output .= '<p>'.&mt('Uploaded [_1]','<span class="LC_filename">'.
+                           $path.$fname.'</span>').'</p>';     
+            }
+        } else {
+# Save the file
+            my $target = $env{'form.embedded_item_'.$i};
+            my $fullpath = $dir_root.$dirpath.'/'.$path;
+            my $dest = $fullpath.$fname;
+            my $url = $url_root.$dirpath.'/'.$path.$fname;
+            my @parts=split(/\//,$fullpath);
+            my $count;
+            my $filepath = $dir_root;
+            for ($count=4;$count<=$#parts;$count++) {
+                $filepath .= "/$parts[$count]";
+                if ((-e $filepath)!=1) {
+                    mkdir($filepath,0770);
+                }
+            }
+            my $fh;
+            if (!open($fh,'>'.$dest)) {
+                &Apache::lonnet::logthis('Failed to create '.$dest);
+                $output .= '<span class="LC_error">'.
+                           &mt('An error occurred while trying to upload [_1] for embedded element [_2].',$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}).
+                           '</span><br />';
+            } else {
+                if (!print $fh $env{'form.embedded_item_'.$i}) {
+                    &Apache::lonnet::logthis('Failed to write to '.$dest);
+                    $output .= '<span class="LC_error">'.
+                              &mt('An error occurred while writing the file [_1] for embedded element [_2].',$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}).
+                              '</span><br />';
+                } else {
+                    if ($context eq 'testbank') {
+                        $output .= &mt('Embedded file uploaded successfully:').
+                                   '&nbsp;<a href="'.$url.'">'.
+                                   $orig_uploaded_filename.'</a><br />';
+                    } else {
+                        $output .= '<span class=\"LC_fontsize_large\">'.
+                                   &mt('View embedded file: [_1]','<a href="'.$url.'">'.
+                                   $orig_uploaded_filename.'</a>').'</span><br />';
+                    }
+                }
+                close($fh);
+            }
+        }
+    }
+    return $output;
+}
+
+sub check_for_existing {
+    my ($path,$fname,$element) = @_;
+    my ($state,$msg);
+    if (-d $path.'/'.$fname) {
+        $state = 'exists';
+        $msg = &mt('Unable to upload [_1]. A directory by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$path);
+    } elsif (-e $path.'/'.$fname) {
+        $state = 'exists';
+        $msg = &mt('Unable to upload [_1]. A file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$path);
+    }
+    if ($state eq 'exists') {
+        $msg = '<span class="LC_error">'.$msg.'</span><br />';
+    }
+    return ($state,$msg);
+}
+
+sub check_for_upload {
+    my ($path,$fname,$group,$element,$portfolio_root,$port_path,
+        $disk_quota,$current_disk_usage,$uname,$udom) = @_;
+    my $filesize = (length($env{'form.'.$element})) / 1000; #express in k (1024?)
+    my $getpropath = 1;
+    my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$path,$udom,$uname,
+                                            $getpropath);
+    my $found_file = 0;
+    my $locked_file = 0;
+    foreach my $line (@dir_list) {
+        my ($file_name)=split(/\&/,$line,2);
+        if ($file_name eq $fname){
+            $file_name = $path.$file_name;
+            if ($group ne '') {
+                $file_name = $group.$file_name;
+            }
+            $found_file = 1;
+            if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
+                $locked_file = 1;
+            }
+        }
+    }
+    if (($current_disk_usage + $filesize) > $disk_quota){
+        my $msg = '<span class="LC_error">'.
+                &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.','<span class="LC_filename">'.$fname.'</span>',$filesize).'</span>'.
+                  '<br />'.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.',$disk_quota,$current_disk_usage);
+        return ('will_exceed_quota',$msg);
+    } elsif ($found_file) {
+        if ($locked_file) {
+            my $msg = '<span class="LC_error">';
+            $msg .= &mt('Unable to upload [_1]. A locked file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>','<span class="LC_filename">'.$port_path.$env{'form.currentpath'}.'</span>');
+            $msg .= '</span><br />';
+            $msg .= &mt('You will be able to rename or delete existing [_1] after a grade has been assigned.','<span class="LC_filename">'.$fname.'</span>');
+            return ('file_locked',$msg);
+        } else {
+            my $msg = '<span class="LC_error">';
+            $msg .= &mt('Unable to upload [_1]. A file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$port_path.$env{'form.currentpath'});
+            $msg .= '</span>';
+            $msg .= '<br />';
+            $msg .= &mt('To upload, rename or delete existing [_1] in [_2].','<span class="LC_filename">'.$fname.'</span>', $port_path.$env{'form.currentpath'});
+            return ('file_exists',$msg);
+        }
+    }
+}
+
 
 =pod
 
@@ -7231,7 +8453,7 @@ sub upfile_select_html {
 #                 xml   => &mt('HTML/XML'),
                  );
     my $Str = '<input type="file" name="upfile" size="50" />'.
-        '<br />Type: <select name="upfiletype">';
+        '<br />'.&mt('Type').': <select name="upfiletype">';
     foreach my $type (sort(keys(%Types))) {
         $Str .= '<option value="'.$type.'" >'.$Types{$type}."</option>\n";
     }
@@ -7272,7 +8494,7 @@ 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());
@@ -7319,7 +8541,7 @@ 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.');">');
@@ -7327,7 +8549,7 @@ sub csv_print_select_table {
 	foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
 	    $r->print('<option value="'.$sample.'"'.
                       ($sample eq $defaultcol ? ' selected="selected" ' : '').
-                      '>Column '.($sample+1).'</option>');
+                      '>'.&mt('Column [_1]',($sample+1)).'</option>');
 	}
 	$r->print('</select></td>'.&end_data_table_row()."\n");
 	$i++;
@@ -7358,7 +8580,8 @@ 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>'.
@@ -7374,7 +8597,7 @@ 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"); 
 	    }
@@ -7974,9 +9197,10 @@ sub restore_settings {
 
 =item * &build_recipient_list()
 
-Build recipient lists for three types of e-mail:
-(a) Error Reports, (b) Package Updates, (c) Help requests, generated by
-lonerrorhandler.pm, CHECKRPMS and lonsupportreq.pm respectively.
+Build recipient lists for four types of e-mail:
+(a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors
+(d) Help requests, generated by
+lonerrorhandler.pm, CHECKRPMS, loncron, and lonsupportreq.pm respectively.
 
 Inputs:
 defmail (scalar - email address of default recipient), 
@@ -8000,23 +9224,29 @@ 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') {
-            my @contacts = ('adminemail','supportemail');
-            foreach my $item (@contacts) {
-                if ($domconfig{'contacts'}{$mailing}{$item}) {
-                    my $addr = $domconfig{'contacts'}{$item}; 
-                    if (!grep(/^\Q$addr\E$/,@recipients)) {
-                        push(@recipients,$addr);
+        if (exists($domconfig{'contacts'}{$mailing})) {
+            if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') {
+                my @contacts = ('adminemail','supportemail');
+                foreach my $item (@contacts) {
+                    if ($domconfig{'contacts'}{$mailing}{$item}) {
+                        my $addr = $domconfig{'contacts'}{$item}; 
+                        if (!grep(/^\Q$addr\E$/,@recipients)) {
+                            push(@recipients,$addr);
+                        }
                     }
+                    $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
                 }
-                $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
             }
+        } elsif ($origmail ne '') {
+            push(@recipients,$origmail);
         }
     } elsif ($origmail ne '') {
         push(@recipients,$origmail);
     }
-    if ($defmail ne '') {
-        push(@recipients,$defmail);
+    if (defined($defmail)) {
+        if ($defmail ne '') {
+            push(@recipients,$defmail);
+        }
     }
     if ($otheremails) {
         my @others;
@@ -8052,11 +9282,15 @@ 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).
 
@@ -8099,17 +9333,26 @@ 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.
@@ -8117,7 +9360,7 @@ 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') {
@@ -8138,7 +9381,14 @@ 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} = [];
                     }
                 }
             }
@@ -8154,13 +9404,19 @@ 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). 
 
@@ -8168,12 +9424,10 @@ 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++) {
@@ -8186,7 +9440,21 @@ 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 {
@@ -8200,17 +9468,147 @@ 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;
 }
@@ -8484,7 +9882,9 @@ sub construct_course {
                    'policy.email',
                    'comment.email',
                    'pch.users.denied',
-                   'plc.users.denied'],
+                   'plc.users.denied',
+                   'hidefromcat',
+                   'categories'],
                    $$crsudom,$$crsunum);
     }
 
@@ -8712,10 +10112,10 @@ sub construct_course {
         $outcome .= ($fatal?$errtext:'read ok').' - ';
         my $title; my $url;
         if ($args->{'firstres'} eq 'syl') {
-	    $title='Syllabus';
+	    $title=&mt('Syllabus');
             $url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus';
         } else {
-            $title='Navigate Contents';
+            $title=&mt('Navigate Contents');
             $url='/adm/navmaps';
         }
 
@@ -8769,28 +10169,14 @@ sub icon {
     return &lonhttpdurl($iconname);
 } 
 
-sub lonhttpd_port {
-    my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'};
-    if (!defined($lonhttpd_port)) { $lonhttpd_port='8080'; }
-    # IE doesn't like a secure page getting images from a non-secure
-    # port (when logging we haven't parsed the browser type so default
-    # back to secure
-    if ((!exists($env{'browser.type'}) || $env{'browser.type'} eq 'explorer')
-	&& $ENV{'SERVER_PORT'} == 443) {
-	return 443;
-    }
-    return $lonhttpd_port;
-
-}
-
 sub lonhttpdurl {
+#
+# Had been used for "small fry" static images on separate port 8080.
+# Modify here if lightweight http functionality desired again.
+# Currently eliminated due to increasing firewall issues.
+#
     my ($url)=@_;
-
-    my $lonhttpd_port = &lonhttpd_port();
-    if ($lonhttpd_port == 443) {
-	return 'https://'.$ENV{'SERVER_NAME'}.$url;
-    }
-    return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
+    return $url;
 }
 
 sub connection_aborted {
@@ -8826,7 +10212,23 @@ 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'};
@@ -8868,7 +10270,7 @@ sub init_user_environment {
 	}
 # Give them a new cookie
 	my $id = ($args->{'robot'} ? 'robot'.$args->{'robot'}
-		                   : $now);
+		                   : $now.$$.int(rand(10000)));
 	$cookie="$username\_$id\_$domain\_$authhost";
     
 # Initialize roles
@@ -8880,19 +10282,6 @@ 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);
@@ -8910,10 +10299,8 @@ 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',
-			'embedsuppress','fontenhance','blackwhite',
-			'interface','localpath','localres') {
-	$form->{$option}=~s/[\n\r\=]//gs;
+    foreach my $option ('interface','localpath','localres') {
+        $form->{$option}=~s/[\n\r\=]//gs;
     }
 # --------------------------------------------------------- Write first profile
 
@@ -8947,15 +10334,19 @@ 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') {
+            $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",
@@ -8968,8 +10359,8 @@ sub init_user_environment {
 	    }
 	    untie(%disk_env);
 	} else {
-	    &Apache::lonnet::logthis("<font color=\"blue\">WARNING: ".
-			   'Could not create environment storage in lonauth: '.$!.'</font>');
+	    &Apache::lonnet::logthis("<span style=\"color:blue;\">WARNING: ".
+			   'Could not create environment storage in lonauth: '.$!.'</span>');
 	    return 'error: '.$!;
 	}
     }
@@ -8983,12 +10374,54 @@ sub init_user_environment {
 
 sub _add_to_env {
     my ($idf,$env_data,$prefix) = @_;
-    while (my ($key,$value) = each(%$env_data)) {
-	$idf->{$prefix.$key} = $value;
-	$env{$prefix.$key}   = $value;
+    if (ref($env_data) eq 'HASH') {
+        while (my ($key,$value) = each(%$env_data)) {
+	    $idf->{$prefix.$key} = $value;
+	    $env{$prefix.$key}   = $value;
+        }
     }
 }
 
+# --- Get the symbolic name of a problem and the url
+sub get_symb {
+    my ($request,$silent) = @_;
+    (my $url=$env{'form.url'}) =~ s-^https?\://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+    my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
+    if ($symb eq '') {
+        if (!$silent) {
+            $request->print("Unable to handle ambiguous references:$url:.");
+            return ();
+        }
+    }
+    &Apache::lonenc::check_decrypt(\$symb);
+    return ($symb);
+}
+
+# --------------------------------------------------------------Get annotation
+
+sub get_annotation {
+    my ($symb,$enc) = @_;
+
+    my $key = $symb;
+    if (!$enc) {
+        $key =
+            &Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
+    }
+    my %annotation=&Apache::lonnet::get('nohist_annotations',[$key]);
+    return $annotation{$key};
+}
+
+sub clean_symb {
+    my ($symb,$delete_enc) = @_;
+
+    &Apache::lonenc::check_decrypt(\$symb);
+    my $enc = $env{'request.enc'};
+    if ($delete_enc) {
+        delete($env{'request.enc'});
+    }
+
+    return ($symb,$enc);
+}
 
 =pod