--- loncom/interface/loncommon.pm	2009/05/21 05:27:10	1.692.4.2
+++ loncom/interface/loncommon.pm	2009/05/27 13:42:04	1.826
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.692.4.2 2009/05/21 05:27:10 raeburn Exp $
+# $Id: loncommon.pm,v 1.826 2009/05/27 13:42:04 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -271,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) 
     
@@ -407,6 +407,7 @@ sub studentbrowser_javascript {
           ) { return ''; }  
    return (<<'ENDSTDBRW');
 <script type="text/javascript" language="Javascript">
+// <![CDATA[
     var stdeditbrowser;
     function openstdbrowser(formname,uname,udom,roleflag,ignorefilter,courseadvonly) {
         var url = '/adm/pickstudent?';
@@ -429,6 +430,7 @@ sub studentbrowser_javascript {
         stdeditbrowser = open(url,title,options,'1');
         stdeditbrowser.focus();
     }
+// ]]>
 </script>
 ENDSTDBRW
 }
@@ -450,7 +452,7 @@ sub selectstudent_link {
               &mt('Select User').'</a></span>';
    }
    if ($env{'request.role'}=~/^(au|dc|su)/) {
-       $callargs .= ",1";
+       $callargs .= ",1"; 
        return '<span class="LC_nobreak">'.
               '<a href="javascript:openstdbrowser('.$callargs.');">'.
               &mt('Select User').'</a></span>';
@@ -460,7 +462,8 @@ sub selectstudent_link {
 
 sub authorbrowser_javascript {
     return <<"ENDAUTHORBRW";
-<script type="text/javascript">
+<script type="text/javascript" language="JavaScript">
+// <![CDATA[
 var stdeditbrowser;
 
 function openauthorbrowser(formname,udom) {
@@ -473,6 +476,7 @@ function openauthorbrowser(formname,udom
     stdeditbrowser.focus();
 }
 
+// ]]>
 </script>
 ENDAUTHORBRW
 }
@@ -482,6 +486,7 @@ sub coursebrowser_javascript {
     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" language="JavaScript">
+// <![CDATA[
     var stdeditbrowser;'."\n";
    $output .= <<"ENDSTDBRW";
     function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
@@ -517,6 +522,10 @@ sub coursebrowser_javascript {
             else {
                 if (formname == 'portform') {
                     url += '&setroles='+extra_element;
+                } else {
+                    if (formname == 'rules') {
+                        url += '&fixeddom='+extra_element; 
+                    }
                 }
             }     
         }
@@ -564,6 +573,7 @@ ENDSTDBRW
         $output .= &setsec_javascript($sec_element,$formname);
     }
     $output .= '
+// ]]>
 </script>';
     return $output;
 }
@@ -825,6 +835,7 @@ sub linked_select_forms {
     # output the javascript to do the changing
     my $result = '';
     $result.='<script type="text/javascript" language="JavaScript">'."\n";
+    $result.="// <![CDATA[\n";
     $result.="var select2data = new Object();\n";
     $" = '","';
     my $debug = '';
@@ -870,6 +881,7 @@ function select1_changed() {
         }
     }
 }
+// ]]>
 </script>
 END
     # output the initial values for the selection lists
@@ -931,9 +943,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;
@@ -951,20 +960,22 @@ sub help_open_topic {
     }
 
     # Add the text
-    if ($text ne "") {
-	$template .= 
-            "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
-            "<td bgcolor='#5555FF'><span class=\"LC_nobreak\"><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("/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></td></tr></table>';
+    $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;
 
@@ -976,26 +987,27 @@ sub helpLatexCheatsheet {
     my ($topic,$text,$not_author) = @_;
     my $out;
     my $addOther = '';
-    if ($other) {
-	$addOther = &Apache::loncommon::help_open_topic($topic,$text,
-						       undef, undef, 600) .
-							   '</td><td>';
-    }
-    $out = '<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>';
+    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 .= '<td>'.
-                &Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
-                                                    undef,undef,600).
-                '</td>';
+        $out .= ' <span>'
+	       .&Apache::loncommon::help_open_topic('Authoring_Output_Tags',&mt('Output Tags'),
+	                                            undef,undef,600)
+	       .'</span>';
     }
-    $out .= '</tr></table>';
+    $out .= '</span>'; # End cheatsheet
     return $out;
 }
 
