Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v diff -u -r1.132 -r1.133 --- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 14 Feb 2009 13:39:07 -0000 1.132 +++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 16 Feb 2009 12:11:55 -0000 1.133 @@ -37,7 +37,8 @@ {show_raw_value} CSSclass style - form-widget-CSSclass + {form_widget_CSSclass form-widget} + {form_item_wrapper_CSSclass form-item-wrapper} {type text} {label} {name} @@ -374,9 +375,7 @@ FormField instproc render_form_widget {} { # This method provides the form-widget wrapper - set class form-widget - if {[my exists form-widget-CSSclass]} {append class " [my form-widget-CSSclass]"} - ::html::div -class $class { my render_input } + ::html::div -class [my form_widget_CSSclass] { my render_input } } FormField instproc render_input {} { @@ -388,7 +387,7 @@ } FormField instproc render_item {} { - ::html::div -class form-item-wrapper { + ::html::div -class [my form_item_wrapper_CSSclass] { ::html::div -class form-label { ::html::label -for [my id] { ::html::t [my label] @@ -1756,6 +1755,7 @@ Class CompoundField -superclass FormField -parameter { {components ""} + {CSSclass compound-field} } -extend_slot validator compound CompoundField instproc check=compound {value} { @@ -1892,8 +1892,7 @@ # # Render content within in a fieldset, but with labels etc. # - my set style "margin: 0px; padding: 0px;" - html::fieldset [my get_attributes id style] { + html::fieldset [my get_attributes id {CSSclass class}] { foreach c [my components] { $c render } } } Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -r1.219 -r1.220 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 14 Feb 2009 13:39:07 -0000 1.219 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 16 Feb 2009 12:11:55 -0000 1.220 @@ -863,7 +863,7 @@ } if {[string match *.* $att]} { foreach {container component} [split $att .] break - lappend containers($container) $component + lappend containers($container) $component } } @@ -886,7 +886,7 @@ set processed($c) 1 #my msg "compute value of $c" set __ia($c) [$f value] - #my msg "__ia($c) is set to '[$f value]'" + #my msg "__ia($c) is set to '$__ia($c)'" } } } Index: openacs-4/packages/xowiki/www/resources/xowiki.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/xowiki.css,v diff -u -r1.43 -r1.44 --- openacs-4/packages/xowiki/www/resources/xowiki.css 23 Dec 2008 09:49:41 -0000 1.43 +++ openacs-4/packages/xowiki/www/resources/xowiki.css 16 Feb 2009 12:11:55 -0000 1.44 @@ -309,6 +309,36 @@ font-size: 65%; } + +div.xowiki-content fieldset.compound-field { + margin: 0px; padding: 0px; +} + +/* child selectors are apparently not supported by IE 5 and 6, + but the content is usable in IE anyhow; maybe we have to use the + parent-node hack + + background-color: expression(/currentpage/.test(this.parentNode.className)? "#eff" : "#ef0"); + + or the nesting hack + + div * { margin-left: 20px; } + div * * { margin-left: 0} + + as well... +*/ +div.xowiki-content div.hidden-field-set > div.form-label { + display: none; +} +div.xowiki-content div.hidden-field-set > div.form-widget { + margin-left: 0px; +} +div.xowiki-content div.hidden-field-set > div.form-widget > .compound-field { + border: 0px; +} + + + div.xowiki-content .margin-form fieldset .form-item-wrapper { padding: 0px 0px 0px 0px; }