--- loncom/interface/lonparmset.pm	2009/06/03 17:17:03	1.453
+++ loncom/interface/lonparmset.pm	2009/07/01 14:35:47	1.465
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.453 2009/06/03 17:17:03 schualex Exp $
+# $Id: lonparmset.pm,v 1.465 2009/07/01 14:35:47 amueller 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,6 +1249,7 @@ sub parmmenu {
     my $tempkey;
     $r->print(<<ENDSCRIPT);
 <script type="text/javascript">
+// <![CDATA[
     function checkall(value, checkName) {
 
         var li = "_li";
@@ -1267,7 +1269,9 @@ sub parmmenu {
     }
 
     function checkthis(thisvalue, checkName) {
-        checkboxChecked(thisvalue);
+
+        document.getElementById(thisvalue.concat("_li")).style.display = "";        
+
 	for (i=0; i<document.forms.parmform.elements.length; i++) {
             ele = document.forms.parmform.elements[i];
             if (ele.name == checkName) {
@@ -1334,71 +1338,185 @@ sub parmmenu {
             document.getElementById(id_li).style.display = "none";
         }
     }
-
+// ]]>
 </script>
 ENDSCRIPT
-    $r->print();
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
 
     #part to print selected parms overview
-    $r->print('<table id="LC_parm_overview_parm_overview">'
-             .'<tr>'
-             .'<td style="vertical-align:top; width:250px"><p>'.&mt('Selected Parameters').': ');
-
-    #print out all possible parms and hide it
-    $r->print('<td>');
-    $r->print('<ol style="list-style-type:disc">');
+    $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(' style="display:none"');
         }
-        
-        $r->print('>'.($$allparms{$tempkey}=~/\s/ ? $$allparms{$tempkey} : $tempkey).'</li>');
-    }
-    $r->print('<a href="javascript:showParms()">('.&mt('add more parameter').')'
-             .'</a></p></td>');
-    $r->print('</td>');
-    $r->print('</tr>'
-             .'</table>');
+        $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('</table>');
+    $r->print(&Apache::lonhtmlcommon::row_closure(1));
 }