@@ -1023,7 +1035,9 @@ sub update_help_link {
     my $banner_link = "/adm/helpmenu?page=banner&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp&amp;stayonpage=$stayOnPage";
     my $output .= <<"ENDOUTPUT";
 <script type="text/javascript">
+// <![CDATA[
 banner_link = '$banner_link';
+// ]]>
 </script>
 ENDOUTPUT
     return $output;
@@ -1036,8 +1050,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;
@@ -1061,8 +1074,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);
@@ -1079,8 +1091,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;
@@ -1139,8 +1150,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);
@@ -1164,7 +1174,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
@@ -1184,8 +1194,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);
@@ -1209,7 +1218,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
@@ -1395,6 +1404,7 @@ sub resize_textarea_js {
     my $geometry = &viewport_geometry_js();
     return <<"RESIZE";
     <script type="text/javascript">
+// <![CDATA[
 $geometry
 
 function getX(element) {
@@ -1433,6 +1443,7 @@ function resize_textarea(textarea_id,bot
     }
     textarea.style.height=new_height+'px';
 }
+// ]]>
 </script>
 RESIZE
 
@@ -1787,7 +1798,7 @@ selected");
 
 If the $showdomdesc flag is set, the domain name is followed by the domain description.
 
-If the $autosubmit flag is set, the form containing the domain selector will be auto-submitted by an onchange action.
+If the $autosubmit flag is set, the form containing the domain selector will be auto-submitted by an onchange action.  
 
 =cut
 
@@ -2300,7 +2311,7 @@ sub authform_internal{
     $result = &mt
         ('[_1] Internally authenticated (with initial password [_2])',
          '<label>'.$authtype,'</label>'.$autharg);
-    $result.="<label><input type=\"checkbox\" name=\"visible\" onClick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
+    $result.="<label><input type=\"checkbox\" name=\"visible\" onclick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
     return $result;
 }
 
@@ -2814,6 +2825,7 @@ sub screenname {
     return $names{'screenname'};
 }
 
+
 # ------------------------------------------------------------- Confirm Wrapper
 =pod
 
@@ -2844,6 +2856,7 @@ sub messagewrapper {
 	'&amp;subject='.&escape($subject).'&amp;text='.&escape($text).'" '.
         'title="'.&mt('Send message').'">'.$link.'</a>';
 }
+
 # --------------------------------------------------------------- Notes Wrapper
 
 sub noteswrapper {
@@ -2851,6 +2864,7 @@ sub noteswrapper {
     return 
 "<a href='/adm/email?recordftf=retrieve&recname=$un&recdom=$do'>$link</a>";
 }
+
 # ------------------------------------------------------------- Aboutme Wrapper
 
 sub aboutmewrapper {
@@ -2864,15 +2878,13 @@ sub aboutmewrapper {
 
 # ------------------------------------------------------------ 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?";
@@ -3174,6 +3186,7 @@ sub user_lang {
     return $user_lh;
 }
 
+
 ###############################################################
 ##               Student Answer Attempts                     ##
 ###############################################################
@@ -3889,7 +3902,7 @@ sub blocking_status {
                              &Apache::lonnet::coursedescription($course);
                         $coursedesc = $courseinfo{'description'};
                     }
-                    $category = "Group portfolio files in the course '$coursedesc'";
+                    $category = "Group portfolio in the course '$coursedesc'";
                 } else {
                     $category = 'Portfolio files belonging to ';
                     if ($env{'user.name'} eq 'public' && 
@@ -4023,7 +4036,7 @@ sub get_domainconf {
                 foreach my $key (keys(%{$domconfig{'login'}})) {
                     if (ref($domconfig{'login'}{$key}) eq 'HASH') {
                         foreach my $img (keys(%{$domconfig{'login'}{$key}})) {
-                            $designhash{$udom.'.login.'.$key.'_'.$img} =
+                            $designhash{$udom.'.login.'.$key.'_'.$img} = 
                                 $domconfig{'login'}{$key}{$img};
                         }
                     } else {
@@ -4143,41 +4156,92 @@ 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);
         }
     }
     return $output;
 }
 
+##############################################
+=pod
+
+=item * &head_subbox()
+
+Inputs: $content (contains HTML code with page functions, etc.)
+
+Returns: HTML div with $content
+         To be included in page header
+
+=cut
+
+sub head_subbox {
+    my ($content)=@_;
+    my $output =
+        '<div id="LC_head_subbox2">' #FIXME: solve conflicts with lonhtmlcommon:breadcrumbs LC_head_subbox
+       .$content
+       .'</div>'
+}
+
+##############################################
+=pod
+
+=item * &CSTR_pageheader()
+
+Inputs: ./.
+
+Returns: HTML div with CSTR path and recent box
+         To be included on Construction Space pages
+
+=cut
+
+sub CSTR_pageheader {
+    # this is for resources; directories have customtitle, and crumbs
+            # and select recent are created in lonpubdir.pm  
+    my ($uname,$thisdisfn)=
+        ($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
+    my $formaction='/priv/'.$uname.'/'.$thisdisfn;
+    $formaction=~s/\/+/\//g;
+
+    my $parentpath = '';
+    my $lastitem = '';
+    if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
+        $parentpath = $1;
+        $lastitem = $2;
+    } else {
+        $lastitem = $thisdisfn;
+    }
+    return
+         '<div>'
+        .&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?
+        .'<b>'.&mt('Construction Space:').'</b> '
+        .'<form name="dirs" method="post" action="'.$formaction
+        .'" target="_top"><tt><b>' #FIXME lonpubdir: target="_parent"
+        .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."$lastitem</b></tt><br />"
+        #FIXME lonpubdir: &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />"
+        .&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
+        .'</form>'
+        .&Apache::lonmenu::constspaceform()
+        .'</div>';
+}
+
 ###############################################
 ###############################################
 
@@ -4214,13 +4278,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
 
@@ -4241,7 +4303,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); }
 
@@ -4286,15 +4348,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') {
@@ -4318,7 +4372,7 @@ $realm&nbsp;
 </td>
 ENDROLE
 
-    my $titleinfo = '<span class="LC_title_bar_title">'.$title.'</span>';
+    my $titleinfo = '<h1>'.$title.'</h1>';
     if ($customtitle) {
         $titleinfo = $customtitle;
     }
@@ -4340,43 +4394,19 @@ ENDROLE
 	    $forcereg=1;
 	}
 
-	if (!$customtitle && $env{'request.state'} eq 'construct') {
-	    # this is for resources; directories have customtitle, and crumbs
-            # and select recent are created in lonpubdir.pm  
-	    my ($uname,$thisdisfn)=
-		($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
-	    my $formaction='/priv/'.$uname.'/'.$thisdisfn;
-	    $formaction=~s/\/+/\//g;
-
-	    my $parentpath = '';
-	    my $lastitem = '';
-	    if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
-		$parentpath = $1;
-		$lastitem = $2;
-	    } else {
-		$lastitem = $thisdisfn;
-	    }
-	    $titleinfo = 
-		&Apache::loncommon::help_open_menu('','',3,'Authoring')
-		.'<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::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) {
+    if (!$customtitle && $env{'request.state'} eq 'construct') {
+        $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
+    }
+
+        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);
@@ -4402,14 +4432,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
@@ -4457,15 +4484,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}.'" ';
@@ -4526,6 +4544,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 ||
@@ -4535,6 +4555,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;
@@ -4552,6 +4576,7 @@ 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'     ) ? '0 2px 0 2px'
@@ -4559,27 +4584,56 @@ sub standard_css {
 
 
     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;
@@ -4605,11 +4659,9 @@ div.LC_confirm_box .LC_success img {
 
 .LC_icon {
   border: none;
+  vertical-align: middle;
 }
-.LC_indexer_icon {
-  border: 0;
-  height: 22px;
-}
+
 .LC_docs_spacer {
   width: 25px;
   height: 1px;
@@ -4620,12 +4672,47 @@ div.LC_confirm_box .LC_success img {
   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 {
   border: 1px solid black;
   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;
@@ -4633,17 +4720,28 @@ table#LC_top_nav, table#LC_menubuttons,t
   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: 0;
+  margin: 0;
 }
 
 table.LC_docs_path {
@@ -4658,97 +4756,133 @@ table.LC_docs_path {
 table#LC_title_bar td {
   background: $tabbg;
 }
-table#LC_title_bar td.LC_title_bar_who {
+
+table#LC_title_bar .LC_title_bar_who {
   background: $tabbg;
-  color: $font;
+  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 td.LC_title_bar_domain_logo {
-  background: $sidebg;
-  text-align: right;
-  padding: 0;
+
+table#LC_title_bar div.LC_title_bar_name {
+  margin: 0;
 }
-table#LC_title_bar td.LC_title_bar_role_logo {
-  background: $sidebg;
-  padding: 0;
+
+table#LC_title_bar div.LC_title_bar_role {
+  margin: 0;
 }
 
-table#LC_menubuttons_mainmenu {
-  width: 100%;
-  border: 0;
-  border-spacing: 1px;
-  padding: 0 1px;
+table#LC_title_bar div.LC_title_bar_realm {
   margin: 0;
-  border-collapse: separate;
 }
-table#LC_menubuttons img, table#LC_menubuttons_mainmenu img {
+
+table#LC_menubuttons img{
   border: none;
 }
+
 table#LC_top_nav td {
   background: $tabbg;
   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: 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;
 }
+
 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 $lg_border_color;
+ height: 32px;
+ line-height: 32px; 
+ margin: 0;
+ padding: 0;
+}
+
+#LC_head_subbox2 { /* FIXME: replace by LC_head_subbox once lonhtmlcommon::breadcrumbs has been fixed */
+ clear:both;
+ background: #F8F8F8; /* $sidebg; */
+ border-bottom: 1px solid $lg_border_color;
+ margin: 0 0 10px 0;
+ padding: 5px;
+}
+
+.LC_fontsize_medium {
+ font-size: 85%;
+}
+
+.LC_fontsize_large {
+ font-size: 120%;
+}
+
 .LC_menubuttons_inline_text {
   color: $font;
   font-family: $sans;
-  font-size: smaller;
+  font-size: 90%;
+  padding-left:3px;
 }
 
 .LC_menubuttons_link {
   text-decoration: none;
 }
