[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm lonmenu.pm

droeschl droeschl@source.lon-capa.org
Fri, 08 May 2009 16:08:57 -0000


droeschl		Fri May  8 16:08:57 2009 EDT

  Modified files:              
    /loncom/interface	loncommon.pm lonmenu.pm 
  Log:
  Changes related to modification of LON-CAPA screen header.
  New styles for Top-Level-Menu. 
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.807 loncom/interface/loncommon.pm:1.808
--- loncom/interface/loncommon.pm:1.807	Fri May  8 13:38:41 2009
+++ loncom/interface/loncommon.pm	Fri May  8 16:08:56 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.807 2009/05/08 13:38:41 droeschl Exp $
+# $Id: loncommon.pm,v 1.808 2009/05/08 16:08:56 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4371,7 +4371,7 @@
 	    $bodytag .= $titletable;
 	} else {
         $bodytag .= qq|<div id="head_userinfo">$name ($role) <br/>
-        <em>$realm</em></div>|;
+            <em>$realm</em>$dc_info</div>|;
 	    if ($env{'request.state'} eq 'construct') {
                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
 							  $titletable);
@@ -4723,7 +4723,7 @@
 table#LC_title_bar a {
   color: $fontmenu;
 }
-
+    
 table#LC_title_bar {
   /*display: none;*/
 }
@@ -5914,11 +5914,27 @@
 	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;
 }
 
-ol#LC_TabMainMenuContent, 
 ul.LC_TabContent ,
 ul.LC_TabContentBigger {
 	display:block;
@@ -5927,7 +5943,6 @@
 	padding: 0;
 }
 
-ol#LC_TabMainMenuContent li,
 ul.LC_TabContent li,
 ul.LC_TabContentBigger li {
 	display: inline;
@@ -5937,18 +5952,8 @@
 	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;
 }
 
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.262 loncom/interface/lonmenu.pm:1.263
--- loncom/interface/lonmenu.pm:1.262	Wed May  6 12:13:18 2009
+++ loncom/interface/lonmenu.pm	Fri May  8 16:08:56 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.262 2009/05/06 12:13:18 raeburn Exp $
+# $Id: lonmenu.pm,v 1.263 2009/05/08 16:08:56 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -369,14 +369,14 @@
 	<li>$helplink</li>
 	<li><a href="/adm/logout" target="_top">$lt{'exit'}</a></li>
 </ol>
-<ol id="LC_TabMainMenuContent">
+<ul id="LC_TabMainMenuContent">
 <li><a href="/adm/menu" target="_top">$lt{'main'}</a></li>
 $reloadlink
 $navmaps
 $docs
 $groups
 $role_selector
-</ol>
+</ul>
 $form
 <script type="text/javascript">
 // END LON-CAPA Internal