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

albertel lon-capa-cvs@mail.lon-capa.org
Thu, 06 Apr 2006 20:52:58 -0000 

albertel		Thu Apr  6 16:52:58 2006 EDT

  Modified files:              
    /loncom/publisher	lonpubdir.pm 
    /loncom/interface	loncommon.pm 
  Log:
  - start_page
  - adding support fo the last argument to bodytag
  
  
Index: loncom/publisher/lonpubdir.pm
diff -u loncom/publisher/lonpubdir.pm:1.88 loncom/publisher/lonpubdir.pm:1.89
--- loncom/publisher/lonpubdir.pm:1.88	Thu Jul 14 17:31:34 2005
+++ loncom/publisher/lonpubdir.pm	Thu Apr  6 16:52:50 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.88 2005/07/14 21:31:34 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.89 2006/04/06 20:52:50 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -137,7 +137,7 @@
   }
   closedir(DIR);
 
-  $r->print('</table></body></html>');
+  $r->print('</table>'.&Apache::loncommon::end_page());
   return OK;  
 }
 #
@@ -191,13 +191,10 @@
     my $currdir = '/priv/'.$uname.$thisdisfn;
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print($html.'<head><title>LON-CAPA Construction Space</title></head>');
 
-    my $pagetitle;
     my $formaction='/priv/'.$uname.$thisdisfn.'/';
-    $formaction=~s/\/+/\//g;
-    $pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring').
+    $formaction=~s|/+|/|g;
+    my $pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring').
         '<font face="Arial, Helvetica, sans-serif" size="+1"><b>Construction Space</b>:</font>&nbsp;'.
         '<form name="dirs" method="post" action="'.$formaction.
         '" target="_parent"><tt><b>'.
@@ -208,8 +205,12 @@
     &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
     if ($env{'environment.remote'} eq 'off') {
 	$env{'request.noversionuri'}=$currdir.'/';
-	$r->print(&Apache::loncommon::bodytag('Construction Space',undef,undef,undef,undef,undef,$pagetitle));
+	$r->print(&Apache::loncommon::start_page('Construction Space',undef,
+						 {'body_title' =>
+						      $pagetitle,}));
     } else {
+	$r->print(&Apache::loncommon::start_page('Construction Space',undef,
+						 {'only_body' => 1,}));
 	$r->print($pagetitle);
     }
     my $pubdirscript=(<<ENDPUBDIRSCRIPT);
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.325 loncom/interface/loncommon.pm:1.326
--- loncom/interface/loncommon.pm:1.325	Tue Apr  4 11:11:26 2006
+++ loncom/interface/loncommon.pm	Thu Apr  6 16:52:58 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.325 2006/04/04 15:11:26 albertel Exp $
+# $Id: loncommon.pm,v 1.326 2006/04/06 20:52:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2737,7 +2737,9 @@
 =item * $forcereg, if page should register as content page (relevant for 
             text interface only)
 
-=item * $customtitle, overrides the $title in some way ????
+=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 * $notopbar, if true, keep the 'what is this' info but remove the
                    navigational links
@@ -3082,6 +3084,9 @@
                                     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
 
 =back
 
@@ -3104,7 +3109,7 @@
 	&bodytag($title, 
 		 $args->{'function'},       $args->{'add_entries'},
 		 $args->{'only_body'},      $args->{'domain'},
-		 $args->{'force_register'}, undef,
+		 $args->{'force_register'}, $args->{'body_title'},
 		 $args->{'no_nav_bar'},     $args->{'bgcolor'});
     if ($args->{'js_ready'}) {
 	$result = &js_ready($result);