--- loncom/interface/loncommon.pm	2012/06/04 15:05:32	1.1075.2.8
+++ loncom/interface/loncommon.pm	2012/05/18 14:27:11	1.1076
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.8 2012/06/04 15:05:32 raeburn Exp $
+# $Id: loncommon.pm,v 1.1076 2012/05/18 14:27:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5060,13 +5060,11 @@ sub bodytag {
 
 
         if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
-            unless ($env{'request.noversionuri'} =~ m{/res/adm/pages/bookmarkmenu/}) {
-                if ($dc_info) {
-                     $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
-                }
-                $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
-                               <em>$realm</em> $dc_info</div>|;
-            }
+             if ($dc_info) {
+                 $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
+             }
+             $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
+                <em>$realm</em> $dc_info</div>|;
             return $bodytag;
         }
 
@@ -5165,10 +5163,7 @@ i.e., $env{'internal.head.redirect'} exi
 
 sub endbodytag {
     my ($args) = @_;
-    my $endbodytag;
-    unless ((ref($args) eq 'HASH') && ($args->{'notbody'})) {
-        $endbodytag='</body>';
-    }
+    my $endbodytag='</body>';
     $endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag;
     if ( exists( $env{'internal.head.redirect'} ) ) {
         if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) {
@@ -6485,19 +6480,16 @@ ol.LC_primary_menu li:hover ul, ol.LC_pr
   position: absolute;
   margin: 0;
   padding: 0;
-  z-index: 2;
 }
 
 ol.LC_primary_menu li:hover li, ol.LC_primary_menu li.hover li {
   font-size: 90%;
   vertical-align: top;
   float: none;
-  border-left: 1px solid black;
-  border-right: 1px solid black;
 }
 
 ol.LC_primary_menu li:hover li a, ol.LC_primary_menu li.hover li a {
-  background-color:$data_table_light;
+  background-color:$data_table_light
 }
 
 ol.LC_primary_menu li li a:hover {
@@ -6508,7 +6500,6 @@ ol.LC_primary_menu li li a:hover {
 ol.LC_primary_menu li img {
   vertical-align: bottom;
   height: 1.1em;
-  margin: 0.2em 0 0 0;
 }
 
 ol.LC_primary_menu a {
@@ -6554,53 +6545,15 @@ ul#LC_secondary_menu {
   margin: 0;
   width: 100%;
   text-align: left;
-  float: left;
 }
 
 ul#LC_secondary_menu li {
   font-weight: bold;
   line-height: 1.8em;
-  border-right: 1px solid black;
-  vertical-align: middle;
-  float: left;
-}
-
-ul#LC_secondary_menu li.LC_hoverable:hover, ul#LC_secondary_menu li.hover {
-  background-color: $data_table_light;
-}
-
-ul#LC_secondary_menu li a {
   padding: 0 0.8em;
-}
-
-ul#LC_secondary_menu li ul {
-  display: none;
-}
-
-ul#LC_secondary_menu li:hover ul, ul#LC_secondary_menu li.hover ul {
-  display: block;
-  position: absolute;
-  margin: 0;
-  padding: 0;
-  list-style:none;
-  float: none;
-  background-color: $data_table_light;
-  z-index: 2;
-}
-
-ul#LC_secondary_menu li ul li {
-  font-size: 90%;
-  vertical-align: top;
-  border-left: 1px solid black;
   border-right: 1px solid black;
-  background-color: $data_table_light
-  list-style:none;
-  float: none;
-  margin-left: -1px;
-}
-
-ul#LC_secondary_menu li ul li:hover, ul#LC_secondary_menu li ul li.hover {
-  background-color: $data_table_dark;
+  display: inline;
+  vertical-align: middle;
 }
 
 ul.LC_TabContent {
@@ -7400,9 +7353,7 @@ sub end_page {
     } else {
 	$result .= &endbodytag($args);
     }
-    unless ($args->{'notbody'}) {
-        $result .= "\n</html>";
-    }
+    $result .= "\n</html>";
 
     if ($args->{'js_ready'}) {
 	$result = &js_ready($result);
@@ -13758,7 +13709,7 @@ sub init_user_environment {
             %domdef = &Apache::lonnet::get_domain_defaults($domain);
         }
 
-        foreach my $tool ('aboutme','blog','webdav','portfolio') {
+        foreach my $tool ('aboutme','blog','portfolio') {
             $userenv{'availabletools.'.$tool} = 
                 &Apache::lonnet::usertools_access($username,$domain,$tool,'reload',
                                                   undef,\%userenv,\%domdef,\%is_adv);