--- loncom/interface/lonblockingmenu.pm	2012/03/31 14:15:24	1.4
+++ loncom/interface/lonblockingmenu.pm	2012/04/05 21:36:28	1.7
@@ -2,7 +2,7 @@
 # Routines for configuring blocking of access to collaborative functions, 
 # and specific resources during an exam
 #
-# $Id: lonblockingmenu.pm,v 1.4 2012/03/31 14:15:24 raeburn Exp $
+# $Id: lonblockingmenu.pm,v 1.7 2012/04/05 21:36:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -506,7 +506,7 @@ sub handler {
     }
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>'/adm/setblock',
-          text=>'Blocking communication/resource access'});
+          text=>'Blocking communication/content access'});
 
     my $js = &blockingmenu_javascript($blockcount);
 
@@ -565,6 +565,7 @@ sub handler {
             '<li>'.&mt("displaying LON-CAPA messages sent by other $usertype in the $lctype").'</li>'."\n".
             '<li>'.&mt("displaying or posting to LON-CAPA discussion boards or live chat in the $lctype").'</li>'."\n".
             '<li>'.&mt('accessing content in LON-CAPA portfolios or blogs').'</li>'."\n".
+            '<li>'.&mt("generating printouts of $lctype content").'</li>'.
             '<li>'.&mt("accessing $lctype content in specified folders or resources").'</li>'.
             '</ul>'.
             '<p class="LC_warning">'.$lt{'blca'}.'<br />'.$lt{'pobl'}.'</p>'
@@ -754,6 +755,11 @@ sub blockstore {
                 if ($blockdocs) {
                     &check_release_required('docs');
                 }
+                if (ref($blocktypes) eq 'HASH') {
+                    if ($blocktypes->{'printout'} eq 'on') {
+                        &check_release_required('printout');
+                    }
+                }
                 if (exists($removals{$key})) {
                     $modtotal ++;
                 } else {
@@ -1175,7 +1181,9 @@ sub convlim {
     my @toshow;
     foreach my $cat (@order) {
         if ($cat eq 'seconds') {
-            last if ($timelimit <= 0);
+            if ($timelimit > 0) {
+                push(@toshow,&mt("[_1] $cat",$timelimit));
+            }
         } elsif ($timelimit >= $catlimits{$cat}) {
             my $val = int($timelimit/$catlimits{$cat});
             if ($val > 0) {
@@ -1471,9 +1479,10 @@ sub blocktype_text {
         'port' => 'Portfolio',
         'groups' => 'Groups',
         'blogs' => 'Blogs',
-        'docs' => 'Content', 
+        'docs' => 'Content',
+        'printout' => 'Printouts',
     );
-    my $typeorder = ['com','chat','boards','port','groups','blogs','docs'];
+    my $typeorder = ['com','chat','boards','port','groups','blogs','printout','docs'];
     return ($typeorder,\%types);
 }