Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 2 Sep 2003 10:07:49 -0000 1.5
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 17 Sep 2003 12:13:25 -0000 1.6
@@ -531,38 +531,37 @@
if { [permission::permission_p -object_id [ad_conn subsite_id] -privilege admin] } {
lappend pageflow admin {
label "Administration"
- folder "admin"
- url "configure"
+ url "admin/configure"
selected_patterns {
*
}
subsections {
configuration {
label "Configuration"
- url "configure"
+ url "admin/configure"
}
applications {
label "Applications"
- folder "applications"
+ folder "admin/applications"
url ""
selected_patterns {
*
}
}
permissions {
label "Permissions"
- url "permissions"
+ url "admin/permissions"
selected_patterns {
permissions*
}
}
parameters {
label "Parameters"
- url "parameters"
+ url "shared/parameters"
}
advanced {
label "Advanced"
- url "."
+ url "admin/."
selected_patterns {
site-map/*
groups/*
Index: openacs-4/packages/acs-subsite/www/group-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/group-master.tcl 28 Aug 2003 09:41:40 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/group-master.tcl 17 Sep 2003 12:13:25 -0000 1.3
@@ -25,33 +25,6 @@
# Where to find the stylesheet
set css_url "${subsite_url}group-master.css"
-# Get system name
-set system_name [ad_system_name]
-set system_url [ad_url]
-
-# Get user information
-set user_id [ad_conn user_id]
-if { $user_id != 0 } {
- set user_name [person::name -person_id $user_id]
- set pvt_home_url [ad_pvt_home]
- set pvt_home_name [ad_pvt_home_name]
- set logout_url [ad_get_logout_url]
-} else {
- set login_url [ad_get_login_url -return]
-}
-
-# Site-wide admin link
-set swadmin_url {}
-if { $user_id != 0 } {
- array set swadmin_node [site_node::get -url /acs-admin]
- set swadmin_object_id $swadmin_node(object_id)
- set sw_admin_p [permission::permission_p -party_id $user_id -object_id $swadmin_object_id -privilege admin]
- if { $sw_admin_p } {
- set sw_admin_url "/acs-admin"
- }
-}
-
-
# Context bar
if { [template::util::is_nil no_context_p] } {
if { ![template::util::is_nil context] } {
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.14 -r1.15
--- openacs-4/packages/acs-subsite/www/admin/index.adp 8 Sep 2003 09:49:40 -0000 1.14
+++ openacs-4/packages/acs-subsite/www/admin/index.adp 17 Sep 2003 12:13:25 -0000 1.15
@@ -17,10 +17,12 @@
</li>
</ul>
-<h3>Core Services</h3>
-<ul>
- <li>
- <a href="@acs_admin_url@">@acs_admin_name@</a>
- <include src="/packages/acs-admin/lib/site-wide-services">
- </li>
-</ul>
+<if @sw_admin_p@ true>
+ <h3>Core Services</h3>
+ <ul>
+ <li>
+ <a href="@acs_admin_url@">@acs_admin_name@</a>
+ <include src="/packages/acs-admin/lib/site-wide-services">
+ </li>
+ </ul>
+</if>
Index: openacs-4/packages/acs-subsite/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/admin/index.tcl 3 Sep 2003 10:35:24 -0000 1.9
+++ openacs-4/packages/acs-subsite/www/admin/index.tcl 17 Sep 2003 12:13:25 -0000 1.10
@@ -22,11 +22,15 @@
set acs_admin_url [apm_package_url_from_key "acs-admin"]
array set acs_admin_node [site_node::get -url $acs_admin_url]
set acs_admin_name $acs_admin_node(instance_name)
+set sw_admin_p [permission::permission_p -party_id [ad_conn user_id] -object_id $acs_admin_node(object_id) -privilege admin]
+
set acs_automated_testing_url [apm_package_url_from_key "acs-automated-testing"]
set acs_lang_admin_url "[apm_package_url_from_key "acs-lang"]admin/"
+
+
# Dirk: temporary fix for noquote hacking
set acs_admin_available_p 1
set instance_name "foobar"
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp 22 May 2003 14:10:01 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp 17 Sep 2003 12:13:25 -0000 1.4
@@ -12,7 +12,7 @@
<else>
<multiple name="rel_types">
- <li> @rel_types.indent@<a href="one?rel_type=@rel_types.rel_type@">@rel_types.pretty_name@</a> (number of relationships defined: @rel_types.number_relationships@)
+ <li> @rel_types.indent;noquote@<a href="one?rel_type=@rel_types.rel_type@">@rel_types.pretty_name@</a> (number of relationships defined: @rel_types.number_relationships@)
</li>
</multiple>
Index: openacs-4/packages/acs-subsite/www/shared/parameters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/parameters.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/shared/parameters.tcl 12 Sep 2003 12:34:21 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/shared/parameters.tcl 17 Sep 2003 12:13:25 -0000 1.2
@@ -19,9 +19,13 @@
set package_url [site_node::get_url_from_object_id -object_id $package_id]
-set page_title "$instance_name Parameters"
+set page_title "Parameters"
-set context [list $page_title]
+if { [string equal $package_url [subsite::get_element -element url]] } {
+ set context [list $page_title]
+} else {
+ set context [list [list $package_url $instance_name] $page_title]
+}
ad_require_permission $package_id admin
Index: openacs-4/www/site-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/www/site-master.adp 12 Sep 2003 09:15:30 -0000 1.1
+++ openacs-4/www/site-master.adp 17 Sep 2003 12:13:10 -0000 1.2
@@ -38,9 +38,9 @@
</td>
<td align="right" class="subsite-header" style="padding-right: 8px;" width="33%">
- <if @sw_admin_url@ not nil>
+ <if @admin_url@ not nil>
- <span class="button-header"><a href="@sw_admin_url@" title="Site-wide administration" class="button">Admin</a></span>
+ <span class="button-header"><a href="@admin_url@" title="Site-wide administration" class="button">Admin</a></span>
</if>
<if @pvt_home_url@ not nil>
Index: openacs-4/www/site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/www/site-master.tcl 17 Sep 2003 11:20:15 -0000 1.2
+++ openacs-4/www/site-master.tcl 17 Sep 2003 12:13:10 -0000 1.3
@@ -41,13 +41,15 @@
}
# Site-wide admin link
-set swadmin_url {}
+set admin_url {}
if { $user_id != 0 } {
- array set swadmin_node [site_node::get -url /acs-admin]
+ array set swadmin_node [site_node::get -url [apm_package_url_from_key "acs-admin"]]
set swadmin_object_id $swadmin_node(object_id)
set sw_admin_p [permission::permission_p -party_id $user_id -object_id $swadmin_object_id -privilege admin]
if { $sw_admin_p } {
- set sw_admin_url "/acs-admin"
+ set admin_url "/acs-admin/"
+ } elseif { [permission::permission_p -party_id $user_id -object_id [ad_conn subsite_id] -privilege admin] } {
+ set admin_url "[subsite::get_element -element url]admin/"
}
}