--- loncom/interface/lonparmset.pm	2009/11/14 17:47:18	1.483
+++ loncom/interface/lonparmset.pm	2009/11/22 21:07:41	1.486
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.483 2009/11/14 17:47:18 amueller Exp $
+# $Id: lonparmset.pm,v 1.486 2009/11/22 21:07:41 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -903,8 +903,7 @@ sub startpage {
     my ($r) = @_;
 
     my %loaditems = ('onunload' => "pclose()",
-             'onload'   => "group_or_section('cgroup')",
-             'onload'   => "showHide_courseContent()",
+             'onload'   => "showHide_courseContent(); group_or_section('cgroup')",
         );
 
     if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
@@ -1768,7 +1767,7 @@ sub mapmenu {
         }
     }
 # Show it ...    
-    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Enclosing Map or Folder')));
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Enclosing Map or Folder'),'','',' id="mapmenu"'));
     if ((ref($tree) eq 'ARRAY') && (ref($treeinfo) eq 'HASH')) {
         my $icon = '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />';
         $r->print(&Apache::loncommon::start_data_table()
@@ -2188,16 +2187,16 @@ function parmsel_show() {
 // ]]>
 </script>
 ENDPARMSELSCRIPT
-    my $parmselhiddenstyle=' style="display:none"';
-    if($env{'form.hideparmsel'} eq 'hidden') {
-        $r->print('<div id="parmsel"'.$parmselhiddenstyle.'>');
-    } else  {
-        $r->print('<div id="parmsel">');
-    }
-
     
     # Display Unit 1 "General Parameters"
     if (!$pssymb) {
+        my $parmselhiddenstyle=' style="display:none"';
+        if($env{'form.hideparmsel'} eq 'hidden') {
+           $r->print('<div id="parmsel"'.$parmselhiddenstyle.'>');
+        } else  {
+           $r->print('<div id="parmsel">');
+        }
+
         $r->print(&Apache::lonhtmlcommon::topic_bar(1,&mt('Resource Specification')));
         $r->print(<<COURSECONTENTSCRIPT);
 <script type="text/javascript">
@@ -2222,54 +2221,57 @@ COURSECONTENTSCRIPT
         &levelmenu($r,\%alllevs,$parmlev);
         $r->print(&Apache::lonhtmlcommon::row_closure(1));
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
-        $r->print('<div id="mapmenu">');
         $r->print(&Apache::lonhtmlcommon::start_pick_box());
         &mapmenu($r,\%allmaps,$pschp,\%maptitles, \%symbp);
         $r->print(&Apache::lonhtmlcommon::row_closure(1));
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
-        $r->print('</div>');
         #Display Unit 2 "Select Parameter"   
         $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('<p>'
+             .'<input type="submit" name="dis"'
+             .' value="'.&mt('Update Parameter Display').'" />'
+             .'<input type="hidden" name="hideparmsel" value="hidden" />'
+             .'</p>');
+        $r->print('</div>');
+        # Offer link to display parameter selection again
+        $r->print('<p id="parmsellink"');
+        if ($env{'form.hideparmsel'} ne 'hidden') {
+           $r->print($parmselhiddenstyle);
+        }
+        $r->print('>'
+             .'<a href="javascript:parmsel_show()">'
+             .&mt('Change Parameter Selection')
+             .'</a>'
+             .'</p>');
     } 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).
                 '<input type="hidden" value="'.$pssymb.'" name="symb" />'.
-                  '<br /><label><b>'.&mt('Show all parts').': <input type="checkbox" name="psprt" value="all"'.
-                  ($env{'form.psprt'}?' checked="checked"':'').' /></b></label><br />');
-        $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('<p>'
+                  '<br />');
+        $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')).
+                  '<label>'.&mt('Show all parts').': <input type="checkbox" name="psprt" value="all"'.
+                  ($env{'form.psprt'}?' checked="checked"':'').' /></label></td></tr>');
+        &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('<p>'
              .'<input type="submit" name="dis"'
              .' value="'.&mt('Update Parameter Display').'" />'
              .'<input type="hidden" name="hideparmsel" value="hidden" />'
-             .'</p>'
-    );
-
-    $r->print('</div>');
-    # ----- End Parameter Selection
-
-    # Offer link to display parameter selection again
-    $r->print('<p id="parmsellink"');
-    if($env{'form.hideparmsel'} ne 'hidden') {
-        $r->print($parmselhiddenstyle);
+             .'</p>');
     }
-    $r->print('>'
-             .'<a href="javascript:parmsel_show()">'
-             .&mt('Change Parameter Selection')
-             .'</a>'
-             .'</p>'
-    );
     
+    # ----- End Parameter Selection
 
     # Display Messages
     $r->print('<div>'.$message.'</div>');