Index: openacs-4/packages/acs-subsite/www/admin/parameters.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/Attic/parameters.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/parameters.adp	28 Aug 2003 09:41:40 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/parameters.adp	12 Sep 2003 09:10:00 -0000	1.3
@@ -2,4 +2,24 @@
   <property name="title">@page_title@</property>
   <property name="context">@context@</property>
 
-<formtemplate id="parameters" style="configuration"></formtemplate>
+
+
+<if @counter@ gt 0>
+  <formtemplate id="parameters" style="configuration"></formtemplate>
+
+  <if @display_warning_p@ true>
+    <span style="color: red; font-weight: bold;">(*)</span>
+    Note text in red below the parameter entry fields indicates the value of this
+    parameter is being overridden by an entry in the OpenACS parameter file.  The
+    use of the parameter file is discouraged but some sites need it to provide
+    instance-specific values for parameters independent of the apm_parameter
+    tables.
+  </if>
+
+</if>
+<else>
+  <p> This package does not have any parameters. </p>
+  <if @return_url@ not nil>
+    <p> <b>&raquo;</b> <a href="@return_url@">Go back</a> </p>
+  </if>
+</else>
Index: openacs-4/packages/acs-subsite/www/admin/parameters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/Attic/parameters.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/parameters.tcl	28 Aug 2003 09:41:40 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/parameters.tcl	12 Sep 2003 09:10:00 -0000	1.3
@@ -4,38 +4,78 @@
     @author Lars Pind (lars@collaboraid.biz)
     @creation-date 2003-06-13
     @cvs-id $Id$
+} {
+    {package_id {[ad_conn package_id]}}
+    {return_url {}}
 }
 
-set page_title "Parameters"
+# TODO: Warn when file has stuff
 
-set context [list $page_title]
+db_1row select_instance_name {
+    select instance_name, package_key
+    from   apm_packages
+    where  package_id = :package_id
+}
 
-set package_id [ad_conn subsite_id]
+set package_url [site_node::get_url_from_object_id -object_id $package_id]
 
+set page_title "$instance_name Parameters"
+
+set context [list $page_title]
+
 ad_require_permission $package_id admin
 
+set form {
+    {return_url:text(hidden),optional}
+    {package_id:integer(hidden),optional}
+}
+
+set display_warning_p 0
+set counter 0
 db_foreach select_params {} {
     if { [empty_string_p $section_name] } {
         set section_name "Main"
     } else {
         set section_name [string map {_ { } - { }} $section_name]
         set section_name "[string toupper [string index $section_name 0]][string range $section_name 1 end]"
     }
-    lappend form [list ${parameter_name}:text,optional [list label $parameter_name] [list help_text $description] [list section $section_name] {html {size 50}}]
+    
+    set elm [list ${parameter_name}:text,optional \
+                 [list label $parameter_name] \
+                 [list help_text $description] \
+                 [list section $section_name] \
+                 {html {size 50}}]
+
+    set file_val [ad_parameter_from_file $parameter_name $package_key]
+    if { ![empty_string_p $file_val] } { 
+        set display_warning_p 1 
+        lappend elm [list after_html "<br><span style=\"color: red; font-weight: bold;\">$file_val (*)</span>"]
+    } 
+    
+    lappend form $elm
     set param($parameter_name) $attr_value
+    
+    incr counter
 }
 
-ad_form -name parameters -cancel_url [ad_conn url] -form $form -on_request {
-    foreach name [array names param] {
-        set $name $param($name)
+if { $counter > 0 } {
+    ad_form -name parameters -cancel_url [ad_conn url] -form $form -on_request {
+        foreach name [array names param] {
+            set $name $param($name)
+        }
+    } -on_submit {
+        db_foreach select_params_set {} {
+            if { [info exists $c__parameter_name]} {
+                parameter::set_value \
+                    -package_id $package_id \
+                    -parameter $c__parameter_name \
+                    -value [set $c__parameter_name]
+            }
+        }
+    } -after_submit {
+        if { ![empty_string_p $return_url] } {
+            ad_returnredirect $return_url
+            ad_script_abort
+        }
     }
-} -on_submit {
-    db_foreach select_params_set {} {
-	if { [info exists $c__parameter_name]} {
-	    parameter::set_value \
-                -package_id $package_id \
-                -parameter $c__parameter_name \
-                -value [set $c__parameter_name]
-	}
-    }
 }
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.15 -r1.16
--- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	8 Sep 2003 09:48:52 -0000	1.15
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	12 Sep 2003 09:10:00 -0000	1.16
@@ -134,7 +134,7 @@
 	    # Is the object a package?
 	    if {![empty_string_p $package_id]} {
 		if {$object_admin_p && ($parameter_count > 0)} {
-		    lappend controls "<a href=parameter-set?[export_url_vars package_id]>parameters</a>"
+		    lappend controls "<a href=\"[export_vars -base "../parameters" { package_id {return_url {[ad_return_url]} } }]\">parameters</a>"
 		}
 	    }
 	    
@@ -299,7 +299,7 @@
 db_foreach services_select {} {
     if {$parameter_count > 0} {
         if {[ad_permission_p $package_id admin]} {		
-	    doc_body_append "  <li><a href=parameter-set?[export_url_vars package_id package_key instance_name]>$instance_name</a>"
+	    doc_body_append "  <li><a href=\"[export_vars -base "../parameters" { package_id { return_url {[ad_return_url]} } }]\">$instance_name</a>"
 	}
     }
     doc_body_append "\n"