-/*2008--9-5: new menu style sheet.Changed category*/
+
 .LC_menubuttons_category {
   color: $font;
   background: $pgbg;
@@ -4758,98 +4892,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_dropadd_labeltext {
-  font-family: $sans;
-  text-align: right;
-}
-
 .LC_preferences_labeltext {
   font-family: $sans;
   text-align: right;
 }
 
 .LC_roleslog_note {
-  font-size: smaller;
+  font-size: small;
 }
 
 .LC_mail_functions {
     font-weight: bold;
 }
 
-table.LC_aboutme_port {
-  border: none;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-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: 0;
   width: 100%;
 }
+
 table.LC_nested {
   border: none;
   border-collapse: collapse;
   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_pick_box tr > td.LC_odd_row,
-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_pick_box tr > td.LC_even_row,
-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;
@@ -4858,15 +4990,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;
@@ -4874,20 +5010,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: #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: #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,
@@ -4903,7 +5043,7 @@ 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  {
@@ -4916,16 +5056,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;
 }
@@ -4933,117 +5077,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: none;
-  border-spacing: 2px 2px;
-  padding: 0;
-  margin: 0;
-  border-collapse: separate;
-}
-table#LC_portfolio_actions td.LC_label {
-  background: $tabbg;
-  text-align: right;
-}
-table#LC_portfolio_actions td.LC_value {
-  background: $tabbg;
-}
 
