--- loncom/interface/lonparmset.pm	2009/05/17 01:02:10	1.450
+++ loncom/interface/lonparmset.pm	2009/06/05 12:49:50	1.455
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.450 2009/05/17 01:02:10 raeburn Exp $
+# $Id: lonparmset.pm,v 1.455 2009/06/05 12:49:50 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -854,7 +854,7 @@ sub page_js {
 
     return(<<ENDJS);
 <script type="text/javascript">
-
+// <![CDATA[
     function pclose() {
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
                  "height=350,width=350,scrollbars=no,menubar=no");
@@ -893,6 +893,7 @@ sub page_js {
         var newWin = window.open(url, wdwName, options);
         newWin.focus();
     }
+// ]]>
 </script>
 $selscript
 ENDJS
@@ -1248,16 +1249,27 @@ sub parmmenu {
     my $tempkey;
     $r->print(<<ENDSCRIPT);
 <script type="text/javascript">
+// <![CDATA[
     function checkall(value, checkName) {
+
+        var li = "_li";
+        var displayOverview = "";
+        
+        if (value == false) {
+            displayOverview = "none"
+        }
+
 	for (i=0; i<document.forms.parmform.elements.length; i++) {
             ele = document.forms.parmform.elements[i];
             if (ele.name == checkName) {
                 document.forms.parmform.elements[i].checked=value;
+                document.getElementById(document.forms.parmform.elements[i].value.concat(li)).style.display = displayOverview;
             }
         }
     }
 
     function checkthis(thisvalue, checkName) {
+        checkboxChecked(thisvalue);
 	for (i=0; i<document.forms.parmform.elements.length; i++) {
             ele = document.forms.parmform.elements[i];
             if (ele.name == checkName) {
@@ -1284,7 +1296,6 @@ sub parmmenu {
  	checkthis('contentclose','pscat');
     }
 
-
     function checkvisi() {
 	checkthis('hiddenresource','pscat');
  	checkthis('encrypturl','pscat');
@@ -1306,15 +1317,73 @@ sub parmmenu {
 	checkthis('maxtries','pscat');
     }
 
+    function hideParms() {
+        document.getElementById('LC_parm_overview_parm_menu').style.display = "none";
+    }
+
+    function showParms() {
+        document.getElementById('LC_parm_overview_parm_menu').style.display = "";
+    }
+
+    function checkboxChecked(id) {
+        var li = "_li";
+        var id_li = id.concat(li);
+
+        if (document.getElementById(id_li).style.display == "none") {
+            document.getElementById(id_li).style.display = "";
+        }
+        else {
+            document.getElementById(id_li).style.display = "none";
+        }
+    }
+// ]]>
 </script>
 ENDSCRIPT
-    $r->print();
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
-    $r->print("\n".'<table id="LC_parm_overview_parm_menu"><tr>');
+
+    #part to print selected parms overview
+    $r->print(&mt('Selected Parameters:').'<br />');
+
+    #print out all possible parms and hide them by default
+    $r->print('<ul>');
+    foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
+        $r->print('<li id="'.$tempkey.'_li" value="'.$tempkey.'_li" name="pscat_li"');
+        if (!($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat})) {
+            $r->print(' style="display:none"');
+        }
+        $r->print('>'
+                 .($$allparms{$tempkey}=~/\s/ ? $$allparms{$tempkey} : $tempkey)
+                 .'</li>'
+        );
+    }
+    $r->print('</ul>'
+             .'<p><a href="javascript:showParms()">'
+             .&mt('Show detailed Parameter Selection')
+             .'</a></p>'
+    );
+
+    &shortCuts($r,$allparms,$pscat,$keyorder);
+
+    $r->print(&Apache::lonhtmlcommon::row_closure(1));
+}
+
+sub parmboxes {
+    my ($r,$allparms,$pscat,$keyorder)=@_;
+    my $tempkey;
+
+    #part to print the parm-list
+    $r->print('<fieldset id="LC_parm_overview_parm_menu" style="display:none">'
+             .'<legend>'.&mt('Parameter').'</legend>'
+             ."\n"
+             .'<table>'
+    );
     my $cnt=0;
+
+    $r->print('<tr>');
     foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
 	$r->print("\n".'<td><label><input type="checkbox" name="pscat" ');
-	$r->print('value="'.$tempkey.'"');
+	$r->print('value="'.$tempkey.'" ');
+        $r->print('onclick="checkboxChecked(\''.$tempkey.'\')"');
 	if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
 	    $r->print(' checked="checked"');
 	}
@@ -1322,15 +1391,29 @@ ENDSCRIPT
                                                   : $tempkey)
                   .'</label></td>');
  	$cnt++;
-        if ($cnt==3) {
+        if ($cnt==4) {
 	    $r->print("</tr>\n<tr>");
 	    $cnt=0;
 	}
     }
     $r->print('</tr>'
-             .'<tr id="LC_parm_overview_parm_menu_selectors">'
+             .'</table>'
+             .'<hr />'
+             .'<a href="javascript:hideParms()">'
+             .&mt('Hide')
+             .'</a>'
+    );
+
+    #&shortCuts($r,$allparms,$pscat,$keyorder);
+    $r->print('</fieldset>');
+}
+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><b>'.&mt('Parameter Selection').'</b></legend>'
+             .'<fieldset><legend>'.&mt('Parameter Selection').'</legend>'
              .'<span class="LC_nobreak">'
              .'&bull; <a href="javascript:checkall(true, \'pscat\')">'.&mt('Select All').'</a>'
              .'</span>'
