10 files changed, 7 insertions, 223 deletions
diff --git a/share/skin/default/layout/action.tt b/share/skin/default/layout/action.tt
index 67d6c37..4c32a37 100644
--- a/share/skin/default/layout/action.tt
+++ b/share/skin/default/layout/action.tt
@@ -1,19 +1,4 @@
-=for layout widget
-
-  <form action="" method="post" enctype="multipart/form-data">
-    [% header  %]
-    [% field_list  %]
-    [% buttons %]
-    [% footer  %]
-  </form>
-
-=for layout header
-
-<!-- header -->
-
-=for layout field_list
-
-<p> [% call_next %] </p>
+=extends NEXT
 
 =for layout field
 
@@ -21,43 +6,6 @@
 
 =for layout message_layout
 
-    <span>[% message %]</span> <br />
-
-=for layout buttons
-  [% message %]
-  [% ok_button_fragment %]
-  [% apply_button_fragment %]
-  [% cancel_button_fragment %]
-
-=for layout standard_button
-
-  <input type="submit" class="button" name="[% event_id %]" value="[% label %]" />
-
-=for layout ok_button
-
-[% standard_button %]
-
-=for layout apply_button
-
-[% standard_button %]
-
-=for layout cancel_button
-
-[% standard_button %]
-
-=for layout whut
-
-  [% IF (viewport.ordered_fields.size != 0) && allowed_events.grep('^apply$').size; %]
-    <input type="submit" name="[% viewport.event_id_for('apply') | html%]" value="[% apply_label %]" />
-  [% END; %]
-
-  [% IF allowed_events.grep('^close$').size; %]
-    <input type="submit" name="[% viewport.event_id_for('close') | html%]" value="[% close_label %]" />
-  [% END; %]
-  <br />
-
-=for layout footer
-
-  <!-- footer -->
+[% call_next %] <br />
 
 =cut
diff --git a/share/skin/default/layout/collection.tt b/share/skin/default/layout/collection.tt
deleted file mode 100644
index d4703f1..0000000
--- a/share/skin/default/layout/collection.tt
+++ /dev/null
@@ -1,5 +0,0 @@
-=for layout widget
-
-[% members %]
-
-=cut
-\ No newline at end of file
diff --git a/share/skin/default/layout/collection/grid.tt b/share/skin/default/layout/collection/grid.tt
deleted file mode 100644
index bfde10d..0000000
--- a/share/skin/default/layout/collection/grid.tt
+++ /dev/null
@@ -1,37 +0,0 @@
-=for layout widget
-
-<table>
-  [% header %]
-  [% body   %]
-  [% footer %]
-</table>
-
-=for layout header
-
-<thead>
-  [% header_row %]
-</thead>
-
-=for layout header_row
-
-<tr>
-  [% header_cells %]
-</tr>
-
-=for layout header_cell
-
-<th> [% header_cell_contents %] </th>
-
-=for layout header_cell_contents
-
-[% label %]
-
-=for layout body
-
-<tbody>
-
-  [% members %]
-
-</tbody>
-
-=cut
diff --git a/share/skin/default/layout/collection/grid/member.tt b/share/skin/default/layout/collection/grid/member.tt
deleted file mode 100644
index 9cf24e2..0000000
--- a/share/skin/default/layout/collection/grid/member.tt
+++ /dev/null
@@ -1,11 +0,0 @@
-=for layout widget
-
-<tr>
-  [% field_list %]
-</tr>
-
-=for layout field
-
-<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/field.tt b/share/skin/default/layout/field.tt
deleted file mode 100644
index 99954ab..0000000
--- a/share/skin/default/layout/field.tt
+++ /dev/null
@@ -1,14 +0,0 @@
-=for layout widget
-
-[% label_fragment %]
-[% value_layout %]
-
-=for layout label
-
-<strong > [% label %]: </strong>
-
-=for layout value_layout
-
-[% field_value %]
-
-=cut
diff --git a/share/skin/default/layout/list_view.tt b/share/skin/default/layout/list_view.tt
deleted file mode 100644
index f7a4ef4..0000000
--- a/share/skin/default/layout/list_view.tt
+++ /dev/null
@@ -1,57 +0,0 @@
-=extends collection/grid
-
-=for layout widget
-
-[% pager_fragment %]
-
-[% call_next %]
-
-[% pager_fragment %]
-
-[% actions %]
-
-=for layout header_action_cell
-
-<th colspan="[% col_count %]"> Actions </th>
-
-=for layout header_cell_contents
-
-<a href="[% order_uri %]">[% call_next %]</a>
-
-=for layout actions
-<div class="collection_actions">
-<ul>
-  [% call_next %]
-</ul>
-</div>
-
-=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/default/layout/object.tt b/share/skin/default/layout/object.tt
index cec7b4d..20dee31 100644
--- a/share/skin/default/layout/object.tt
+++ b/share/skin/default/layout/object.tt
@@ -1,6 +1,4 @@
-=for layout widget
-
-  [% field_list %]
+=extends NEXT
 
 =for layout field
 
diff --git a/share/skin/default/layout/site_layout.tt b/share/skin/default/layout/site_layout.tt
index e9b70ca..17d78ca 100644
--- a/share/skin/default/layout/site_layout.tt
+++ b/share/skin/default/layout/site_layout.tt
@@ -1,4 +1,7 @@
+=extends NEXT
+
 =for layout widget
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -14,36 +17,6 @@
 
 </html>
 
-=for layout head
-
-  <title>[% title %]</title>
-
-  [% head_meta %]
-  [% head_style %]
-
-=for layout head_meta 
-
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  [% meta_info %]
-
-=for layout meta_info
-
-[% call_next %]
-
-=for layout meta_member
-
-<meta name="[% meta_name %]" content="[% meta_value %]" />[% "\n" %]
-
 =for layout head_style
 
-  <!-- stylesheet links go here -->
-  
-=for layout body
-
-[% inner %]
-
-=for layout header
-
-<h1>[% title %]</h1>
-
 =cut
diff --git a/share/skin/default/skin.conf b/share/skin/default/skin.conf
new file mode 100644
index 0000000..65b4978
--- /dev/null
+++ b/share/skin/default/skin.conf
@@ -0,0 +1 @@
+extends base