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

bisitz bisitz@source.lon-capa.org
Thu, 03 Dec 2009 14:27:16 -0000


bisitz		Thu Dec  3 14:27:16 2009 EDT

  Modified files:              
    /loncom/interface	loncommon.pm lonmenu.pm 
  Log:
  - Quick fix to get (nearly) consistent layout for main menu compared to other menus:
      - Fixed box width
      - Same headline hierarchy
  - Removed some unused and unneeded styles
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.922 loncom/interface/loncommon.pm:1.923
--- loncom/interface/loncommon.pm:1.922	Wed Dec  2 18:33:27 2009
+++ loncom/interface/loncommon.pm	Thu Dec  3 14:27:16 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.922 2009/12/02 18:33:27 bisitz Exp $
+# $Id: loncommon.pm,v 1.923 2009/12/03 14:27:16 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5014,10 +5014,6 @@
   text-align: center;
 }
 
-table#LC_mainmenu td.LC_mainmenu_column {
-  vertical-align: top;
-}
-
 .LC_fontsize_small {
   font-size: 70%;
 }
@@ -5929,21 +5925,8 @@
   vertical-align: middle;
 }
 
-table#LC_mainmenu {
-  margin-top:10px;
-  width:80%;
-}
-
-table#LC_mainmenu td.LC_mainmenu_col_fieldset {
+table td.LC_mainmenu_col_fieldset {
   vertical-align: top;
-  width: 45%;
-}
-
-.LC_mainmenu_fieldset_category {
-  color: $font;
-  background: $pgbg;
-  font-size: small;
-  font-weight: bold;
 }
 
 div.LC_createcourse {
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.308 loncom/interface/lonmenu.pm:1.309
--- loncom/interface/lonmenu.pm:1.308	Mon Nov 30 21:29:47 2009
+++ loncom/interface/lonmenu.pm	Thu Dec  3 14:27:16 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.308 2009/11/30 21:29:47 raeburn Exp $
+# $Id: lonmenu.pm,v 1.309 2009/12/03 14:27:16 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1336,15 +1336,15 @@
     undef(%category_members);
 # calling rawconfig with "1" will evaluate mydesk.tab, even if there is no active remote control
     &rawconfig(1);
-    my $output='<table id="LC_mainmenu"><tr>';
+    my $output='<table><tr>';
     for (my $col=1; $col<=2; $col++) {
         $output.='<td class="LC_mainmenu_col_fieldset">';
         for (my $row=1; $row<=8; $row++) {
             foreach my $cat (keys(%category_members)) {
                if ($category_positions{$cat} ne "$col,$row") { next; }
                #$output.='<table><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>';
-               $output.='<div class="LC_Box">';
-	       $output.='<h4 class="LC_hcell">'.&mt($category_names{$cat}).'</h4>';
+               $output.='<div class="LC_Box LC_400Box">';
+	       $output.='<h3 class="LC_hcell">'.&mt($category_names{$cat}).'</h3>';
                $output.='<table>';
                my %active=();
                foreach my $menu_item (split(/\:/,$category_members{$cat})) {