-table#LC_cstr_controls {
-  width: 100%;
-  border-collapse: collapse;
-}
-table#LC_cstr_controls tr td {
-  border: 4px solid $pgbg;
-  padding: 4px;
-  text-align: center;
-  background: $tabbg;
-}
-table#LC_cstr_controls tr th {
-  border: 4px solid $pgbg;
-  background: $table_header;
-  text-align: center;
-  font-family: $sans;
-  font-size: smaller;
-}
-
-table#LC_browser {
- 
-}
-table#LC_browser tr th {
-  background: $table_header;
-}
-table#LC_browser tr td {
-  padding: 2px;
-}
-table#LC_browser tr.LC_browser_file,
-table#LC_browser tr.LC_browser_file_published {
+table.LC_data_table tr > td.LC_browser_file,
+table.LC_data_table tr > td.LC_browser_file_published {
   background: #CCFF88;
 }
-table#LC_browser tr.LC_browser_file_locked,
-table#LC_browser tr.LC_browser_file_unpublished {
+
+table.LC_data_table tr > td.LC_browser_file_locked,
+table.LC_data_table tr > td.LC_browser_file_unpublished {
   background: #FFAA99;
 }
-table#LC_browser tr.LC_browser_file_obsolete {
+
+table.LC_data_table tr > td.LC_browser_file_obsolete {
   background: #AAAAAA;
 }
