--- loncom/interface/lonparmset.pm 2009/05/12 10:54:11 1.446 +++ loncom/interface/lonparmset.pm 2009/05/16 22:18:20 1.449 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.446 2009/05/12 10:54:11 bisitz Exp $ +# $Id: lonparmset.pm,v 1.449 2009/05/16 22:18:20 neumanie Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1488,6 +1488,7 @@ function group_or_section(caller) { if (%sectionhash || %grouphash) { $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group/Section'))); $r->print($sections.$groups); + $r->print(&Apache::lonhtmlcommon::row_closure()); } $r->print(&Apache::lonhtmlcommon::row_title(&mt('User'))); @@ -1499,16 +1500,15 @@ function group_or_section(caller) { sub displaymenu { my ($r,$allparms,$allparts,$pscat,$psprt,$keyorder)=@_; - $r->print('
'); - $r->print('

Step 2

'); - $r->print('
' ); + $r->print(&Apache::lonhtmlcommon::topic_bar (2,&mt('Select Parameters'))); $r->print(&Apache::lonhtmlcommon::start_pick_box()); - &parmmenu($r,$allparms,$pscat,$keyorder); - $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View'))); + $r->print(&Apache::lonhtmlcommon::row_closure()); + + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View'))); &partmenu($r,$allparts,$psprt); + $r->print(&Apache::lonhtmlcommon::row_closure(1)); $r->print(&Apache::lonhtmlcommon::end_pick_box()); - $r->print('
'); } sub mapmenu { @@ -1862,21 +1862,19 @@ sub assessparms { } if (!$pssymb) { - - $r->print('
'); - $r->print('

Step 1

'); - $r->print('
' ); + $r->print(&Apache::lonhtmlcommon::topic_bar (1,&mt('General Parameters'))); $r->print(&Apache::lonhtmlcommon::start_pick_box()); &levelmenu($r,\%alllevs,$parmlev); if ($parmlev ne 'general') { + $r->print(&Apache::lonhtmlcommon::row_closure()); &mapmenu($r,\%allmaps,$pschp,\%maptitles); } + $r->print(&Apache::lonhtmlcommon::row_closure(1)); $r->print(&Apache::lonhtmlcommon::end_pick_box()); - $r->print('
'); - + &displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder); } else { my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb); @@ -1886,14 +1884,12 @@ sub assessparms { '

'); } - $r->print('
'); - $r->print('

Step 3

'); - $r->print('
' ); + $r->print(&Apache::lonhtmlcommon::topic_bar (3,&mt('User Selection'))); $r->print(&Apache::lonhtmlcommon::start_pick_box()); &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups); - + $r->print(&Apache::lonhtmlcommon::row_closure(1)); $r->print(&Apache::lonhtmlcommon::end_pick_box()); - $r->print('
'); + $r->print('

'.$message.'

'); @@ -3612,9 +3608,11 @@ ENDOVER &levelmenu($r,\%alllevs,$parmlev); if ($parmlev ne 'general') { #$r->print(''); + $r->print(&Apache::lonhtmlcommon::row_closure()); &mapmenu($r,\%allmaps,$pschp,\%maptitles); #$r->print(''); } + $r->print(&Apache::lonhtmlcommon::row_closure(1)); $r->print(&Apache::lonhtmlcommon::end_pick_box()); $r->print(''); #$r->print(''); @@ -3625,6 +3623,7 @@ ENDOVER $r->print('
' ); $r->print(&Apache::lonhtmlcommon::start_pick_box()); &parmmenu($r,\%allparms,\@pscat,\%keyorder); + $r->print(&Apache::lonhtmlcommon::row_closure()); $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View'))); #$r->print(''. @@ -3638,6 +3637,7 @@ ENDOVER &groupmenu($r,\@selected_groups); $r->print(''); #$r->print(''); + $r->print(&Apache::lonhtmlcommon::row_closure(1)); $r->print(&Apache::lonhtmlcommon::end_pick_box()); $r->print('
');