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

bisitz bisitz@source.lon-capa.org
Thu, 28 May 2009 15:19:54 -0000 

bisitz		Thu May 28 15:19:54 2009 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  Changes related to modification of LON-CAPA screen header.
  Removed outdated possibility to have custom title in title_bar.
  A customized header has been used in the past for the special page header in the Construction Space.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.830 loncom/interface/loncommon.pm:1.831
--- loncom/interface/loncommon.pm:1.830	Thu May 28 12:39:23 2009
+++ loncom/interface/loncommon.pm	Thu May 28 15:19:54 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.830 2009/05/28 12:39:23 bisitz Exp $
+# $Id: loncommon.pm,v 1.831 2009/05/28 15:19:54 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4274,10 +4274,6 @@
 =item * $forcereg, if page should register as content page (relevant for 
             text interface only)
 
-=item * $customtitle, alternate text to use instead of $title
-                      in the title box that appears, this text
-                      is not auto translated like the $title is
-
 =item * $no_nav_bar, if true, keep the 'what is this' info but remove the
                      navigational links
 
@@ -4302,7 +4298,7 @@
 =cut
 
 sub bodytag {
-    my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
+    my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
         $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
 
     if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
@@ -4373,9 +4369,6 @@
 ENDROLE
 
     my $titleinfo = '<h1>'.$title.'</h1>';
-    if ($customtitle) {
-        $titleinfo = $customtitle;
-    }
     #
     # Extra info if you are the DC
     my $dc_info = '';
@@ -4394,7 +4387,7 @@
 	    $forcereg=1;
 	}
 
-    if (!$customtitle && $env{'request.state'} eq 'construct') {
+    if ($env{'request.state'} eq 'construct') {
         $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
     }
 
@@ -6488,9 +6481,6 @@
                                     a html attribute
              force_register -> if is true will turn on the &bodytag()
                                     $forcereg arg
-             body_title     -> alternate text to use instead of $title
-                                    in the title box that appears, this text
-                                    is not auto translated like the $title is
              frameset       -> if true will start with a <frameset>
                                     rather than <body>
              skip_phases    -> hash ref of 
@@ -6534,16 +6524,15 @@
 	    my $attr_string = &make_attr_string($args->{'force_register'},
 						$args->{'add_entries'});
 	    $result .= "\n<frameset $attr_string>\n";
-	} else {
-	    $result .=
-		&bodytag($title, 
-			 $args->{'function'},       $args->{'add_entries'},
-			 $args->{'only_body'},      $args->{'domain'},
-			 $args->{'force_register'}, $args->{'body_title'},
-			 $args->{'no_nav_bar'},     $args->{'bgcolor'},
-			 $args->{'no_inline_link'},
-			 $args);
-	}
+        } else {
+            $result .=
+                &bodytag($title, 
+                         $args->{'function'},       $args->{'add_entries'},
+                         $args->{'only_body'},      $args->{'domain'},
+                         $args->{'force_register'}, $args->{'no_nav_bar'},
+                         $args->{'bgcolor'},        $args->{'no_inline_link'},
+                         $args);
+        }
     }
 
     if ($args->{'js_ready'}) {