--- loncom/interface/lonparmset.pm	2009/04/05 17:31:04	1.442
+++ loncom/interface/lonparmset.pm	2009/05/08 22:47:01	1.445
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.442 2009/04/05 17:31:04 droeschl Exp $
+# $Id: lonparmset.pm,v 1.445 2009/05/08 22:47:01 neumanie Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1321,7 +1321,8 @@ sub parmmenu {
 
 </script>
 ENDSCRIPT
-    $r->print();
+    $r->print();    
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
     $r->print("\n".'<table id="LC_parm_overview_parm_menu"><tr>');
     my $cnt=0;
     foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
@@ -1382,7 +1383,8 @@ ENDSCRIPT
 }
 
 sub partmenu {
-    my ($r,$allparts,$psprt)=@_;
+    my ($r,$allparts,$psprt)=@_;    
+    
     $r->print('<select multiple="multiple" name="psprt" size="8">');
     $r->print('<option value="all"');
     $r->print(' selected="selected"') unless (@{$psprt});
@@ -1400,7 +1402,7 @@ sub partmenu {
 	    $r->print('>'.$$allparts{$tempkey}.'</option>');
 	}
     }
-    $r->print('</select>');
+    $r->print('</select>');    
 }
 
 sub usermenu {
@@ -1417,7 +1419,7 @@ sub usermenu {
 
     my $g_s_header='';
     my $g_s_footer='';
-
+    
     if (%sectionhash) {
         $sections=&mt('Section:').' <select name="csec"';
         if (%grouphash && $parmlev ne 'full') {
@@ -1484,38 +1486,35 @@ function group_or_section(caller) {
     }
 
     if (%sectionhash || %grouphash) {
-        $g_s_header='<fieldset><legend>'.&mt('Group/Section').'</legend><div>';
-        $g_s_footer='</div></fieldset>';
+        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group/Section')));       
+        $r->print($sections.$groups);        
     }
-
-    $r->print('<b>'
-             .$g_s_header
-             .$sections
-             .$groups
-             .$g_s_footer
-             .'<fieldset><legend>'.&mt('User').'</legend><div>'
-             .&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
+    
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('User')));             
+    $r->print(&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
                  ,'<input type="text" value="'.$uname.'" size="12" name="uname" />'
                  ,'<input type="text" value="'.$id.'" size="12" name="id" /> '
-                 ,$chooseopt)
-             .'</div></fieldset>'
-             .'</b>'
-    );
+                 ,$chooseopt));  
 }
 
 sub displaymenu {
     my ($r,$allparms,$allparts,$pscat,$psprt,$keyorder)=@_;
-    $r->print('<table border="1"><tr><th>'.&mt('Select Parameters to View').'</th><th>'.
-	     &mt('Select Parts to View').'</th></tr><tr><td>');  
+    $r->print('<div class="LC_ContentBoxSpecial">');
+    $r->print('<h2 class="LC_hcell">Step 2</h2>');
+    $r->print('<div class="LC_BoxPadding">' );
+    $r->print(&Apache::lonhtmlcommon::start_pick_box());
+    
     &parmmenu($r,$allparms,$pscat,$keyorder);
-    $r->print('</td><td valign="top" align="center">');
+   $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
     &partmenu($r,$allparts,$psprt);
-    $r->print('</td></tr></table>');
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
+    $r->print('</div></div>');
 }
 
 sub mapmenu {
-    my ($r,$allmaps,$pschp,$maptitles)=@_;
-    $r->print('<b>'.&mt('Select Enclosing Map or Folder').'</b> ');
+    my ($r,$allmaps,$pschp,$maptitles)=@_; 
+   
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Enclosing Map or Folder')));
     $r->print('<select name="pschp">');
     $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
     foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {
@@ -1524,12 +1523,13 @@ sub mapmenu {
 	$r->print('>'.$$maptitles{$_}.($$allmaps{$_}!~/^uploaded/?' ['.$$allmaps{$_}.']':'').'</option>');
     }
     $r->print("</select>");
+   
 }
 
 sub levelmenu {
-    my ($r,$alllevs,$parmlev)=@_;
-    $r->print('<b>'.&mt('Select Parameter Level').
-	      &Apache::loncommon::help_open_topic('Course_Parameter_Levels').'</b> ');
+    my ($r,$alllevs,$parmlev)=@_;    
+    
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameter Level').&Apache::loncommon::help_open_topic('Course_Parameter_Levels')));
     $r->print('<select name="parmlev">');
     foreach (reverse sort keys %{$alllevs}) {
 	$r->print('<option value="'.$$alllevs{$_}.'"');
@@ -1538,7 +1538,7 @@ sub levelmenu {
 	}
 	$r->print('>'.&mt($_).'</option>');
     }
-    $r->print("</select>");
+    $r->print("</select>");    
 }
 
 
@@ -1862,15 +1862,21 @@ sub assessparms {
     }
                         
     if (!$pssymb) {
-        $r->print('<table border="1"><tr><td>');
+	
+        $r->print('<div class="LC_ContentBoxSpecial">');
+        $r->print('<h2 class="LC_hcell">Step 1</h2>');
+        $r->print('<div class="LC_BoxPadding">' );
+        $r->print(&Apache::lonhtmlcommon::start_pick_box());
+       
         &levelmenu($r,\%alllevs,$parmlev);
-        $r->print('</td>');
-	if ($parmlev ne 'general') {
-            $r->print('<td>');
-	    &mapmenu($r,\%allmaps,$pschp,\%maptitles);
-	    $r->print('</td>');
-	}
-        $r->print('</tr></table>');
+       
+	if ($parmlev ne 'general') {           
+	    &mapmenu($r,\%allmaps,$pschp,\%maptitles);	    
+	}
+           
+        $r->print(&Apache::lonhtmlcommon::end_pick_box());        
+        $r->print('</div></div>');
+
 	&displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
     } else {
         my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
@@ -1880,7 +1886,14 @@ sub assessparms {
 		  '<br /><label><b>'.&mt('Show all parts').': <input type="checkbox" name="psprt" value="all"'.
 		  ($env{'form.psprt'}?' checked="checked"':'').' /></b></label><br />');
     }
-    &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);    
+    $r->print('<div class="LC_ContentBoxSpecial">');
+    $r->print('<h2 class="LC_hcell">Step 3</h2>');
+    $r->print('<div class="LC_BoxPadding">' );
+    $r->print(&Apache::lonhtmlcommon::start_pick_box());
+    &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
+   
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
+    $r->print('</div></div>');
 
     $r->print('<p>'.$message.'</p>');
 
