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

[wenzelju]

wenzelju		Tue Oct 13 13:18:25 2009 EDT

  Modified files:              
    /loncom/interface	loncommon.pm lonmenu.pm 
  Log:
  Unified style sheet names and function names.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.896 loncom/interface/loncommon.pm:1.897
--- loncom/interface/loncommon.pm:1.896	Mon Oct 12 08:01:08 2009
+++ loncom/interface/loncommon.pm	Tue Oct 13 13:18:24 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.896 2009/10/12 08:01:08 amueller Exp $
+# $Id: loncommon.pm,v 1.897 2009/10/13 13:18:24 wenzelju Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4501,7 +4501,7 @@
 	       :'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');
     $bodytag .= qq|<div id="LC_nav_bar">$name $role
             <em>$realm</em> $dc_info </div>
-            <ol class="LC_smallMenu LC_right">
+            <ol class="LC_primary_menu LC_right">
                 <li>$menu</li>
             </ol>| unless $env{'form.inhibitmenu'};
     #
@@ -5830,10 +5830,10 @@
 # --------------------------*/
 
 a:hover,
-ol.LC_smallMenu a:hover,
+ol.LC_primary_menu a:hover,
 ol#LC_MenuBreadcrumbs a:hover,
 ol#LC_PathBreadcrumbs a:hover,
-ul#LC_TabMainMenuContent a:hover,
+ul#LC_secondary_menu a:hover,
 .LC_FormSectionClearButton input:hover
 ul.LC_TabContent   li:hover a {
 	color:#BF2317;
@@ -5910,7 +5910,7 @@
     font-style: normal;
 }
 
-ol.LC_smallMenu {
+ol.LC_primary_menu {
     float: right;
     margin: 0.2em 0 0 0;
 }
@@ -5919,23 +5919,23 @@
 	margin: 0;
 }
 
-ol.LC_smallMenu li {
+ol.LC_primary_menu li {
 	display: inline;
 	padding: 5px 5px 0 10px;
 	vertical-align: top;
 }
 
-ol.LC_smallMenu li img {
+ol.LC_primary_menu li img {
 	vertical-align: bottom;
 }
 
-ol.LC_smallMenu a {
+ol.LC_primary_menu a {
 	font-size: 90%;
 	color: RGB(80, 80, 80);
 	text-decoration: none;
 }
 
-ul#LC_TabMainMenuContent {
+ul#LC_secondary_menu {
     clear: both;
     color: $fontmenu;
     background: $tabbg;
@@ -5945,7 +5945,7 @@
     width: 100%;
 }
 
-ul#LC_TabMainMenuContent li {
+ul#LC_secondary_menu li {
     font-weight: bold;
     line-height: 1.8em;
     padding: 0 0.8em; 
@@ -5968,7 +5968,7 @@
 	float:left;
 }
 
-ul#LC_TabMainMenuContent li a {
+ul#LC_secondary_menu li a {
     color: $fontmenu;
 	text-decoration: none;
 }
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.284 loncom/interface/lonmenu.pm:1.285
--- loncom/interface/lonmenu.pm:1.284	Tue Oct  6 14:06:12 2009
+++ loncom/interface/lonmenu.pm	Tue Oct 13 13:18:25 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.284 2009/10/06 14:06:12 droeschl Exp $
+# $Id: lonmenu.pm,v 1.285 2009/10/13 13:18:25 wenzelju Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -193,7 +193,7 @@
         }
      }
 
-     return "<ol class=\"LC_smallMenu LC_right\">$menu</ol>";
+     return "<ol class=\"LC_primary_menu LC_right\">$menu</ol>";
 }
 
 
@@ -259,7 +259,7 @@
         $menu =~ s/\[symb\]/$escsymb/g;
     }
 
-    return "<ul id=\"LC_TabMainMenuContent\">$menu</ul>";
+    return "<ul id=\"LC_secondary_menu\">$menu</ul>";
 }
 
 
@@ -363,7 +363,7 @@
 
         if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
             return (<<ENDINLINEMENU);
-            <ol class="LC_smallMenu LC_right">
+            <ol class="LC_primary_menu LC_right">
                 <li>$logo</li>
                 <li><a href="/adm/roles" target="_top">$lt{'login'}</a></li>
             </ol>
@@ -427,14 +427,14 @@
 $utility
 // ]]>
 </script>
-<ol class="LC_smallMenu LC_right">
+<ol class="LC_primary_menu LC_right">
 	<li>$logo</li>
 	<li>$messagelink</li>
 	<li>$roles</li>
 	<li>$helplink</li>
 	<li><a href="/adm/logout" target="_top">$lt{'exit'}</a></li>
 </ol>
-<ul id="LC_TabMainMenuContent">
+<ul id="LC_secondary_menu">
 <li><a href="/adm/menu" target="_top">$lt{'main'}</a></li>
 $reloadlink
 $navmaps