- The call to gp_return_template then renders the page - it is your responsibility to render the form + The call to ad_return_template then renders the page - it is your responsibility to render the form in your template by use of the ATS formtemplate tag.
@@ -360,10 +360,9 @@
return -code error "No \"form\" block has been specified for form \"$form_name\""
}
- # If we're not extending
+ # If we're not extending - this needs integration with the ATS form builder ...
if { !$extend_p } {
- global gp_conn
- incr gp_conn(form_count)
+ # incr ad_conn(form_count)
}
####################
@@ -739,7 +738,7 @@
foreach {element_name validate_expr error_message} $validate_element {
if { ![template::element error_p $form_name $element_name] && \
![uplevel #$level [list expr $validate_expr]] } {
- template::element set_error $form_name $element_name $error_message
+ template::element set_error $form_name $element_name [subst $error_message]
}
}
}
@@ -854,9 +853,9 @@
foreach arg $args {
if { [llength $arg] == 1 } {
upvar $arg value
- gp_set_element_value -element $arg $value
+ ad_set_element_value -element $arg $value
} else {
- gp_set_element_value -element [lindex $arg 0] [lindex $arg 1]
+ ad_set_element_value -element [lindex $arg 0] [lindex $arg 1]
}
}
}
Index: openacs.org-dev/packages/acs-tcl/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/acs-tcl/tcl/navigation-procs.tcl,v
diff -u -N -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/acs-tcl/tcl/navigation-procs.tcl 9 Jul 2002 17:34:59 -0000 1.1.1.1
+++ openacs.org-dev/packages/acs-tcl/tcl/navigation-procs.tcl 25 Jul 2002 18:46:52 -0000 1.1.1.2
@@ -12,11 +12,16 @@
}
-ad_proc ad_context_bar { args } {
+ad_proc ad_context_bar {
+ -node_id
+ args
+} {
Returns a Yahoo-style hierarchical navbar. Includes "Your Workspace" or "Administration"
if applicable, and the subsite if not global.
+ @param node_id If provided work up from this node, otherwise the current node
+
} {
set context [list]
@@ -25,7 +30,10 @@
lappend context [list "[ad_pvt_home]" "[ad_pvt_home_name]"]
}
- set node_id [ad_conn node_id]
+ if { ![info exists node_id] } {
+ set node_id [ad_conn node_id]
+ }
+
db_foreach context {
select site_node.url(node_id) as url, object_id,
acs_object.name(object_id) as object_name,
Index: openacs.org-dev/packages/acs-tcl/tcl/request-processor-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/acs-tcl/tcl/request-processor-init.tcl,v
diff -u -N -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/acs-tcl/tcl/request-processor-init.tcl 9 Jul 2002 17:34:59 -0000 1.1.1.1
+++ openacs.org-dev/packages/acs-tcl/tcl/request-processor-init.tcl 25 Jul 2002 18:46:52 -0000 1.1.1.2
@@ -8,7 +8,7 @@
}
# These procedures are dynamically defined at startup to alleviate
-# lock contention. Thanks to davis@arsdigita.com.
+# lock contention. Thanks to davis@xarg.net.
proc ad_acs_admin_id_mem {} {
return [db_string acs_kernel_id_get {
Index: openacs.org-dev/packages/acs-tcl/tcl/site-nodes-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/acs-tcl/tcl/site-nodes-procs.tcl,v
diff -u -N -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/acs-tcl/tcl/site-nodes-procs.tcl 9 Jul 2002 17:34:59 -0000 1.1.1.1
+++ openacs.org-dev/packages/acs-tcl/tcl/site-nodes-procs.tcl 25 Jul 2002 18:46:52 -0000 1.1.1.2
@@ -32,29 +32,6 @@
return $node_id
}
- ad_proc -public new_with_package {
- {-name:required}
- {-parent_id:required}
- {-package_key:required}
- {-instance_name:required}
- {-context_id:required}
- } {
- create site node, instantiate package, mount package at new site node
- } {
- set node_id [new -name $name -parent_id $parent_id]
-
- set package_id [apm_package_create_instance $instance_name $context_id $package_key]
-
- mount -node_id $node_id -object_id $package_id
-
- update_cache -node_id $node_id
-
- # call post instantiation proc for the package
- apm_package_call_post_instantiation_proc $package_id $package_key
-
- return $package_id
- }
-
ad_proc -public delete {
{-node_id:required}
} {
@@ -219,7 +196,7 @@
} {
return the site node associated with the given object_id
} {
- return [get -url [get_url_from_object_id -object_id $object_id]]
+ return [get -url [lindex [get_url_from_object_id -object_id $object_id] 0]]
}
ad_proc -public get_url {
@@ -238,9 +215,10 @@
ad_proc -public get_url_from_object_id {
{-object_id:required}
} {
- return the url of the site node associated with the given object
+ returns a list of urls for site_nodes that have the given object
+ mounted or the empty list if there are none
} {
- return [db_string select_url_from_object_id {} -default ""]
+ return [db_list select_url_from_object_id {}]
}
ad_proc -public get_node_id {
@@ -257,7 +235,7 @@
} {
return the site node id associated with the given object_id
} {
- return [get_node_id -url [get_url_from_object_id -object_id $object_id]]
+ return [get_node_id -url [lindex [get_url_from_object_id -object_id $object_id] 0]]
}
ad_proc -public get_parent_id {
@@ -389,7 +367,7 @@
set context_id $parent_node_id
}
- return [site_node::new_with_package \
+ return [site_node_apm_integration::new_site_node_and_package \
-name $instance_name \
-parent_id $parent_node_id \
-package_key $package_key \
@@ -537,5 +515,5 @@
return $default
}
- return [site_node::get_url_from_object_id -object_id $subsite_pkg_id]
+ return [lindex [site_node::get_url_from_object_id -object_id $subsite_pkg_id] 0]
}
Index: openacs.org-dev/packages/acs-tcl/tcl/text-html-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/acs-tcl/tcl/text-html-procs.tcl,v
diff -u -N -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/acs-tcl/tcl/text-html-procs.tcl 9 Jul 2002 17:34:59 -0000 1.1.1.1
+++ openacs.org-dev/packages/acs-tcl/tcl/text-html-procs.tcl 25 Jul 2002 18:46:52 -0000 1.1.1.2
@@ -133,7 +133,7 @@
@param break_hard the number of characters you want the html fragment
truncated to. Will truncate, regardless of what tag is currently in action.
- @author Jeff Davis (davis@arsdigita.com)
+ @author Jeff Davis (davis@xarg.net)
} {
set frag $html_fragment
Index: openacs.org-dev/packages/acs-templating/acs-templating.info
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/acs-templating/acs-templating.info,v
diff -u -N -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/acs-templating/acs-templating.info 9 Jul 2002 17:34:59 -0000 1.1.1.1
+++ openacs.org-dev/packages/acs-templating/acs-templating.info 25 Jul 2002 18:46:52 -0000 1.1.1.2
@@ -30,7 +30,12 @@
+You are attaching a document to @pretty_object_name@.
-Choose a location for your attachment. If your attachment already
-exists in the file storage folder, simply select it.
+
+To attach a file already in a folder, open the folder by clicking the
+folder's name, then click the "[ Choose ]" link next to the file. To
+upload a new file into a folder, open the folder by clicking the
+folder's name, then click the appropriate "Attach a new: File | URL"
+link
+
+
@fs_context_bar_html@
Index: openacs.org-dev/packages/attachments/www/attach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/attachments/www/attach.tcl,v
diff -u -N -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/attachments/www/attach.tcl 9 Jul 2002 17:35:01 -0000 1.1.1.1
+++ openacs.org-dev/packages/attachments/www/attach.tcl 25 Jul 2002 18:46:57 -0000 1.1.1.2
@@ -24,10 +24,15 @@
}
# Load up file storage information
-
set root_folder_id [attachments::get_root_folder]
if {[empty_string_p $folder_id]} {
set folder_id $root_folder_id
+}
+
+# sanity check
+if {[empty_string_p $folder_id]} {
+ ad_return_complaint 1 "Error: empty folder_id!"
+ ad_script_abort
}
# Check permission
Index: openacs.org-dev/packages/attachments/www/file-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/attachments/www/file-add.adp,v
diff -u -N -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/attachments/www/file-add.adp 9 Jul 2002 17:35:01 -0000 1.1.1.1
+++ openacs.org-dev/packages/attachments/www/file-add.adp 25 Jul 2002 18:46:57 -0000 1.1.1.2
@@ -2,7 +2,7 @@
+You are attaching a new document to @pretty_object_name@.
+ @elements.section@ @elements.section@
-Otherwise, you
-may upload a new attachment.
+
-Date: @start_date@
-Time: @start_time@ - @end_time@
-Details: @description@
+Date: @cal_item.start_date@
+Time: @cal_item.start_time@ - @cal_item.end_time@
+Details: @cal_item.description@