Index: openacs-4/packages/acs-templating/www/doc/demo/pay.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/pay.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/www/doc/demo/pay.tcl 27 Oct 2014 16:40:19 -0000 1.3
+++ openacs-4/packages/acs-templating/www/doc/demo/pay.tcl 10 Jun 2015 12:09:59 -0000 1.4
@@ -25,7 +25,7 @@
set confirm_data [form export]
# add the form:confirm element
- append confirm_data ""
+ append confirm_data ""
template::set_file "[file dirname $__adp_stub]/pay-confirm"
}
Index: openacs-4/packages/acs-templating/www/doc/demo/string.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/string.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/www/doc/demo/string.tcl 13 Mar 2001 22:59:27 -0000 1.1
+++ openacs-4/packages/acs-templating/www/doc/demo/string.tcl 10 Jun 2015 12:09:59 -0000 1.2
@@ -1,7 +1,7 @@
# suppose this template was obtained from a database query
set template "
@name@ ordered
-
@food:item@
\n
"
+
@food:item@
\n
"
set code [adp_compile -string $template]; # compile the template
Index: openacs-4/packages/acs-templating/www/doc/exercise/form-sample-revised.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/form-sample-revised.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/exercise/form-sample-revised.tcl 27 Apr 2001 02:27:09 -0000 1.2
+++ openacs-4/packages/acs-templating/www/doc/exercise/form-sample-revised.tcl 10 Jun 2015 12:09:59 -0000 1.3
@@ -8,7 +8,7 @@
address -html { size 40 } -label "Address" -optional -datatype text
city -html { size 30 } -label "City" -optional -datatype text
state -html { size 3 maxlength 2 } -label "State" -optional -datatype keyword \
- -validate { {expr [string length $value ] ==2 } {Entry for tate must be two characters in length } }
+ -validate { {expr [string length $value ] == 2 } {Entry for tate must be two characters in length } }
zip -html { size 10 } -label "Zip" -optional -datatype text
country -html { size 30 } -label "Country" -optional -datatype text
email -html { size 30 } -label "Email" -optional -datatype text
Index: openacs-4/packages/acs-templating/www/doc/exercise/form-sample.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/form-sample.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-templating/www/doc/exercise/form-sample.tcl 10 Jan 2007 21:22:13 -0000 1.4
+++ openacs-4/packages/acs-templating/www/doc/exercise/form-sample.tcl 10 Jun 2015 12:09:59 -0000 1.5
@@ -73,7 +73,7 @@
address -html { size 40 } -label "Address" -optional -datatype text
city -html { size 30 } -label "City" -optional -datatype text
state -html { size 3 maxlength 2 } -label "State" -optional -datatype keyword \
- -validate { {expr [string length $value ] ==2 } {Entry for tate must be two characters in length } }
+ -validate { {expr [string length $value ] == 2 } {Entry for tate must be two characters in length } }
zip -html { size 10 } -label "Zip" -optional -datatype text
country -html { size 30 } -label "Country" -optional -datatype text
email -html { size 30 } -label "Email" -optional -datatype text
Index: openacs-4/packages/acs-templating/www/doc/gen/proc-template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/gen/proc-template.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/www/doc/gen/proc-template.tcl 13 Mar 2001 22:59:27 -0000 1.1
+++ openacs-4/packages/acs-templating/www/doc/gen/proc-template.tcl 10 Jun 2015 12:09:59 -0000 1.2
@@ -51,7 +51,7 @@
util::list_to_multirow see [lindex $data 3]
-set required_marker "*"
+set required_marker "*"
Index: openacs-4/packages/acs-templating/www/doc/guide/composite.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/guide/composite.html,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/www/doc/guide/composite.html 13 Mar 2001 22:59:27 -0000 1.1
+++ openacs-4/packages/acs-templating/www/doc/guide/composite.html 10 Jun 2015 12:09:59 -0000 1.2
@@ -17,11 +17,11 @@
may have the following structure.
-
+
master
-
+
top
@@ -31,8 +31,8 @@
root (main)
-
-
+
+
widget
@@ -57,109 +57,109 @@
The parts are
- put together with the <<include> tag (in the diagram below,
black links going right) and
- the <<master> tag (brown link going left);
and the concept is similar to a procedure call. The structure
of the composite page looks like this as a graph.
-
+
-
root
+
root
-
+
code
-
+
template
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
master
-
+
code
-
+
template
-
+
code
-
+
template
-
+
widget
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
code
-
+
template
-
+
code
-
+
template
-
+
-
top
bottom
+
top
bottom
@@ -188,27 +188,27 @@
-
root.tcl
-
root.adp
+
root.tcl
+
root.adp
(beginning and middle)
-
-
widget.tcl
-
widget.adp
-
root.adp
+
+
widget.tcl
+
widget.adp
+
root.adp
(end)
-
-
master.tcl
-
master.adp
+
+
master.tcl
+
master.adp
(beginning)
-
+
top.tcl
top.adp
-
master.adp
+
master.adp
(middle, containing <slave> tag)
-
+
bottom.tcl
bottom.adp
-
master.adp
+
master.adp
(end)
@@ -239,25 +239,25 @@
set_file again, we get the following picure.
-
+
code A
-
+
(template A ignored)
-
+
code B
(template B ignored)
-
-
...
-
+
+
...
+
code Z
@@ -267,7 +267,7 @@
This assumes page "A" was originally wanted. An arrow () exits from code
+ src="down.gif" width="7" height="15" align="top">) exits from code
which calls template::set_file (directly or through
ad_return_template). All scripts and the template
are executed in the same scope, i.e., they share
@@ -279,11 +279,11 @@
possibilities.