@@ -1345,7 +1428,7 @@ ENDSCRIPT
              .'</fieldset>'
              .'</td>'
              .'<td colspan="2" valign="top">'
-             .'<fieldset><legend><b>'.&mt('Add Selection for...').'</b></legend>'
+             .'<fieldset><legend>'.&mt('Add Selection for...').'</legend>'
              .'<span class="LC_nobreak">'
              .'&bull; <a href="javascript:checkdates()">'.&mt('Problem Dates').'</a>'
              .'</span>'
@@ -1365,8 +1448,7 @@ ENDSCRIPT
              .'</span>'
              .'</fieldset>'
              .'</td>'
-             .'</tr></table>'
-    );
+             .'</tr></table>');
 }
 
 sub partmenu {
@@ -1425,6 +1507,7 @@ sub usermenu {
         $sections .= '&nbsp;'.&mt('or').'&nbsp;';
         $sections .= qq|
 <script type="text/javascript">
+// <![CDATA[
 function group_or_section(caller) {
    if (caller == "cgroup") {
        if (document.parmform.cgroup.selectedIndex != 0) {
@@ -1436,14 +1519,17 @@ function group_or_section(caller) {
        }
    }
 }
+// ]]>
 </script>
 |;
     } else {
         $sections .= qq|
 <script type="text/javascript">
+// <![CDATA[
 function group_or_section(caller) {
     return;
 }
+// ]]>
 </script>
 |;
     }
@@ -1490,8 +1576,9 @@ sub displaymenu {
     $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::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));
@@ -2790,7 +2877,7 @@ ENDOVER
     #           <tr><td class="LC_parm_overview_level_menu">');
     $r->print('<div class="LC_ContentBoxSpecial">');
     #$r->print('<h2 class="LC_hcell">Step 1</h2>');
-    $r->print('<div class="LC_BoxPadding">' );
+    $r->print('<div>');
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     &levelmenu($r,\%alllevs,$parmlev);
     if ($parmlev ne 'general') {
@@ -2807,11 +2894,12 @@ ENDOVER
     #$r->print('<table id="LC_parm_overview_controls">
     #           <tr><td class="LC_parm_overview_parm_selectors">');
     $r->print('<div class="LC_ContentBoxSpecial">');
-    $r->print('<div class="LC_BoxPadding">' );
+    $r->print('<div>');
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     &parmmenu($r,\%allparms,\@pscat,\%keyorder);
-    $r->print(&Apache::lonhtmlcommon::row_closure());
-
+    $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')));
     #$r->print('</td><td class="LC_parm_overview_restrictions">'.
      $r->print('<table>'.
@@ -2829,7 +2917,7 @@ ENDOVER
     $r->print('</div></div>');
 
     $r->print('<div class="LC_ContentBoxSpecial">');
-    $r->print('<div class="LC_BoxPadding">' );
+    $r->print('<div>');
     my $sortorder=$env{'form.sortorder'};
     unless ($sortorder) { $sortorder='realmstudent'; }
     &sortmenu($r,$sortorder);
@@ -3346,19 +3434,19 @@ sub output_row {
             push @options,['deleted', 'Delete Metadata Field'];
         }
        $output = &Apache::loncommon::start_data_table_row();
-        $output .= '<td><span class="LC_metadata"><strong>'.$field_text.':</strong></span></td>';
+        $output .= '<td><strong>'.$field_text.':</strong></td>';
         $output .= &Apache::loncommon::end_data_table_row();
         foreach my $opt (@options) {
 	    my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
 	    $output .= &Apache::loncommon::continue_data_table_row();
-	    $output .= '<td>'.('&nbsp;' x 5).'<span class="LC_metadata"><label>
+	    $output .= '<td>'.('&nbsp;' x 5).'<label>
 	               <input type="checkbox" name="'.
 	               $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
-	               &mt($opt->[1]).'</label></span> </td>';
+	               &mt($opt->[1]).'</label></td>';
 	    $output .= &Apache::loncommon::end_data_table_row();
 	}
         $output .= &Apache::loncommon::continue_data_table_row();
-        $output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata"><input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></span></td>';
+        $output .= '<td>'.('&nbsp;' x 10).'<input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></td>';
         $output .= &Apache::loncommon::end_data_table_row();
         my $multiple_checked;
         my $single_checked;
@@ -3370,14 +3458,14 @@ sub output_row {
             $single_checked = '';
         }
 	$output .= &Apache::loncommon::continue_data_table_row();
-	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
+	$output .= '<td>'.('&nbsp;' x 10).'
 	            <input type="radio" name="'.$field_name.'_onlyone" value="multiple"'.$multiple_checked .' />
-	            '.&mt('Student may select multiple choices from list').'</span></td>';
+	            '.&mt('Student may select multiple choices from list').'</td>';
 	$output .= &Apache::loncommon::end_data_table_row();
 	$output .= &Apache::loncommon::continue_data_table_row();
-	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
+	$output .= '<td>'.('&nbsp;' x 10).'
 	            <input type="radio" name="'.$field_name.'_onlyone"  value="single"'.$single_checked.' />
-	            '.&mt('Student may select only one choice from list').'</span></td>';
+	            '.&mt('Student may select only one choice from list').'</td>';
 	$output .= &Apache::loncommon::end_data_table_row();
     }
     return ($output);