rat/lonpage.pm - diff

Return to lonpage.pm CVS log

Up to [LON-CAPA] / rat

Diff for /rat/lonpage.pm between versions 1.111.2.10.2.3 and 1.139

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

version 1.111.2.10.2.3, 2020/11/13 02:46:48	version 1.139, 2020/11/10 23:55:32
Line 202 sub handler {	Line 202 sub handler {
my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser();	my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser();
unless ($pagesymb) {	unless ($pagesymb) {
$pagesymb=&Apache::lonnet::symbread($requrl);	$pagesymb=&Apache::lonnet::symbread($requrl);
}	}
if ($pagesymb && ($courseid ne '') && ($domain ne '') && ($name ne '')) {	if ($pagesymb && ($courseid ne '') && ($domain ne '') && ($name ne '')) {
my %times=&Apache::lonnet::get('firstaccesstimes',	my %times=&Apache::lonnet::get('firstaccesstimes',
[$courseid."\0".$pagesymb],	[$courseid."\0".$pagesymb],
Line 381 ENDEXT	Line 381 ENDEXT
} elsif ($cellemb{$_} eq 'ssi') {	} elsif ($cellemb{$_} eq 'ssi') {
# --------------------------------------------------------- This is an SSI cell	# --------------------------------------------------------- This is an SSI cell
my $prefix='p_'.$_.'_';	my $prefix='p_'.$_.'_';
my $idprefix='p_'.join('_',($mapid,$resid,''));	my $idprefix= 'p_'.join('_',($mapid,$resid,''));
my %posthash=('request.prefix' => $prefix,	my %posthash=('request.prefix' => $prefix,
'LONCAPA_INTERNAL_no_discussion' => 'true',	'LONCAPA_INTERNAL_no_discussion' => 'true',
'symb' => $symb);	'symb' => $symb);
Line 419 ENDEXT	Line 419 ENDEXT
} elsif ($env{'form.'.$prefix.'markaccess'} eq 'yes') {	} elsif ($env{'form.'.$prefix.'markaccess'} eq 'yes') {
$posthash{'markaccess'} = $env{'form.'.$prefix.'markaccess'};	$posthash{'markaccess'} = $env{'form.'.$prefix.'markaccess'};
}	}
if ($env{'environment.remote'} eq 'on') {
$posthash{'inhibitmenu'} = 'yes';
}
my $output=Apache::lonnet::ssi($src,%posthash);	my $output=Apache::lonnet::ssi($src,%posthash);
$output=~s\|//(\s<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s(-->)?\s\|\|gs;	$output=~s\|//(\s<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s(-->)?\s\|\|gs;
if (($target eq 'tex') \|\| ($target eq 'tex_answer')) {	if (($target eq 'tex') \|\| ($target eq 'tex_answer')) {
Line 690 ENDEXT	Line 687 ENDEXT
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;
$r->print(&Apache::loncommon::start_page(undef,undef,	$r->print(&Apache::loncommon::start_page(undef,undef,
{'force_register' => 1}));	{'force_register' => 1,}));
$r->print(&mt('This page is either empty or it only contains resources that are currently hidden').'. ');	$r->print(&mt('This page is either empty or it only contains resources that are currently hidden').'. ');
$r->print('<br /><br />'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course').	$r->print('<br /><br />'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course').
&Apache::loncommon::end_page());	&Apache::loncommon::end_page());
Line 1043 sub get_buttons {	Line 1040 sub get_buttons {
if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) &&	if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) &&
($hash->{'src_'.$rid} !~ m-^/uploaded/-)) {	($hash->{'src_'.$rid} !~ m-^/uploaded/-)) {

if ((&Apache::lonnet::allowed('mgr',$crs_sec)) \|\|	if ((&Apache::lonnet::allowed('mgr',$crs_sec)) \|\|
(&Apache::lonnet::allowed('vgr',$crs_sec))) {	(&Apache::lonnet::allowed('vgr',$crs_sec))) {
$metainfo.=	$metainfo.=
'<a href="/adm/grades?symb='.&escape($symb).	'<a href="/adm/grades?symb='.&escape($symb).
Line 1056 sub get_buttons {	Line 1053 sub get_buttons {
}	}
if (&Apache::lonnet::allowed('mgr',$crs_sec)) {	if (&Apache::lonnet::allowed('mgr',$crs_sec)) {
$metainfo.=	$metainfo.=
'<a href="/adm/grades?symb='.&escape($symb).	'<a href="/adm/grades?symb='.&escape($symb).
# '&command=gradingmenu" target="LONcatInfo">'.	# '&command=gradingmenu" target="LONcatInfo">'.
'&command=gradingmenu">'.	'&command=gradingmenu">'.
'<img src="/res/adm/pages/pgrd.png" class="LC_icon"'.	'<img src="/res/adm/pages/pgrd.png" class="LC_icon"'.
' alt="'.&mt('Content Grades').'"'.	' alt="'.&mt('Content Grades').'"'.
' title="'.&mt('Content Grades').'" />'.	' title="'.&mt('Content Grades').'" />'.
'</a>';	'</a>';
}	}
if ((&Apache::lonnet::allowed('opa',$crs_sec)) \|\|	if ((&Apache::lonnet::allowed('opa',$crs_sec)) \|\|
(&Apache::lonnet::allowed('vpa',$crs_sec))) {	(&Apache::lonnet::allowed('vpa',$crs_sec))) {
$metainfo.=	$metainfo.=
'<a href="/adm/parmset?symb='.&escape($symb).	'<a href="/adm/parmset?symb='.&escape($symb).
Line 1158 sub add_countdown_timer {	Line 1155 sub add_countdown_timer {
$donebuttontext = &mt('Done');	$donebuttontext = &mt('Done');
$type = 'map';	$type = 'map';
}	}
$donebutton =	$donebutton =
&Apache::lonmenu::done_button_js($type,'','',$proctor,$donebuttontext);	&Apache::lonmenu::done_button_js($type,'','',$proctor,$donebuttontext);
}	}
unless ($env{'environment.icons'} eq 'iconsonly') {	unless ($env{'environment.icons'} eq 'iconsonly') {

Removed from v.1.111.2.10.2.3
changed lines
	Added in v.1.139