--- loncom/interface/loncommon.pm	2009/04/24 05:28:55	1.793
+++ loncom/interface/loncommon.pm	2009/05/11 16:10:33	1.810
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.793 2009/04/24 05:28:55 raeburn Exp $
+# $Id: loncommon.pm,v 1.810 2009/05/11 16:10:33 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -517,6 +517,10 @@ sub coursebrowser_javascript {
             else {
                 if (formname == 'portform') {
                     url += '&setroles='+extra_element;
+                } else {
+                    if (formname == 'rules') {
+                        url += '&fixeddom='+extra_element; 
+                    }
                 }
             }     
         }
@@ -931,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;
@@ -1039,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;
@@ -1064,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);
@@ -1082,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;
@@ -1142,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);
@@ -1187,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);
@@ -1859,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))) {
@@ -2818,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 {
@@ -2828,6 +2844,7 @@ sub messagewrapper {
 	'&amp;subject='.&escape($subject).'&amp;text='.&escape($text).'" '.
         'title="'.&mt('Send message').'">'.$link.'</a>';
 }
+
 # --------------------------------------------------------------- Notes Wrapper
 
 sub noteswrapper {
@@ -2835,6 +2852,7 @@ sub noteswrapper {
     return 
 "<a href='/adm/email?recordftf=retrieve&recname=$un&recdom=$do'>$link</a>";
 }
+
 # ------------------------------------------------------------- Aboutme Wrapper
 
 sub aboutmewrapper {
@@ -2848,12 +2866,13 @@ sub aboutmewrapper {
 
 # ------------------------------------------------------------ Syllabus Wrapper
 
-
 sub syllabuswrapper {
     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?";
@@ -4232,7 +4251,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),
@@ -4268,15 +4287,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') {
@@ -4359,6 +4370,8 @@ ENDROLE
 	if ($notopbar) {
 	    $bodytag .= $titletable;
 	} else {
+        $bodytag .= qq|<div id="head_userinfo">$name ($role) <br/>
+            <em>$realm</em>$dc_info</div>|;
 	    if ($env{'request.state'} eq 'construct') {
                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
 							  $titletable);
@@ -4508,6 +4521,7 @@ 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 =
@@ -4542,37 +4556,38 @@ sub standard_css {
     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;
-body{
-     font-family: $sans;
-     line-height:130%;
-     font-size:0.83em;
-     color:$font;
-  }
-a:link, a:visited { font-size:100%; }
+body {
+   font-family: $sans;
+   line-height:130%;
+   font-size:0.83em;
+   color:$font;
+}
 
-a:focus { color: red; background: yellow }
-table.thinborder,
-table.thinborder tr th {
-  border-style: solid;
-  border-width: 1px;
-  border-color: $lg_border_color;
-  background: $tabbg;
+a:link, a:visited { 
+  font-size:100%; 
 }
-table.thinborder tr td {
-  border-style: solid;
-  border-width: 1px;
-  border-color: $lg_border_color;
+
+a:focus { 
+  color: red;
+  background: yellow 
 }
 
-form, .inline { display: inline; }
+form, .inline { 
+   display: inline; 
+}
 
-.LC_right {text-align:right;}
-.LC_middle {vertical-align:middle;}
+.LC_right {
+   text-align:right;
+}
+
+.LC_middle {
+   vertical-align:middle;
+}
 
 /* just for tests */
 .LC_400Box {width:400px; }
@@ -4595,6 +4610,7 @@ form, .inline { display: inline; }
   color: red;
   font-size: larger;
 }
+
 .LC_warning,
 .LC_diff_removed {
   color: red;
@@ -4605,6 +4621,19 @@ form, .inline { display: inline; }
 .LC_diff_added {
   color: green;
 }
+
+div.LC_confirm_box {
+  background-color: #FAFAFA;
+  border: 1px solid $lg_border_color;
+  margin-right: 0;
+  padding: 5px;
+}
+
+div.LC_confirm_box .LC_error img,
+div.LC_confirm_box .LC_success img {
+  vertical-align: middle;
+}
+
 .LC_unknown {
   color: yellow;
 }
@@ -4615,9 +4644,10 @@ form, .inline { display: inline; }
 }
 
 .LC_indexer_icon {
-  border: 0px;
+  border: none;
   height: 22px;
 }
+
 .LC_docs_spacer {
   width: 25px;
   height: 1px;
@@ -4628,128 +4658,187 @@ form, .inline { display: inline; }
   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;
   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 {
+  /*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;
 }
+
 table.LC_docs_path {
   width: 100%;
   border: 0;
   background: $pgbg;
   font-family: $sans;
   border-collapse: collapse;
-  padding: 0px;
+  padding: 0;
 }
 
 table#LC_title_bar td {
   background: $tabbg;
 }
+
 table#LC_title_bar .LC_title_bar_who {
   background: $tabbg;
-  color: $font;
+  color: $fontmenu;
   font: small $sans;
   text-align: right;
-  margin: 0px;
+  margin: 0;
 }
+
 table#LC_title_bar .LC_title_bar_name {
-  margin: 0px;
+  margin: 0;
 }
+
 table#LC_title_bar .LC_title_bar_role {
-  margin: 0px;
+  margin: 0;
 }
+
 table#LC_title_bar .LC_title_bar_realm {
-  margin: 0px;
+  margin: 0;
 }
+
 span.LC_metadata {
-    font-family: $sans;
+  font-family: $sans;
 }
 
 table#LC_menubuttons img{
-  border: 0px;
+  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;
 }
+
 table#LC_mainmenu td.LC_mainmenu_column {
     vertical-align: top;
 }
 
-.LC_fontsize_small
-{
+.LC_fontsize_small {
  font-size: 70%;
 }
 
-.LC_fontsize_medium
-{
+.LC_fontsize_medium {
  font-size: 85%;
 }
 
-.LC_fontsize_large
-{
+.LC_fontsize_large {
  font-size: 120%;
 }
 
@@ -4763,7 +4852,7 @@ table#LC_mainmenu td.LC_mainmenu_column
 .LC_menubuttons_link {
   text-decoration: none;
 }
-/*2008--9-5: new menu style sheet.Changed category*/
+
 .LC_menubuttons_category {
   color: $font;
   background: $pgbg;
@@ -4776,19 +4865,17 @@ td.LC_menubuttons_text {
  	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;
@@ -4807,62 +4894,69 @@ td.LC_menubuttons_text {
     font-weight: bold;
 }
 
-table.LC_aboutme_port {
-  border: 0px;
-  border-collapse: collapse;
-  border-spacing: 0px;
-}
-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;
+  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_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;
@@ -4871,15 +4965,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: small;
   border-bottom: 1px solid #000000;
 }
+
 table.LC_nested_outer tr td.LC_subheader {
   background-color: $data_table_head;
   font-weight: bold;
@@ -4887,20 +4985,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,
@@ -4929,44 +5031,58 @@ 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;
 }
+
 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_even {
 }
-table.LC_mail_list tr.LC_mail_odd{
+
+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;
 }
@@ -4975,17 +5091,21 @@ table.LC_data_table tr > td.LC_browser_f
 table.LC_data_table tr > td.LC_browser_file_published {
   background: #CCFF88;
 }
+
 table.LC_data_table tr > td.LC_browser_file_locked,
 table.LC_data_table tr > td.LC_browser_file_unpublished {
   background: #FFAA99;
 }
+
 table.LC_data_table tr > td.LC_browser_file_obsolete {
   background: #AAAAAA;
 }
+
 table.LC_data_table tr > td.LC_browser_file_modified,
 table.LC_data_table tr > td.LC_browser_file_metamodified {
   background: #FFFF77;
 }
+
 table.LC_data_table tr.LC_browser_folder > td {
   background: #CCCCFF;
 }
@@ -4993,18 +5113,23 @@ table.LC_data_table tr.LC_browser_folder
 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;
 }
@@ -5018,58 +5143,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_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;
@@ -5077,11 +5214,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;
@@ -5091,20 +5230,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;
@@ -5113,6 +5256,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;
@@ -5125,28 +5269,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;
@@ -5154,6 +5304,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;
@@ -5161,51 +5312,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 {
@@ -5213,12 +5374,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;
@@ -5226,35 +5390,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%;
 }
+
 span.LC_feedback_link {
   background: $feedback_link_bg;
   font-size: larger;
 }
+
 span.LC_message_link {
   background: $feedback_link_bg;
   font-size: larger;
@@ -5273,31 +5440,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_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,
@@ -5316,9 +5501,12 @@ 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 {
@@ -5341,15 +5529,17 @@ span.LC_cusr_subheading {
 
 table.LC_docs_documents {
   background: #BBBBBB;
-  border-width: 0px;
+  border-width: 0;
   border-collapse: collapse;
 }
+
 table.LC_docs_documents td.LC_docs_document {
   border: 2px solid black;
   padding: 4px;
 }
+
 .LC_docs_entry_move {
-  border: 0px;
+  border: none;
   border-collapse: collapse;
 }
 
@@ -5362,15 +5552,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;
 }
@@ -5384,6 +5578,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;
@@ -5400,12 +5595,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;
@@ -5444,17 +5640,18 @@ div.LC_clear_float_footer {
   clear: both;
 }
 
-
 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-weight: bold;
   font-size: large;
 }
+
 div.LC_grade_show_user_odd_row div.LC_grade_user_name {
   background: #DDEEDD;
 }
@@ -5468,6 +5665,7 @@ 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,
@@ -5475,6 +5673,7 @@ div.LC_grade_assign_header {
   font-weight: bold;
   font-size: large;
 }
+
 div.LC_grade_show_problem_problem,
 div.LC_grade_submissions_body,
 div.LC_grade_message_center_body,
@@ -5483,6 +5682,7 @@ div.LC_grade_assign_body {
   width: 99%;
   background: #FFFFFF;
 }
+
 span.LC_grade_check_note {
   font-weight: normal;
   font-size: medium;
@@ -5494,16 +5694,19 @@ span.LC_grade_check_note {
 table.LC_scantron_action {
   width: 100%;
 }
+
 table.LC_scantron_action tr th {
   font-weight:bold;
   font-style:normal;
 }
+
 .LC_edit_problem_header,
 div.LC_edit_problem_footer {
   font-weight: normal;
   font-size:  medium;
   margin: 2px;
 }
+
 div.LC_edit_problem_header,
 div.LC_edit_problem_header div,
 div.LC_edit_problem_footer,
@@ -5512,17 +5715,20 @@ 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-weight: bold;
   font-size: larger;
   background: $tabbg;
   padding: 3px;
 }
+
 table.LC_edit_problem_header_title {
   font-size: larger;
   font-weight:  bold;
@@ -5530,42 +5736,44 @@ table.LC_edit_problem_header_title {
   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;
+  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;
@@ -5573,6 +5781,7 @@ table#LC_mainmenu td.LC_mainmenu_col_fie
   font-size: small;
   font-weight: bold;
 }
+
 div.LC_createcourse {
     margin: 10px 10px 10px 10px;
 }
@@ -5590,7 +5799,7 @@ 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{
+ul.LC_TabContent   li:hover a {
 	color:#BF2317;
         text-decoration:none;
 }
@@ -5600,20 +5809,22 @@ h1 {
 	line-height:130%;
 }
 
-h2,h3,h4,h5,h6
-{
-	margin:5px 0px 5px 0px;
-	padding:0px;
+h2,h3,h4,h5,h6 {
+	margin: 5px 0 5px 0;
+	padding: 0;
 	line-height:130%;
 }
-.LC_hcell{
+
+.LC_hcell {
         padding:3px 15px 3px 15px;
-        margin:0px;
+        margin: 0;
 	background-color:$tabbg;
+	color:$fontmenu;
 	border-bottom:solid 1px $lg_border_color;
 }
+
 .LC_noBorder {
-        border:0px;
+        border: 0;
 }
 
 
@@ -5621,17 +5832,13 @@ h2,h3,h4,h5,h6
 
 .LC_Right {
         float: right;
-        margin: 0px;
-        padding: 0px;
+        margin: 0;
+        padding: 0;
 }
 
-p, .LC_ContentBox {
-	padding: 10px;
-
-}
 .LC_FormSectionClearButton input {
         background-color:transparent;
-        border:0px;
+        border: none;
         cursor:pointer;
         text-decoration:underline;
 }
@@ -5647,16 +5854,31 @@ p, .LC_ContentBox {
 }
 
 dl,ul,div,fieldset {
-	margin: 10px 10px 10px 0px;
-	overflow:hidden;
+	margin: 10px 10px 10px 0;
+/*	overflow: hidden; */
 }
+
+#head_userinfo {
+    float: left;
+    margin: 0;
+}
+
+#head_userinfo em{
+    font-weight: bold;
+    font-style: normal;
+}
+
+ol.LC_smallMenu {
+    float: right;
+}
+
 ol.LC_smallMenu, ol#LC_PathBreadcrumbs {
-	margin: 0px;
+	margin: 0;
 }
 
 ol.LC_smallMenu li {
 	display: inline;
-	padding: 5px 5px 0px 10px;
+	padding: 5px 5px 0 10px;
 	vertical-align: top;
 }
 
@@ -5669,58 +5891,76 @@ ol.LC_smallMenu a {
 	color: RGB(80, 80, 80);
 	text-decoration: none;
 }
-ol#LC_TabMainMenuContent, ul.LC_TabContent ,
+
+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: 0px;
-	padding: 0px;
+	margin: 0;
+	padding: 0;
 }
 
-ol#LC_TabMainMenuContent li, ul.LC_TabContent li,
-ul.LC_TabContentBigger li{
+ul.LC_TabContent li,
+ul.LC_TabContentBigger li {
 	display: inline;
 	border-right: solid 1px $lg_border_color;
 	float:left;
 	line-height:140%;
 	white-space:nowrap;
 }
-ol#LC_TabMainMenuContent li{
-	vertical-align: bottom;
-	border-bottom: solid 1px RGB(175, 175, 175);
-	padding: 5px 10px 5px 10px;
-	margin-right:5px;
-	margin-bottom:3px;
-	font-weight: bold;
-	background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
-}
 
-ol#LC_TabMainMenuContent li a{
-	color: RGB(47, 47, 47);
+ul#LC_TabMainMenuContent li a {
+    color: $fontmenu;
 	text-decoration: none;
 }
+
 ul.LC_TabContent {
 	min-height:1.6em;
 }
-ul.LC_TabContent li{
+
+ul.LC_TabContent li {
 	vertical-align:middle;
-	padding:0px 10px 0px 10px;
+	padding: 0 10px 0 10px;
 	background-color:$tabbg;
 	border-bottom:solid 1px $lg_border_color;
 }
-ul.LC_TabContent li a, ul.LC_TabContent li{
+
+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{
+
+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{
+
+ul.LC_TabContentBigger li {
 	vertical-align:bottom;
 	border-top:solid 1px $lg_border_color;
 	border-left:solid 1px $lg_border_color;
@@ -5728,31 +5968,39 @@ ul.LC_TabContentBigger li{
 	margin-left:2px;
 	background:url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
 }
-ul.LC_TabContentBigger li:hover, ul.LC_TabContentBigger li.active{
+
+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{
+
+ul.LC_TabContentBigger li, 
+ul.LC_TabContentBigger li a {
 	font-size:110%;
 	font-weight:bold;
 }
 
-ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcrumbs, ul.LC_CourseBreadcrumbs{
+ol#LC_MenuBreadcrumbs, 
+ol#LC_PathBreadcrumbs, 
+ul.LC_CourseBreadcrumbs {
 	border-top: solid 1px RGB(255, 255, 255);
 	height: 20px;
 	line-height: 20px;
 	vertical-align: bottom;
-	margin: 0px 0px 30px 0px;
+	margin: 0 0 30px 0;
 	padding-left: 10px;
 	list-style-position: inside;
 	background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
 }
 
-ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li, ul.LC_CourseBreadcrumbs li {
+ol#LC_MenuBreadcrumbs li, 
+ol#LC_PathBreadcrumbs li, 
+ul.LC_CourseBreadcrumbs li {
 /*
 	background: url(/adm/lonIcons/arrow_white.png) no-repeat left center;
 */
 	display: inline;
-	padding: 0px 0px 0px 10px;
+	padding: 0 0 0 10px;
 /*	vertical-align: bottom; */
 	overflow:hidden;
 }
@@ -5761,34 +6009,36 @@ ol#LC_MenuBreadcrumbs li a, ul.LC_Course
 	text-decoration: none;
 	font-size:90%;
 }
-ol#LC_PathBreadcrumbs li a{
+
+ol#LC_PathBreadcrumbs li a {
 	text-decoration:none;
 	font-size:100%;
 	font-weight:bold;
 }
-.LC_BoxPadding
-{
+
+.LC_BoxPadding {
 	padding: 10px;
 }
-.LC_ContentBoxSpecial
-{
+
+.LC_ContentBoxSpecial {
 	border: solid 1px $lg_border_color;
 }
-.LC_ContentBoxSpecialContactInfo
-{
+
+.LC_ContentBoxSpecialContactInfo {
 	border: solid 1px $lg_border_color;
 	max-width:25%;
 	min-width:25%;
 }
-.LC_AboutMe_Image
-{
+
+.LC_AboutMe_Image {
 	float:left;
 	margin-right:10px;
 }
-.LC_Clear_AboutMe_Image
-{
+
+.LC_Clear_AboutMe_Image {
 	clear:left;
 }
+
 dl.LC_ListStyleClean dt {
 	padding-right: 5px;
 	display: table-header-group;
@@ -5802,13 +6052,12 @@ dl.LC_ListStyleClean dd {
 .LC_ListStyleSimple,
 .LC_ListStyleNormal,
 .LC_ListStyle_Border,
-.LC_ListStyleSpecial
-	{
+.LC_ListStyleSpecial {
 	/*display:block;	*/
 	list-style-position: inside;
 	list-style-type: none;
 	overflow: hidden;
-	padding: 0px;
+	padding: 0;
 }
 
 .LC_ListStyleSimple li,
@@ -5816,21 +6065,20 @@ dl.LC_ListStyleClean dd {
 .LC_ListStyleNormal li,
 .LC_ListStyleNormal dd,
 .LC_ListStyleSpecial li,
-.LC_ListStyleSpecial dd
-	{
-	margin: 0px;
+.LC_ListStyleSpecial dd {
+	margin: 0;
 	padding: 5px 5px 5px 10px;
 	clear: both;
 }
 
 .LC_ListStyleClean li,
 .LC_ListStyleClean dd {
-	padding-top: 0px;
-	padding-bottom: 0px;
+	padding-top: 0;
+	padding-bottom: 0;
 }
 
 .LC_ListStyleSimple dd,
-.LC_ListStyleSimple li{
+.LC_ListStyleSimple li {
 	border-bottom: solid 1px $lg_border_color;
 }
 
@@ -5844,13 +6092,14 @@ dl.LC_ListStyleClean dd {
 table.LC_SimpleTable {
 	margin:5px;
 	border:solid 1px $lg_border_color;
-	}
+}
 
 table.LC_SimpleTable tr {
-	padding:0px;
+	padding: 0;
 	border:solid 1px $lg_border_color;
 }
-table.LC_SimpleTable thead{
+
+table.LC_SimpleTable thead {
 	 background:rgb(220,220,220);
 }
 
@@ -5858,34 +6107,33 @@ div.LC_columnSection {
 	display: block;
 	clear: both;
 	overflow: hidden;
-	margin:0px;
+	margin: 0;
 }
 
 div.LC_columnSection>* {
 	float: left;
-	margin: 10px 20px 10px 0px;
+	margin: 10px 20px 10px 0;
 	overflow:hidden;
 }
 
-.ContentBoxSpecialTemplate
-{
+.ContentBoxSpecialTemplate {
         border: solid 1px $lg_border_color;
 }
+
 .ContentBoxTemplate {
         padding:10px;
 }
 
 div.LC_columnSection > .ContentBoxTemplate,
-div.LC_columnSection > .ContentBoxSpecialTemplate
-        {
+div.LC_columnSection > .ContentBoxSpecialTemplate {
         width: 600px;
 }
 
-.clear{
+.clear {
 	clear: both;
-	line-height: 0px;
-	font-size: 0px;
-	height: 0px;
+	line-height: 0;
+	font-size: 0;
+	height: 0;
 }
 
 .LC_loginpage_container {
@@ -5907,8 +6155,8 @@ div.LC_columnSection > .ContentBoxSpecia
 	background-color:$loginbg;
 }
 
-.LC_loginpage_loginContainer h2{
-	margin-top:0;
+.LC_loginpage_loginContainer h2 {
+	margin-top: 0;
 	display:block;
 	background:$bgcol;
 	color:$textcol;
@@ -5934,12 +6182,13 @@ div.LC_columnSection > .ContentBoxSpecia
 	margin: 0;
 }
 
-table em{
+table em {
 	font-weight: bold;
 	font-style: normal;
 }
+
 table.LC_tableBrowseRes,
-table.LC_tableOfContent{
+table.LC_tableOfContent {
         border:none;
 	border-spacing: 1;
 	padding: 3px;
@@ -5962,75 +6211,75 @@ table.LC_tableOfContent tr.LC_trOdd{
 	background-color: #EEEEEE;
 }
 
-table.LC_tableOfContent img{
+table.LC_tableOfContent img {
 	border: none;
 	height: 1.3em;
 	vertical-align: text-bottom;
 	margin-right: 0.3em;
 }
 
-a#LC_content_toolbar_firsthomework{
+a#LC_content_toolbar_firsthomework {
 	background-image:url(/res/adm/pages/open-first-problem.gif);
 }
 
-a#LC_content_toolbar_launchnav{
+a#LC_content_toolbar_launchnav {
 	background-image:url(/res/adm/pages/start-navigation.gif);
 }
 
-a#LC_content_toolbar_closenav{
+a#LC_content_toolbar_closenav {
 	background-image:url(/res/adm/pages/close-navigation.gif);
 }
 
-a#LC_content_toolbar_everything{
+a#LC_content_toolbar_everything {
 	background-image:url(/res/adm/pages/show-all.gif);
 }
 
-a#LC_content_toolbar_uncompleted{
+a#LC_content_toolbar_uncompleted {
 	background-image:url(/res/adm/pages/show-incomplete-problems.gif);
 }
 
-#LC_content_toolbar_clearbubbles{
+#LC_content_toolbar_clearbubbles {
 	background-image:url(/res/adm/pages/mark-discussionentries-read.gif);
 }
 
-a#LC_content_toolbar_changefolder{
+a#LC_content_toolbar_changefolder {
 	background : url(/res/adm/pages/close-all-folders.gif) top center ;
 }
 
-a#LC_content_toolbar_changefolder_toggled{
+a#LC_content_toolbar_changefolder_toggled {
 	background-image:url(/res/adm/pages/open-all-folders.gif);
 }
 
-ul#LC_toolbar li a:hover{
+ul#LC_toolbar li a:hover {
 	background-position: bottom center;
 }
 
-ul#LC_toolbar{
-	padding:0;
+ul#LC_toolbar {
+	padding: 0;
 	margin: 2px;
 	list-style:none;
 	position:relative;
 	background-color:white;
 }
 
-ul#LC_toolbar li{
+ul#LC_toolbar li {
 	border:1px solid white;
-	padding:0;
+	padding: 0;
 	margin: 0;
-    float: left;
+        float: left;
 	display:inline;
 	vertical-align:middle;
-}
+} 
 
 
-a.LC_toolbarItem{
+a.LC_toolbarItem {
 	display:block;
-	padding:0;
-	margin:0;
+	padding: 0;
+	margin: 0;
 	height: 32px;
 	width: 32px;
 	color:white;
-	border:0 none;
+	border: none;
 	background-repeat:no-repeat;
 	background-color:transparent;
 }
@@ -6039,7 +6288,7 @@ ul.LC_functionslist li {
   float: left;
   white-space: nowrap;
   height: 35px; /* at least as high as heighest list item */
-  margin: 0px 15px 15px 10px;
+  margin: 0 15px 15px 10px;
 }
 
 
@@ -7270,12 +7519,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 />';
                 }
             }
         }