[LON-CAPA-cvs] cvs: loncom /homework structuretags.pm /interface loncommon.pm lonsearchcat.pm /xml londefdef.pm
bisitz
bisitz@source.lon-capa.org
Fri, 15 May 2009 14:48:50 -0000
bisitz Fri May 15 14:48:50 2009 EDT
Modified files:
/loncom/homework structuretags.pm
/loncom/interface loncommon.pm lonsearchcat.pm
/loncom/xml londefdef.pm
Log:
Removed outdated no_title option for start_page call.
This option will be new standard (title bar will be removed) and is not needed explicitly anymore.
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.444 loncom/homework/structuretags.pm:1.445
--- loncom/homework/structuretags.pm:1.444 Mon May 11 16:51:22 2009
+++ loncom/homework/structuretags.pm Fri May 15 14:48:35 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.444 2009/05/11 16:51:22 bisitz Exp $
+# $Id: structuretags.pm,v 1.445 2009/05/15 14:48:35 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -225,7 +225,7 @@
if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; }
$body_args{'bgcolor'} = $bgcolor;
- $body_args{'no_title'} = 1;
+# $body_args{'no_title'} = 1;
$body_args{'force_register'} = 1;
$body_args{'add_entries'} = \%add_entries;
if ($env{'environment.remote'} eq 'off'
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.815 loncom/interface/loncommon.pm:1.816
--- loncom/interface/loncommon.pm:1.815 Fri May 15 09:33:22 2009
+++ loncom/interface/loncommon.pm Fri May 15 14:48:42 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.815 2009/05/15 09:33:22 tempelho Exp $
+# $Id: loncommon.pm,v 1.816 2009/05/15 14:48:42 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4220,8 +4220,6 @@
=item * $bgcolor, used to override the bgcolor on a webpage to a specific value
-=item * $notitle, if true keep the nav controls, but remove the title bar
-
=item * $no_inline_link, if true and in remote mode, don't show the
'Switch To Inline Menu' link
@@ -4242,7 +4240,7 @@
sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
- $no_nav_bar,$bgcolor,$notitle,$no_inline_link,$args)=@_;
+ $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
@@ -4360,13 +4358,10 @@
.&Apache::lonmenu::constspaceform();
}
- my $titletable;
- if (!$notitle) {
- $titletable =
- '<table id="LC_title_bar">'.
- "<tr><td> $titleinfo $dc_info</td>".$roleinfo.
- '</tr></table>';
- }
+ my $titletable = '<table id="LC_title_bar">'
+ ."<tr><td> $titleinfo $dc_info</td>".$roleinfo
+ .'</tr></table>';
+
if ($no_nav_bar) {
$bodytag .= $titletable;
} else {
@@ -4397,9 +4392,6 @@
my $menu= ($no_inline_link?''
:'<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>');
#
- if ($notitle) {
- return $bodytag;
- }
return(<<ENDBODY);
$bodytag
<table id="LC_title_bar" class="LC_with_remote">
@@ -6486,7 +6478,6 @@
is not auto translated like the $title is
frameset -> if true will start with a <frameset>
rather than <body>
- no_title -> if true the title bar won't be shown
skip_phases -> hash ref of
head -> skip the <html><head> generation
body -> skip all <body> generation
@@ -6535,7 +6526,7 @@
$args->{'only_body'}, $args->{'domain'},
$args->{'force_register'}, $args->{'body_title'},
$args->{'no_nav_bar'}, $args->{'bgcolor'},
- $args->{'no_title'}, $args->{'no_inline_link'},
+ $args->{'no_inline_link'},
$args);
}
}
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.306 loncom/interface/lonsearchcat.pm:1.307
--- loncom/interface/lonsearchcat.pm:1.306 Mon May 4 16:45:57 2009
+++ loncom/interface/lonsearchcat.pm Fri May 15 14:48:42 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.306 2009/05/04 16:45:57 bisitz Exp $
+# $Id: lonsearchcat.pm,v 1.307 2009/05/15 14:48:42 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2248,8 +2248,7 @@
</script>
END
- my $start_page = &Apache::loncommon::start_page('Results',$js,
- {'no_title' => 1});
+ my $start_page = &Apache::loncommon::start_page('Results',$js);
my $breadcrumbs=
&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
$env{'form.catalogmode'} ne 'import');
@@ -2487,8 +2486,7 @@
#
# Print run_search header
#
- my $start_page = &Apache::loncommon::start_page('Search Status',undef,
- {'no_title' => 1});
+ my $start_page = &Apache::loncommon::start_page('Search Status',undef);
my $breadcrumbs =
&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
$env{'form.catalogmode'} ne 'import');
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.403 loncom/xml/londefdef.pm:1.404
--- loncom/xml/londefdef.pm:1.403 Sat May 2 22:16:58 2009
+++ loncom/xml/londefdef.pm Fri May 15 14:48:50 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.403 2009/05/02 22:16:58 foxr Exp $
+# $Id: londefdef.pm,v 1.404 2009/05/15 14:48:50 bisitz Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -543,7 +543,7 @@
$Apache::londefdef::head
.$extra_head,
{'add_entries' => $token->[2],
- 'no_title' => 1,
+# 'no_title' => 1,
'force_register' => 1});
if ($env{'request.state'} ne 'published') {
@@ -3508,7 +3508,7 @@
&Apache::loncommon::start_page($Apache::londefdef::title,
$Apache::londefdef::head,
{'add_entries' => $token->[2],
- 'no_title' => 1,
+# 'no_title' => 1,
'force_register' => 1,
'frameset' => 1,});