-table#LC_browser tr.LC_browser_file_modified,
-table#LC_browser tr.LC_browser_file_metamodified {
+
+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.LC_browser_folder {
+
+table.LC_data_table tr.LC_browser_folder > td {
   background: #CCCCFF;
 }
 
 table.LC_data_table tr > td.LC_roles_is {
 /*  background: #77FF77; */
 }
+
 table.LC_data_table tr > td.LC_roles_future {
   background: #FFFF77;
 }
+
 table.LC_data_table tr > td.LC_roles_will {
   background: #FFAA77;
 }
+
 table.LC_data_table tr > td.LC_roles_expired {
   background: #FF7777;
 }
+
 table.LC_data_table tr > td.LC_roles_will_not {
   background: #AAFF77;
 }
+
 table.LC_data_table tr > td.LC_roles_selected {
   background: #11CC55;
 }
 
 span.LC_current_location {
-  font-size: x-large;
+  font-size:larger;
   background: $pgbg;
 }
 
@@ -5051,41 +5168,51 @@ 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: none;
   height: 55px;
@@ -5096,6 +5223,7 @@ table#LC_helpmenu fieldset legend {
   font-size: larger;
   font-weight: bold;
 }
+
 table#LC_helpmenu_links {
   width: 100%;
   border: 1px solid black;
@@ -5103,6 +5231,7 @@ table#LC_helpmenu_links {
   padding: 0;
   border-spacing: 1px;
 }
+
 table#LC_helpmenu_links tr td {
   padding: 1px;
   background: $tabbg;
@@ -5110,11 +5239,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;
@@ -5124,20 +5255,24 @@ 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;
@@ -5146,6 +5281,7 @@ table.LC_pick_box td.LC_pick_box_title {
   width: 184px;
   padding: 8px;
 }
+
 table.LC_pick_box td.LC_selfenroll_pick_box_title {
   background: $tabbg;
   font-weight: bold;
@@ -5158,28 +5294,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: 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;
@@ -5187,6 +5329,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;
@@ -5194,48 +5337,58 @@ 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: 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: 0;
@@ -5246,12 +5399,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;
@@ -5261,34 +5417,36 @@ table.LC_notify_front_page td {
   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;
@@ -5307,33 +5465,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,
@@ -5352,15 +5526,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;
 }
@@ -5385,13 +5563,6 @@ 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: none;
   border-collapse: collapse;
@@ -5406,15 +5577,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;
 }
@@ -5428,6 +5603,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;
@@ -5444,6 +5620,7 @@ table.LC_docs_adddocs th {
 table.LC_sty_begin {
   background: #BBFFBB;
 }
+
 table.LC_sty_end {
   background: #FFBBBB;
 }
@@ -5464,7 +5641,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;
 }
@@ -5488,33 +5665,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;
 }
@@ -5528,12 +5690,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,
@@ -5542,8 +5707,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;
@@ -5552,15 +5719,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,
@@ -5569,23 +5740,27 @@ 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: 0;
@@ -5595,10 +5770,12 @@ 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;
@@ -5606,21 +5783,22 @@ hr.LC_edit_problem_divide {
   height: 3px;
   border: none;
 }
+
 img.stift{
-  border-width:0;
-  vertical-align:middle;
+  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;
@@ -5628,15 +5806,509 @@ table#LC_mainmenu td.LC_mainmenu_col_fie
   font-size: small;
   font-weight: bold;
 }
-fieldset#LC_mainmenu_fieldset {
-  margin:0 10px 10px 0;
-
-}
 
 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
 }
 
@@ -5826,7 +6498,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
@@ -5845,7 +6517,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
@@ -5894,35 +6565,46 @@ 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);
-            }
-        }
+		&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();
-        }
+		#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;
+}
+
 
 =pod
 
@@ -6066,7 +6748,7 @@ sub simple_error_page {
     }
 
     sub start_data_table_empty_row {
-	$row_count[0]++;
+#	$row_count[0]++;
 	return  '<tr class="LC_empty_row" >'."\n";;
     }
 
@@ -6147,14 +6829,17 @@ 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';
     }
     if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
         $function='admin';
     }