@@ -3590,21 +3603,32 @@ ENDOVER
     }
 # Menu to select levels, etc
 
-    $r->print('<table id="LC_parm_overview_scope">
-               <tr><td class="LC_parm_overview_level_menu">');
+    #$r->print('<table id="LC_parm_overview_scope">
+    #           <tr><td class="LC_parm_overview_level_menu">');
+    $r->print('<div class="LC_ContentBoxSpecial">');
+    #$r->print('<h2 class="LC_hcell">Step 1</h2>');
+    $r->print('<div class="LC_BoxPadding">' );
+    $r->print(&Apache::lonhtmlcommon::start_pick_box());
     &levelmenu($r,\%alllevs,$parmlev);
     if ($parmlev ne 'general') {
-	$r->print('<td class="LC_parm_overview_map_menu">');
+	#$r->print('<td class="LC_parm_overview_map_menu">');
 	&mapmenu($r,\%allmaps,$pschp,\%maptitles);
-	$r->print('</td>');
+	#$r->print('</td>');
     }
-    $r->print('</td></tr></table>');
-
-    $r->print('<table id="LC_parm_overview_controls">
-               <tr><td class="LC_parm_overview_parm_selectors">');  
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
+    $r->print('</div></div>');
+    #$r->print('</td></tr></table>');
+    
+    #$r->print('<table id="LC_parm_overview_controls">
+    #           <tr><td class="LC_parm_overview_parm_selectors">');
+    $r->print('<div class="LC_ContentBoxSpecial">');
+    $r->print('<div class="LC_BoxPadding">' );
+    $r->print(&Apache::lonhtmlcommon::start_pick_box());  
     &parmmenu($r,\%allparms,\@pscat,\%keyorder);
-    $r->print('</td><td class="LC_parm_overview_restrictions">
-                <table class="LC_parm_overview_restrictions">'.
+
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));    
+    #$r->print('</td><td class="LC_parm_overview_restrictions">'.
+     $r->print('<table>'.
               '<tr><th>'.&mt('Parts').'</th><th>'.&mt('Section(s)').
               '</th><th>'.&mt('Group(s)').'</th></tr><tr><td>');
     &partmenu($r,\%allparts,\@psprt);
@@ -3613,14 +3637,19 @@ ENDOVER
     $r->print('</td><td>');
     &groupmenu($r,\@selected_groups);
     $r->print('</td></tr></table>');
-    $r->print('</td></tr></table>');
- 
+    #$r->print('</td></tr></table>');
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
+    $r->print('</div></div>');
+
+    $r->print('<div class="LC_ContentBoxSpecial">');
+    $r->print('<div class="LC_BoxPadding">' );
     my $sortorder=$env{'form.sortorder'};
     unless ($sortorder) { $sortorder='realmstudent'; }
     &sortmenu($r,$sortorder);
-
+    $r->print('</div></div>');
+   
     $r->print('<p><input type="submit" name="dis" value="'.&mt('Display').'" /></p>');
-
+    
 # Build the list data hash from the specified parms
 
     my $listdata;
@@ -4575,12 +4604,12 @@ ENDINPUTDATE
 	} elsif ($defkeytype{$tempkey} eq 'string_yesno') {
             my $yeschecked='';
             my $nochecked='';
-            if (&rulescache($tempkey.'_value') eq 'yes') { $yeschecked='checked="checked"'; }
-            if (&rulescache($tempkey.'_value') eq 'no') { $nochecked='checked="checked"'; }
+            if (&rulescache($tempkey.'_value') eq 'yes') { $yeschecked=' checked="checked"'; }
+            if (&rulescache($tempkey.'_value') eq 'no') { $nochecked=' checked="checked"'; }
 
 	    $r->print(<<ENDYESNO);
-<label><input type="radio" name="$tempkey\_value" value="yes" $yeschecked /> $lt{'yes'}</label><br />
-<label><input type="radio" name="$tempkey\_value" value="no" $nochecked /> $lt{'no'}</label>
+<label><input type="radio" name="$tempkey\_value" value="yes"$yeschecked /> $lt{'yes'}</label><br />
+<label><input type="radio" name="$tempkey\_value" value="no"$nochecked /> $lt{'no'}</label>
 ENDYESNO
         } else {
 	    $r->print('<input type="text" size="20" name="'.$tempkey.'_value" value="'.&rulescache($tempkey.'_value').'" />');