Index: openacs-4/packages/acs-admin/www/apm/version-parameters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-parameters.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-admin/www/apm/version-parameters.tcl	17 Oct 2010 21:06:07 -0000	1.8
+++ openacs-4/packages/acs-admin/www/apm/version-parameters.tcl	27 Oct 2014 16:38:54 -0000	1.9
@@ -7,79 +7,92 @@
     @creation-date 12 September 2000
     @cvs-id $Id$
 } {
-    {orderby ""}
-    {version_id:integer}
+    {orderby "parameter_name"}
+    {version_id:naturalnum,notnull}
     {section_name ""}
 }
 
 db_1row apm_package_by_version_id {
     select pretty_name, version_name, package_key
-      from apm_package_version_info 
-     where version_id = :version_id
+    from apm_package_version_info 
+    where version_id = :version_id
 }
 
 
 set dimensional_list [apm_parameter_section_slider $package_key]
 
-set table_def [list \
-		   [list  parameter_name "Parameter"] \
-		   [list datatype "Type"] \
-                   [list scope "Scope"] \
-		   [list description "Description" {} {<td>[ad_quotehtml $description]</td>}]]
+set elements_list {
+    parameter_name {
+        label "Parameter"
+        orderby parameter_name
+    }
+    datatype {
+        label "Type"
+        orderby datatype
+    }
+    scope {
+        label "Scope"
+        orderby scope
+    }
+    description {
+        label "Description"
+        orderby description
+    }    
+}
 
 #DRB: sql_clauses must not contain RDBMS-specific query clauses.
 set sql_clauses ""
 
-if { [exists_and_not_null dimensional_list] } {
-    lappend table_def [list section_name "Section:"]
+if { ([info exists dimensional_list] && $dimensional_list ne "") } {
     append sql_clauses [ad_dimensional_sql $dimensional_list]
+    lappend elements_list section_name {
+        label "Section"
+        orderby section_name
+    }
 }
 
-lappend table_def [list parameter_id "Actions" no_sort \
-		       {<td>\[<font size=-1>
-	     <a href=parameter-delete?[export_url_vars parameter_id version_id section_name]>delete</a> | 
-			  <a href=parameter-edit?[export_url_vars version_id parameter_id]>edit</a></font>\] 
-			   </td>}]
+lappend elements_list actions {
+    label "Actions"
+    display_template { @parameters.actions;noquote@ }
+}
 
-append sql_clauses [ad_order_by_from_sort_spec $orderby $table_def]
+template::list::create -name parameters_list \
+    -multirow parameters \
+    -key parameter_name \
+    -no_data "No parameters registered in this section." \
+    -actions [list "Add new parameter" [export_vars -base parameter-add {version_id section_name}] "Add new parameter"] \
+    -elements $elements_list \
+    -filters {version_id {} section_name {}}
 
+set parent_package_keys [lrange [apm_one_package_inherit_order $package_key] 0 end-1]
+append sql_clauses " [template::list::orderby_clause -orderby -name parameters_list]"
+
+db_multirow -extend {actions} parameters parameter_table {} {
+    set actions "\[<font size=-1>
+        <a href=parameter-delete?[export_vars -url {parameter_id version_id section_name}]>delete</a> | 
+        <a href=parameter-edit?[export_vars -url {version_id parameter_id}]>edit</a></font>\]"
+}
+
+
+
 set page_title "Parameters"
 set context [list [list "." "Package Manager"] [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] $page_title]
 
-append body "
-<blockquote>
-"
-
+set filter_html ""
 if { $dimensional_list ne "" } {
-    append body "[ad_dimensional $dimensional_list]<p>"
+    set filter_html [ad_dimensional $dimensional_list]
 }
 
 # LARS hack
-set sections [lindex [lindex $dimensional_list 0] 3]
+set sections [lindex $dimensional_list 0 3]
 foreach section $sections {
     if {$section_name eq [lindex $section 0]} {
         set section_name [lindex $section 1]
         break
     }
 }
 
-set parent_package_keys [lrange [apm_one_package_inherit_order $package_key] 0 end-1]
 
-append body "[ad_table -Torderby $orderby \
-     -bind [ad_tcl_vars_to_ns_set version_id package_key parent_package_keys] \
-     -Textra_vars {version_id} \
-     -Tmissing_text "No parameters registered in this section." \
-		     parameter_table "" $table_def]
-<br><a href=parameter-add?[export_url_vars version_id section_name]>Add a new parameter</a>
 
-</blockquote>
-"
 
 
-
-
-
-
-
-
-