Index: openacs-4/packages/acs-admin/www/apm/version-callback-invoke.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-invoke.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/apm/version-callback-invoke.adp	11 Sep 2003 09:19:25 -0000	1.1
@@ -0,0 +1,17 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<if @result@ not nil>
+  <h2>Output</h2>
+  <blockquote><pre>
+  @result@
+  </pre></blockquote>
+</if>
+<else>
+  The callback has been invoked.
+</else>
+
+<p>
+  <b>&raquo;</b> <a href="@return_url@">Go back</a>
+</p>
Index: openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl	11 Sep 2003 09:19:25 -0000	1.1
@@ -0,0 +1,27 @@
+ad_page_contract {
+    Invoke a callback.
+
+    @author Lars Pind (lars@collaboraid.biz)
+    @creation-date 11 September 2003
+    @cvs-id $Id: version-callback-invoke.tcl,v 1.1 2003/09/11 09:19:25 lars Exp $
+} {
+    version_id:integer,notnull    
+    type:notnull
+}
+
+db_1row package_version_info "select pretty_name, version_name from apm_package_version_info where version_id = :version_id"
+
+set return_url "version-callbacks?[export_vars { version_id }]"
+
+# Set default values for type and proc name
+set proc_value [apm_get_callback_proc -type $type -version_id $version_id]
+set page_title "Invoke Tcl Callback"
+
+
+set context [list \
+                 [list "." "ACS Package Manager Administration"] \
+                 [list [export_vars -base "version-view" { version_id }] "$pretty_name $version_name"] \
+                 [list $return_url "Tcl Callbacks"] $page_title]
+
+catch $proc_value result
+
Index: openacs-4/packages/acs-admin/www/apm/version-callbacks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callbacks.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/apm/version-callbacks.adp	28 Aug 2003 09:41:37 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/version-callbacks.adp	11 Sep 2003 09:19:25 -0000	1.5
@@ -3,35 +3,8 @@
 <property name="context_bar">@context_bar;noquote@</property>
 
 
-<if @callbacks:rowcount@ gt 0>
-  <table cellspacing="1" cellpadding="4" bgcolor="#999999">
-    <tr bgcolor="#ffffff">
-      <th>Type</th>
-      <th>Tcl Proc</th>
-      <th>Action</th>
-    </tr>
-    <multiple name="callbacks">
-      <tr bgcolor="#ffffff">
-        <td>@callbacks.type@</td>
-        <td><code>@callbacks.proc@</code></td>
-        <td>
-          <a href="version-callback-add-edit?version_id=@version_id@&type=@callbacks.type@">Edit</a> 
-          <a href="version-callback-delete?version_id=@version_id@&type=@callbacks.type@">Delete</a>
-        </td>
-      </tr>
-    </multiple>
-  </table>
-</if>
-<else>
-  <i>There are no Tcl callbacks defined for the package.</i>
-</else>
+<p><listtemplate name="callbacks"></listtemplate></p>
 
-<if @unused_types_p@ eq 1>
-  <p>
-    <b>&raquo;</b> <a href="version-callback-add-edit?version_id=@version_id@">Add callback</a>
-  </p>
-</if>
-
 <h3>Help</h3>
 
 <p>
Index: openacs-4/packages/acs-admin/www/apm/version-callbacks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callbacks.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/version-callbacks.tcl	28 Aug 2003 09:41:37 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/version-callbacks.tcl	11 Sep 2003 09:19:25 -0000	1.4
@@ -12,16 +12,59 @@
 set page_title "Tcl Callbacks"
 set context_bar [ad_context_bar [list "." "ACS Package Manager Administration"] [list "version-view?[export_vars { version_id }]" "$pretty_name $version_name"] $page_title]
 
+set unused_callback_types [apm_unused_callback_types -version_id $version_id]
+
+if { [llength $unused_callback_types] > 0  } {
+    set actions [list "Add callback" [export_vars -base "version-callback-add-edit" { version_id }]]
+} else {
+    set actions [list]
+}
+
+
+template::list::create \
+    -name callbacks \
+    -multirow callbacks \
+    -actions $actions \
+    -elements {
+        edit {
+            label {}
+            sub_class narrow
+            display_template {
+                <img src="/resources/acs-subsite/Edit16.gif" width="16" height="16" border="0">
+            } 
+            link_url_eval {[export_vars -base "version-callback-add-edit" { version_id type }]}
+            link_html { title "Edit callback" }
+        }
+        type {
+            label "Type"
+        }
+        proc {
+            label "Tcl Proc"
+        }
+        invoke {
+            label "Invoke"
+            display_template "Invoke"
+            link_url_eval {[export_vars -base "version-callback-invoke" { version_id type }]}
+            link_html { title "Invoke this callback proc now. Be careful!" }
+        }
+        delete {
+            label {}
+            sub_class narrow
+            display_template {
+                <img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0">
+            } 
+            link_url_eval {[export_vars -base "version-callback-delete" { version_id type }]}
+            link_html { title "Delete callback" }
+        }
+    }
+
 db_multirow callbacks get_all_callbacks {
-    select type,
+    select version_id,
+           type,
            proc
     from apm_package_callbacks
     where version_id = :version_id
     order by type
 }
 
-set unused_callback_types [apm_unused_callback_types -version_id $version_id]
-
-set unused_types_p [ad_decode [llength $unused_callback_types] 0 0 1]
-
 ad_return_template