From d738d11fb21607bb66617ac95a455be8c9fa9e62 Mon Sep 17 00:00:00 2001
From: wreis <wreis@03d0b0b2-0e1a-0410-a411-fdb2f4bd65d7>
Date: Mon, 27 Jul 2009 18:34:34 +0000
Subject: Object consumes Action and Collection consumes Pager and Action, so
 Member::WithActions go away

---
 .../skin/base/layout/collection/grid/member/with_actions.tt  | 12 ------------
 share/skin/base/layout/object.tt                             |  9 +++++++++
 .../default/layout/collection/grid/member/with_actions.tt    | 12 ------------
 share/skin/default/layout/object.tt                          |  4 ++++
 4 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 share/skin/base/layout/collection/grid/member/with_actions.tt
 delete mode 100644 share/skin/default/layout/collection/grid/member/with_actions.tt

(limited to 'share')

diff --git a/share/skin/base/layout/collection/grid/member/with_actions.tt b/share/skin/base/layout/collection/grid/member/with_actions.tt
deleted file mode 100644
index e7ba750..0000000
--- a/share/skin/base/layout/collection/grid/member/with_actions.tt
+++ /dev/null
@@ -1,12 +0,0 @@
-=extends collection/grid/member
-
-=for layout field_list
-
-[% call_next %]
-[% actions %]
-
-=for layout action
-
-[% call_next %]
-
-=cut
diff --git a/share/skin/base/layout/object.tt b/share/skin/base/layout/object.tt
index 8a5074a..2a7f37e 100644
--- a/share/skin/base/layout/object.tt
+++ b/share/skin/base/layout/object.tt
@@ -6,5 +6,14 @@
 
 [% call_next %]
 
+=for layout field_list
+
+[% call_next %]
+[% actions %]
+
+=for layout action
+
+[% call_next %]
+
 =cut
 
diff --git a/share/skin/default/layout/collection/grid/member/with_actions.tt b/share/skin/default/layout/collection/grid/member/with_actions.tt
deleted file mode 100644
index a0bca88..0000000
--- a/share/skin/default/layout/collection/grid/member/with_actions.tt
+++ /dev/null
@@ -1,12 +0,0 @@
-=extends collection/grid/member
-
-=for layout field_list
-
-[% call_next %]
-[% actions %]
-
-=for layout action
-
-<td>[% call_next %]</td>
-
-=cut
diff --git a/share/skin/default/layout/object.tt b/share/skin/default/layout/object.tt
index 0f32321..8413f23 100644
--- a/share/skin/default/layout/object.tt
+++ b/share/skin/default/layout/object.tt
@@ -4,4 +4,8 @@
 
   [% call_next %] <br>
 
+=for layout action
+
+<td>[% call_next %]</td>
+
 =cut
-- 
cgit v1.2.3-54-g00ecf