version 1.443, 2016/04/02 04:30:20
|
version 1.446, 2016/04/15 14:14:09
|
Line 560 sub create_submenu {
|
Line 560 sub create_submenu {
|
# see perldoc create_submenu documentation for further information |
# see perldoc create_submenu documentation for further information |
sub build_submenu { |
sub build_submenu { |
my ($target, $submenu, $translate, $first_level) = @_; |
my ($target, $submenu, $translate, $first_level) = @_; |
if (!defined(@{$submenu})) { |
unless (@{$submenu}) { |
return ''; |
return ''; |
} |
} |
|
|
Line 840 ENDMENUITEMS
|
Line 840 ENDMENUITEMS
|
$menuitems = "c&3&1"; |
$menuitems = "c&3&1"; |
if (($crstype ne 'Placement') || ($env{'request.role.adv'})) { |
if (($crstype ne 'Placement') || ($env{'request.role.adv'})) { |
$menuitems.=" |
$menuitems.=" |
s&2&1&back.png&&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1"; |
s&2&1&back.png&&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1 |
|
s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3"; |
|
} else { |
|
# Suppress display of backward arrow for Placement Tests |
|
# Suppress display of forward arrow for Placement Tests if this is the last resource. |
|
my $showforw = 1; |
|
if ($env{'request.symb'}) { |
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
|
if (ref($navmap)) { |
|
if (&Apache::lonplacementtest::is_lastres($env{'request.symb'},$navmap)) { |
|
$showforw = 0; |
|
} |
|
} |
|
} |
|
if ($showforw) { |
|
$menuitems.=" |
|
s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3"; |
|
} |
} |
} |
$menuitems .= (<<ENDMENUITEMS); |
$menuitems .= (<<ENDMENUITEMS); |
|
|
s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3 |
|
c&6&3 |
c&6&3 |
c&8&1 |
c&8&1 |
c&8&2 |
c&8&2 |
Line 931 ENDMENUITEMS
|
Line 947 ENDMENUITEMS
|
} |
} |
} |
} |
} |
} |
|
my $showprogress; |
|
if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) { |
|
$showprogress = &placement_progress(); |
|
} |
|
|
|
my $addremote=0; |
|
foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} } |
|
|
my $addremote=0; |
|
foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} } |
|
if ($addremote) { |
if ($addremote) { |
my $countdown; |
my $countdown; |
if ($env{'request.filename'} =~ /\.page$/) { |
if ($env{'request.filename'} =~ /\.page$/) { |
Line 953 ENDMENUITEMS
|
Line 974 ENDMENUITEMS
|
if ($countdown) { |
if ($countdown) { |
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown); |
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown); |
} |
} |
|
if ($showprogress) { |
|
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$showprogress); |
|
} |
} else { |
} else { |
my @tools = @inlineremote[93,91,81,82,83]; |
my @tools = @inlineremote[93,91,81,82,83]; |
if ($countdown) { |
if ($countdown) { |
Line 971 ENDMENUITEMS
|
Line 995 ENDMENUITEMS
|
} |
} |
&advtools_crumbs(@inlineremote); |
&advtools_crumbs(@inlineremote); |
} |
} |
|
} else { |
|
if ($showprogress) { |
|
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$showprogress); |
|
} |
} |
} |
my ($topic_help,$topic_help_text); |
my ($topic_help,$topic_help_text); |
if ($is_const_dir == 2) { |
if ($is_const_dir == 2) { |
Line 2518 END
|
Line 2546 END
|
return; |
return; |
} |
} |
|
|
|
sub placement_progress { |
|
my ($totalpoints,$incomplete) = &Apache::lonplacementtest::check_completion(undef,undef,1); |
|
my $complete = 100 - $incomplete; |
|
return '<span class="LC_placement_prog">'. |
|
&mt('Test is [_1]% complete',$complete).'</span>'; |
|
} |
|
|
# ================================================================ Main Program |
# ================================================================ Main Program |
|
|
BEGIN { |
BEGIN { |