Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.47 -r1.48
--- openacs-4/packages/acs-subsite/acs-subsite.info 12 Sep 2003 08:27:43 -0000 1.47
+++ openacs-4/packages/acs-subsite/acs-subsite.info 12 Sep 2003 12:34:21 -0000 1.48
@@ -57,7 +57,6 @@
-
Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/lib/login.tcl 12 Sep 2003 10:18:30 -0000 1.6
+++ openacs-4/packages/acs-subsite/lib/login.tcl 12 Sep 2003 12:34:21 -0000 1.7
@@ -76,10 +76,14 @@
}
}
+if { [parameter::get -parameter UsePasswordWidgetForUsername -package_id [ad_acs_kernel_id]] } {
+ set username_widget password
+} else {
+ set username_widget text
+}
+ad_form -extend -name login -form [list [list username:text($username_widget) [list label "Username"]]]
+
ad_form -extend -name login -form {
- {username:text
- {label "Username"}
- }
{password:text(password)
{label "Password"}
}
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/parameters-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/admin/parameters-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/parameters.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/parameters.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
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.16 -r1.17
--- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl 12 Sep 2003 09:10:00 -0000 1.16
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl 12 Sep 2003 12:34:21 -0000 1.17
@@ -134,7 +134,7 @@
# Is the object a package?
if {![empty_string_p $package_id]} {
if {$object_admin_p && ($parameter_count > 0)} {
- lappend controls "parameters"
+ lappend controls "parameters"
}
}
@@ -299,7 +299,7 @@
db_foreach services_select {} {
if {$parameter_count > 0} {
if {[ad_permission_p $package_id admin]} {
- doc_body_append "
$instance_name"
+ doc_body_append " $instance_name"
}
}
doc_body_append "\n"
Index: openacs-4/packages/acs-subsite/www/shared/parameters-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/Attic/parameters-oracle.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/shared/parameters-oracle.xql 12 Sep 2003 12:34:21 -0000 1.1
@@ -0,0 +1,42 @@
+
+
+
+ oracle8.1.6
+
+
+
+
+ select p.parameter_name,
+ nvl(p.description, 'No Description') as description,
+ v.attr_value,
+ nvl(p.section_name, '') as section_name
+ from apm_parameters p,
+ (select v.parameter_id,
+ v.attr_value
+ from apm_parameter_values v
+ where v.package_id = :package_id
+ ) v
+ where p.package_key = (select package_key from apm_packages where package_id = :package_id)
+ and p.parameter_id = v.parameter_id
+ order by section_name, parameter_name
+
+
+
+
+
+
+
+ select p.parameter_name as c__parameter_name
+ from apm_parameters p,
+ (select v.parameter_id,
+ v.attr_value
+ from apm_parameter_values v
+ where v.package_id = :package_id
+ ) v
+ where p.package_key = (select package_key from apm_packages where package_id = :package_id)
+ and p.parameter_id = v.parameter_id
+
+
+
+
+
Index: openacs-4/packages/acs-subsite/www/shared/parameters-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/Attic/parameters-postgresql.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/shared/parameters-postgresql.xql 12 Sep 2003 12:34:21 -0000 1.1
@@ -0,0 +1,41 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select p.parameter_name,
+ coalesce(p.description, 'No Description') as description,
+ v.attr_value,
+ coalesce(p.section_name, '') as section_name
+ from apm_parameters p left outer join
+ (select v.parameter_id,
+ v.attr_value
+ from apm_parameter_values v
+ where v.package_id = :package_id
+ ) v on p.parameter_id = v.parameter_id
+ where p.package_key = (select package_key from apm_packages where package_id = :package_id)
+ order by section_name, parameter_name
+
+
+
+
+
+
+
+
+ select p.parameter_name as c__parameter_name
+ from apm_parameters p left outer join
+ (select v.parameter_id,
+ v.attr_value
+ from apm_parameter_values v
+ where v.package_id = :package_id
+ ) v on p.parameter_id = v.parameter_id
+ where p.package_key = (select package_key from apm_packages where package_id = :package_id)
+
+
+
+
+
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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/shared/parameters.adp 12 Sep 2003 12:34:21 -0000 1.1
@@ -0,0 +1,25 @@
+
+ @page_title@
+ @context@
+
+
+
+
+
+
+
+ (*)
+ 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.
+
+
+
+
+ This package does not have any parameters.
+
+ » Go back
+
+
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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/shared/parameters.tcl 12 Sep 2003 12:34:21 -0000 1.1
@@ -0,0 +1,79 @@
+ad_page_contract {
+ Parameters page.
+
+ @author Lars Pind (lars@collaboraid.biz)
+ @creation-date 2003-06-13
+ @cvs-id $Id: parameters.tcl,v 1.1 2003/09/12 12:34:21 lars Exp $
+} {
+ {package_id {[ad_conn package_id]}}
+ {return_url {[ad_conn url]}}
+}
+
+permission::require_permission -object_id $package_id -privilege admin
+
+db_1row select_instance_name {
+ select instance_name, package_key
+ from apm_packages
+ where package_id = :package_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]"
+ }
+
+ 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 "
$file_val (*)"]
+ }
+
+ lappend form $elm
+ set param($parameter_name) $attr_value
+
+ incr counter
+}
+
+if { $counter > 0 } {
+ ad_form -name parameters -cancel_url $return_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 {
+ ad_returnredirect $return_url
+ ad_script_abort
+ }
+}