--- loncom/interface/loncommon.pm	2009/04/25 20:22:07	1.796
+++ loncom/interface/loncommon.pm	2009/05/11 17:40:34	1.812
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.796 2009/04/25 20:22:07 www Exp $
+# $Id: loncommon.pm,v 1.812 2009/05/11 17:40:34 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,8 +4556,8 @@ 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;
@@ -4563,20 +4577,6 @@ a:focus {
   background: yellow 
 }
 
-table.thinborder,
-table.thinborder tr th {
-  border-style: solid;
-  border-width: 1px;
-  border-color: $lg_border_color;
-  background: $tabbg;
-}
-
-table.thinborder tr td {
-  border-style: solid;
-  border-width: 1px;
-  border-color: $lg_border_color;
-}
-
 form, .inline { 
    display: inline; 
 }
@@ -4622,18 +4622,21 @@ form, .inline {
   color: green;
 }
 
-.LC_unknown {
-  color: yellow;
+div.LC_confirm_box {
+  background-color: #FAFAFA;
+  border: 1px solid $lg_border_color;
+  margin-right: 0;
+  padding: 5px;
 }
 
-.LC_icon {
-  border: none;
+div.LC_confirm_box .LC_error img,
+div.LC_confirm_box .LC_success img {
   vertical-align: middle;
 }
 
-.LC_indexer_icon {
-  border: 0px;
-  height: 22px;
+.LC_icon {
+  border: none;
+  vertical-align: middle;
 }
 
 .LC_docs_spacer {
@@ -4655,7 +4658,7 @@ form, .inline {
 .LC_disc_action_links_bar {
    background: $tabbg;
    font-family: $sans;
-   border: 0px;
+   border: none;
    margin: 4px;
 }
 
@@ -4691,7 +4694,15 @@ table#LC_nav_location {
   background: $pgbg;
   border: 2px;
   border-collapse: separate;
-  padding: 0px;
+  padding: 0;
+}
+
+table#LC_title_bar a {
+  color: $fontmenu;
+}
+    
+table#LC_title_bar {
+  /*display: none;*/
 }
 
 table#LC_title_bar,
@@ -4702,9 +4713,10 @@ table#LC_title_bar.LC_with_remote {
   border-style: solid;
   border-width: $border;
   background: $pgbg;
+  color: $fontmenu;
   font-family: $sans;
   border-collapse: collapse;
-  padding: 0px;
+  padding: 0;
 }
 
 table.LC_docs_path {
@@ -4713,7 +4725,7 @@ table.LC_docs_path {
   background: $pgbg;
   font-family: $sans;
   border-collapse: collapse;
-  padding: 0px;
+  padding: 0;
 }
 
 table#LC_title_bar td {
@@ -4722,22 +4734,22 @@ table#LC_title_bar td {
 
 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 {
@@ -4745,12 +4757,12 @@ span.LC_metadata {
 }
 
 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;
@@ -4770,7 +4782,7 @@ table#LC_top_nav td.LC_top_nav_logo {
 }
 
 table#LC_top_nav td.LC_top_nav_logo img {
-  border: 0px;
+  border: none;
   vertical-align: bottom;
 }
 
@@ -4787,7 +4799,7 @@ table#LC_top_nav td.LC_top_nav_login {
 table.LC_breadcrumbs td,
 table.LC_docs_path td  {
   background: $tabbg;
-  color: $font;
+  color: $fontmenu;
   font-family: $sans;
   font-size: smaller;
 }
@@ -4795,7 +4807,7 @@ table.LC_docs_path td  {
 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;
@@ -4855,11 +4867,6 @@ td.LC_menubuttons_text {
   font-weight: bold;
 }
 
-.LC_dropadd_labeltext {
-  font-family: $sans;
-  text-align: right;
-}
-
 .LC_preferences_labeltext {
   font-family: $sans;
   text-align: right;
@@ -4873,12 +4880,6 @@ 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 {
   border: 1px solid #000000;
@@ -4894,14 +4895,14 @@ table.LC_mail_list {
 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%;
 }
 
@@ -4911,6 +4912,7 @@ 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%;
 }
 
@@ -4921,15 +4923,13 @@ table.LC_data_table tr.LC_info_row > td
 }
 
 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;
 }
@@ -4958,6 +4958,7 @@ table.LC_nested tr.LC_empty_row td {
 
 table.LC_nested_outer tr th {
   font-weight: bold;
+  color:$fontmenu;
   background-color: $data_table_head;
   font-size: small;
   border-bottom: 1px solid #000000;
@@ -5174,9 +5175,9 @@ table.LC_parm_overview_restrictions th {
 }
 
 table#LC_helpmenu {
-  border: 0px;
+  border: none;
   height: 55px;
-  border-spacing: 0px;
+  border-spacing: 0;
 }
 
 table#LC_helpmenu fieldset legend {
@@ -5188,7 +5189,7 @@ table#LC_helpmenu_links {
   width: 100%;
   border: 1px solid black;
   background: $pgbg;
-  padding: 0px;
+  padding: 0;
   border-spacing: 1px;
 }
 
@@ -5261,7 +5262,7 @@ table.LC_pick_box td.LC_pick_box_select
 }
 
 table.LC_pick_box td.LC_pick_box_separator {
-  padding: 0px;
+  padding: 0;
   height: 1px;
   background: black;
 }
@@ -5311,7 +5312,7 @@ table.LC_helpform_receipt td.LC_oddrow_v
 }
 
 table.LC_helpform_receipt td.LC_pick_box_separator {
-  padding: 0px;
+  padding: 0;
   height: 1px;
   background: black;
 }
