--- loncom/interface/lonparmset.pm	2009/11/14 18:54:17	1.484
+++ loncom/interface/lonparmset.pm	2010/01/12 18:11:58	1.491
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.484 2009/11/14 18:54:17 amueller Exp $
+# $Id: lonparmset.pm,v 1.491 2010/01/12 18:11:58 bisitz 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'})
@@ -1362,13 +1361,17 @@ ENDSCRIPT
                  .'</li>'
         );
     }
-    $r->print('</ul>'
-             .'<p><a href="javascript:showParms()">'
-             .&mt('Show detailed Parameter Selection')
-             .'</a></p>'
-    );
+    $r->print('</ul>');
 
+    $r->print('<hr />');
     &shortCuts($r,$allparms,$pscat,$keyorder);
+    $r->print('<hr />');
+
+    $r->print(
+        '<p><a href="javascript:showParms()">'
+       .&mt('Show detailed Parameter Selection')
+       .'</a></p>'
+    );
 
     $r->print(&Apache::lonhtmlcommon::row_closure(1));
 }
@@ -1494,13 +1497,24 @@ sub parmboxes {
         'slots' => [],
         'file_submission' => [],
         'misc' => [],
-   );
+    );
+    my $hidelink =
+        '<p>'
+       .'<a href="javascript:hideParms()">'
+       .&mt('Hide detailed Parameter Selection')
+       .'</a>'
+       .'</p>'
+       ."\n";
+;
     foreach $tempparameter (keys %$allparms) {
         &whatIsMyCategory($tempparameter, \%categoryList);
     }
     #part to print the parm-list
-    $r->print('<fieldset id="LC_parm_overview_parm_menu" style="display:none">'
-             .'<legend>'.&mt('Parameter').'</legend>'."\n"
+    $r->print(
+        '<div id="LC_parm_overview_parm_menu" class="LC_Box" style="display:none">'."\n"
+       .'<h3>'.&mt('Parameter').'</h3>'."\n"
+       .$hidelink
+       .'<div class="LC_columnSection">'."\n"
     );
 
     #Print parameters
@@ -1508,10 +1522,10 @@ sub parmboxes {
         if(@{$categoryList{$key}} == 0) {
             next;
         } else { 
-            $r->print('<fieldset>'
-                     .'<legend>'
+            $r->print('<div class="LC_Box LC_400Box">'
+                     .'<h4 class="LC_hcell">'
                      .&mt($categories{$key})
-                     .'</legend>'."\n");
+                     .'</h4>'."\n");
             foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
                     $r->print('<span class="LC_nobreak">'
                              .'<label><input type="checkbox" name="pscat" ');
@@ -1522,19 +1536,18 @@ sub parmboxes {
                 }
                 $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
                                                       : $tempkey)
-                        .'</label></span> ');
+                        .'</label></span><br />'."\n");
             }
-            $r->print('</fieldset>');
+            $r->print("</div>\n");
         }
     }
-    $r->print('<hr />'
-             .'<a href="javascript:hideParms()">'
-             .&mt('Hide')
-             .'</a>'
-    );
 
     #&shortCuts($r,$allparms,$pscat,$keyorder);
-    $r->print('</fieldset>');
+    $r->print(
+        "</div>\n"
+       .$hidelink
+       ."</div>\n"
+    );
 }
 #
 # This function offers some links on the parameter section to get with one click a group a parameters
