[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonhelper.pm

[raeburn]

raeburn		Mon Sep  3 16:23:25 2018 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonhelper.pm 
  Log:
  - For 2.11
    Backport 1.199, 1.200, 1.201
  
  
Index: loncom/interface/lonhelper.pm
diff -u loncom/interface/lonhelper.pm:1.197 loncom/interface/lonhelper.pm:1.197.2.1
--- loncom/interface/lonhelper.pm:1.197	Fri Aug 28 22:44:59 2015
+++ loncom/interface/lonhelper.pm	Mon Sep  3 16:23:25 2018
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.197 2015/08/28 22:44:59 raeburn Exp $
+# $Id: lonhelper.pm,v 1.197.2.1 2018/09/03 16:23:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1800,7 +1800,7 @@
 	if (lc($time) eq 'anytime') {
 	    $anytime=1;
 	    $date = &get_date_object(time);
-	    $date->min(0);
+            $date->set_minute(0); 
 	} elsif (defined($time) && $time ne 0) {
 	    $date = &get_date_object($time);
 	} else {
@@ -1810,7 +1810,7 @@
 
     if (!defined($date)) {
 	$date = &get_date_object(time);
-	$date->min(0);
+        $date->set_minute(0);
     }
 
     if ($anytime) {
@@ -2047,7 +2047,9 @@
 and long status display columns to the display. The 'addparts'
 attribute will add in a part selector beside problems that have more
 than 1 part. The 'includecourse' attribute if true, will include
-the toplevel default.sequence in the results.
+the toplevel default.sequence in the results. The 'modalLink' attribute,
+if true, will cause links to be launched as modal pop-ups, instead of 
+replacing the resource selection listing, currently being displayed.
 
 =head3 SUB-TAGS
 
@@ -2159,6 +2161,7 @@
     $paramHash->{'toponly'} = $token->[2]{'toponly'};
     $paramHash->{'addstatus'} = $token->[2]{'addstatus'};
     $paramHash->{'addparts'} = $token->[2]{'addparts'};
+    $paramHash->{'modalLink'} = $token->[2]{'modallink'};
     if ($paramHash->{'addparts'}) {
 	$helper->declareVar($paramHash->{'variable'}.'_part');
     }
@@ -2365,6 +2368,7 @@
     my $option_texts   = $self->{OPTION_TEXTS};
     my $option_types   = $self->{OPTION_TYPES};
     my $addparts       = $self->{'addparts'};
+    my $modalLink      = $self->{'modalLink'};
     my $headings_done  = 0;
 
     # Evaluate the map url as needed
@@ -2464,7 +2468,7 @@
 			    $resource_name . "'/> </td>";
 		    } else {
 			$col .= 
-			    "<td align='center'><input type=$option_type name ='$option_var".
+			    "<td align='center'><input type='$option_type' name ='$option_var".
 			    "_forminput' value='".
 			    $resource_name . "' $checked /> </td>";
 		    }
@@ -2549,7 +2553,8 @@
                                        'suppressEmptySequences' => $self->{'suppressEmptySequences'},
 				       'include_top_level_map' => $self->{'include_top_level_map'},
                                        'iterator_map' => $mapUrl,
-                                       'map_no_edit_link' => 1, } 
+                                       'map_no_edit_link' => 1,
+                                       'modalLink' => $modalLink, } 
                                        );
 
     $result .= $buttons;