loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.1075.2.20 and 1.1075.2.21

version 1.1075.2.20, 2012/12/22 15:43:03	version 1.1075.2.21, 2012/12/22 15:53:00
Line 5068 sub bodytag {	Line 5068 sub bodytag {

if ($env{'request.state'} eq 'construct') { $forcereg=1; }	if ($env{'request.state'} eq 'construct') { $forcereg=1; }

unless ($env{'environment.remote'} eq 'on') {	my $funclist;
	if (($env{'environment.remote'} eq 'on') && ($env{'request.state'} ne 'construct')) {
	$bodytag .= Apache::lonhtmlcommon::scripttag(Apache::lonmenu::utilityfunctions(), 'start')."\n".
	Apache::lonmenu::serverform();
	my $forbodytag;
	&Apache::lonmenu::prepare_functions($env{'request.noversionuri'},
	$forcereg,$args->{'group'},
	$args->{'bread_crumbs'},
	$advtoolsref,'',\$forbodytag);
	unless (ref($args->{'bread_crumbs'}) eq 'ARRAY') {
	$funclist = $forbodytag;
	}
	} else {

# if ($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	# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
Line 5112 sub bodytag {	Line 5124 sub bodytag {
} elsif ($forcereg) {	} elsif ($forcereg) {
$bodytag .= &Apache::lonmenu::innerregister($forcereg);	$bodytag .= &Apache::lonmenu::innerregister($forcereg);
} else {	} else {
$bodytag .=	my $forbodytag;
&Apache::lonmenu::prepare_functions($env{'request.noversionuri'},	&Apache::lonmenu::prepare_functions($env{'request.noversionuri'},
$forcereg,$args->{'group'},	$forcereg,$args->{'group'},
$args->{'bread_crumbs'},	$args->{'bread_crumbs'},
$advtoolsref);	$advtoolsref,'',\$forbodytag);
	unless (ref($args->{'bread_crumbs'}) eq 'ARRAY') {
	$bodytag .= $forbodytag;
	}
}	}
}else{	}else{
# this is to seperate menu from content when there's no secondary	# this is to seperate menu from content when there's no secondary
Line 5152 sub bodytag {	Line 5167 sub bodytag {
<li>$menu</li>	<li>$menu</li>
</ol><div id="LC_realm"> $realm $dc_info</div>\|;	</ol><div id="LC_realm"> $realm $dc_info</div>\|;
}	}
my $funclist;
if ($env{'request.state'} eq 'construct') {	if ($env{'request.state'} eq 'construct') {
if (!$public){	if (!$public){
if ($env{'request.state'} eq 'construct') {	if ($env{'request.state'} eq 'construct') {
Line 5164 sub bodytag {	Line 5178 sub bodytag {
}	}
}	}
}	}
return(<<ENDBODY);	return $bodytag."\n".$funclist;
$bodytag
<table id="LC_title_bar" class="LC_with_remote">
<tr><td>$upperleft</td>
<td>$messages </td>
</tr>
<tr><td>$titleinfo $dc_info $menu</td>
</tr>
</table>
$funclist
ENDBODY
}	}

sub dc_courseid_toggle {	sub dc_courseid_toggle {
Line 7491 sub start_page {	Line 7495 sub start_page {
}else{	}else{
$result .= &Apache::lonhtmlcommon::breadcrumbs();	$result .= &Apache::lonhtmlcommon::breadcrumbs();
}	}
	} elsif ($env{'request.noversionuri'} =~ m{^/res/}) {
	$result .= '<div style="padding:0;margin:0;clear:both"><hr /></div>';
}	}
return $result;	return $result;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1075.2.20
changed lines
	Added in v.1.1075.2.21