--- loncom/interface/lonparmset.pm 2009/11/15 20:50:03 1.485 +++ loncom/interface/lonparmset.pm 2009/11/23 13:03:58 1.487 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.485 2009/11/15 20:50:03 amueller Exp $ +# $Id: lonparmset.pm,v 1.487 2009/11/23 13:03:58 wenzelju Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2187,16 +2187,16 @@ function parmsel_show() { // ]]> ENDPARMSELSCRIPT - my $parmselhiddenstyle=' style="display:none"'; - if($env{'form.hideparmsel'} eq 'hidden') { - $r->print('
'); - } else { - $r->print('
'); - } - # Display Unit 1 "General Parameters" if (!$pssymb) { + my $parmselhiddenstyle=' style="display:none"'; + if($env{'form.hideparmsel'} eq 'hidden') { + $r->print('
'); + } else { + $r->print('
'); + } + $r->print(&Apache::lonhtmlcommon::topic_bar(1,&mt('Resource Specification'))); $r->print(< @@ -2229,44 +2229,49 @@ COURSECONTENTSCRIPT $r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification'))); &displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder); $r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)'))); + $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('
'); + # Offer link to display parameter selection again + $r->print(''); } else { # parameter screen for a single resource. - my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb); + my ($map,$iid,$resource)=&Apache::lonnet::decode_symb($pssymb); my $title = &Apache::lonnet::gettitle($pssymb); $r->print(&mt('Specific Resource: [_1] ([_2])',$title,$resource). ''. - '

'); - $r->print(&Apache::lonhtmlcommon::topic_bar('',&mt('User Specification (optional)'))); - } - $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()); - - # parm selection is shown: display parm update button - $r->print('

' + '
'); + $r->print(&Apache::lonhtmlcommon::topic_bar('',&mt('Additional Display Specification (optional)'))); + $r->print(&Apache::lonhtmlcommon::start_pick_box()); + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')). + ''); + &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('
'); - # ----- End Parameter Selection - - # Offer link to display parameter selection again - $r->print(''); } - $r->print('>' - .'' - .&mt('Change Parameter Selection') - .'' - .'

' - ); + # ----- End Parameter Selection # Display Messages $r->print('
'.$message.'
'); @@ -3714,7 +3719,7 @@ ENDMAINFORMHEAD url => '/adm/parmset?action=parameterchangelog', permission => $parm_permission, linktitle =>"View parameter and $lc_crstype blog posting/user notification change log." , - icon => 'emblem-system.png' , + icon => 'document-properties.png', }]} ); $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));