--- loncom/interface/lonparmset.pm	2009/06/17 20:01:57	1.461
+++ loncom/interface/lonparmset.pm	2009/06/30 14:59:17	1.464
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.461 2009/06/17 20:01:57 neumanie Exp $
+# $Id: lonparmset.pm,v 1.464 2009/06/30 14:59:17 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1612,33 +1612,61 @@ sub mapmenu {
                     }
                     my $id= $curRes->id();
                     my ($mapid,$resid)=split(/\./,$id);
-                    push(@$tree,$mapid);
-                    $treeinfo->{$mapid} = {
+                    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')));
     if ((ref($tree) eq 'ARRAY') && (ref($treeinfo) eq 'HASH')) {
         my $icon = '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />';
-        $r->print('<table><tr><td>'.$icon.'<label>&nbsp;<input type="radio" name="pschp" value="all"/>'.&mt('All Maps or Folders').'</td></tr>');
+        $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 = ('&nbsp;'x$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('<tr><td>'.$indent.$icon.'<label>&nbsp;<input type ="radio" name="pschp" value="'.$mapid.'"');
+            $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></tr>');
+            $r->print('/>'
+                     .$$maptitles{$mapid}
+                     .($$allmaps{$mapid}!~/^uploaded/?' ['.$$allmaps{$mapid}.']':'')
+                     .'</label>'
+                     .'</td>'
+                     .&Apache::loncommon::end_data_table_row()
+            );
         }
-        $r->print('</table>');
+        $r->print(&Apache::loncommon::end_data_table());
     }
 }