--- loncom/interface/lonblockingmenu.pm	2016/10/23 17:06:49	1.14.2.3
+++ loncom/interface/lonblockingmenu.pm	2016/10/22 01:49:10	1.20
@@ -2,7 +2,7 @@
 # Routines for configuring blocking of access to collaborative functions, 
 # and specific resources during an exam
 #
-# $Id: lonblockingmenu.pm,v 1.14.2.3 2016/10/23 17:06:49 raeburn Exp $
+# $Id: lonblockingmenu.pm,v 1.20 2016/10/22 01:49:10 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
 
@@ -318,16 +318,13 @@ Creates web form elements used to select
 items in the course for use in an exam block of type: "Triggered by 
 Activating Timer".
 
-Inputs: 8 (four required, last four optional)
+Inputs: 7 (three required, last four optional)
    - $intervals - Reference to hash of parameters for timed intervals
 
    - $parmcount - numeric ID of current block
 
    - $navmap - navmaps object
 
-   - $context - this will be "accesstimes" if called by lonaccesstimes.pm,
-                or "blocking" if called internally by lonblockingmenu.pm
-
    - $currkey - current interval (where this is a block already using
                 an interval-based trigger).  
 
@@ -342,34 +339,6 @@ Inputs: 8 (four required, last four opti
 Outputs: 1 - $intervalform - web form elements used to select a time interval
 
 
-=item &interval_details()
-
-Creates name/scope of current interval and expandable/collapsible
-showing which interval parameters apply to the current folder/resource
-
-Inputs: 6
-
-    - $item - course, map url, or resource symb
-
-    - $type - course, map, or resource
-
-    - $url  - url of item (null if item is course).
-
-    - $navmap - navmaps object
-
-    - $intervals - Reference to hash of parameters for timed intervals
-
-    - $parmcount - unique ID for current element.
-
-
-Outputs: 2
-
-   - $itemname - name/scope of interval (timer) parameter
-
-   - $iteminfo - Expandable/collapsible block showing which interval
-                 (timer) parameters affect the current folder or resource.
-
-
 =item &trigger_details_toggle()
  
 Creates link used to expand item showing information about timer for current
@@ -379,7 +348,6 @@ Inputs: 1 - $parmcount - numericID of ex
 
 Outputs: 1 - returns HTML for link to display contents of information item 
 
-
 =item &show_timer_path()
 
 Display hierarchy of names of folders/sub-folders containing the current
@@ -424,21 +392,12 @@ Output: 1 - Javascript (with <script></s
 
 =item *  for action to take -- add or modify block
 
-=back
-
-
-=item &details_javascript()
-
-Create Javascript to toggle visibility of unordered list item
-containing details about item with timed interval parameter.
+=item *  for display of detailed information about intervals 
 
-Inputs: none
+=back
 
-Output: 1 Javascript (with <script></script> tags) for functions used to:
-          toggle visibility of unordered list for display of detailed
-          information about intervals.
 
-=back
+=back  
 
 =cut
 
@@ -561,8 +520,7 @@ sub handler {
         ({href=>'/adm/setblock',
           text=>'Blocking communication/content access'});
 
-    my $js = &blockingmenu_javascript($blockcount).
-             &details_javascript();
+    my $js = &blockingmenu_javascript($blockcount);
 
     $r->print(
         &Apache::loncommon::start_page('Blocking communication/content access',$js).
@@ -628,8 +586,8 @@ sub handler {
 
 # ------------------------ 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,19 +616,20 @@ END
         &Apache::loncourserespicker::get_navmap_object($crstype,'examblock');
 
 # --------------------------------------------- Interface for adding a new block
-    unless ($readonly) {
+    if ($readonly) {
+        if (!$blockcount) {
+            $r->print($lt{'ncbc'}.'<br />');
+        }
+    } else {
         &display_addblocker_table($r,$blockcount,\%ltext,\%intervals,
                                   $navmap,$errormsg);
         if ($blockcount > 0) {
             $r->print('</div>');
         }
     }
+
 # ------------------------------------------------ Interface for existing blocks
-    if (!$blockcount) {
-        if ($readonly) {
-            $r->print($lt{'ncbc'}.'<br />');
-        }
-    } else {
+    if ($blockcount > 0) {
         &display_blocker_status($r,\%records,\%ltext,\%intervals,
                                 $navmap,$errormsg,$blockcount,$readonly);
     }
@@ -1135,6 +1094,7 @@ ACT
                       $ltext->{'endd'}.':&nbsp;&nbsp;'.$endform.'</fieldset></td>');
         } elsif ($record =~ /^firstaccess____(.+)$/) {
             my $item = $1;
+            my ($itemname,$iteminfo,$skipdetails);
             my $type = 'map';
             my $url;
             if ($item eq 'course') {
@@ -1146,8 +1106,118 @@ ACT
                 $url = $item;
             }
             $r->print('<td><fieldset><legend>'.$ltext->{'trig'}.'</legend>');
-            my ($itemname,$iteminfo) = &interval_details($item,$type,$url,$navmap,$intervals,$parmcount);
-            $r->print(&create_interval_form($intervals,$parmcount,$navmap,'blocking',$item,$jschg,
+            if ($type eq 'course') {
+                $itemname = &mt('Timer for all items in course.');
+            } else {
+                if (&Apache::lonnet::is_on_map($url)) { 
+                    if ($type eq 'map') {
+                        if (ref($navmap)) {
+                            my $title;
+                            my $resobj = $navmap->getResourceByUrl($item);
+                            if (ref($resobj)) { 
+                                $title = $resobj->compTitle();
+                            } else {
+                                $title = &Apache::lonnet::gettitle($item);
+                            }
+                            $itemname = &mt('Timer for all items in folder: [_1]',
+                                            '<span style="font-style:italic">'.
+                                            $title.'</span>');
+                        }
+                    } else {
+                        if (ref($navmap)) {
+                            my $title;
+                            my $resobj = $navmap->getBySymb($item);
+                            if (ref($resobj)) {
+                                $title = $resobj->compTitle();
+                            } else {
+                                $title = &Apache::lonnet::gettitle($item);
+                            }
+                            $itemname = &mt('Timer for resource: [_1]',
+                                             '<span style="font-style:italic">'.
+                                             $title.'</span>');
+                        }
+                    }
+                    if (ref($navmap)) {
+                        my $path = &show_timer_path($type,$item);
+                        if ($path) {
+                            $iteminfo  = ' <span style="font-size:90%;">'.
+                                         &mt('(in: [_1])',$path).
+                                         '</span>';
+                        }
+                    }
+                } else {
+                    $skipdetails = 1;
+                    $itemname = '<span style="LC_warning">'.
+                                &mt('Timer folder/resource not in course').
+                                '</span>';  
+                }
+            }
+            if ((!$skipdetails) && (ref($intervals) eq 'HASH')) {
+                if (ref($intervals->{$type}) eq 'HASH') {
+                    $iteminfo .= &trigger_details_toggle($parmcount).
+                                '<ul id="trigdetails_'.$parmcount.'" style="display:none">';
+                    if ($type eq 'course') {
+                        foreach my $scope (keys(%{$intervals->{$type}})) {
+                            if ($scope eq 'all') {
+                                $iteminfo .= '<li>'.&mt('All users -- time limit: [_1]',
+                                         &convlim($intervals->{$type}->{$scope})).'</li>';
+                            } elsif ($scope eq 'secgrp') {
+                                if (ref($intervals->{$type}->{$scope}) eq 'HASH') {
+                                    $iteminfo .= '<li>'.&mt('Sections/groups').'<ul>';
+                                    foreach my $item (sort(keys(%{$intervals->{$type}->{$scope}}))) {
+                                        $iteminfo .= '<li>'.&mt('[_1] -- time limit: [_2]',$item,
+                                                     &convlim($intervals->{$type}->{$scope}->{$item})).
+                                                     '</li>';
+                                    }
+                                    $iteminfo .= '</ul></li>';
+                                }
+                            } elsif ($scope eq 'users') {
+                                if (ref($intervals->{$type}->{$scope}) eq 'HASH') {
+                                    $iteminfo .= '<li>'.&mt('Users').'<ul>'; 
+                                    foreach my $item (sort(keys(%{$intervals->{$type}->{$scope}}))) {
+                                        $iteminfo .= '<li>'.&mt('[_1] -- time limit: [_2]',
+                                                     &convlim($item,$intervals->{$type}->{$scope}->{$item})).
+                                                     '</li>';
+                                    }
+                                    $iteminfo .= '</ul></li>';
+                                }
+                            }
+                        }
+                    } elsif (($type eq 'map') || ($type eq 'resource')) {
+                        if (ref($intervals->{$type}->{$item}) eq 'HASH') { 
+                            foreach my $scope (keys(%{$intervals->{$type}->{$item}})) {
+                                if ($scope eq 'all') {
+                                    $iteminfo .= '<li>'.&mt('All users -- time limit: [_1]',
+                                                  &convlim($intervals->{$type}->{$item}->{$scope})).
+                                                  '</li>';
+                                } elsif ($scope eq 'secgrp') {
+                                    if (ref($intervals->{$type}->{$item}->{$scope}) eq 'HASH') {
+                                        $iteminfo .= '<li>'.&mt('Sections/groups').'<ul>';
+                                        foreach my $sec (sort(keys(%{$intervals->{$type}->{$item}->{$scope}}))) {
+                                            $iteminfo .= '<li>'.&mt('[_1] -- time limit: [_2]',$sec,
+                                                         &convlim($intervals->{$type}->{$item}->{$scope}->{$sec})).
+                                                         '</li>';
+                                        }
+                                        $iteminfo .= '</ul></li>'; 
+                                    }
+                                } elsif ($scope eq 'users') {
+                                    if (ref($intervals->{$type}->{$item}->{$scope}) eq 'HASH') {
+                                        $iteminfo .= '<li>'.&mt('Users').'<ul>';
+                                        foreach my $user (sort(keys(%{$intervals->{$type}->{$item}->{$scope}}))) {
+                                            $iteminfo .= '<li>'.&mt('[_1] -- time limit: [_2]',$user,
+                                                         &convlim($intervals->{$type}->{$item}->{$scope}->{$user})).
+                                                         '</li>';
+                                        }
+                                        $iteminfo .= '</ul></li>';
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    $iteminfo .= '</ul>';
+                }
+            }
+            $r->print(&create_interval_form($intervals,$parmcount,$navmap,$item,$jschg,
                                             $itemname,$iteminfo,$disabled).'</fieldset></td>');
         }
         $r->print(<<"END");
@@ -1211,7 +1281,7 @@ sub display_addblocker_table {
     my %lt = &Apache::lonlocal::texthash(
         'exam' => 'e.g., Exam 1',
     );
-    my $intervalform = &create_interval_form($intervals,$parmcount,$navmap,'blocking');
+    my $intervalform = &create_interval_form($intervals,$parmcount,$navmap);
     if ($intervalform ne '') {
         $intervalform = '<fieldset>'.
                         '<legend>'.$ltext->{'chtr'}.'</legend>'.
@@ -1335,10 +1405,9 @@ sub blocker_checkboxes {
 }
 
 sub create_interval_form {
-    my ($intervals,$parmcount,$navmap,$context,$currkey,$jschg,$itemname,$iteminfo,$disabled) = @_;
+    my ($intervals,$parmcount,$navmap,$currkey,$jschg,$itemname,$iteminfo,$disabled) = @_;
     return unless ((ref($intervals) eq 'HASH') && (ref($navmap)));
     my $intervalform;
-    my $counter = 0;
     if (keys(%{$intervals}) > 0) {
         foreach my $type (sort(keys(%{$intervals}))) {
             if ($type eq 'course') {
@@ -1358,14 +1427,8 @@ sub create_interval_form {
                 $intervalform .= '</label>';
                 if ($currkey eq 'course') {
                     $intervalform .= $iteminfo;
-                } elsif ($context eq 'accesstimes') {
-                    (undef,$iteminfo) = &interval_details('course',$type,'',$navmap,$intervals,$counter);
-                    if ($iteminfo) {
-                        $intervalform .= ' '.$iteminfo;
-                    }
                 }
                 $intervalform .= '<br />';
-                $counter ++;
             } elsif ($type eq 'map') {
                 if (ref($intervals->{$type}) eq 'HASH') {
                     if (ref($navmap)) {
@@ -1400,15 +1463,8 @@ sub create_interval_form {
                                 $intervalform .= &mt('Timer for all items in folder: [_1]',
                                                      '<i>'.$title.'</i>').
                                                  '</label>'.$path;
-                                if ($context eq 'accesstimes') {
-                                    (undef,$iteminfo) = &interval_details($map,$type,$map,$navmap,$intervals,$counter);
-                                    if ($iteminfo) {
-                                        $intervalform .= ' '.$iteminfo;
-                                    }
-                                }
                             }
                             $intervalform .= '<br />';
-                            $counter ++;
                         }
                     }
                 }
@@ -1435,8 +1491,7 @@ sub create_interval_form {
                                 my ($title,$path,$hierarchy);
                                 if (ref($resobj)) {
                                     $title = $resobj->compTitle();
-                                }
-                                if ($title eq '') {
+                                } else {
                                     $title = &Apache::lonnet::gettitle($resource);
                                 }
                                 $hierarchy = &show_timer_path($type,$resource,$navmap);
@@ -1448,19 +1503,8 @@ sub create_interval_form {
                                 $intervalform .= &mt('Timer for resource: [_1]','<i>'.$title.'</i>').
                                                  '</label>'.
                                                  $path;
-                                if ($context eq 'accesstimes') {
-                                    if (ref($resobj)) {
-                                        my $url = $resobj->src();
-                                        if ($url eq '') {
-                                            (my $map, my $resid, $url) = &Apache::lonnet::decode_symb($resource);
-                                        }
-                                        ($itemname,$iteminfo) = &interval_details($resource,$type,$url,$navmap,$intervals,$counter);
-                                        $intervalform .= ' '.$iteminfo;
-                                    }
-                                }
                             }
                             $intervalform .= '<br />';
-                            $counter ++;
                         }
                     }
                 }
@@ -1488,121 +1532,6 @@ sub trigger_details_toggle {
            'style="text-decoration: none;"><b>'.&mt('(More ...)').'</b></a></span>';
 }
 
-sub interval_details {
-    my ($item,$type,$url,$navmap,$intervals,$parmcount) = @_;
-    my ($itemname,$iteminfo,$skipdetails);
-    if ($type eq 'course') {
-        $itemname = &mt('Timer for all items in course.');
-    } else {
-        if (&Apache::lonnet::is_on_map($url)) {
-            if ($type eq 'map') {
-                if (ref($navmap)) {
-                    my $title;
-                    my $resobj = $navmap->getResourceByUrl($item);
-                    if (ref($resobj)) {
-                        $title = $resobj->compTitle();
-                    } else {
-                        $title = &Apache::lonnet::gettitle($item);
-                    }
-                    $itemname = &mt('Timer for all items in folder: [_1]',
-                                    '<span style="font-style:italic">'.
-                                    $title.'</span>');
-                }
-            } else {
-                if (ref($navmap)) {
-                    my $title;
-                    my $resobj = $navmap->getBySymb($item);
-                    if (ref($resobj)) {
-                        $title = $resobj->compTitle();
-                    } else {
-                        $title = &Apache::lonnet::gettitle($item);
-                    }
-                    $itemname = &mt('Timer for resource: [_1]',
-                                    '<span style="font-style:italic">'.
-                                    $title.'</span>');
-                }
-            }
-            if (ref($navmap)) {
-                my $path = &show_timer_path($type,$item);
-                if ($path) {
-                   $iteminfo  = ' <span style="font-size:90%;">'.
-                                  &mt('(in: [_1])',$path).
-                                  '</span>';
-                }
-            }
-        } else {
-            $skipdetails = 1;
-            $itemname = '<span style="LC_warning">'.
-                        &mt('Timer folder/resource not in course').
-                        '</span>';
-        }
-    }
-    if ((!$skipdetails) && (ref($intervals) eq 'HASH') && (ref($intervals->{$type}) eq 'HASH')) {
-        $iteminfo = &trigger_details_toggle($parmcount).
-                    '<ul id="trigdetails_'.$parmcount.'" style="display:none">';
-        if ($type eq 'course') {
-            foreach my $scope (keys(%{$intervals->{$type}})) {
-                if ($scope eq 'all') {
-                    $iteminfo .= '<li>'.&mt('All users -- time limit: [_1]',
-                                 &convlim($intervals->{$type}->{$scope})).'</li>';
-                } elsif ($scope eq 'secgrp') {
-                    if (ref($intervals->{$type}->{$scope}) eq 'HASH') {
-                        $iteminfo .= '<li>'.&mt('Sections/groups').'<ul>';
-                        foreach my $item (sort(keys(%{$intervals->{$type}->{$scope}}))) {
-                            $iteminfo .= '<li>'.&mt('[_1] -- time limit: [_2]',$item,
-                                         &convlim($intervals->{$type}->{$scope}->{$item})).
-                                         '</li>';
-                        }
-                        $iteminfo .= '</ul></li>';
-                    }
-                } elsif ($scope eq 'users') {
-                    if (ref($intervals->{$type}->{$scope}) eq 'HASH') {
-                        $iteminfo .= '<li>'.&mt('Users').'<ul>';
-                        foreach my $item (sort(keys(%{$intervals->{$type}->{$scope}}))) {
-                            $iteminfo .= '<li>'.&mt('[_1] -- time limit: [_2]',
-                                         &convlim($item,$intervals->{$type}->{$scope}->{$item})).
-                                         '</li>';
-                        }
-                        $iteminfo .= '</ul></li>';
-                    }
-                }
-            }
-        } elsif (($type eq 'map') || ($type eq 'resource')) {
-            if (ref($intervals->{$type}->{$item}) eq 'HASH') {
-                foreach my $scope (keys(%{$intervals->{$type}->{$item}})) {
-                    if ($scope eq 'all') {
-                        $iteminfo .= '<li>'.&mt('All users -- time limit: [_1]',
-                                     &convlim($intervals->{$type}->{$item}->{$scope})).
-                                     '</li>';
-                    } elsif ($scope eq 'secgrp') {
-                        if (ref($intervals->{$type}->{$item}->{$scope}) eq 'HASH') {
-                            $iteminfo .= '<li>'.&mt('Sections/groups').'<ul>';
-                            foreach my $sec (sort(keys(%{$intervals->{$type}->{$item}->{$scope}}))) {
-                                $iteminfo .= '<li>'.&mt('[_1] -- time limit: [_2]',$sec,
-                                             &convlim($intervals->{$type}->{$item}->{$scope}->{$sec})).
-                                            '</li>';
-                            }
-                            $iteminfo .= '</ul></li>';
-                        }
-                    } elsif ($scope eq 'users') {
-                        if (ref($intervals->{$type}->{$item}->{$scope}) eq 'HASH') {
-                            $iteminfo .= '<li>'.&mt('Users').'<ul>';
-                            foreach my $user (sort(keys(%{$intervals->{$type}->{$item}->{$scope}}))) {
-                                $iteminfo .= '<li>'.&mt('[_1] -- time limit: [_2]',$user,
-                                             &convlim($intervals->{$type}->{$item}->{$scope}->{$user})).
-                                             '</li>';
-                            }
-                            $iteminfo .= '</ul></li>';
-                        }
-                    }
-                }
-            }
-        }
-        $iteminfo .= '</ul>';
-    }
-    return ($itemname,$iteminfo);
-}
-
 sub show_timer_path {
     my ($type,$item,$navmap) = @_;
     return unless(ref($navmap));
@@ -1639,6 +1568,10 @@ sub blocktype_text {
 
 sub blockingmenu_javascript {
     my ($blockcount) = @_;
+    my %lt = &Apache::lonlocal::texthash (
+                                           more => 'More ...',
+                                           less => 'Less ...',
+                                         );
     return <<ENDSCRIPT;
 <script type="text/javascript">
 // <![CDATA[
@@ -1694,22 +1627,6 @@ function toggleAddModify() {
     return;
 }
 
-// ]]>
-</script>
-ENDSCRIPT
-
-}
-
-sub details_javascript {
-    my %lt = &Apache::lonlocal::texthash (
-                                           more => 'More ...',
-                                           less => 'Less ...',
-                                         );
-    return <<ENDSCRIPT;
-
-<script type="text/javascript">
-// <![CDATA[
-
 function showTriggerDetails(item) {
     document.getElementById('trigdetails_'+item).style.display='block';
     document.getElementById('trigdetails_'+item).style.textAlign='left';