Index: openacs-4/packages/ams/tcl/ams-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/ams-widget-procs.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/ams/tcl/ams-widget-procs.tcl	9 Feb 2006 20:46:43 -0000	1.21
+++ openacs-4/packages/ams/tcl/ams-widget-procs.tcl	9 Feb 2006 20:54:41 -0000	1.22
@@ -186,9 +186,9 @@
     switch $request {
         ad_form_widget  {
 	    if { [string is true $optional_p] } {
-		return "${attribute_name}:address(address),optional {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:address(address),optional {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    } else {
-		return "${attribute_name}:address(address) {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:address(address) {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    }
 	}
         template_form_widget  {
@@ -271,9 +271,9 @@
     switch $request {
         ad_form_widget  {
 	    if { [string is true $optional_p] } {
-		return "${attribute_name}:telecom_number(telecom_number),optional {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:telecom_number(telecom_number),optional {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    } else {
-		return "${attribute_name}:telecom_number(telecom_number) {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:telecom_number(telecom_number) {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    }
 	}
         template_form_widget  {
@@ -355,9 +355,9 @@
     switch $request {
         ad_form_widget  {
 	    if { [string is true $optional_p] } {
-		return "${attribute_name}:date(date),optional {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:date(date),optional {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    } else {
-		return "${attribute_name}:date(date) {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:date(date) {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    }
 	}
         template_form_widget  {
@@ -433,10 +433,10 @@
         ad_form_widget  {
 	    if { [string is true $optional_p] } {
 		set options [concat [list [list "" ""]] $options]
-		return "${attribute_name}:integer(select),optional {help_text $help_text} {[list label ${pretty_name}]} {[list options $options]}"
+		return "${attribute_name}:integer(select),optional {help_text \"$help_text\"} {[list label ${pretty_name}]} {[list options $options]}"
 	    } else {
 		set options [concat [list [list "- [_ ams.select_one] -" ""]] $options]
-		return "${attribute_name}:integer(select) {help_text $help_text} {[list label ${pretty_name}]} {[list options $options]}"
+		return "${attribute_name}:integer(select) {help_text \"$help_text\"} {[list label ${pretty_name}]} {[list options $options]}"
 	    }
 	}
         template_form_widget  {
@@ -508,9 +508,9 @@
     switch $request {
         ad_form_widget  {
 	    if { [string is true $optional_p] } {
-		return "${attribute_name}:integer(radio),optional {help_text $help_text} {[list label ${pretty_name}]} {[list options $options]}"
+		return "${attribute_name}:integer(radio),optional {help_text \"$help_text\"} {[list label ${pretty_name}]} {[list options $options]}"
 	    } else {
-		return "${attribute_name}:integer(radio) {help_text $help_text} {[list label ${pretty_name}]} {[list options $options]}"
+		return "${attribute_name}:integer(radio) {help_text \"$help_text\"} {[list label ${pretty_name}]} {[list options $options]}"
 	    }
 	}
         template_form_widget  {
@@ -581,9 +581,9 @@
     switch $request {
         ad_form_widget  {
 	    if { [string is true $optional_p] } {
-		return "${attribute_name}:integer(checkbox),multiple,optional {help_text $help_text} {[list label ${pretty_name}]} {[list options $options]}"
+		return "${attribute_name}:integer(checkbox),multiple,optional {help_text \"$help_text\"} {[list label ${pretty_name}]} {[list options $options]}"
 	    } else {
-		return "${attribute_name}:integer(checkbox),multiple {help_text $help_text} {[list label ${pretty_name}]} {[list options $options]}"
+		return "${attribute_name}:integer(checkbox),multiple {help_text \"$help_text\"} {[list label ${pretty_name}]} {[list options $options]}"
 	    }
 	}
         template_form_widget  {
@@ -656,9 +656,9 @@
     switch $request {
         ad_form_widget  {
 	    if { [string is true $optional_p] } {
-		return "${attribute_name}:integer(multiselect),multiple,optional {help_text $help_text} {[list label ${pretty_name}]} {[list options $options]}"
+		return "${attribute_name}:integer(multiselect),multiple,optional {help_text \"$help_text\"} {[list label ${pretty_name}]} {[list options $options]}"
 	    } else {
-		return "${attribute_name}:integer(multiselect),multiple {help_text $help_text} {[list label ${pretty_name}]} {[list options $options]}"
+		return "${attribute_name}:integer(multiselect),multiple {help_text \"$help_text\"} {[list label ${pretty_name}]} {[list options $options]}"
 	    }
 	}
         template_form_widget  {
@@ -733,9 +733,9 @@
     switch $request {
         ad_form_widget  {
 	    if { [string is true $optional_p] } {
-		return "${attribute_name}:integer(text),optional {html {size 6}} {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:integer(text),optional {html {size 6}} {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    } else {
-		return "${attribute_name}:integer(text) {html {size 6}} {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:integer(text) {html {size 6}} {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    }
 	}
         template_form_widget  {
@@ -809,9 +809,9 @@
     switch $request {
         ad_form_widget  {
 	    if { [string is true $optional_p] } {
-		return "${attribute_name}:text(text),optional {html {size 30}} {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:text(text),optional {html {size 30}} {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    } else {
-		return "${attribute_name}:text(text) {html {size 30}} {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:text(text) {html {size 30}} {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    }
 	}
         template_form_widget  {
@@ -881,13 +881,13 @@
     @see ams::widget
 } {
     set value [ams::util::text_value -value $value]
-        set help_text [attribute::help_text -attribute_id $attribute_id] 
+    set help_text [attribute::help_text -attribute_id $attribute_id] 
     switch $request {
         ad_form_widget  {
 	    if { [string is true $optional_p] } {
-		return "${attribute_name}:text(textarea),optional {html {cols 60 rows 6}} {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:text(textarea),optional {html {cols 60 rows 6}} {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    } else {
-		return "${attribute_name}:text(textarea) {html {cols 60 rows 10}} {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:text(textarea) {html {cols 60 rows 10}} {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    }
 	}
         template_form_widget  {
@@ -963,9 +963,9 @@
     switch $request {
         ad_form_widget  {
 	    if { [string is true $optional_p] } {
-		return "${attribute_name}:richtext(richtext),optional {html {cols 60 rows 14}} {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:richtext(richtext),optional {html {cols 60 rows 14}} {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    } else {
-		return "${attribute_name}:richtext(richtext) {html {cols 60 rows 14}} {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:richtext(richtext) {html {cols 60 rows 14}} {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    }
 	}
         template_form_widget  {
@@ -1040,9 +1040,9 @@
     switch $request {
         ad_form_widget  {
 	    if { [string is true $optional_p] } {
-		return "${attribute_name}:email(text),optional {html {size 30}} {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:email(text),optional {html {size 30}} {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    } else {
-		return "${attribute_name}:email(text) {html {size 30}} {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:email(text) {html {size 30}} {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    }
 	}
         template_form_widget  {
@@ -1115,9 +1115,9 @@
     switch $request {
         ad_form_widget  {
 	    if { [string is true $optional_p] } {
-		return "${attribute_name}:url(text),optional {html {size 30}} {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:url(text),optional {html {size 30}} {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    } else {
-		return "${attribute_name}:url(text) {html {size 30}} {help_text $help_text} {[list label ${pretty_name}]}"
+		return "${attribute_name}:url(text) {html {size 30}} {help_text \"$help_text\"} {[list label ${pretty_name}]}"
 	    }
 	}
         template_form_widget  {
Index: openacs-4/packages/ams/www/attribute.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/www/attribute.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/ams/www/attribute.tcl	9 Feb 2006 20:46:43 -0000	1.8
+++ openacs-4/packages/ams/www/attribute.tcl	9 Feb 2006 20:54:41 -0000	1.9
@@ -17,11 +17,7 @@
 
 set pretty_name_url   [lang::util::edit_lang_key_url -message $attribute_info(pretty_name)]
 set pretty_plural_url [lang::util::edit_lang_key_url -message $attribute_info(pretty_plural)]
-if {[string eq "" $attribute_info(help_text)]} {
-    set help_text_url [lang::util::edit_lang_key_url -message "#acs-translations.ams_attribute_${attribute_id}_help_text#"]    
-} else {
-    set help_text_url [lang::util::edit_lang_key_url -message $attribute_info(help_text)]
-}
+set help_text_url [lang::util::edit_lang_key_url -message "#acs-translations.ams_attribute_${attribute_id}_help_text#"]    
 
 set title $attribute_info(pretty_name)
 set context [list [list objects Objects] [list "object?object_type=$attribute_info(object_type)" $object_info(pretty_name)] $title]