6 files changed, 139 insertions, 17 deletions
diff --git a/share/skin/default/layout/grid_view.tt b/share/skin/default/layout/grid_view.tt
index 3205e60..0015713 100644
--- a/share/skin/default/layout/grid_view.tt
+++ b/share/skin/default/layout/grid_view.tt
@@ -42,12 +42,4 @@
   [% content %]
 </tbody>
 
-=for layout body_row
-
-<tr> [% content %] </tr>
-
-=for layout body_cell
-
-<td> [% content %] </td>
-
 =cut
diff --git a/share/skin/default/layout/grid_view/action.tt b/share/skin/default/layout/grid_view/action.tt
new file mode 100644
index 0000000..4de7797
--- /dev/null
+++ b/share/skin/default/layout/grid_view/action.tt
@@ -0,0 +1,3 @@
+=for layout widget
+  <a href="[% uri %]">[% label | html %]</a>
+=cut
diff --git a/share/skin/default/layout/grid_view/row.tt b/share/skin/default/layout/grid_view/entity.tt
index 6b0151a..9c69baf 100644
--- a/share/skin/default/layout/grid_view/row.tt
+++ b/share/skin/default/layout/grid_view/entity.tt
@@ -4,11 +4,11 @@
   [% content %]
 <tr>
 
-=for layout cells
+=for layout fields
 
 [% content %]
 
-=for layout cell
+=for layout field
 
 <td>[% content %]</td>
 
diff --git a/share/skin/default/layout/grid_view/entity/with_actions.tt b/share/skin/default/layout/grid_view/entity/with_actions.tt
new file mode 100644
index 0000000..ea78ed8
--- /dev/null
+++ b/share/skin/default/layout/grid_view/entity/with_actions.tt
@@ -0,0 +1,25 @@
+=for layout widget
+
+<tr>
+  [% fields  %]
+  [% actions %]
+<tr>
+
+=for layout fields
+
+[% content %]
+
+=for layout field
+
+<td>[% content %]</td>
+
+=for layout actions
+
+[% content %]
+
+=for layout action
+
+<td>[% content %]</td>
+
+
+=cut
+\ No newline at end of file
diff --git a/share/skin/default/layout/list_view.tt b/share/skin/default/layout/list_view.tt
index 3205e60..7cd3cc4 100644
--- a/share/skin/default/layout/list_view.tt
+++ b/share/skin/default/layout/list_view.tt
@@ -1,11 +1,17 @@
 =for layout widget
 
+[% pager %]
+
 <table>
   [% header %]
   [% body   %]
   [% footer %]
 </table>
 
+[% pager %]
+
+[% actions %]
+
 =for layout header
 
 <thead>
@@ -16,11 +22,14 @@
 
 <tr>
   [% content %]
+  [% IF object_action_count %]
+  <th colspan="[% object_action_count %]"> Actions </th>
+  [% END %]
 </tr>
 
 =for layout header_cell
 
-<th> [% content %] </th>
+<th> <a href="[% uri %]"> [% content | html %] </a> </th>
 
 =for layout footer
 
@@ -30,11 +39,16 @@
 
 =for layout footer_row
 
-<tr> [% content %] </tr>
+<tr> 
+  [% content %] 
+  [% IF object_action_count %]
+  <th colspan="[% object_action_count %]"> Actions </th>
+  [% END %]
+</tr>
 
 =for layout footer_cell
 
-<td> [% content %] </td>
+<th> <a href="[% uri %]"> [% content | html %] </a> </th>
 
 =for layout body
 
@@ -42,12 +56,45 @@
   [% content %]
 </tbody>
 
-=for layout body_row
+=for layout pager
+
+<ul class="pager">
+  <li>[% first_page %]</li>
+  <li>[% previous_page %]</li>
+  <li>[% page_list %]</li>
+  <li>[% next_page %]</li>
+  <li>[% last_page %]</li>
+</ul>
+
+=for layout page_list
+[% content %]
 
-<tr> [% content %] </tr>
+=for layout page
+<li> <a href="[% uri | html %]">[% content | html %]</a> </li>
 
-=for layout body_cell
+=for layout first_page
+<a href="[% uri | html %]">[% content | html %]</a>
+
+=for layout previous_page
+<a href="[% uri | html %]">[% content | html %]</a>
+
+=for layout current_page
+<a href="[% uri | html %]">[% content | html %]</a>
+
+=for layout next_page
+<a href="[% uri | html %]">[% content | html %]</a>
+
+=for layout last_page
+<a href="[% uri | html %]">[% content | html %]</a>
+
+=for layout actions
+<div class="collection_actions">
+<ul>
+  [% content %]
+</ul>
+</div>
 
-<td> [% content %] </td>
+=for layout action
+<li>[% content %]</li>
 
 =cut
diff --git a/share/skin/default/web/componentui-basic.css b/share/skin/default/web/componentui-basic.css
index a22dbdf..1f25ddb 100644
--- a/share/skin/default/web/componentui-basic.css
+++ b/share/skin/default/web/componentui-basic.css
@@ -143,4 +143,59 @@ input{
         font-size: 90%;
         color: white;
         border: 2px solid #369;
+}
+
+.pager {
+    display: inline
+    margin:  0px;
+    padding: 0px;
+    list-style-type: none;
+    font-size: 80%;
+}
+
+.pager li {
+    display: inline;
+    margin: 1px;
+}
+
+.pager li a {
+    padding: 1px 3px 1px 3px;
+    text-decoration: none;
+    color: #036;
+    border: 1px solid #036;
+    text-align: center;
+    font-weight: bold;
+}
+
+.pager li a:hover {
+    color: #369;
+    border: 1px solid #369;
+}
+
+.collection_actions ul {
+    display: inline
+    margin:  0px;
+    padding: 0px;
+    list-style-type: none;
+}
+
+.collection_actions ul li {
+    display: inline;
+    margin: 0.2em;
+}
+
+.collection_actions ul li a {
+    /* background-color #9CF;  */
+    /* padding: 0.2em .2em;    */
+    /* text-decoration: none;  */
+    /* border: 1px solid #369; */
+    text-align: center;
+    font-weight: bold;
+}
+
+th {
+  font-weight: bold;
+  padding-left:  4px;
+  padding-right: 4px;
+  text-align: center;
 }
 \ No newline at end of file