--- loncom/interface/lonprintout.pm	2008/12/06 12:49:18	1.546
+++ loncom/interface/lonprintout.pm	2009/02/18 07:06:15	1.549
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.546 2008/12/06 12:49:18 bisitz Exp $
+# $Id: lonprintout.pm,v 1.549 2009/02/18 07:06:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1543,7 +1543,7 @@ ENDPART
 	&Apache::lonnet::appenv({'construct.style' =>
 				$helper->{'VARS'}->{'style_file'}});
     } elsif ($env{'construct.style'}) {
-	&Apache::lonnet::delenv('construct\\.style');
+	&Apache::lonnet::delenv('construct.style');
     }
 
 
@@ -2487,17 +2487,23 @@ sub get_randomly_ordered_warning {
 
     my $postdata = $env{'form.postdata'} || $helper->{VARS}{'postdata'};
     my $navmap = Apache::lonnavmaps::navmap->new();
-    my $res = $navmap->getResourceByUrl($map);
-    if ($res) {
-	my $func = 
-	    sub { return ($_[0]->is_map() && $_[0]->randomorder); };
-	my @matches = $navmap->retrieveResources($res, $func,1,1,1);
-	if (@matches) {
-	    $message = "Some of the items below are in folders set to be randomly ordered. However, when printing the contents of these folders, they will be printed in the original order for all students, not the randomized order.";
-	}
-    }
-    if ($message) {
-	return '<message type="warning">'.$message.'</message>';
+    if (defined($navmap)) {
+        my $res = $navmap->getResourceByUrl($map);
+        if ($res) {
+	    my $func = 
+	        sub { return ($_[0]->is_map() && $_[0]->randomorder); };
+	    my @matches = $navmap->retrieveResources($res, $func,1,1,1);
+	    if (@matches) {
+	        $message = "Some of the items below are in folders set to be randomly ordered. However, when printing the contents of these folders, they will be printed in the original order for all students, not the randomized order.";
+	    }
+        }
+        if ($message) {
+	    return '<message type="warning">'.$message.'</message>';
+        }
+    } else {
+        &Apache::lonnet::logthis('Retrieval of resources to check for folders set to be randomly ordered failed - could not create navmap object');
+        $message = "Retrieval of information about ordering of resources failed."; 
+        return '<message type="warning">'.$message.'</message>';
     }
     return;
 }
@@ -3630,50 +3636,36 @@ sub render {
     }  else {
 	$size{'margin'} += 2.54;
     }
-    my %text = ('format' => 'How should each column be formatted?',
-		'width'  => 'Width:',
-		'height' => 'Height:',
-		'margin' => 'Left Margin:',);
-    %text = &Apache::lonlocal::texthash(%text);
-
-    $result .= <<ELEMENTHTML;
-
-<p>$text{'format'}</p>
-
-<table cellpadding='3'>
-  <tr>
-    <td align='right'><b>$text{'width'}</b></td>
-    <td align='left'><input type='text' name='$var.width' value="$size{'width'}" size='4' /></td>
-    <td align='left'>
-      <select name='$var.widthunit'>
-      $size{'width_options'}
-      </select>
-    </td>
-  </tr>
-  <tr>
-    <td align='right'><b>$text{'height'}</b></td>
-    <td align='left'><input type='text' name="$var.height" value="$size{'height'}" size='4' /></td>
-    <td align='left'>
-      <select name='$var.heightunit'>
-      $size{'height_options'}
-      </select>
-    </td>
-  </tr>
-  <tr>
-    <td align='right'><b>$text{'margin'}</b></td>
-    <td align='left'><input type='text' name='$var.lmargin' value="$size{'margin'}" size='4' /></td>
-    <td align='left'>
-      <select name='$var.lmarginunit'>
-      $size{'margin_options'}
-      </select>
-    </td>
-  </tr>
-</table>
-
-<!--<p>Hint: Some instructors like to leave scratch space for the student by
-making the width much smaller than the width of the page.</p>-->
-
-ELEMENTHTML
+    my %lt = &Apache::lonlocal::texthash(
+        'format' => 'How should each column be formatted?',
+        'width'  => 'Width',
+        'height' => 'Height',
+        'margin' => 'Left Margin'
+    );
+
+    $result .= '<p>'.$lt{'format'}.'</p>'
+              .&Apache::lonhtmlcommon::start_pick_box()
+              .&Apache::lonhtmlcommon::row_title($lt{'width'})
+              .'<input type="text" name="'.$var.'.width" value="'.$size{'width'}.'" size="4" />'
+              .'<select name="'.$var.'.widthunit">'
+              .$size{'width_options'}
+              .'</select>'
+              .&Apache::lonhtmlcommon::row_closure()
+              .&Apache::lonhtmlcommon::row_title($lt{'height'})
+              .'<input type="text" name="'.$var.'.height" value="'.$size{'height'}.'" size="4" />'
+              .'<select name="'.$var.'.heightunit">'
+              .$size{'height_options'}
+              .'</select>'
+              .&Apache::lonhtmlcommon::row_closure()
+              .&Apache::lonhtmlcommon::row_title($lt{'margin'})
+              .'<input type="text" name="'.$var.'.lmargin" value="'.$size{'margin'}.'" size="4" />'
+              .'<select name="'.$var.'.lmarginunit">'
+              .$size{'margin_options'}
+              .'</select>'
+              .&Apache::lonhtmlcommon::row_closure(1)
+              .&Apache::lonhtmlcommon::end_pick_box();
+    # <p>Hint: Some instructors like to leave scratch space for the student by
+    # making the width much smaller than the width of the page.</p>
 
     return $result;
 }