[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm

[foxr]

foxr		Tue Apr 18 06:03:46 2006 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  - Part of 3585 (there are other incomplete modifications elsewhere but this
    does no (further harm) .. latex errors on .page resources.. add some special
    case code for .page resources.
  - Part of 3809  - put a rule between the sort type and student selection on 
    print helper construction for print all resources/problems for selected
    students...per the mockup in the current accepted attachment.  There will
    be additional modifications, however they will live in lonhelper.pm.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.436 loncom/interface/lonprintout.pm:1.437
--- loncom/interface/lonprintout.pm:1.436	Fri Apr 14 15:42:19 2006
+++ loncom/interface/lonprintout.pm	Tue Apr 18 06:03:45 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.436 2006/04/14 19:42:19 albertel Exp $
+# $Id: lonprintout.pm,v 1.437 2006/04/18 10:03:45 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1119,6 +1119,8 @@
 	$selectionmade = 1;
 	if ($cleanURL!~m|^/adm/|
 	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+	    if ($cleanURL =~/\.page/) {
+	    }
 	    my $rndseed=time;
 	    my $texversion='';
 	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
@@ -1319,6 +1321,8 @@
 	    my $texversion='';
 	    if ($urlp!~m|^/adm/|
 		&& $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+		if ($urlp =!/\.page/) {
+		}
 		$resources_printed .= $urlp.':';
 
 		&Apache::lonxml::remember_problem_counter();
@@ -1824,6 +1828,8 @@
 	    if (&Apache::lonnet::allowed('bre',$res_url)) {
 		if ($res_url!~m|^ext/|
 		    && $res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+		    if ($res_url =~ /\.page/) {
+		    }
 		    $printed .= $curresline.':';
 
 		    &Apache::lonxml::remember_problem_counter();    
@@ -2260,6 +2266,7 @@
       <choice computer='0'>Sort by section then student</choice>
       <choice computer='1'>Sort by students across sections.</choice>
     </choices>
+      <message><br /><hr /><br /> </message>
       <student multichoice='1' variable="STUDENTS" nextstate="SELECT_PROBLEMS" coursepersonnel="1"/>
   </state>
     $resource_selector
@@ -2419,6 +2426,7 @@
       <choice computer='0'>Sort by section then student</choice>
       <choice computer='1'>Sort by students across sections.</choice>
     </choices>
+    <message><br /><hr /><br /></message>
     <student multichoice='1' variable="STUDENTS" nextstate="SELECT_RESOURCES" coursepersonnel="1" />
 
     </state>