Index: openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql	31 Jul 2002 21:50:30 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql	19 Aug 2002 14:50:41 -0000	1.6
@@ -22,6 +22,7 @@
         <querytext>
             select package_id,
                    package_key,
+                   (select pretty_name from apm_package_types where package_key = p.package_key) as package_pretty_name,
                    apm_package_type.num_parameters(package_key) parameter_count,
                    node_id,
                    url,
Index: openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql	21 Jun 2002 19:08:33 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql	19 Aug 2002 14:50:42 -0000	1.8
@@ -22,11 +22,12 @@
         <querytext>
             select package_id,
                    package_key,
+                   pretty_name as package_pretty_name,
                    apm_package_type__num_parameters(package_key) as parameter_count,
                    node_id, url, parent_url, name, root_p, mylevel, object_id,
                    object_name, directory_p, parent_id, n_children,
                    (select case when acs_permission__permission_p(object_id, :user_id, 'admin') = 't' then 1 else 0 end) as object_admin_p
-            from apm_packages p right outer join
+            from apm_packages p join apm_package_types using (package_key) right outer join
                  (select n.node_id,
                          site_node__url(n.node_id) as url,
                          site_node__url(n.parent_id) as parent_url,
Index: openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	6 Jul 2002 14:05:22 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	19 Aug 2002 14:50:42 -0000	1.8
@@ -87,7 +87,7 @@
 </td></tr>
 <tr bgcolor=#aaaaaa><td>
 <table align=center width=100% bgcolor=#eeeeee cellspacing=1 border=0>
-<tr bgcolor=#cccccc><th>URL</th><th>Application</th><th>&nbsp;</th></tr>
+<tr bgcolor=#cccccc><th>URL</th><th>Instance Name</th><th>Package Type</th><th>&nbsp;</th></tr>
 "
 
 if {[llength $expand] == 0} {
@@ -188,6 +188,7 @@
         [export_form_vars expand:multiple root_id node_id new_package_id]
         <font size=-1>
         <input name=instance_name type=text size=8 value=\"Untitled\">
+        </td><td>
         <select name=package_key>
       "
 
@@ -203,6 +204,8 @@
 
       doc_body_append "
         </select>
+        </td>
+        <td>
         <input type=submit value=New>
         </font>
       </form>
@@ -222,7 +225,10 @@
     doc_body_append "<a href=\"$url\">$object_name</a>"
   }
 
-  doc_body_append "</td><td><font size=-1>\[ [join $controls " | "] \]</font></td></tr>\n"
+  if {![empty_string_p $object_id] || $new_application != $node_id } {
+      doc_body_append "</td><td>$package_pretty_name</td><td><font size=-1>\[ [join $controls " | "] \]</font></td>"
+  } 
+  doc_body_append "</tr>\n"
 
   if {$node_id == $new_parent} {
     set parent_id $new_parent