+# return a hash
+sub categories {
+    return ('time_settings' => 'Time Settings',
+    'grading' => 'Grading',
+    'tries' => 'Tries',
+    'problem_appearance' => 'Problem Appearance',
+    'behaviour_of_input_fields' => 'Behaviour of Input Fields',
+    'hiding' => 'Hiding',
+    'high_level_randomization' => 'High Level Randomization',
+    'slots' => 'Slots',
+    'file_submission' => 'File Submission',
+    'misc' => 'Miscellaneous' ); 
+}
+
+# return a hash. Like a look-up table
+sub lookUpTableParameter {
+ 
+    return ( 
+        'opendate' => 'time_settings',
+        'duedate' => 'time_settings',
+        'answerdate' => 'time_settings',
+        'interval' => 'time_settings',
+        'contentopen' => 'time_settings',
+        'contentclose' => 'time_settings',
+        'discussend' => 'time_settings',
+        'weight' => 'grading',
+        'handgrade' => 'grading',
+        'maxtries' => 'tries',
+        'hinttries' => 'tries',
+        'type' => 'problem_appearance',
+        'problemstatus' => 'problem_appearance',
+        'display' => 'problem_appearance',
+        'ordered' => 'problem_appearance',
+        'numbubbles' => 'problem_appearance',
+        'tol' => 'behaviour_of_input_fields',
+        'sig' => 'behaviour_of_input_fields',
+        'turnoffunit' => 'behaviour_of_input_fields',
+        'hiddenresource' => 'hiding',
+        'hiddenparts' => 'hiding',
+        'discusshide' => 'hiding',
+        'buttonshide' => 'hiding',
+        'turnoffeditor' => 'hiding',
+        'encrypturl' => 'hiding',
+        'randomorder' => 'high_level_randomization',
+        'randompick' => 'high_level_randomization',
+        'available' => 'slots',
+        'useslots' => 'slots',
+        'availablestudent' => 'slots',
+        'uploadedfiletypes' => 'file_submission',
+        'maxfilesize' => 'file_submission',
+        'cssfile' => 'misc',
+        'mapalias' => 'misc',
+        'acc' => 'misc',
+        'maxcollaborators' => 'misc',
+        'scoreformat' => 'misc',
+
+    );    
+}
+
+sub whatIsMyCategory {
+    my $name = shift;
+    my $catList = shift;
+    my @list;
+    my %lookUpList = &lookUpTableParameter; #Initilize the lookupList
+    my $cat = $lookUpList{$name};
+    if (defined($cat)) {
+        if (!defined($$catList{$cat})){
+            push @list, ($name);
+            $$catList{$cat} = \@list;
+        } else {
+            push @{${$catList}{$cat}}, ($name);     
+        }
+    } else {
+        if (!defined($$catList{'misc'})){
+            push @list, ($name);
+            $$catList{'misc'} = \@list;
+        } else {
+            push @{${$catList}{'misc'}}, ($name);     
+        }
+    }        
+}
+
+sub keysindisplayorderCategory {
+    my ($name,$keyorder)=@_;
+    return sort {
+    	$$keyorder{'parameter_0_'.$a} <=> $$keyorder{'parameter_0_'.$b}; 
+    } ( @{$name});
+}
+
 
 sub parmboxes {
     my ($r,$allparms,$pscat,$keyorder)=@_;
     my $tempkey;
+    my $tempparameter;
+    my %categories = &categories;
+    my %categoryList = (
+        'time_settings' => [],
+        'grading' => [],
+        'tries' => [],
+        'problem_appearance' => [],
+        'behaviour_of_input_fields' => [],
+        'hiding' => [],
+        'high_level_randomization' => [],
+        'slots' => [],
+        'file_submission' => [],
+        'misc' => [],
+   );
 
+    foreach $tempparameter (keys %$allparms) {
+        &whatIsMyCategory($tempparameter, \%categoryList);
+    }
     #part to print the parm-list
-    $r->print('<table><tr><td><fieldset id="LC_parm_overview_parm_menu" style="display:none"><legend><b>'.&mt('Parameter').'</legend>');
-    $r->print("\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('onclick="checkboxChecked(\''.$tempkey.'\')"');
-	if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
-	    $r->print(' checked="checked"');
-	}
-        $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
-                                                  : $tempkey)
-                  .'</label></td>');
- 	$cnt++;
-        if ($cnt==4) {
-	    $r->print("</tr>\n<tr>");
-	    $cnt=0;
-	}
-    }
-    $r->print('</tr>'
-             .'</table>'
-             .'<a href="javascript:hideParms()" style="font-weight:normal">('.&mt('hide more parameter').')');
+    $r->print('<fieldset id="LC_parm_overview_parm_menu" style="display:none">'
+             .'<legend>'.&mt('Parameter').'</legend>'
+             ."\n"
+             .'<table>'
+    );
+
+    #Print parameters
+    my ($category, $list) = undef;
+    while (($category, $list) = each %categoryList) {
+        if(@$list == 0) {
+            next;
+        } else { 
+            $r->print('<tr>');
+            $r->print('<td><b>' .&mt($categories{$category}).'</b></td> </tr> <tr>');
+            foreach $tempkey (&keysindisplayorderCategory($list,$keyorder)) {
+	            $r->print("\n".'<td><label><input type="checkbox" name="pscat" ');
+	            $r->print('value="'.$tempkey.'" ');
+                $r->print('onclick="checkboxChecked(\''.$tempkey.'\')"');
+	            if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
+	                $r->print(' checked="checked"');
+	            }
+                $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
+                                                      : $tempkey)
+                        .'</label></td>');
+            }
+            $r->print('</tr>');
+        }
+    }
+    $r->print( '</table>'
+               .'<hr />'
+               .'<a href="javascript:hideParms()">'
+               .&mt('Hide')
+               .'</a>'
+    );
 
     #&shortCuts($r,$allparms,$pscat,$keyorder);
-    $r->print('</fieldset></td></tr></table>');
+    $r->print('</fieldset>');
 }
 sub shortCuts {
     my ($r,$allparms,$pscat,$keyorder)=@_;
@@ -1406,7 +1524,7 @@ sub shortCuts {
     #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>'
@@ -1421,7 +1539,7 @@ sub shortCuts {
              .'</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>'
@@ -1500,6 +1618,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) {
@@ -1511,14 +1630,17 @@ function group_or_section(caller) {
        }
    }
 }
+// ]]>
 </script>
 |;
     } else {
         $sections .= qq|
 <script type="text/javascript">
+// <![CDATA[
 function group_or_section(caller) {
     return;
 }
+// ]]>
 </script>
 |;
     }
