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

bisitz bisitz@source.lon-capa.org
Thu, 14 May 2009 16:59:22 -0000


bisitz		Thu May 14 16:59:22 2009 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  - Consistent names for nav_bar: adjusted style names
  - &start_page(): Don't print breadcrumbs if only_body is requested
  - Removed padding from <h1>. These headlines are intended to be used only as initial page headline where padding isn't needed. Further removals of wrong <h1> usages are still in progress.
  - Added missing white space between username and dc_info in nav_bar
  - Added comment for consistent functionlist area at top of page (work in progress)
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.812 loncom/interface/loncommon.pm:1.813
--- loncom/interface/loncommon.pm:1.812	Mon May 11 17:40:34 2009
+++ loncom/interface/loncommon.pm	Thu May 14 16:59:21 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.812 2009/05/11 17:40:34 bisitz Exp $
+# $Id: loncommon.pm,v 1.813 2009/05/14 16:59:21 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4370,8 +4370,8 @@
 	if ($notopbar) {
 	    $bodytag .= $titletable;
 	} else {
-        $bodytag .= qq|<div id="head_userinfo">$name ($role) <br/>
-            <em>$realm</em>$dc_info</div>|;
+        $bodytag .= qq|<div id="LC_nav_bar">$name ($role)<br />
+            <em>$realm</em> $dc_info</div>|;
 	    if ($env{'request.state'} eq 'construct') {
                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
 							  $titletable);
@@ -5791,7 +5791,7 @@
 }
 
 h1 {
-	padding:5px 10px 5px 20px;
+	padding: 0;
 	line-height:130%;
 }
 
@@ -5844,12 +5844,12 @@
 /*	overflow: hidden; */
 }
 
-#head_userinfo {
+#LC_nav_bar {
     float: left;
     margin: 0;
 }
 
-#head_userinfo em{
+#LC_nav_bar em{
     font-weight: bold;
     font-style: normal;
 }
@@ -6547,7 +6547,15 @@
 		$result = &html_encode($result);
     }
 
-	#Breadcrumbs
+    # Preparation for new and consistent functionlist at top of screen
+    # if ($args->{'functionlist'}) {
+    #            $result .= &build_functionlist();
+    #}
+
+    # Don't add anything more if only_body wanted
+    return $result if $args->{'only_body'};
+
+    #Breadcrumbs
     if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
 		&Apache::lonhtmlcommon::clear_breadcrumbs();
 		#if any br links exists, add them to the breadcrumbs