--- loncom/interface/lonblockingmenu.pm 2016/10/23 14:35:32 1.22
+++ loncom/interface/lonblockingmenu.pm 2017/06/26 01:56:58 1.25
@@ -2,7 +2,7 @@
# Routines for configuring blocking of access to collaborative functions,
# and specific resources during an exam
#
-# $Id: lonblockingmenu.pm,v 1.22 2016/10/23 14:35:32 raeburn Exp $
+# $Id: lonblockingmenu.pm,v 1.25 2017/06/26 01:56:58 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -116,7 +116,7 @@ Outputs: 2
$readonly - true if modification of blocking events is prohibited.
$allowed - true if blocking events information can be shown.
-
+
=item &get_timed_items()
@@ -252,7 +252,7 @@ Inputs: 8
- $blockcount - number of existing blocking events in course
- $readonly - if true, modification not allowed.
-
+
Output: None
@@ -345,7 +345,7 @@ Outputs: 1 - $intervalform - web form el
=item &interval_details()
Creates name/scope of current interval and expandable/collapsible
-showing which interval parameters apply to the current folder/resource
+showing which interval parameters apply to the current folder/resource
Inputs: 6
@@ -362,7 +362,7 @@ Inputs: 6
- $parmcount - unique ID for current element.
-Outputs: 2
+Outputs: 2
- $itemname - name/scope of interval (timer) parameter
@@ -435,10 +435,10 @@ containing details about item with timed
Inputs: none
Output: 1 Javascript (with <script></script> tags) for functions used to:
- toggle visibility of unordered list for display of detailed
+ toggle visibility of unordered list for display of detailed
information about intervals.
-
-=back
+
+=back
=cut
@@ -578,6 +578,7 @@ sub handler {
my %lt=&Apache::lonlocal::texthash (
'cbds' => 'Blocking communication and/or content access during exams',
'prev' => "For the duration of an exam, or a timed quiz, students in this course can be prevented from:",
+ 'flow' => "For the duration of an exam, or a timed quiz, event-driven interruptions to a student's workflow can be suppressed:",
'blca' => "Blocks can potentially interrupt legitimate communication between $usertype who are also both enrolled in a different LON-CAPA $lctype.",
'pobl' => "Portfolio blocking can impact a student's ability to complete assignments in courses besides your own. Please use this feature wisely.",
'actt' => "Action to take:",
@@ -622,14 +623,19 @@ sub handler {
'<li>'.&mt("accessing $lctype content in specified folders or resources").'</li>'.
'<li>'.&mt("changing user's own password").'</li>'.
'</ul>'.
+ $lt{'flow'}.
+ '<ul>'."\n".
+ '<li>'.&mt("re-initialization of cached course structure, when a change has been made to $lctype content by a Coordinator").'</li>'.
+ '<li>'.&mt('display of Critical Messages when navigation arrows used to move to the adjacent resource').'</li>'.
+ '</ul>'.
'<p class="LC_warning">'.$lt{'blca'}.'<br />'.$lt{'pobl'}.'</p>'
);
}
# ------------------------ Choose between modifying existing block or adding new
$r->print('<form name="blockform" method="post" action="/adm/setblock?action=store">');
-
- unless ($readonly) {
+
+ unless ($readonly) {
if ($blockcount > 0) {
$r->print(<<"END");
<div class="LC_left_float">
@@ -658,20 +664,19 @@ END
&Apache::loncourserespicker::get_navmap_object($crstype,'examblock');
# --------------------------------------------- Interface for adding a new block
- if ($readonly) {
- if (!$blockcount) {
- $r->print($lt{'ncbc'}.'<br />');
- }
- } else {
+ unless ($readonly) {
&display_addblocker_table($r,$blockcount,\%ltext,\%intervals,
$navmap,$errormsg);
if ($blockcount > 0) {
$r->print('</div>');
}
}
-
# ------------------------------------------------ Interface for existing blocks
- if ($blockcount > 0) {
+ if (!$blockcount) {
+ if ($readonly) {
+ $r->print($lt{'ncbc'}.'<br />');
+ }
+ } else {
&display_blocker_status($r,\%records,\%ltext,\%intervals,
$navmap,$errormsg,$blockcount,$readonly);
}
@@ -878,6 +883,24 @@ sub blockstore {
&escape($env{'form.title_'.$key})).'<br />';
}
}
+ if ($blocktypes->{'alert'} eq 'on') {
+ ($status,$needsrelease) = &check_release_required('alert',$chomemajor,$chomeminor);
+ if ($status eq 'fail') {
+ $blocktypes->{'alert'} = 'off';
+ $output .= '<p class="LC_warning">'.
+ &mt('Message Alert blocking not allowed for [_1]',
+ &escape($env{'form.title_'.$key})).'<br />';
+ }
+ }
+ if ($blocktypes->{'reinit'} eq 'on') {
+ ($status,$needsrelease) = &check_release_required('reinit',$chomemajor,$chomeminor);
+ if ($status eq 'fail') {
+ $blocktypes->{'reinit'} = 'off';
+ $output .= '<p class="LC_warning">'.
+ &mt('Course Re-initialization blocking not allowed for [_1]',
+ &escape($env{'form.title_'.$key})).'<br />';
+ }
+ }
}
if ($blockdocs) {
($status,$needsrelease) = &check_release_required('docs',$chomemajor,$chomeminor);
@@ -1437,7 +1460,7 @@ sub create_interval_form {
if (ref($resobj)) {
$title = $resobj->compTitle();
}
- if ($title eq '') {
+ if ($title eq '') {
$title = &Apache::lonnet::gettitle($resource);
}
$hierarchy = &show_timer_path($type,$resource,$navmap);
@@ -1633,8 +1656,10 @@ sub blocktype_text {
'docs' => 'Content',
'printout' => 'Printouts',
'passwd' => 'Change Password',
+ 'alert' => 'Critical Alert',
+ 'reinit' => 'Course Re-init',
);
- my $typeorder = ['com','chat','boards','port','groups','blogs','printout','docs','passwd'];
+ my $typeorder = ['com','chat','boards','port','groups','blogs','printout','docs','alert','reinit','passwd'];
return ($typeorder,\%types);
}