Index: openacs-4/packages/acs-admin/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/index.tcl,v
diff -u -N -r1.15 -r1.15.4.1
--- openacs-4/packages/acs-admin/www/index.tcl	17 Oct 2010 21:06:07 -0000	1.15
+++ openacs-4/packages/acs-admin/www/index.tcl	16 Apr 2014 09:09:26 -0000	1.15.4.1
@@ -39,7 +39,8 @@
          $global_params == 0 } {
          set global_param_url ""
     } else {
-        set global_param_url [export_vars -base /shared/parameters {package_key {scope global}}]
+	set return_url [ad_conn url]
+        set global_param_url [export_vars -base /shared/parameters {package_key return_url {scope global}}]
     }
     if { $admin_url eq "" && $global_param_url eq "" } {
         continue
Index: openacs-4/packages/acs-subsite/www/shared/parameters.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/parameters.adp,v
diff -u -N -r1.4.22.1 -r1.4.22.2
--- openacs-4/packages/acs-subsite/www/shared/parameters.adp	11 Sep 2013 18:40:20 -0000	1.4.22.1
+++ openacs-4/packages/acs-subsite/www/shared/parameters.adp	16 Apr 2014 09:09:25 -0000	1.4.22.2
@@ -3,6 +3,13 @@
   <property name="context">@context@</property>
   <property name="focus">@focus;noquote@</property>
 
+<if @global_param_url@ defined>
+<h2>Global parameters</h2> 
+<blockquote>
+<a href='@global_param_url;literal@'>@global_parameter_label@</a><br>
+</blockquote>
+<h2>Instance parameters</h2>
+</if>
 <if @counter@ gt 0>
   <formtemplate id="parameters"></formtemplate>
 
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 -N -r1.20 -r1.20.6.1
--- openacs-4/packages/acs-subsite/www/shared/parameters.tcl	4 Apr 2010 14:51:47 -0000	1.20
+++ openacs-4/packages/acs-subsite/www/shared/parameters.tcl	16 Apr 2014 09:09:26 -0000	1.20.6.1
@@ -17,16 +17,9 @@
         -object_id [acs_lookup_magic_object security_context_root] \
         -privilege admin
     db_1row select_pretty_name {}
-    set package_url /acs-admin
-    set page_title "$instance_name Global Parameters"
-    set context [list [list $package_url "Site-Wide Administration"] $page_title]
-} else {
-    permission::require_permission -object_id $package_id -privilege admin
 
-    db_1row select_instance_name {}
-
+    set page_title "$instance_name Global Parameters"
     set package_url [site_node::get_url_from_object_id -object_id $package_id]
-    set page_title "$instance_name Instance Parameters"
 
     if { $package_url eq [subsite::get_element -element url] } {
         set context [list [list "${package_url}admin/" "Administration"] $page_title]
@@ -35,8 +28,40 @@
     } else {
         set context [list $page_title]
     }
+
+} else {
+    permission::require_permission -object_id $package_id -privilege admin
+    db_1row select_instance_name {}
+
+    set page_title "$instance_name Instance Parameters"
+    set package_url [site_node::get_url_from_object_id -object_id $package_id]
 }
 
+if { $package_url eq [subsite::get_element -element url] } {
+    set context [list [list "${package_url}admin/" "Administration"] $page_title]
+} elseif { $package_url ne "" } {
+    set context [list [list $package_url $instance_name] [list "${package_url}admin/" "Administration"] $page_title]
+} else {
+    set context [list $page_title]
+}
+
+if { $scope ne "global" } {
+
+    if {![info exists package_key] || $package_key eq ""} {
+	set package_key [apm_package_key_from_id $package_id]
+    }
+    set global_parameters [db_list get_global_parameters {
+	select parameter_name from apm_parameters where package_key = :package_key and scope = 'global'
+    }] 
+    if {[llength $global_parameters] > 0} {
+	#
+	# Just provide a link to the global parameters in case these exist
+	#
+	set global_parameter_label [join [lsort $global_parameters] ", "]
+	set global_param_url [export_vars -base /shared/parameters {package_key return_url package_id {scope global}}]
+    }
+}
+
 ad_form -name parameters -export {section} -cancel_url $return_url -form {
     {return_url:text(hidden)}
     {scope:text(hidden)}