@@ -1565,7 +1687,6 @@ 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());
@@ -1577,17 +1698,85 @@ sub displaymenu {
 
 sub mapmenu {
     my ($r,$allmaps,$pschp,$maptitles)=@_;
-
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    my $tree=[];
+    my $treeinfo={};
+    if (defined($navmap)) {
+        my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
+        my $curRes;
+        my $depth = 0;
+
+        while ($curRes = $it->next()) {
+            if ($curRes == $it->BEGIN_MAP()) {
+                $depth++;
+            }
+            if ($curRes == $it->END_MAP()) {
+                $depth--;
+            }
+            if (ref($curRes)) {
+                if (($curRes->is_sequence()) || ($curRes->is_page())) {
+                    my $type = 'sequence';
+                    if ($curRes->is_page()) {
+                        $type = 'page';
+                    }
+                    my $id= $curRes->id();
+                    my ($mapid,$resid)=split(/\./,$id);
+                    if(!exists($treeinfo->{$mapid})) {
+                        push(@$tree,$mapid);	    
+                        $treeinfo->{$mapid} = {
+                                    depth => $depth,
+                                    type  => $type,
+                                    };
+                    }
+                }
+            }
+        }
+    }
+	
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Enclosing Map or Folder')));
-    $r->print('<select name="pschp">');
-    $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
-    foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {
-	$r->print('<option value="'.$_.'"');
-	if (($pschp eq $_)) { $r->print(' selected="selected"'); }
-	$r->print('>'.$$maptitles{$_}.($$allmaps{$_}!~/^uploaded/?' ['.$$allmaps{$_}.']':'').'</option>');
+    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()
+                 .&Apache::loncommon::start_data_table_row()
+                 .'<td>'.$icon
+                 .'<label>&nbsp;'
+                 .'<input type="radio" name="pschp" checked="checked" value="all" />'
+                 .&mt('All Maps or Folders')
+                 .'</label></td>'
+                 .&Apache::loncommon::end_data_table_row()
+        );
+        my $whitespace = '<img src="'
+                        .&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif")
+                        .'" alt="" />';
+        foreach my $mapid (@{$tree}) {
+            # Indentation
+            my $depth = $treeinfo->{$mapid}->{'depth'};
+            my $indent;
+            for (my $i = 0; $i < $depth; $i++) {
+                $indent.= $whitespace;
+            }
+            $icon =  '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />';
+            if ($treeinfo->{$mapid}->{'type'} eq 'page') {
+                $icon = '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />';
+            }
+            $r->print(&Apache::loncommon::start_data_table_row()
+                     .'<td>'.$indent.$icon
+                     .'<label>&nbsp;'
+                     .'<input type ="radio" name="pschp" value="'.$mapid.'"'
+            );
+            if ($pschp eq $mapid) {
+                $r->print(' checked="checked"');
+            }
+            $r->print('/>'
+                     .$$maptitles{$mapid}
+                     .($$allmaps{$mapid}!~/^uploaded/?' ['.$$allmaps{$mapid}.']':'')
+                     .'</label>'
+                     .'</td>'
+                     .&Apache::loncommon::end_data_table_row()
+            );
+        }
+        $r->print(&Apache::loncommon::end_data_table());
     }
-    $r->print("</select>");
-
 }
 
 sub levelmenu {
@@ -1908,7 +2097,10 @@ sub assessparms {
 				 $uname,$udom,$csec,$cgroup);
 	}
 # ---------------------------------------------------------------- Done storing
-	$message.='<h3>'.&mt('Changes can take up to 10 minutes before being active for all students.').&Apache::loncommon::help_open_topic('Caching').'</h3>';
+        $message.='<p class="LC_warning">'
+                 .&mt('Changes can take up to 10 minutes before being active for all students.')
+                 .&Apache::loncommon::help_open_topic('Caching')
+                 .'</p>';
     }
 #----------------------------------------------- if all selected, fill in array
     if ($pscat[0] eq "all") {@pscat = (keys %allparms);}
@@ -1925,6 +2117,27 @@ sub assessparms {
 		  '" name="recent_'.$_.'" />');
     }
 
+    # ----- Start Parameter Selection
+
+    # Hide parm selection?
+    $r->print(<<ENDPARMSELSCRIPT);
+<script type="text/javascript">
+// <![CDATA[
+function parmsel_show() {
+  document.getElementById('parmsel').style.display = "";
+  document.getElementById('parmsellink').style.display = "none";
+}
+// ]]>
+</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 parameter selection boxes
     if (!$pssymb) {
         $r->print(&Apache::lonhtmlcommon::topic_bar (1,&mt('General Parameters')));
         $r->print(&Apache::lonhtmlcommon::start_pick_box());
@@ -1954,10 +2167,31 @@ sub assessparms {
     $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>'
+             .'<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);
+    }
+    $r->print('>'
+             .'<a href="javascript:parmsel_show()">'
+             .&mt('Change Parameter Selection')
+             .'</a>'
+             .'</p>');
 
-    $r->print('<p>'.$message.'</p>');
+    # Display Messages
+    $r->print('<div>'.$message.'</div>');
 
-    $r->print('<br /><input type="submit" name="dis" value="'.&mt("Update Parameter Display").'" />');
 
     my @temp_pscat;
     map {
@@ -2865,7 +3099,7 @@ ENDOVER
 
     #$r->print('<table id="LC_parm_overview_scope">
     #           <tr><td class="LC_parm_overview_level_menu">');
-    $r->print('<div class="LC_ContentBoxSpecial">');
+    $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());
@@ -2883,11 +3117,10 @@ 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_Box">');
     $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());
@@ -2907,7 +3140,7 @@ ENDOVER
     $r->print(&Apache::lonhtmlcommon::end_pick_box());
     $r->print('</div></div>');
 
-    $r->print('<div class="LC_ContentBoxSpecial">');
+    $r->print('<div class="LC_Box">');
     $r->print('<div>');
     my $sortorder=$env{'form.sortorder'};
     unless ($sortorder) { $sortorder='realmstudent'; }