--- loncom/interface/lonparmset.pm	2006/10/13 17:40:12	1.342
+++ loncom/interface/lonparmset.pm	2006/11/15 22:33:13	1.346
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.342 2006/10/13 17:40:12 banghart Exp $
+# $Id: lonparmset.pm,v 1.346 2006/11/15 22:33:13 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2193,7 +2193,7 @@ sub crsenv {
                     ' Tabloid [11x17 in], Executive [7 1/2x10 in], A2 [420x594 mm],'. 
                     ' A3 [297x420 mm], A4 [210x297 mm], A5 [148x210 mm], A6 [105x148 mm])',
 	     'print_header_format'
-	         => '<b>Print header format; substitutions:  %n student name %c course id %a assignment',
+	         => '<b>Print header format; substitutions</b>:  %n student name %c course id %a assignment note, numbers after the % limit the field size',
              'anonymous_quiz'
                  => '<b>'.&mt('Anonymous quiz/exam').'</b><br />'.
                     ' (<tt><b>'.&mt('yes').'</b> '.&mt('to avoid print students names').' </tt>)',
@@ -3188,8 +3188,15 @@ ENDMAINFORMHEAD
 }
 ### Set portfolio metadata
 sub output_row {
-    my ($r, $field_name, $field_text, $added_flag) = @_;
+    my ($r, $field_name, $field_text, $added_flag, $alt_row) = @_;
+    my $row_class;
+    if ($alt_row) {
+        $row_class = ' class="LC_metadata_light" ';
+    } else {
+        $row_class = ' class="LC_metadata_dark" ';
+    }
     my $output;
+    $output = "<tr $row_class>";
     my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
     my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
     if (!defined($options)) {
@@ -3197,9 +3204,10 @@ sub output_row {
         $values = '';
     }
     if (!($options =~ /deleted/)) {
-        $output.='<strong>'.$field_text.':</strong>';
-        $output.='<input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /><br />';
-
+        $output = "<tr $row_class>";
+        $output .= '<td><span class="LC_metadata"><strong>'.$field_text.':</strong></span></td>';
+        $output .= '<td><span class="LC_metadata"><input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></span></td>';
+        $output .= "</tr>\n";
         my @options= ( ['active', 'Show to student'],
 		   ['onlyone','Student may select only one choice'],
 		   ['stuadd', 'Student may type choices']);
@@ -3208,10 +3216,11 @@ sub output_row {
         }
         foreach my $opt (@options) {
 	    my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
-	    $output.=('&nbsp;'x5).'<label><input type="checkbox" name="'.
+	    $output .= '<tr '.$row_class.'><td colspan="2">'.('&nbsp;' x 5).'<span class="LC_metadata"><label><input type="checkbox" name="'.
 	        $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
-	        &mt($opt->[1]).'</label> <br />';
+	        &mt($opt->[1]).'</label></span> </td></tr>'."\n";
 	}
+	
     }
     return ($output);
 }
@@ -3221,7 +3230,11 @@ sub order_meta_fields {
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     $r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata Fields'));
+    &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>"/adm/parmset?action=setrestrictmeta",
+              text=>"Restrict Metadata"},
+             {text=>"Order Metadata"});
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata'));
     if ($env{'form.storeorder'}) {
         my $newpos = $env{'form.newpos'} - 1;
         my $currentpos = $env{'form.currentpos'} - 1;
@@ -3254,6 +3267,8 @@ sub order_meta_fields {
     	    }
         }
 	my $ordered_fields = join ",", @neworder;
+        my $put_result = &Apache::lonnet::put('environment',
+                           {'metadata.addedorder'=>$ordered_fields},$dom,$crs); 	
 	&Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields);
     }
     my $fields = &get_added_meta_fieldnames();
@@ -3386,27 +3401,31 @@ sub setrestrictmeta {
     my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
     # Now get possible added metadata fields
     my $added_metadata_fields = &get_added_meta_fieldnames(\%metadata_fields);
+    my $row_alt = 1;
+    $output .= '<table class="LC_metadata_table" cellspacing="0">';
     foreach my $field (sort(keys(%metadata_fields))) {
         if ($field ne 'courserestricted') {
-	    $output.= &output_row($r, $field, $metadata_fields{$field});
+            $row_alt = $row_alt ? 0 : 1;
+	    $output.= &output_row($r, $field, $metadata_fields{$field}, undef, $row_alt);
 	}
     }
     my $added_flag = 1;
     foreach my $field (sort(keys(%$added_metadata_fields))) {
-        $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag);
+        $row_alt = $row_alt ? 0 : 1;
+        $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt);
     }
+    $output .= "</table>";
     $r->print(<<ENDenv);       
         <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">
-        <p>
         $output
-        <input type="submit" name="restrictmeta" value="Update Metadata Restrictions">
+        <input type="submit" name="restrictmeta" value="Update Metadata Restrictions" />
         </form><br />
-        <form method="post" action="/adm/parmset?action=addmetadata" name="form">
-        <input type="submit" name="restrictmeta" value="Add a Metadata Field">
+        <form method="post" action="/adm/parmset?action=addmetadata" name="form1">
+        <input type="submit" name="restrictmeta" value="Add a Metadata Field" />
         </form>
-        </form><br />
-        <form method="post" action="/adm/parmset?action=ordermetadata" name="form">
-        <input type="submit" name="restrictmeta" value="Order Metadata Fields">
+        <br />
+        <form method="post" action="/adm/parmset?action=ordermetadata" name="form2">
+        <input type="submit" name="restrictmeta" value="Order Metadata Fields" />
         </form>
 ENDenv
     $r->print(&Apache::loncommon::end_page());