--- loncom/interface/lonparmset.pm	2009/05/27 13:36:46	1.451
+++ loncom/interface/lonparmset.pm	2009/06/30 14:30:26	1.463
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.451 2009/05/27 13:36:46 bisitz Exp $
+# $Id: lonparmset.pm,v 1.463 2009/06/30 14:30:26 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,29 @@ 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) {
+
+        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) {
@@ -1284,7 +1298,6 @@ sub parmmenu {
  	checkthis('contentclose','pscat');
     }
 
-
     function checkvisi() {
 	checkthis('hiddenresource','pscat');
  	checkthis('encrypturl','pscat');
@@ -1306,15 +1319,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 +1393,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 +1430,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 +1450,7 @@ ENDSCRIPT
              .'</span>'
              .'</fieldset>'
              .'</td>'
-             .'</tr></table>'
-    );
+             .'</tr></table>');
 }
 
 sub partmenu {
@@ -1425,6 +1509,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 +1521,17 @@ function group_or_section(caller) {
        }
    }
 }
+// ]]>
 </script>
 |;
     } else {
         $sections .= qq|
 <script type="text/javascript">
+// <![CDATA[
 function group_or_section(caller) {
     return;
 }
+// ]]>
 </script>
 |;
     }
@@ -1490,8 +1578,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));
@@ -1500,17 +1589,78 @@ 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()
+        );
+        foreach my $mapid (@{$tree}) {
+            my $depth = $treeinfo->{$mapid}->{'depth'};
+            my $indent = ('&nbsp;'x$depth);
+            $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 {
@@ -1831,7 +1981,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);}
@@ -1848,6 +2001,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());
@@ -1877,10 +2051,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
 
-    $r->print('<p>'.$message.'</p>');
+    # 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>');
+
+    # Display Messages
+    $r->print('<div>'.$message.'</div>');
 
-    $r->print('<br /><input type="submit" name="dis" value="'.&mt("Update Parameter Display").'" />');
 
     my @temp_pscat;
     map {
@@ -2788,9 +2983,9 @@ 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 class="LC_BoxPadding">' );
+    $r->print('<div>');
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     &levelmenu($r,\%alllevs,$parmlev);
     if ($parmlev ne 'general') {
@@ -2806,12 +3001,13 @@ 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 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());
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
     #$r->print('</td><td class="LC_parm_overview_restrictions">'.
      $r->print('<table>'.
@@ -2828,8 +3024,8 @@ ENDOVER
     $r->print(&Apache::lonhtmlcommon::end_pick_box());
     $r->print('</div></div>');
 
-    $r->print('<div class="LC_ContentBoxSpecial">');
-    $r->print('<div class="LC_BoxPadding">' );
+    $r->print('<div class="LC_Box">');
+    $r->print('<div>');
     my $sortorder=$env{'form.sortorder'};
     unless ($sortorder) { $sortorder='realmstudent'; }
     &sortmenu($r,$sortorder);