Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/groups-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/groups-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/groups.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/groups.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-subsite/www/subsites-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/Attic/subsites-oracle.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/subsites-oracle.xql	19 Sep 2003 13:58:03 -0000	1.1
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="select_subsites">      
+      <querytext>
+      
+    select n.node_id, 
+           n.name, 
+           p.package_id,
+           p.instance_name,
+           acs_permission.permission_p(p.package_id, :user_id, 'read') as read_p
+    from   site_nodes n,
+           apm_packages p
+    where  n.parent_id = :subsite_node_id
+    and    p.package_id = n.object_id
+    and    p.package_key = 'acs-subsite'
+
+
+      </querytext>
+</fullquery>
+ 
+</queryset>
Index: openacs-4/packages/acs-subsite/www/subsites-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/Attic/subsites-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/subsites-postgresql.xql	19 Sep 2003 13:58:03 -0000	1.1
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="select_subsites">      
+      <querytext>
+      
+    select n.node_id, 
+           n.name, 
+           p.package_id,
+           p.instance_name,
+           acs_permission__permission_p(p.package_id, :user_id, 'read') as read_p
+    from   site_nodes n,
+           apm_packages p
+    where  n.parent_id = :subsite_node_id
+    and    p.package_id = n.object_id
+    and    p.package_key = 'acs-subsite'
+
+
+      </querytext>
+</fullquery>
+
+ 
+</queryset>
Index: openacs-4/packages/acs-subsite/www/subsites.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/Attic/subsites.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/subsites.adp	19 Sep 2003 13:58:03 -0000	1.1
@@ -0,0 +1,14 @@
+<master>
+  <property name="title">@page_title@</property>
+  <property name="context">@context@</property>
+
+<if @subsites:rowcount@ gt 0>
+  <p><listtemplate name="subsites"></listtemplate></p>
+</if>
+<else>
+  <p> There are no @pretty_plural@ here. </p>
+</else>
+
+<if @add_url@ not nil>
+  <p> <b>&raquo;</b> <a href="@add_url@">Create new @pretty_name@</a> </p>
+</if>
Index: openacs-4/packages/acs-subsite/www/subsites.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/Attic/subsites.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/subsites.tcl	19 Sep 2003 13:58:03 -0000	1.1
@@ -0,0 +1,49 @@
+ad_page_contract {
+    Applications
+
+    @author Lars Pind (lars@collaboraid.biz)
+    @creation-date 2003-06-02
+    @cvs-id $Id: subsites.tcl,v 1.1 2003/09/19 13:58:03 lars Exp $
+}
+
+
+if { [string equal [ad_conn package_url] "/"] } {
+    set pretty_name "community"
+    set pretty_plural "communities"
+} else {
+    set pretty_name "subcommunity"
+    set pretty_plural "subcommunities"
+}
+
+set page_title [string totitle $pretty_plural]
+set context [list $page_title]
+
+set user_id [ad_conn user_id]
+
+
+set admin_p [permission::permission_p -object_id [ad_conn package_id] -privilege admin]
+if { $admin_p } {
+    set add_url "[subsite::get_element -element url]admin/subsite-add"
+}
+
+
+# Get the subsite node ID
+set subsite_url [site_node_closest_ancestor_package_url]
+array set subsite_sitenode [site_node::get -url $subsite_url]
+set subsite_node_id $subsite_sitenode(node_id)
+
+db_multirow subsites select_subsites {}
+
+list::create \
+    -name subsites \
+    -multirow subsites \
+    -key node_id \
+    -elements {
+        instance_name {
+            label "Name"
+            link_url_eval {$name/}
+        }
+    }
+
+
+
Index: openacs-4/packages/acs-subsite/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-subsite/www/admin/index.adp	17 Sep 2003 12:13:25 -0000	1.15
+++ openacs-4/packages/acs-subsite/www/admin/index.adp	19 Sep 2003 13:58:03 -0000	1.16
@@ -2,21 +2,27 @@
 <property name="context">@context;noquote@</property>
 <property name="title">@subsite_name;noquote@ Administration</property>
 
-<h3>Subsite Administration</h3>
+<h3>@subsite_name@ Administration</h3>
 <ul>
-  <li>@subsite_name@
-    <ul>
-      <li><a href=site-map/>Site Map</a>
-      <li><a href=groups/>Groups</a>
-      <li><a href=group-types/>Group Types</a>
-      <li><a href=rel-segments/>Relational Segments</a>
-      <li><a href=rel-types/>Relationship Types</a>
-      <li><a href=host-node-map/>Host-Node Map</a>
-      <li><a href=object-types/>Object Types</a>
-    </ul>
-  </li> 
+  <li><a href="applications/"/>Applications</a>
+  <li><a href="configure">Configure</a>
+  <li><a href="permissions">Permissions</a>
+  <li><a href="../members/">Members</a>
+  <li><a href="../shared/parameters">Parameters</a>
 </ul>
 
+<h2>Advanced Features</h2>
+
+<ul>
+  <li><a href=site-map/>Site Map</a>
+  <li><a href=groups/>Groups</a>
+  <li><a href=group-types/>Group Types</a>
+  <li><a href=rel-segments/>Relational Segments</a>
+  <li><a href=rel-types/>Relationship Types</a>
+  <li><a href=host-node-map/>Host-Node Map</a>
+  <li><a href=object-types/>Object Types</a>
+</ul>
+
 <if @sw_admin_p@ true>
   <h3>Core Services</h3>
   <ul>