@@ -5351,7 +5352,7 @@ table.LC_group_priv_box td.LC_groups_fun
 
 table.LC_group_priv td {
   text-align: left;
-  padding: 0px;
+  padding: 0;
 }
 
 table.LC_notify_front_page {
@@ -5375,6 +5376,7 @@ table.LC_notify_front_page td {
   background: $tabbg;
   vertical-align: middle;
   margin: 2ex 0ex 2ex 0ex;
+  padding: 3px;
 }
 
 .LC_topic_bar span {
@@ -5395,12 +5397,6 @@ table.LC_status_selector td {
   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;
@@ -5437,7 +5433,7 @@ table.LC_prior_tries td {
 }
 
 .LC_answer_charged_try {
-  background: lightred;
+  background: #FFAAAA;
   font-family: $sans;
   color: darkred;
   padding: 6px;
@@ -5519,7 +5515,7 @@ span.LC_cusr_subheading {
 
 table.LC_docs_documents {
   background: #BBBBBB;
-  border-width: 0px;
+  border-width: 0;
   border-collapse: collapse;
 }
 
@@ -5529,7 +5525,7 @@ table.LC_docs_documents td.LC_docs_docum
 }
 
 .LC_docs_entry_move {
-  border: 0px;
+  border: none;
   border-collapse: collapse;
 }
 
@@ -5591,7 +5587,7 @@ table.LC_sty_end {
 }
 
 table.LC_double_column {
-  border-width: 0px;
+  border-width: 0;
   border-collapse: collapse;
   width: 100%;
   padding: 2px;
@@ -5728,7 +5724,7 @@ table.LC_edit_problem_header_title {
   border-width: $border;
   background: $tabbg;
   border-collapse: collapse;
-  padding: 0px
+  padding: 0;
 }
 
 div.LC_edit_problem_discards {
@@ -5746,12 +5742,12 @@ hr.LC_edit_problem_divide {
   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{
@@ -5800,20 +5796,21 @@ h1 {
 }
 
 h2,h3,h4,h5,h6 {
-	margin:5px 0px 5px 0px;
-	padding:0px;
+	margin: 5px 0 5px 0;
+	padding: 0;
 	line-height:130%;
 }
 
 .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;
 }
 
 
@@ -5821,13 +5818,13 @@ h2,h3,h4,h5,h6 {
 
 .LC_Right {
         float: right;
-        margin: 0px;
-        padding: 0px;
+        margin: 0;
+        padding: 0;
 }
 
 .LC_FormSectionClearButton input {
         background-color:transparent;
-        border:0px;
+        border: none;
         cursor:pointer;
         text-decoration:underline;
 }
@@ -5843,17 +5840,31 @@ h2,h3,h4,h5,h6 {
 }
 
 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;
 }
 
@@ -5867,16 +5878,35 @@ ol.LC_smallMenu a {
 	text-decoration: none;
 }
 
-ol#LC_TabMainMenuContent, 
+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 {
 	display: inline;
@@ -5886,18 +5916,8 @@ ul.LC_TabContentBigger li {
 	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;
 }
 
@@ -5907,7 +5927,7 @@ ul.LC_TabContent {
 
 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;
 }
@@ -5953,7 +5973,7 @@ ul.LC_CourseBreadcrumbs {
 	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;
@@ -5966,7 +5986,7 @@ 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;
 }
@@ -6023,7 +6043,7 @@ dl.LC_ListStyleClean dd {
 	list-style-position: inside;
 	list-style-type: none;
 	overflow: hidden;
-	padding: 0px;
+	padding: 0;
 }
 
 .LC_ListStyleSimple li,
@@ -6032,15 +6052,15 @@ dl.LC_ListStyleClean dd {
 .LC_ListStyleNormal dd,
 .LC_ListStyleSpecial li,
 .LC_ListStyleSpecial dd {
-	margin: 0px;
+	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,
@@ -6061,7 +6081,7 @@ table.LC_SimpleTable {
 }
 
 table.LC_SimpleTable tr {
-	padding:0px;
+	padding: 0;
 	border:solid 1px $lg_border_color;
 }
 
@@ -6073,12 +6093,12 @@ 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;
 }
 
@@ -6097,9 +6117,9 @@ div.LC_columnSection > .ContentBoxSpecia
 
 .clear {
 	clear: both;
-	line-height: 0px;
-	font-size: 0px;
-	height: 0px;
+	line-height: 0;
+	font-size: 0;
+	height: 0;
 }
 
 .LC_loginpage_container {
@@ -6122,7 +6142,7 @@ div.LC_columnSection > .ContentBoxSpecia
 }
 
 .LC_loginpage_loginContainer h2 {
-	margin-top:0;
+	margin-top: 0;
 	display:block;
 	background:$bgcol;
 	color:$textcol;
@@ -6221,7 +6241,7 @@ ul#LC_toolbar li a:hover {
 }
 
 ul#LC_toolbar {
-	padding:0;
+	padding: 0;
 	margin: 2px;
 	list-style:none;
 	position:relative;
@@ -6230,7 +6250,7 @@ ul#LC_toolbar {
 
 ul#LC_toolbar li {
 	border:1px solid white;
-	padding:0;
+	padding: 0;
 	margin: 0;
         float: left;
 	display:inline;
@@ -6240,12 +6260,12 @@ ul#LC_toolbar li {
 
 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;
 }
@@ -6254,7 +6274,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;
 }
 
 
@@ -7485,12 +7505,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 />';
                 }
             }
         }