listview ported bar pager

5 files changed, 31 insertions, 113 deletions

diff --git a/share/skin/default/layout/grid_view.tt b/share/skin/default/layout/grid_view.tt
index 0015713..310fe66 100644
--- a/share/skin/default/layout/grid_view.tt
+++ b/share/skin/default/layout/grid_view.tt
@@ -9,37 +9,37 @@
 =for layout header
 
 <thead>
-  [% content %]
+  [% header_row %]
 </thead>
 
 =for layout header_row
 
 <tr>
-  [% content %]
+  [% header_cells %]
 </tr>
 
 =for layout header_cell
 
-<th> [% content %] </th>
+<th> [% header_cell_contents %] </th>
+
+=for layout header_cell_contents
+
+[% label %]
 
 =for layout footer
 
 <tfoot>
-  [% content %]
+  [% footer_row %]
 </tfoot>
 
 =for layout footer_row
 
-<tr> [% content %] </tr>
-
-=for layout footer_cell
-
-<td> [% content %] </td>
+[% header_row %]
 
 =for layout body
 
 <tbody>
-  [% content %]
+  [% body_rows %]
 </tbody>
 
 =cut
diff --git a/share/skin/default/layout/grid_view/action.tt b/share/skin/default/layout/grid_view/action.tt
index 4de7797..7c07d31 100644
--- a/share/skin/default/layout/grid_view/action.tt
+++ b/share/skin/default/layout/grid_view/action.tt
@@ -1,3 +1,3 @@
 =for layout widget
-  <a href="[% uri %]">[% label | html %]</a>
+  <a href="[% uri %]">[% label %]</a>
 =cut
diff --git a/share/skin/default/layout/grid_view/entity.tt b/share/skin/default/layout/grid_view/entity.tt
index c66af93..9cf24e2 100644
--- a/share/skin/default/layout/grid_view/entity.tt
+++ b/share/skin/default/layout/grid_view/entity.tt
@@ -1,15 +1,11 @@
 =for layout widget
 
 <tr>
-  [% content %]
-<tr>
-
-=for layout field_list
-
-[% content %]
+  [% field_list %]
+</tr>
 
 =for layout field
 
-<td>[% content %]</td>
+<td>[% call_next %]</td>
 
 =cut
diff --git a/share/skin/default/layout/grid_view/entity/with_actions.tt b/share/skin/default/layout/grid_view/entity/with_actions.tt
index 438a168..7f84147 100644
--- a/share/skin/default/layout/grid_view/entity/with_actions.tt
+++ b/share/skin/default/layout/grid_view/entity/with_actions.tt
@@ -1,25 +1,12 @@
-=for layout widget
-
-<tr>
-  [% field_list %]
-  [% actions    %]
-<tr>
+=extends grid_view/entity
 
 =for layout field_list
 
-[% content %]
-
-=for layout field
-
-<td>[% content %]</td>
-
-=for layout actions
-
-[% content %]
+[% call_next %]
+[% actions %]
 
 =for layout action
 
-<td>[% content %]</td>
-
+<td>[% call_next %]</td>
 
 =cut
diff --git a/share/skin/default/layout/list_view.tt b/share/skin/default/layout/list_view.tt
index 7cd3cc4..d74e2b4 100644
--- a/share/skin/default/layout/list_view.tt
+++ b/share/skin/default/layout/list_view.tt
@@ -1,100 +1,35 @@
+=extends grid_view
+
 =for layout widget
 
 [% pager %]
 
-<table>
-  [% header %]
-  [% body   %]
-  [% footer %]
-</table>
+[% call_next %]
 
 [% pager %]
 
 [% actions %]
 
-=for layout header
-
-<thead>
-  [% content %]
-</thead>
-
-=for layout header_row
-
-<tr>
-  [% content %]
-  [% IF object_action_count %]
-  <th colspan="[% object_action_count %]"> Actions </th>
-  [% END %]
-</tr>
-
-=for layout header_cell
-
-<th> <a href="[% uri %]"> [% content | html %] </a> </th>
-
-=for layout footer
+=for layout header_action_cell
 
-<tfoot>
-  [% content %]
-</tfoot>
+<th colspan="[% col_count %]"> Actions </th>
 
-=for layout footer_row
+=for layout header_cell_contents
 
-<tr> 
-  [% content %] 
-  [% IF object_action_count %]
-  <th colspan="[% object_action_count %]"> Actions </th>
-  [% END %]
-</tr>
-
-=for layout footer_cell
-
-<th> <a href="[% uri %]"> [% content | html %] </a> </th>
-
-=for layout body
-
-<tbody>
-  [% content %]
-</tbody>
-
-=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 %]
-
-=for layout page
-<li> <a href="[% uri | html %]">[% content | html %]</a> </li>
-
-=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>
+<a href="[% order_uri %]">[% call_next %]</a>
 
 =for layout actions
 <div class="collection_actions">
 <ul>
-  [% content %]
+  [% call_next %]
 </ul>
 </div>
 
 =for layout action
-<li>[% content %]</li>
+<li>[% call_next %]</li>
+
+=for layout pager
+
+<p>Pager would be here. But it isn't.</p>
 
 =cut