-    if (($env{'request.role'}=~/^(au|ca)/) ||
+    if (($env{'request.role'}=~/^(au|ca|aa)/) ||
         ($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
         $function='author';
     }
@@ -6169,6 +6854,7 @@ sub get_users_function {
 
 Used by lonmenu.pm and lonroles.pm to determine whether to use the word
 'Courses' or 'Roles' in inline navigation and on screen displaying user's roles.
+
 Inputs:
 None
 
@@ -6699,6 +7385,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
 
 ###############################################
@@ -6895,9 +7583,12 @@ sub user_picker {
                         official   => 'institutional',
                         unofficial => 'non-institutional',
                     );
-                    $new_user_create = '<p class="LC_warning">'.
-                                       &mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.
-                                       &mt('Please contact the [_1]helpdesk[_2] for assistance.','<a href="'.$helplink.'">','</a>').'</p><br />';
+                    $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 />';
                 }
             }
         }
@@ -6934,6 +7625,7 @@ ENDSCRIPT
 
     my $output = <<"END_BLOCK";
 <script type="text/javascript">
+// <![CDATA[
 function validateEntry(callingForm) {
 
     var checkok = 1;
@@ -7002,6 +7694,7 @@ function validateEntry(callingForm) {
 
 $newuserscript
 
+// ]]>
 </script>
 
 $new_user_create
@@ -7255,7 +7948,7 @@ sub get_institutional_codes {
 
 =item * sorted_slots()
 
-Sorts an array of slot names in order of slot start time (earliest first).
+Sorts an array of slot names in order of slot start time (earliest first). 
 
 Inputs:
 
@@ -7297,9 +7990,8 @@ sub sorted_slots {
     return @sorted;
 }
 
-=pod
 
-=back
+=pod
 
 =head1 HTTP Helpers
 
@@ -7590,9 +8282,9 @@ sub upload_embedded {
                                    '&nbsp;<a href="'.$url.'">'.
                                    $orig_uploaded_filename.'</a><br />';
                     } else {
-                        $output .= '<font size="+2">'.
+                        $output .= '<span class=\"LC_fontsize_large\">'.
                                    &mt('View embedded file: [_1]','<a href="'.$url.'">'.
-                                   $orig_uploaded_filename.'</a>').'</font><br />';
+                                   $orig_uploaded_filename.'</a>').'</span><br />';
                     }
                 }
                 close($fh);
@@ -8627,7 +9319,7 @@ sub build_recipient_list {
                 my @contacts = ('adminemail','supportemail');
                 foreach my $item (@contacts) {
                     if ($domconfig{'contacts'}{$mailing}{$item}) {
-                        my $addr = $domconfig{'contacts'}{$item};
+                        my $addr = $domconfig{'contacts'}{$item}; 
                         if (!grep(/^\Q$addr\E$/,@recipients)) {
                             push(@recipients,$addr);
                         }
@@ -8907,7 +9599,7 @@ sub assign_categories_table {
                     my $checked = '';
                     if (@currcategories > 0) {
                         if (grep(/^\Q$item\E$/,@currcategories)) {
-                            $checked = ' checked="checked" ';
+                            $checked = ' checked="checked"';
                         }
                     }
                     $output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
@@ -8973,7 +9665,7 @@ sub assign_category_rows {
                     if (ref($currcategories) eq 'ARRAY') {
                         if (@{$currcategories} > 0) {
                             if (grep(/^\Q$item\E$/,@{$currcategories})) {
-                                $checked = ' checked="checked" ';
+                                $checked = ' checked="checked"';
                             }
                         }
                     }
@@ -9626,7 +10318,7 @@ sub compare_arrays {
     return @difference;
 }
 
-# -------------------------------------------------------- Initliaze user login
+# -------------------------------------------------------- Initialize user login
 sub init_user_environment {
     my ($r, $username, $domain, $authhost, $form, $args) = @_;
     my $lonids=$Apache::lonnet::perlvar{'lonIDsDir'};
@@ -9680,19 +10372,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);
@@ -9710,10 +10389,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
 
@@ -9747,17 +10424,10 @@ 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} =
+            $userenv{'availabletools.'.$tool} = 
                 &Apache::lonnet::usertools_access($username,$domain,$tool,'reload');
         }
 
@@ -9779,8 +10449,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: '.$!;
 	}
     }