--- loncom/interface/lonparmset.pm 2009/05/12 11:23:16 1.447 +++ 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.447 2009/05/12 11:23:16 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,17 +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_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 { @@ -1863,10 +1862,7 @@ 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); @@ -1878,8 +1874,7 @@ sub assessparms { $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); @@ -1889,15 +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.'

');