--- loncom/interface/lonparmset.pm 2009/04/05 17:31:04 1.442 +++ loncom/interface/lonparmset.pm 2009/05/05 16:53:25 1.443 @@ -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.443 2009/05/05 16:53:25 neumanie Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1322,6 +1322,11 @@ sub parmmenu { ENDSCRIPT $r->print(); + $r->print(''); + $r->print(''); + $r->print('
'.&mt('Select Parameters to View').'
'); + $r->print(''); + $r->print('
'); $r->print("\n".''); my $cnt=0; foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) { @@ -1379,10 +1384,16 @@ ENDSCRIPT .'' .'
' ); + $r->print('
'); } sub partmenu { my ($r,$allparts,$psprt)=@_; + $r->print(''); + $r->print(''); + $r->print('
'. &mt('Select Parts to View').'
'); + $r->print(''); + $r->print('
'); $r->print(''); + $r->print('
'); } sub usermenu { @@ -1417,7 +1429,7 @@ sub usermenu { my $g_s_header=''; my $g_s_footer=''; - + if (%sectionhash) { $sections=&mt('Section:').' ' ,' ' - ,$chooseopt) - .'' - .'' - ); + ,$chooseopt)); + + $r->print(''); } sub displaymenu { my ($r,$allparms,$allparts,$pscat,$psprt,$keyorder)=@_; - $r->print('
'.&mt('Select Parameters to View').''. - &mt('Select Parts to View').'
'); + $r->print('
'); + $r->print('

Step 2

'); + $r->print('
'); + $r->print(''); + + #$r->print('
'.&mt('Select Parameters to View').''. &mt('Select Parts to View').'
'); &parmmenu($r,$allparms,$pscat,$keyorder); - $r->print(''); + &partmenu($r,$allparts,$psprt); - $r->print('
'); + $r->print('
'); } -sub mapmenu { - my ($r,$allmaps,$pschp,$maptitles)=@_; - $r->print(''.&mt('Select Enclosing Map or Folder').' '); +sub mapmenu {## + my ($r,$allmaps,$pschp,$maptitles)=@_; + $r->print(''); + $r->print(''); + $r->print('
'.&mt('Select Enclosing Map or Folder').'
'); + $r->print(''); + $r->print('
'); $r->print('"); + $r->print('
'); } sub levelmenu { - my ($r,$alllevs,$parmlev)=@_; - $r->print(''.&mt('Select Parameter Level'). - &Apache::loncommon::help_open_topic('Course_Parameter_Levels').' '); + my ($r,$alllevs,$parmlev)=@_; + $r->print(''); + $r->print(''); + $r->print('
'.&mt('Select Parameter Level').&Apache::loncommon::help_open_topic('Course_Parameter_Levels').'
'); + $r->print(''); + $r->print('
'); $r->print('"); + $r->print('
'); } @@ -1861,16 +1889,21 @@ sub assessparms { '" name="recent_'.$_.'" />'); } - if (!$pssymb) { - $r->print('
'); + if (!$pssymb) { + $r->print('
'); + $r->print('

Step 1

'); + $r->print('
'); + $r->print(''); &levelmenu($r,\%alllevs,$parmlev); - $r->print(''); + if ($parmlev ne 'general') { - $r->print(''); + } - $r->print('
'); + &mapmenu($r,\%allmaps,$pschp,\%maptitles); - $r->print('
'); + $r->print('
'); + $r->print(''); + $r->print(''); &displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder); } else { my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb); @@ -1880,7 +1913,14 @@ sub assessparms { '

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

Step 3

'); + $r->print('
'); + $r->print(''); &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups); + $r->print('
'); + $r->print('
'); + $r->print('
'); $r->print('

'.$message.'

');