Index: openacs-4/packages/acs-templating/resources/forms/standard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/standard.adp,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/acs-templating/resources/forms/standard.adp 15 Oct 2008 17:24:04 -0000 1.24
+++ openacs-4/packages/acs-templating/resources/forms/standard.adp 21 Oct 2008 08:34:55 -0000 1.25
@@ -89,7 +89,9 @@
-
+
+
+
Index: openacs-4/packages/acs-templating/tcl/date-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/date-procs.tcl,v
diff -u -r1.43 -r1.44
--- openacs-4/packages/acs-templating/tcl/date-procs.tcl 29 Jul 2008 19:22:24 -0000 1.43
+++ openacs-4/packages/acs-templating/tcl/date-procs.tcl 21 Oct 2008 08:34:55 -0000 1.44
@@ -1014,7 +1014,6 @@
# the user to enter a freeform format
append output "\n"
- append output "
\n"
# Prepare the value to set defaults on the form
if { [info exists element(value)] &&
@@ -1038,7 +1037,6 @@
set id_attr_name $attributes(id)
}
- set tbody_content "
"
while { $format_string ne {} } {
# Snip off the next token
@@ -1048,19 +1046,17 @@
regexp -nocase $template::util::date::token_exp $word \
match token type
- append tbody_content "
"
-
lappend tokens $token
# Output the widget
set fragment_def $template::util::date::fragment_widgets([string toupper $token])
set fragment [lindex $fragment_def 1]
if {[exists_and_not_null id_attr_name]} {
- set attributes(id) "${id_attr_name}.${fragment}"
+ set attributes(id) "${id_attr_name}.${fragment}"
}
- append tbody_content [template::widget::[lindex $fragment_def 0] \
+ set widget [template::widget::[lindex $fragment_def 0] \
element \
$fragment \
[lindex $fragment_def 2] \
@@ -1069,34 +1065,21 @@
$element(mode) \
[array get attributes]]
+ if { [info exists element(help)] } {
+ append output ""
+ } else {
+ append output $widget
+ }
+
# Output the separator
if {$sep eq " "} {
- append tbody_content " "
+ append output " "
} else {
- append tbody_content "$sep"
+ append output "$sep"
}
- append tbody_content "
\n"
}
- append tbody_content "
\n"
-
- # Append help text under each widget, if neccessary
- set tfoot_content ""
- if { [info exists element(help)] } {
-
- append tfoot_content "
\n"
- foreach token $tokens {
- set fragment_def $template::util::date::fragment_widgets([string toupper $token])
- set fragment [lindex $fragment_def 1]
- append tfoot_content "