Index: openacs-4/packages/content-includelet/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/content-includelet/www/admin/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/content-includelet/www/admin/index.tcl	11 Jul 2008 16:38:55 -0000	1.1
+++ openacs-4/packages/content-includelet/www/admin/index.tcl	30 Aug 2008 00:31:48 -0000	1.2
@@ -17,14 +17,38 @@
 set page_title "Manage Content"
 set name "Content Name"
 
-db_multirow -extend {author_url} revisions revisions {
-    select r.*, p.first_names || ' ' || p.last_name as author,
-      p.person_id as user_id
-    from cr_revisions r, persons p, acs_objects o
-    where r.item_id = :item_id
-      and o.object_id = r.revision_id
-      and p.person_id = o.creation_user
-    order by r.revision_id desc
-} {
+db_multirow -extend {author_url display_template} revisions revisions {} {
     set author_url [export_vars -base /shared/community-member {user_id}]
+    set publish_date [lc_time_fmt $publish_date "%x %X"]
+    set display_template "
+        <a href=\"view?element_id=$element_id&item_id=$item_id&revision_id=@revisions.revision_id@\" title=\"#content-includelet.View#\" class=\"button\">#content-includelet.View#</a>
+        <a href=\"edit?element_id=$element_id&item_id=$item_id&revision_id=@revisions.revision_id@\" title=\"#content-includelet.Edit#\" class=\"button\">#content-includelet.Edit#</a>
+        <if @revisions.revision_id@ ne $live_revision>
+          <a href=\"delete?element_id=$element_id&item_id=$item_id&revision_id=@revisions.revision_id@\" title=\"#content-includelet.Delete#\" class=\"button\">#content-includelet.Delete#</a>
+          <a href=\"publish?element_id=$element_id&item_id=$item_id&revision_id=@revisions.revision_id@\" title=\"#content-includelet.Publish#\" class=\"button\">#content-includelet.Publish#</a>
+        </if>
+        <else>
+          <a href=\"unpublish?element_id=$element_id&item_id=$item_id&revision_id=@revisions.revision_id@\" title=\"#content-includelet.Unpublish#\" class=\"button\">#content-includelet.Unpublish#</a>
+        </else>"
 }
+
+template::list::create \
+    -name revisions \
+    -multirow revisions \
+    -key revision_id \
+    -elements {
+        author {
+            label {[_ content-includelet.Author]}
+            display_template {
+                <a href="@revisions.author_url@" title="@revisions.author@">@revisions.author@</a>
+            }
+        }
+        publish_date {
+            label {[_ content-includelet.Published]}
+        }
+        actions {
+            label {[_ layout-subsite-integration.Action]}
+            display_template $display_template
+        }
+    }
+