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

[droeschl]

droeschl		Wed Nov 18 11:18:23 2009 EDT

  Modified files:              
    /loncom/interface	loncommon.pm lonhtmlcommon.pm lonmenu.pm 
  Log:
  Changed layout of head_subbox, which now uses less space.
  Removed vertical-align from LC_noBorder, which isn't supposed to define alignment. 
  The class of icons in head_subbox is now LC_icon which covers the intended alignment change.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.914 loncom/interface/loncommon.pm:1.915
--- loncom/interface/loncommon.pm:1.914	Sat Nov 14 04:03:00 2009
+++ loncom/interface/loncommon.pm	Wed Nov 18 11:18:23 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.914 2009/11/14 04:03:00 faziophi Exp $
+# $Id: loncommon.pm,v 1.915 2009/11/18 11:18:23 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4994,9 +4994,9 @@
   background: $sidebg;
   border-bottom: 1px solid $lg_border_color;
   line-height: 2.5em;
- /* SD working here
- height: 2.5em;
- overflow: hidden; */
+     /* SD working here 
+     height: 2.5em;
+     overflow: hidden; */
   margin: 0;
   padding: 0;
 }
@@ -5009,9 +5009,8 @@
 #LC_head_subbox {
   clear:both;
   background: #F8F8F8; /* $sidebg; */
-  border-bottom: 1px solid $lg_border_color;
-  margin: 0 0 10px 0;
-  padding: 5px;
+  border: 1px solid $sidebg;
+  margin: 0 0 10px 0;      
 }
 
 .LC_fontsize_medium {
@@ -5961,7 +5960,6 @@
 
 .LC_noBorder {
   border: 0;
-  vertical-align: middle;
 }
 
 .LC_Right {
@@ -6169,7 +6167,7 @@
   padding-left: 10px;
   margin: 0;
   list-style-position: inside;
-    /* SD working here
+    /* SD working here 
     white-space: nowrap; */
 }
 
@@ -6178,8 +6176,8 @@
 ul.LC_CourseBreadcrumbs li {
   display: inline;
   white-space: nowrap;
-    /* SD working here
-    white-space: normal; */
+    /* SD working here  
+    white-space: normal; */ 
 }
 
 ol#LC_MenuBreadcrumbs li a,
@@ -6433,11 +6431,29 @@
   background-color:transparent;
 }
 
+ul.LC_funclist {
+    margin: 0;
+    padding: 0.5em 1em 0.5em 0;
+}
+
+ul.LC_funclist + ul.LC_funclist {
+    /* 
+       left border as a seperator if we have more than
+       one list 
+    */
+    border-left: 1px solid $sidebg;
+    /* 
+       this hides the left border behind the border of the 
+       outer box if element is wrapped to the next 'line' 
+    */
+    margin-left: -1px;
+}
+
 ul.LC_funclist li {
-  float: left;
+  display: inline;
   white-space: nowrap;
-  height: 35px; /* at least as high as heighest list item */
-  margin: 0 15px 15px 10px;
+  margin: 0 0 0 25px;
+  line-height: 150%;
 }
 
 
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.243 loncom/interface/lonhtmlcommon.pm:1.244
--- loncom/interface/lonhtmlcommon.pm:1.243	Sat Nov 14 18:54:17 2009
+++ loncom/interface/lonhtmlcommon.pm	Wed Nov 18 11:18:23 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.243 2009/11/14 18:54:17 amueller Exp $
+# $Id: lonhtmlcommon.pm,v 1.244 2009/11/18 11:18:23 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2343,8 +2343,7 @@
 sub start_funclist {
     my($legendtext)=@_;
     $legendtext=&mt('Functions') if !$legendtext;
-    return "<fieldset>\n<legend>$legendtext</legend>\n"
-          .'<ul class="LC_funclist">'."\n";
+    return '<ul class="LC_funclist"><li style="font-weight:bold; margin-left:0.8em;">'.$legendtext.'</li>'."\n";
 }
 
 
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.302 loncom/interface/lonmenu.pm:1.303
--- loncom/interface/lonmenu.pm:1.302	Wed Nov 18 04:59:56 2009
+++ loncom/interface/lonmenu.pm	Wed Nov 18 11:18:23 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.302 2009/11/18 04:59:56 raeburn Exp $
+# $Id: lonmenu.pm,v 1.303 2009/11/18 11:18:23 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1267,7 +1267,7 @@
        my $pic=
 	   '<img alt="'.$text.'" src="'.
 	   &Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$img).
-	   '" align="'.($nobreak==3?'right':'left').'" class="LC_noBorder" />';
+	   '" align="'.($nobreak==3?'right':'left').'" class="LC_icon" />';
        if ($env{'browser.interface'} eq 'faketextual') {
 # Main Menu
 	   if ($nobreak==3) {