version 1.435, 2015/06/17 03:57:15
|
version 1.438, 2016/01/26 14:30:25
|
Line 634 sub innerregister {
|
Line 634 sub innerregister {
|
&& $maptitle ne $coursetitle); |
&& $maptitle ne $coursetitle); |
|
|
push @crumbs, {text => $restitle, no_mt => 1} if $restitle; |
push @crumbs, {text => $restitle, no_mt => 1} if $restitle; |
|
my @tools; |
|
if ($env{'request.filename'} =~ /\.page$/) { |
|
my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools(); |
|
if (ref($breadcrumb_tools{'tools'}) eq 'ARRAY') { |
|
@tools = @{$breadcrumb_tools{'tools'}}; |
|
} |
|
} |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::add_breadcrumb(@crumbs); |
&Apache::lonhtmlcommon::add_breadcrumb(@crumbs); |
|
if (@tools) { |
|
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',@tools); |
|
} |
} else { |
} else { |
$resurl = $env{'request.noversionuri'}; |
$resurl = $env{'request.noversionuri'}; |
my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'}); |
my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'}); |
Line 837 if ($env{'browser.mobile'}) {
|
Line 847 if ($env{'browser.mobile'}) {
|
$is_mobile = 1; |
$is_mobile = 1; |
} |
} |
|
|
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) { |
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio|exttools?)(\?|$)/) { |
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) { |
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) { |
$menuitems.=(<<ENDREALRES); |
$menuitems.=(<<ENDREALRES); |
s&6&3&catalog.png&Info&info[_1]&catalog_info('$is_mobile')&Show Metadata |
s&6&3&catalog.png&Info&info[_1]&catalog_info('$is_mobile')&Show Metadata |
Line 895 ENDMENUITEMS
|
Line 905 ENDMENUITEMS
|
my $addremote=0; |
my $addremote=0; |
foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} } |
foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} } |
if ($addremote) { |
if ($addremote) { |
|
my $countdown; |
|
if ($env{'request.filename'} =~ /\.page$/) { |
|
my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools(); |
|
if (ref($breadcrumb_tools{'tools'}) eq 'ARRAY') { |
|
$countdown = $breadcrumb_tools{'tools'}[0]; |
|
} |
|
} else { |
|
$countdown = &countdown_timer(); |
|
} |
&Apache::lonhtmlcommon::clear_breadcrumb_tools(); |
&Apache::lonhtmlcommon::clear_breadcrumb_tools(); |
|
|
&Apache::lonhtmlcommon::add_breadcrumb_tool( |
&Apache::lonhtmlcommon::add_breadcrumb_tool( |
'navigation', @inlineremote[21,23]); |
'navigation', @inlineremote[21,23]); |
|
|
my $countdown = &countdown_timer(); |
|
if (&hidden_button_check() eq 'yes') { |
if (&hidden_button_check() eq 'yes') { |
if ($countdown) { |
if ($countdown) { |
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown); |
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown); |
Line 1108 sub prepare_functions {
|
Line 1125 sub prepare_functions {
|
if (($env{'form.folderpath'} =~ /^supplemental/) && |
if (($env{'form.folderpath'} =~ /^supplemental/) && |
(&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) && |
(&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) && |
(($resurl =~ m{^/adm/wrapper/ext/}) || |
(($resurl =~ m{^/adm/wrapper/ext/}) || |
|
($resurl =~ m{^/adm/$cdom/$cnum/\d+/exttools?$}) || |
($resurl =~ m{^/uploaded/$cdom/$cnum/supplemental/}) || |
($resurl =~ m{^/uploaded/$cdom/$cnum/supplemental/}) || |
($resurl eq '/adm/supplemental') || |
($resurl eq '/adm/supplemental') || |
($resurl =~ m{^/public/$cdom/$cnum/syllabus$}) || |
($resurl =~ m{^/public/$cdom/$cnum/syllabus$}) || |
Line 2269 sub countdown_timer {
|
Line 2287 sub countdown_timer {
|
} |
} |
my $duedate = &Apache::lonnet::EXT("resource.0.duedate"); |
my $duedate = &Apache::lonnet::EXT("resource.0.duedate"); |
my @interval=&Apache::lonnet::EXT("resource.0.interval"); |
my @interval=&Apache::lonnet::EXT("resource.0.interval"); |
|
my ($timelimit,$usesdone); |
if (@interval > 1) { |
if (@interval > 1) { |
|
($timelimit,$usesdone) = split(/_/,$interval[0]); |
my $first_access=&Apache::lonnet::get_first_access($interval[1]); |
my $first_access=&Apache::lonnet::get_first_access($interval[1]); |
if ($first_access > 0) { |
if ($first_access > 0) { |
if ($first_access+$interval[0] > time) { |
if ($first_access+$timelimit > time) { |
$hastimeleft = 1; |
$hastimeleft = 1; |
} |
} |
} |
} |
Line 2286 sub countdown_timer {
|
Line 2306 sub countdown_timer {
|
$currdisp = 'inline'; |
$currdisp = 'inline'; |
$collapse = '► '; |
$collapse = '► '; |
if ((@interval > 1) && ($hastimeleft)) { |
if ((@interval > 1) && ($hastimeleft)) { |
$donebutton = &done_button_js($interval[1]); |
if ($usesdone eq 'done') { |
|
$donebutton = &done_button_js($interval[1]); |
|
} |
} |
} |
} else { |
} else { |
$currdisp = 'none'; |
$currdisp = 'none'; |