--- loncom/interface/lonparmset.pm	2009/06/10 14:42:24	1.459
+++ 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.459 2009/06/10 14:42:24 bisitz Exp $
+# $Id: lonparmset.pm,v 1.463 2009/06/30 14:30:26 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1353,7 +1353,7 @@ ENDSCRIPT
         if (!($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat})) {
             $r->print(' style="display:none"');
         }
-        $r->print(' />'
+        $r->print('>'
                  .($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey} : $tempkey)
                  .'</li>'
         );
@@ -1589,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 {