version 1.440, 2016/03/15 14:25:26
|
version 1.445, 2016/04/05 02:02:28
|
Line 238 sub prep_menuitem {
|
Line 238 sub prep_menuitem {
|
# @primary_menu is filled within the BEGIN block of this module with |
# @primary_menu is filled within the BEGIN block of this module with |
# entries from mydesk.tab |
# entries from mydesk.tab |
sub primary_menu { |
sub primary_menu { |
|
my ($crstype) = @_; |
my (%menu); |
my (%menu); |
# each element of @primary contains following array: |
# each element of @primary contains following array: |
# (link url, icon path, alt text, link text, condition, position) |
# (link url, icon path, alt text, link text, condition, position) |
Line 246 sub primary_menu {
|
Line 247 sub primary_menu {
|
|| (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) { |
|| (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) { |
$public = 1; |
$public = 1; |
} |
} |
|
my $rolecount; |
|
if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) { |
|
my $update=$env{'user.update.time'}; |
|
if (!$update) { |
|
$update = $env{'user.login.time'}; |
|
} |
|
my %roles_in_env; |
|
$rolecount = &Apache::lonroles::roles_from_env(\%roles_in_env,$update); |
|
} |
foreach my $menuitem (@primary_menu) { |
foreach my $menuitem (@primary_menu) { |
# evaluate conditions |
# evaluate conditions |
next if ref($menuitem) ne 'ARRAY'; # |
next if ref($menuitem) ne 'ARRAY'; # |
Line 263 sub primary_menu {
|
Line 273 sub primary_menu {
|
&& &Apache::loncommon::show_course(); ##term 'Courses' or |
&& &Apache::loncommon::show_course(); ##term 'Courses' or |
next if $$menuitem[4] eq 'courses' ##'Roles' wanted |
next if $$menuitem[4] eq 'courses' ##'Roles' wanted |
&& !&Apache::loncommon::show_course(); ## |
&& !&Apache::loncommon::show_course(); ## |
|
|
my $title = $menuitem->[3]; |
my $title = $menuitem->[3]; |
|
if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) { |
|
if ($menuitem->[4] eq 'courses') { |
|
next unless ($rolecount>1); |
|
} else { |
|
next unless (($title eq 'Personal') || ($title eq 'Logout')); |
|
} |
|
} |
my $position = $menuitem->[5]; |
my $position = $menuitem->[5]; |
if ($position eq '') { |
if ($position eq '') { |
$position = 'right'; |
$position = 'right'; |
Line 280 sub primary_menu {
|
Line 296 sub primary_menu {
|
my @primsub; |
my @primsub; |
if (ref($primary_submenu{$title}) eq 'ARRAY') { |
if (ref($primary_submenu{$title}) eq 'ARRAY') { |
foreach my $item (@{$primary_submenu{$title}}) { |
foreach my $item (@{$primary_submenu{$title}}) { |
|
next if (($crstype eq 'Placement') && (!$env{'request.role.adv'})); |
next if (($item->[2] eq 'wishlist') && (!$env{'user.adv'})); |
next if (($item->[2] eq 'wishlist') && (!$env{'user.adv'})); |
next if ((($item->[2] eq 'portfolio') || |
next if ((($item->[2] eq 'portfolio') || |
($item->[2] eq 'blog')) && |
($item->[2] eq 'blog')) && |
Line 287 sub primary_menu {
|
Line 304 sub primary_menu {
|
undef,'tools'))); |
undef,'tools'))); |
push(@primsub,$item); |
push(@primsub,$item); |
} |
} |
|
if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'} ) { |
|
$title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); |
|
} else { |
|
$title = &mt($title); |
|
} |
if (@primsub > 0) { |
if (@primsub > 0) { |
if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'} ) { |
|
$title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); |
|
} else { |
|
$title = &mt($title); |
|
} |
|
$menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1); |
$menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1); |
} elsif ($link) { |
} elsif ($link) { |
$menu{$position} .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>'; |
$menu{$position} .= '<li><a href="'.$link.'" target="'.$target.'">'.$title.'</a></li>'; |
} |
} |
} |
} |
} elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink |
} elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink |
|
next if ($crstype eq 'Placement'); |
if ($public) { |
if ($public) { |
my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
my $defdom = &Apache::lonnet::default_login_domain(); |
my $defdom = &Apache::lonnet::default_login_domain(); |
Line 424 sub secondary_menu {
|
Line 442 sub secondary_menu {
|
foreach my $menuitem (@secondary_menu) { |
foreach my $menuitem (@secondary_menu) { |
# evaluate conditions |
# evaluate conditions |
next if ref($menuitem) ne 'ARRAY'; |
next if ref($menuitem) ne 'ARRAY'; |
|
next if (($crstype eq 'Placement') && ($$menuitem[3] ne 'Roles') && (!$env{'request.role.adv'})); |
next if $$menuitem[4] ne 'always' |
next if $$menuitem[4] ne 'always' |
&& ($$menuitem[4] ne 'author' && $$menuitem[4] ne 'cca') |
&& ($$menuitem[4] ne 'author' && $$menuitem[4] ne 'cca') |
&& !$env{'request.course.id'}; |
&& !$env{'request.course.id'}; |
Line 609 sub innerregister {
|
Line 628 sub innerregister {
|
|
|
undef(@inlineremote); |
undef(@inlineremote); |
|
|
my ($mapurl,$resurl); |
my ($mapurl,$resurl,$crstype); |
|
|
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
|
# |
|
#course_type: Course, Community, or Placement |
|
# |
|
$crstype = &Apache::loncommon::course_type(); |
if ($env{'request.symb'}) { |
if ($env{'request.symb'}) { |
($mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread()); |
($mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread()); |
my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'}; |
my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'}; |
|
|
my $maptitle = &Apache::lonnet::gettitle($mapurl); |
my $maptitle = &Apache::lonnet::gettitle($mapurl); |
my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread()); |
my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread()); |
|
|
#SD |
|
#course_type only Course and Community? |
|
# |
|
my @crumbs; |
my @crumbs; |
unless (($forcereg) && |
unless (($forcereg) && |
($env{'request.noversionuri'} eq '/adm/navmaps') && |
($env{'request.noversionuri'} eq '/adm/navmaps') && |
($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) { |
($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) || |
@crumbs = ({text => Apache::loncommon::course_type() |
(($crstype eq 'Placement') && (!$env{'request.role.adv'}))) { |
. ' Contents', |
@crumbs = ({text => $crstype.' Contents', |
href => "Javascript:gopost('/adm/navmaps','')"}); |
href => "Javascript:gopost('/adm/navmaps','')"}); |
} |
} |
if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { |
if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { |
Line 635 sub innerregister {
|
Line 654 sub innerregister {
|
no_mt => 1}); |
no_mt => 1}); |
} |
} |
|
|
push @crumbs, {text => $maptitle, no_mt => 1} if ($maptitle |
unless (($crstype eq 'Placement') || (!$env{'request.role.adv'})) { |
&& $maptitle ne 'default.sequence' |
push @crumbs, {text => $maptitle, no_mt => 1} if ($maptitle |
&& $maptitle ne $coursetitle); |
&& $maptitle ne 'default.sequence' |
|
&& $maptitle ne $coursetitle); |
|
} |
|
|
push @crumbs, {text => $restitle, no_mt => 1} if $restitle; |
push @crumbs, {text => $restitle, no_mt => 1} if $restitle; |
my @tools; |
my @tools; |
Line 655 sub innerregister {
|
Line 676 sub innerregister {
|
} 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'}); |
my $crstype = &Apache::loncommon::course_type(); |
|
my $title = &mt('View Resource'); |
my $title = &mt('View Resource'); |
if ($resurl =~ m{^\Q/uploaded$courseurl/supplemental/\E(default|\d+)/}) { |
if ($resurl =~ m{^\Q/uploaded$courseurl/supplemental/\E(default|\d+)/}) { |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folderpath','title']); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folderpath','title']); |
Line 817 ENDMENUITEMS
|
Line 837 ENDMENUITEMS
|
# We are in a course and looking at a registered URL |
# We are in a course and looking at a registered URL |
# Should probably be in mydesk.tab |
# Should probably be in mydesk.tab |
# |
# |
$menuitems=(<<ENDMENUITEMS); |
$menuitems = "c&3&1"; |
c&3&1 |
if (($crstype ne 'Placement') || ($env{'request.role.adv'})) { |
|
$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 |
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); |
|
|
c&6&3 |
c&6&3 |
c&8&1 |
c&8&1 |
c&8&2 |
c&8&2 |
Line 907 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 929 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 947 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 1501 sub rawconfig {
|
Line 1553 sub rawconfig {
|
|
|
sub check_for_rcrs { |
sub check_for_rcrs { |
my $showreqcrs = 0; |
my $showreqcrs = 0; |
my @reqtypes = ('official','unofficial','community','textbook'); |
my @reqtypes = ('official','unofficial','community','textbook','placement'); |
foreach my $type (@reqtypes) { |
foreach my $type (@reqtypes) { |
if (&Apache::lonnet::usertools_access($env{'user.name'}, |
if (&Apache::lonnet::usertools_access($env{'user.name'}, |
$env{'user.domain'}, |
$env{'user.domain'}, |
Line 1579 END
|
Line 1631 END
|
# |
# |
sub done_button_js { |
sub done_button_js { |
my ($type,$width,$height,$proctor) = @_; |
my ($type,$width,$height,$proctor) = @_; |
|
return unless (($type eq 'map') || ($type eq 'resource')); |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
title => 'WARNING!', |
title => 'WARNING!', |
button => 'Done', |
button => 'Done', |
Line 1593 sub done_button_js {
|
Line 1646 sub done_button_js {
|
key => 'Key:', |
key => 'Key:', |
nokey => 'A proctor key is required', |
nokey => 'A proctor key is required', |
); |
); |
my $confirm; |
my $navmap = Apache::lonnavmaps::navmap->new(); |
if (($type eq 'map') || ($type eq 'resource')) { |
my ($missing,$tried); |
if ($proctor) { |
if (ref($navmap)) { |
$confirm = $lt{'preamble'}.' '.$lt{$type}; |
$missing=0; |
if ($height !~ /^\d+$/) { |
$tried=0; |
$height = 400; |
my @resources=(); |
|
if ($type eq 'map') { |
|
my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($env{'request.symb'}); |
|
@resources=$navmap->retrieveResources($mapurl,sub { $_[0]->is_problem() }); |
|
} else { |
|
my $res = $navmap->getBySymb($env{'request.symb'}); |
|
if (ref($res)) { |
|
if ($res->is_problem()) { |
|
push(@resources,$res); |
|
} |
} |
} |
if ($width !~ /^\d+$/) { |
} |
$width = 400; |
foreach my $res (@resources) { |
|
if ($res->singlepart()) { |
|
if (!$res->tries()) { |
|
$missing++; |
|
} else { |
|
$tried++; |
|
} |
|
} else { |
|
foreach my $part (@{$res->parts()}) { |
|
if (!$res->tries($part)) { |
|
$missing++; |
|
} else { |
|
$tried++; |
|
} |
|
} |
} |
} |
return <<END; |
} |
|
} |
|
if ($missing) { |
|
$lt{'miss'} .= '<p class="LC_error">'; |
|
if ($type eq 'map') { |
|
$lt{'miss'} .= &mt('Submissions are missing for [quant,_1,question part,question parts] in this folder.',$missing); |
|
} else { |
|
$lt{'miss'} .= &mt('Submissions are missing for [quant,_1,part] in this question.',$missing); |
|
} |
|
if ($missing > 1) { |
|
$lt{'miss'} .= ' '.&mt('If you confirm you are done you will be unable to submit answers for them.').'</span>'; |
|
} else { |
|
$lt{'miss'} .= ' '.&mt('If you confirm you are done you will be unable to submit an answer for it.').'</p>'; |
|
} |
|
} |
|
if ($proctor) { |
|
if ($height !~ /^\d+$/) { |
|
$height = 400; |
|
if ($missing) { |
|
$height += 60; |
|
} |
|
} |
|
if ($width !~ /^\d+$/) { |
|
$width = 400; |
|
if ($missing) { |
|
$width += 60; |
|
} |
|
} |
|
return <<END; |
<form method="post" name="LCdoneButton" action=""> |
<form method="post" name="LCdoneButton" action=""> |
<input type="hidden" name="LC_interval_done" value="" /> |
<input type="hidden" name="LC_interval_done" value="" /> |
<input type="hidden" name="LC_interval_done_proctorpass" value="" /> |
<input type="hidden" name="LC_interval_done_proctorpass" value="" /> |
Line 1612 sub done_button_js {
|
Line 1716 sub done_button_js {
|
|
|
<div id="LC_done-confirm" title="$lt{'title'}"> |
<div id="LC_done-confirm" title="$lt{'title'}"> |
<p>$lt{'preamble'} $lt{$type}</p> |
<p>$lt{'preamble'} $lt{$type}</p> |
|
$lt{'miss'} |
<p>$lt{'proctor'}</p> |
<p>$lt{'proctor'}</p> |
<form> |
<form> |
<label>$lt{'key'}<input type="password" name="LC_interval_done_proctorkey" value="" /></label> |
<label>$lt{'key'}<input type="password" name="LC_interval_done_proctorkey" value="" /></label> |
Line 1667 sub done_button_js {
|
Line 1772 sub done_button_js {
|
</script> |
</script> |
|
|
END |
END |
} else { |
} else { |
if ($height !~ /^\d+$/) { |
if ($height !~ /^\d+$/) { |
$height = 320; |
$height = 320; |
|
if ($missing) { |
|
$height += 60; |
} |
} |
if ($width !~ /^\d+$/) { |
} |
$width = 320; |
if ($width !~ /^\d+$/) { |
|
$width = 320; |
|
if ($missing) { |
|
$width += 60; |
} |
} |
return <<END; |
} |
|
if ($missing) { |
|
$lt{'miss'} = '</p>'.$lt{'miss'}.'<p>'; |
|
} |
|
return <<END; |
|
|
<form method="post" name="LCdoneButton" action=""> |
<form method="post" name="LCdoneButton" action=""> |
<input type="hidden" name="LC_interval_done" value="" /> |
<input type="hidden" name="LC_interval_done" value="" /> |
Line 1682 END
|
Line 1796 END
|
</form> |
</form> |
|
|
<div id="LC_done-confirm" title="$lt{'title'}"> |
<div id="LC_done-confirm" title="$lt{'title'}"> |
<p>$lt{'preamble'} $lt{$type} $lt{'okdone'} $lt{'cancel'}</p> |
<p>$lt{'preamble'} $lt{$type} $lt{'miss'} $lt{'okdone'} $lt{'cancel'}</p> |
</div> |
</div> |
|
|
<script type="text/javascript"> |
<script type="text/javascript"> |
Line 1717 END
|
Line 1831 END
|
</script> |
</script> |
|
|
END |
END |
} |
|
} else { |
|
return; |
|
} |
} |
} |
} |
|
|
Line 2435 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 { |