9 files changed, 96 insertions, 25 deletions
diff --git a/share/skin/base/layout/collection.tt b/share/skin/base/layout/collection.tt
index 3923838..6becfb1 100644
--- a/share/skin/base/layout/collection.tt
+++ b/share/skin/base/layout/collection.tt
@@ -1,7 +1,17 @@
 =for layout widget
 
+[% header %]
+[% body %]
+[% footer %]
+
+=for layout body
+
 <div class="collection_members">
   [% members %]
 </div>
 
+=for layout footer
+
+[% actions %]
+
 =cut
diff --git a/share/skin/base/layout/collection/grid/member.tt b/share/skin/base/layout/collection/grid/member.tt
index 377f97c..a73a2a7 100644
--- a/share/skin/base/layout/collection/grid/member.tt
+++ b/share/skin/base/layout/collection/grid/member.tt
@@ -2,6 +2,11 @@
 
 [% field_list %]
 
+=for layout field_list
+
+[% call_next %]
+[% actions %]
+
 =for layout field
 
 [% call_next %]
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..39df771 100644
--- a/share/skin/base/layout/object.tt
+++ b/share/skin/base/layout/object.tt
@@ -5,6 +5,6 @@
 =for layout container
 
 [% call_next %]
+[% actions %]
 
 =cut
-
diff --git a/share/skin/componentui/layout/bar/collection.tt b/share/skin/componentui/layout/bar/collection.tt
new file mode 100644
index 0000000..9c8f5bd
--- /dev/null
+++ b/share/skin/componentui/layout/bar/collection.tt
@@ -0,0 +1,51 @@
+=widget ListView
+
+=extends collection
+
+=for layout header
+
+[% pager_fragment %]
+
+=for layout footer
+
+[% pager_fragment %]
+
+[% actions %]
+
+=for layout actions
+
+<ul class="collection_actions">
+  [% call_next %]
+</ul>
+
+=for layout action
+
+<li>[% call_next %]</li>
+
+=for layout pager
+
+<ul class="pager">
+  [% first_page %]
+  [% previous_page %]
+  [% page_list %]
+  [% next_page %]
+  [% last_page %]
+</ul>
+
+=for layout numbered_page_this_page
+
+<li> [% page_number %] </li>
+
+=for layout numbered_page
+
+<li> <a href="[% page_uri %]">[% page_number %]</a> </li>
+
+=for layout named_page
+
+<li> <a href="[% page_uri %]">[% page_name %]</a> </li>
+
+=for layout named_page_no_page
+
+<li> [% page_name %] </li>
+
+=cut
diff --git a/share/skin/componentui/layout/bar/member.tt b/share/skin/componentui/layout/bar/member.tt
new file mode 100644
index 0000000..63d01da
--- /dev/null
+++ b/share/skin/componentui/layout/bar/member.tt
@@ -0,0 +1,21 @@
+=widget Collection::Grid::Member
+
+=for layout widget
+
+<fieldset style="width:50%; border:1px solid black; margin-bottom:4px; display:inline;">
+  <div style="width:100%; text-align:right;">
+     [% actions %]
+  </div>
+   [% field_list %]
+</fieldset><br>
+
+=for layout field
+[% call_next %] <br>
+
+=for layout action
+
+<span style="border:1px solid black; margin-right:3px; padding:2px;">
+  [% call_next %]
+</span>
+
+=cut
diff --git a/share/skin/default/layout/collection/grid/member.tt b/share/skin/default/layout/collection/grid/member.tt
index f0583d7..13e29c3 100644
--- a/share/skin/default/layout/collection/grid/member.tt
+++ b/share/skin/default/layout/collection/grid/member.tt
@@ -10,4 +10,8 @@
 
 <td>[% call_next %]</td>
 
+=for layout action
+
+<td>[% call_next %]</td>
+
 =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