Index: openacs-4/packages/ams/www/list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/www/list.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ams/www/list.tcl	26 May 2005 07:35:29 -0000	1.3
+++ openacs-4/packages/ams/www/list.tcl	28 May 2005 15:37:27 -0000	1.4
@@ -1,251 +1,239 @@
-ad_page_contract {
-    
-    This page lets users manage ams lists
-
-    @author Matthew Geddert openacs@geddert.com
-    @creation-date 2004-07-28
-    @cvs-id $Id$
-
-} {
-    package_key:notnull
-    object_type:notnull
-    list_name:notnull
-    {pretty_name ""}
-    {description ""}
-    groupby:optional
-    orderby:optional
-    {format "normal"}
-    {status "normal"}
-    {return_url ""}
-    {return_url_label "Return to Where You Were"}
-}
-
-set provided_return_url $return_url
-set provided_return_url_label $return_url_label
-
-set this_url [export_vars -url -base "list" {package_key object_type list_name }]
-set code_url [export_vars -url -base "list-code" {package_key object_type list_name return_url return_url_label}]
-
-
-
-if { ![ams::list::exists_p -package_key $package_key -object_type $object_type -list_name $list_name] } {
-    ad_returnredirect -message "The list specified does not exists. You may create it if you like." [export_vars -base "list-add" -url {package_key object_type list_name pretty_name description return_url return_url_label}]
-    ad_script_abort
-}
-set list_id [ams::list::get_list_id -package_key $package_key -object_type $object_type -list_name $list_name]
-
-
-set create_attribute_url [export_vars -base "attribute-add" -url {object_type list_id return_url return_url_label}]
-
-
-
-
-ams::list::get -list_id $list_id -array "list_info"
-set title $list_info(pretty_name)
-set context [list [list lists Lists] $title]
-
-list::create \
-    -name mapped_attributes \
-    -multirow mapped_attributes \
-    -key attribute_id \
-    -row_pretty_plural "Mapped Attributes" \
-    -checkbox_name checkbox \
-    -selected_format $format \
-    -class "list" \
-    -main_class "list" \
-    -sub_class "narrow" \
-    -pass_properties {
-    } -actions {
-    } -bulk_actions {
-	"Answer Required" "list-attributes-required" "Require an answer from the checked attributes"
-	"Answer Optional" "list-attributes-optional" "An answer from the checked attributes is optional"
-	"Unmap" "list-attributes-unmap" "Unmap check attributes"
-	"Update Ordering" "list-order-update" "Update ordering from values in list"
-    } -bulk_action_export_vars { 
-        list_id
-    } -elements {
-        attribute_name {
-            label "Attribute"
-            display_col attribute_name
-        }
-        pretty_name {
-            label "Pretty Name"
-	    display_template {
-		<a href="@mapped_attributes.attribute_url@">@mapped_attributes.pretty_name@</a><if $object_type not eq @mapped_attributes.object_type@> (Parent Object Type: <a href="object?object_type=@mapped_attributes.object_type@">@mapped_attributes.object_type@</a>)</if>
-	    }
-        }
-        widget {
-            label "Widget"
-            display_col widget
-            link_url_eval widgets
-        }
-        section_heading {
-            label "Heading"
-            display_col section_heading
-        }
-        action {
-            label "Action"
-            display_template {
-                <a href="@mapped_attributes.unmap_url@" class="button">Unmap</a>
-                <a href="@mapped_attributes.heading_url@" class="button"><if @mapped_attributes.section_heading@ nil>Add Heading</if><else>Edit/Delete Heading</else></a>
-            }
-        }
-        answer {
-            label "Required"
-            display_template {
-                <if @mapped_attributes.required_p@>
-                <a href="list-attributes-optional?list_id=$list_id&attribute_id=@mapped_attributes.attribute_id@"><img src="/resources/acs-subsite/checkboxchecked.gif" title="Required" border="0"></a>
-                </if>
-                <else>
-                <a href="list-attributes-required?list_id=$list_id&attribute_id=@mapped_attributes.attribute_id@"><img src="/resources/acs-subsite/checkbox.gif" title="Optional" border="0"></a>
-                </else>
-            }
-        }
-        sort_order {
-            label "Ordering"
-            display_template {
-                <input name="sort_key.@mapped_attributes.attribute_id@" value="@mapped_attributes.sort_order_key@" size="4">
-            }
-        }
-    } -filters {
-    } -groupby {
-    } -orderby {
-    } -formats {
-        normal {
-            label "Table"
-            layout table
-            row {
-                checkbox {}
-                pretty_name {}
-                sort_order {}
-                answer {}
-                action {}
-		section_heading {}
-            }
-        }
-    }
-
-
-
-set sort_order_count 10
-
-db_multirow -extend { sort_order_key attribute_url unmap_url heading_url } -unclobber mapped_attributes select_mapped_attributes {
-        select alam.required_p,
-               alam.section_heading,
-               ams.attribute_id,
-               ams.widget,
-               ams.deprecated_p,
-               ams.attribute_name,
-               ams.pretty_name,
-               ams.pretty_plural,
-               ams.object_type
-          from ams_list_attribute_map alam,
-               ams_attributes ams
-         where alam.list_id = :list_id
-           and alam.attribute_id = ams.attribute_id
-         order by alam.sort_order
-} {
-    set attribute_url "attribute?[export_vars -url {attribute_id}]"
-    set sort_order_key $sort_order_count
-    set unmap_url [export_vars -base "list-attributes-unmap" -url {list_id attribute_id return_url return_url_label}]
-    set heading_url [export_vars -base "list-attribute-section-heading" -url {list_id attribute_id return_url return_url_label}]
-    incr sort_order_count 10
-}
-
-
-#----------------------------------------------------------------------
-# List builder
-#----------------------------------------------------------------------
-
-
-
-
-#    } -bulk_actions [list "Map" "list-attributes" "Map the selected attributes"] \
-#    -bulk_action_export_vars { 
-#        list_id
-
-list::create \
-    -name unmapped_attributes \
-    -multirow unmapped_attributes \
-    -key attribute_id \
-    -row_pretty_plural "Unmapped Attributes" \
-    -checkbox_name checkbox \
-    -selected_format "normal" \
-    -class "list" \
-    -main_class "list" \
-    -sub_class "narrow" \
-    -pass_properties {
-    } -actions {
-    } -elements {
-        attribute_name {
-            label "Attribute"
-            display_col attribute_name
-        }
-        pretty_name {
-            label "Pretty Name"
-            display_col pretty_name
-            link_url_eval $attribute_url
-        }
-        widget {
-            label "Widget"
-            display_col widget
-            link_url_eval widgets
-        }
-        action {
-            label "Action"
-            display_template {
-                <if @unmapped_attributes.widget@ nil>
-		<a href="@unmapped_attributes.attribute_add_url@" class="button">Define Widget</a>
-		</if>
-		<else>
-                <a href="@unmapped_attributes.map_url@" class="button">Map</a>
-		</else>
-            }
-        }
-    } -filters {
-    } -groupby {
-    } -orderby {
-    } -formats {
-        normal {
-            label "Table"
-            layout table
-            row {
-                pretty_name {}
-                widget {}
-                action {}
-            }
-        }
-    }
-#                checkbox {}
-
-
-
-# This query will override the ad_page_contract value entry_id
-
-db_multirow -extend { attribute_url attribute_add_url map_url } -unclobber unmapped_attributes get_unmapped_attributes "
-        select attribute_id,
-               widget,
-               deprecated_p,
-               attribute_name,
-               pretty_name,
-               pretty_plural,
-               object_type
-          from ams_attributes
-         where attribute_id not in ( select alam.attribute_id from ams_list_attribute_map alam where alam.list_id = :list_id )
-           and object_type in ([ams::object_parents -sql -object_type $object_type])
-" {
-    set attribute_add_url [export_vars -base "attribute-add" -url {object_type attribute_name {return_url $this_url}}]
-    set attribute_url [export_vars -base "attribute" -url {attribute_id}]
-    set map_url [export_vars -base "list-attributes" -url {list_id attribute_id return_url return_url_label {command "map"}}]
-}
-
-set return_url $provided_return_url
-set return_url_label $provided_return_url_label
-
-
-ad_return_template
-
-
-
-
-
+ad_page_contract {
+    
+    This page lets users manage ams lists
+
+    @author Matthew Geddert openacs@geddert.com
+    @creation-date 2004-07-28
+    @cvs-id $Id$
+
+} {
+    package_key:notnull
+    object_type:notnull
+    list_name:notnull
+    {pretty_name ""}
+    {description ""}
+    groupby:optional
+    orderby:optional
+    {format "normal"}
+    {status "normal"}
+    {return_url ""}
+    {return_url_label "[_ ams.lt_Return_to_Where_You_W]"}
+}
+
+set provided_return_url $return_url
+set provided_return_url_label $return_url_label
+
+set this_url [export_vars -url -base "list" {package_key object_type list_name }]
+set code_url [export_vars -url -base "list-code" {package_key object_type list_name return_url return_url_label}]
+
+
+
+if { ![ams::list::exists_p -package_key $package_key -object_type $object_type -list_name $list_name] } {
+    ad_returnredirect -message "[_ ams.lt_The_list_specified_do]" [export_vars -base "list-add" -url {package_key object_type list_name pretty_name description return_url return_url_label}]
+    ad_script_abort
+}
+set list_id [ams::list::get_list_id -package_key $package_key -object_type $object_type -list_name $list_name]
+
+
+set create_attribute_url [export_vars -base "attribute-add" -url {object_type list_id return_url return_url_label}]
+
+
+
+
+ams::list::get -list_id $list_id -array "list_info"
+set title $list_info(pretty_name)
+set context [list [list lists Lists] $title]
+
+list::create \
+    -name mapped_attributes \
+    -multirow mapped_attributes \
+    -key attribute_id \
+    -row_pretty_plural "[_ ams.Mapped_Attributes]" \
+    -checkbox_name checkbox \
+    -selected_format $format \
+    -class "list" \
+    -main_class "list" \
+    -sub_class "narrow" \
+    -pass_properties {
+    } -actions {
+    } -bulk_actions {
+	"[_ ams.Answer_Required]" "list-attributes-required" "[_ ams.lt_Require_an_answer_fro]"
+	"[_ ams.Answer_Optional]" "list-attributes-optional" "[_ ams.lt_An_answer_from_the_ch]"
+	"[_ ams.Unmap]" "list-attributes-unmap" "[_ ams.lt_Unmap_check_attribute]"
+	"[_ ams.Update_Ordering]" "list-order-update" "[_ ams.lt_Update_ordering_from_]"
+    } -bulk_action_export_vars { 
+        list_id
+    } -elements {
+        attribute_name {
+            label "[_ ams.Attribute]"
+            display_col attribute_name
+        }
+        pretty_name {
+            label "[_ ams.Pretty_Name_1]"
+	    display_template {
+		<a href="@mapped_attributes.attribute_url@">@mapped_attributes.pretty_name@</a><if $object_type not eq @mapped_attributes.object_type@> (Parent Object Type: <a href="object?object_type=@mapped_attributes.object_type@">@mapped_attributes.object_type@</a>)</if>
+	    }
+        }
+        widget {
+            label "[_ ams.Widget_1]"
+            display_col widget
+            link_url_eval widgets
+        }
+        section_heading {
+            label "[_ ams.Heading]"
+            display_col section_heading
+        }
+        action {
+            label "[_ ams.Action]"
+            display_template {
+                <a href="@mapped_attributes.unmap_url@" class="button">[_ ams.Unmap]</a>
+                <a href="@mapped_attributes.heading_url@" class="button"><if @mapped_attributes.section_heading@ nil>[_ ams.Add_Heading]</if><else>[_ ams.EditDelete_Heading]</else></a>
+            }
+        }
+        answer {
+            label "[_ ams.Required]"
+            display_template {
+                <if @mapped_attributes.required_p@>
+                <a href="list-attributes?command="required"&list_id=$list_id&attribute_id=@mapped_attributes.attribute_id@"><img src="/resources/acs-subsite/checkboxchecked.gif" title="[_ ams.Required]" border="0"></a>
+                </if>
+                <else>
+                <a href="list-attributes?command="optional"&list_id=$list_id&attribute_id=@mapped_attributes.attribute_id@"><img src="/resources/acs-subsite/checkbox.gif" title="[_ ams.Optional]" border="0"></a>
+                </else>
+            }
+        }
+        sort_order {
+            label "[_ ams.Ordering]"
+            display_template {
+                <input name="sort_key.@mapped_attributes.attribute_id@" value="@mapped_attributes.sort_order_key@" size="4">
+            }
+        }
+    } -filters {
+    } -groupby {
+    } -orderby {
+    } -formats {
+        normal {
+            label "[_ ams.Table]"
+            layout table
+            row {
+                checkbox {}
+                pretty_name {}
+                sort_order {}
+                answer {}
+                action {}
+		section_heading {}
+            }
+        }
+    }
+
+
+
+set sort_order_count 10
+
+db_multirow -extend { sort_order_key attribute_url unmap_url heading_url } -unclobber mapped_attributes select_mapped_attributes {
+        select alam.required_p,
+               alam.section_heading,
+               ams.attribute_id,
+               ams.widget,
+               ams.deprecated_p,
+               ams.attribute_name,
+               ams.pretty_name,
+               ams.pretty_plural,
+               ams.object_type
+          from ams_list_attribute_map alam,
+               ams_attributes ams
+         where alam.list_id = :list_id
+           and alam.attribute_id = ams.attribute_id
+         order by alam.sort_order
+} {
+    set attribute_url "attribute?[export_vars -url {attribute_id}]"
+    set sort_order_key $sort_order_count
+    set unmap_url [export_vars -base "list-attributes-unmap" -url {list_id attribute_id return_url return_url_label}]
+    set heading_url [export_vars -base "list-attribute-section-heading" -url {list_id attribute_id return_url return_url_label}]
+    incr sort_order_count 10
+}
+
+list::create \
+    -name unmapped_attributes \
+    -multirow unmapped_attributes \
+    -key attribute_id \
+    -row_pretty_plural "[_ ams.Unmapped_Attributes]" \
+    -checkbox_name checkbox \
+    -selected_format "normal" \
+    -class "list" \
+    -main_class "list" \
+    -sub_class "narrow" \
+    -pass_properties {
+    } -actions {
+    } -elements {
+        attribute_name {
+            label "[_ ams.Attribute]"
+            display_col attribute_name
+        }
+        pretty_name {
+            label "[_ ams.Pretty_Name_1]"
+            display_col pretty_name
+            link_url_eval $attribute_url
+        }
+        widget {
+            label "[_ ams.Widget_1]"
+            display_col widget
+            link_url_eval widgets
+        }
+        action {
+            label "[_ ams.Action]"
+            display_template {
+                <if @unmapped_attributes.widget@ nil>
+		<a href="@unmapped_attributes.attribute_add_url@" class="button">[_ ams.Define_Widget]</a>
+		</if>
+		<else>
+                <a href="@unmapped_attributes.map_url@" class="button">[_ ams.Map]</a>
+		</else>
+            }
+        }
+    } -filters {
+    } -groupby {
+    } -orderby {
+    } -formats {
+        normal {
+            label "[_ ams.Table]"
+            layout table
+            row {
+                pretty_name {}
+                widget {}
+                action {}
+            }
+        }
+    }
+#                checkbox {}
+
+
+
+# This query will override the ad_page_contract value entry_id
+
+db_multirow -extend { attribute_url attribute_add_url map_url } -unclobber unmapped_attributes get_unmapped_attributes "
+        select attribute_id,
+               widget,
+               deprecated_p,
+               attribute_name,
+               pretty_name,
+               pretty_plural,
+               object_type
+          from ams_attributes
+         where attribute_id not in ( select alam.attribute_id from ams_list_attribute_map alam where alam.list_id = :list_id )
+           and object_type in ([ams::object_parents -sql -object_type $object_type])
+" {
+    set attribute_add_url [export_vars -base "attribute-add" -url {object_type attribute_name {return_url $this_url}}]
+    set attribute_url [export_vars -base "attribute" -url {attribute_id}]
+    set map_url [export_vars -base "list-attributes" -url {list_id attribute_id return_url return_url_label {command "map"}}]
+}
+
+set return_url $provided_return_url
+set return_url_label $provided_return_url_label
+
+
+ad_return_template
+
+
+
+
+