@@ -1542,45 +1555,33 @@ sub parmboxes {
 sub shortCuts {
     my ($r,$allparms,$pscat,$keyorder)=@_;
 
-    #part to print out the shortcuts for parmselection
-    $r->print('<table><tr id="LC_parm_overview_parm_menu_selectors">'
-             .'<td valign="top">'
-             .'<fieldset><legend>'.&mt('Parameter Selection').'</legend>'
-             .'<span class="LC_nobreak">'
-             .'&bull; <a href="javascript:checkall(true, \'pscat\')">'.&mt('Select All').'</a>'
-             .'</span>'
-             .'<br />'
-             .'<span class="LC_nobreak">'
-             .'&bull; <a href="javascript:checkstandard()">'.&mt('Select Common Only').'</a>'
-             .'</span>'
-             .'<br />'
-             .'<span class="LC_nobreak">'
-             .'&bull; <a href="javascript:checkall(false, \'pscat\')">'.&mt('Unselect All').'</a>'
-             .'</span>'
-             .'</fieldset>'
-             .'</td>'
-             .'<td colspan="2" valign="top">'
-             .'<fieldset><legend>'.&mt('Add Selection for...').'</legend>'
-             .'<span class="LC_nobreak">'
-             .'&bull; <a href="javascript:checkdates()">'.&mt('Problem Dates').'</a>'
-             .'</span>'
-             .'<span class="LC_nobreak">'
-             .' &bull; <a href="javascript:checkcontdates()">'.&mt('Content Dates').'</a>'
-             .'</span>'
-#            .'<br />'
-             .'<span class="LC_nobreak">'
-             .' &bull; <a href="javascript:checkdisset()">'.&mt('Discussion Settings').'</a>'
-             .'</span>'
-             .'<span class="LC_nobreak">'
-             .' &bull; <a href="javascript:checkvisi()">'.&mt('Visibilities').'</a>'
-             .'</span>'
-#            .'<br />'
-             .'<span class="LC_nobreak">'
-             .' &bull; <a href="javascript:checkparts()">'.&mt('Part Parameters').'</a>'
-             .'</span>'
-             .'</fieldset>'
-             .'</td>'
-             .'</tr></table>');
+    # Parameter Selection
+    $r->print(
+        &Apache::lonhtmlcommon::start_funclist(&mt('Parameter Selection'))
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkall(true, \'pscat\')">'.&mt('Select All').'</a>')
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkstandard()">'.&mt('Select Common Only').'</a>')
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkall(false, \'pscat\')">'.&mt('Unselect All').'</a>')
+       .&Apache::lonhtmlcommon::end_funclist()
+    );
+
+    # Add Selection for...
+    $r->print(
+        &Apache::lonhtmlcommon::start_funclist(&mt('Add Selection for...'))
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkdates()">'.&mt('Problem Dates').'</a>')
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkcontdates()">'.&mt('Content Dates').'</a>')
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkdisset()">'.&mt('Discussion Settings').'</a>')
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkvisi()">'.&mt('Visibilities').'</a>')
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="javascript:checkparts()">'.&mt('Part Parameters').'</a>')
+       .&Apache::lonhtmlcommon::end_funclist()
+    );
 }
 
 sub partmenu {
@@ -1712,11 +1713,6 @@ sub displaymenu {
     &parmmenu($r,$allparms,$pscat,$keyorder);
     $r->print(&Apache::lonhtmlcommon::end_pick_box());
     &parmboxes($r,$allparms,$pscat,$keyorder);
-    $r->print(&Apache::lonhtmlcommon::start_pick_box());
-    $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());
 }
 
 sub mapmenu {
@@ -2188,16 +2184,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">');
+        }
+
+        # Step 1
         $r->print(&Apache::lonhtmlcommon::topic_bar(1,&mt('Resource Specification')));
         $r->print(<<COURSECONTENTSCRIPT);
 <script type="text/javascript">
@@ -2220,54 +2216,66 @@ COURSECONTENTSCRIPT
 
         $r->print(&Apache::lonhtmlcommon::start_pick_box());
         &levelmenu($r,\%alllevs,$parmlev);
-        $r->print(&Apache::lonhtmlcommon::row_closure(1));
-        $r->print(&Apache::lonhtmlcommon::end_pick_box());
-        $r->print(&Apache::lonhtmlcommon::start_pick_box());
+        $r->print(&Apache::lonhtmlcommon::row_closure());
         &mapmenu($r,\%allmaps,$pschp,\%maptitles, \%symbp);
+        $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());
-        #Display Unit 2 "Select Parameter"   
+
+        # Step 2
         $r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification')));
         &displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
+
+        # Step 3
         $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());
+
+        # Update Display Button
+        $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>');
@@ -3178,26 +3186,19 @@ ENDOVER
     }
 # Menu to select levels, etc
 
-    #$r->print('<table id="LC_parm_overview_scope">
-    #           <tr><td class="LC_parm_overview_level_menu">');
     $r->print('<div class="LC_Box">');
     #$r->print('<h2 class="LC_hcell">Step 1</h2>');
     $r->print('<div>');
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     &levelmenu($r,\%alllevs,$parmlev);
     if ($parmlev ne 'general') {
-        #$r->print('<td class="LC_parm_overview_map_menu">');
         $r->print(&Apache::lonhtmlcommon::row_closure());
         &mapmenu($r,\%allmaps,$pschp,\%maptitles,\%symbp);
-        #$r->print('</td>');
     }
     $r->print(&Apache::lonhtmlcommon::row_closure(1));
     $r->print(&Apache::lonhtmlcommon::end_pick_box());
     $r->print('</div></div>');
-    #$r->print('</td></tr></table>');
 
-    #$r->print('<table id="LC_parm_overview_controls">
-    #           <tr><td class="LC_parm_overview_parm_selectors">');
     $r->print('<div class="LC_Box">');
     $r->print('<div>');
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
@@ -3206,7 +3207,6 @@ ENDOVER
     &parmboxes($r,\%allparms,\@pscat,\%keyorder);
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
-    #$r->print('</td><td class="LC_parm_overview_restrictions">'.
     $r->print('<table>'.
               '<tr><th>'.&mt('Parts').'</th><th>'.&mt('Section(s)').
               '</th><th>'.&mt('Group(s)').'</th></tr><tr><td>');
@@ -3664,7 +3664,7 @@ ENDMAINFORMHEAD
             url => '/adm/slotrequest?command=showslots',
             permission => $vgr,
             linktitle => "Manage slots for this $lc_crstype."  ,
-            icon => 'format-justify-fill.png'  ,
+            icon => 'rsrv.png'  ,
             },
           { linktext => 'Reset Student Access Times',
             url => '/adm/helper/resettimes.helper',
@@ -3715,7 +3715,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));