From e716714fb1197850975fcd131149db2f53b07f64 Mon Sep 17 00:00:00 2001
From: groditi <groditi@03d0b0b2-0e1a-0410-a411-fdb2f4bd65d7>
Date: Tue, 2 Oct 2007 23:33:28 +0000
Subject: gridview is so close. so close

---
 componentui.conf                                   |  10 -
 lib/ComponentUI/Controller/TestModel/Bar.pm        |   5 +-
 lib/Reaction/UI/ViewPort/GridView.pm               | 203 ++++++++++++++++++---
 lib/Reaction/UI/ViewPort/GridView/Row.pm           |   3 +
 lib/Reaction/UI/ViewPort/ListView.pm               |   4 +-
 lib/Reaction/UI/Widget/GridView.pm                 |  57 +-----
 lib/Reaction/UI/Widget/GridView/Row.pm             |   4 +-
 lib/Reaction/UI/WidgetClass.pm                     |  24 ++-
 share/skin/default/layout/action_form              |  46 -----
 share/skin/default/layout/action_form.tt           |  46 +++++
 share/skin/default/layout/display_field/boolean    |  13 --
 share/skin/default/layout/display_field/boolean.tt |  13 ++
 share/skin/default/layout/display_field/collection |  20 --
 .../default/layout/display_field/collection.tt     |  20 ++
 share/skin/default/layout/display_field/date_time  |  13 --
 .../skin/default/layout/display_field/date_time.tt |  13 ++
 share/skin/default/layout/display_field/list       |  20 --
 share/skin/default/layout/display_field/list.tt    |  20 ++
 share/skin/default/layout/display_field/number     |  13 --
 share/skin/default/layout/display_field/number.tt  |  13 ++
 .../default/layout/display_field/related_object    |  13 --
 .../default/layout/display_field/related_object.tt |  13 ++
 share/skin/default/layout/display_field/string     |  13 --
 share/skin/default/layout/display_field/string.tt  |  13 ++
 share/skin/default/layout/display_field/text       |  13 --
 share/skin/default/layout/display_field/text.tt    |  13 ++
 share/skin/default/layout/field/boolean            |  34 ----
 share/skin/default/layout/field/boolean.tt         |  34 ++++
 share/skin/default/layout/field/choose_many        |  68 -------
 share/skin/default/layout/field/choose_many.tt     |  68 +++++++
 share/skin/default/layout/field/choose_one         |  42 -----
 share/skin/default/layout/field/choose_one.tt      |  42 +++++
 share/skin/default/layout/field/date_time          |  26 ---
 share/skin/default/layout/field/date_time.tt       |  26 +++
 share/skin/default/layout/field/file               |  25 ---
 share/skin/default/layout/field/file.tt            |  25 +++
 share/skin/default/layout/field/hidden_array       |  17 --
 share/skin/default/layout/field/hidden_array.tt    |  17 ++
 share/skin/default/layout/field/number             |  26 ---
 share/skin/default/layout/field/number.tt          |  26 +++
 share/skin/default/layout/field/password           |  26 ---
 share/skin/default/layout/field/password.tt        |  26 +++
 share/skin/default/layout/field/string             |  26 ---
 share/skin/default/layout/field/string.tt          |  26 +++
 share/skin/default/layout/field/text               |  28 ---
 share/skin/default/layout/field/text.tt            |  28 +++
 share/skin/default/layout/field/time_range         |  25 ---
 share/skin/default/layout/field/time_range.tt      |  25 +++
 share/skin/default/layout/grid_view                |  49 -----
 share/skin/default/layout/grid_view.tt             |  53 ++++++
 share/skin/default/layout/index                    |   5 -
 share/skin/default/layout/index.tt                 |   5 +
 share/skin/default/layout/layout                   |  56 ------
 share/skin/default/layout/layout.tt                |  56 ++++++
 share/skin/default/layout/list_view                |  49 -----
 share/skin/default/layout/list_view.tt             |  53 ++++++
 share/skin/default/layout/object_view              |  15 --
 share/skin/default/layout/object_view.tt           |  15 ++
 share/skin/default/layout/value/boolean            |   9 -
 share/skin/default/layout/value/boolean.tt         |   9 +
 share/skin/default/layout/value/collection         |  15 --
 share/skin/default/layout/value/collection.tt      |  15 ++
 share/skin/default/layout/value/date_time          |   9 -
 share/skin/default/layout/value/date_time.tt       |   9 +
 share/skin/default/layout/value/list               |  15 --
 share/skin/default/layout/value/list.tt            |  15 ++
 share/skin/default/layout/value/number             |   9 -
 share/skin/default/layout/value/number.tt          |   9 +
 share/skin/default/layout/value/related_object     |   9 -
 share/skin/default/layout/value/related_object.tt  |   9 +
 share/skin/default/layout/value/string             |   9 -
 share/skin/default/layout/value/string.tt          |   9 +
 share/skin/default/layout/value/text               |   9 -
 share/skin/default/layout/value/text.tt            |   9 +
 74 files changed, 979 insertions(+), 869 deletions(-)
 delete mode 100644 share/skin/default/layout/action_form
 create mode 100644 share/skin/default/layout/action_form.tt
 delete mode 100644 share/skin/default/layout/display_field/boolean
 create mode 100644 share/skin/default/layout/display_field/boolean.tt
 delete mode 100644 share/skin/default/layout/display_field/collection
 create mode 100644 share/skin/default/layout/display_field/collection.tt
 delete mode 100644 share/skin/default/layout/display_field/date_time
 create mode 100644 share/skin/default/layout/display_field/date_time.tt
 delete mode 100644 share/skin/default/layout/display_field/list
 create mode 100644 share/skin/default/layout/display_field/list.tt
 delete mode 100644 share/skin/default/layout/display_field/number
 create mode 100644 share/skin/default/layout/display_field/number.tt
 delete mode 100644 share/skin/default/layout/display_field/related_object
 create mode 100644 share/skin/default/layout/display_field/related_object.tt
 delete mode 100644 share/skin/default/layout/display_field/string
 create mode 100644 share/skin/default/layout/display_field/string.tt
 delete mode 100644 share/skin/default/layout/display_field/text
 create mode 100644 share/skin/default/layout/display_field/text.tt
 delete mode 100644 share/skin/default/layout/field/boolean
 create mode 100644 share/skin/default/layout/field/boolean.tt
 delete mode 100644 share/skin/default/layout/field/choose_many
 create mode 100644 share/skin/default/layout/field/choose_many.tt
 delete mode 100644 share/skin/default/layout/field/choose_one
 create mode 100644 share/skin/default/layout/field/choose_one.tt
 delete mode 100644 share/skin/default/layout/field/date_time
 create mode 100644 share/skin/default/layout/field/date_time.tt
 delete mode 100644 share/skin/default/layout/field/file
 create mode 100644 share/skin/default/layout/field/file.tt
 delete mode 100644 share/skin/default/layout/field/hidden_array
 create mode 100644 share/skin/default/layout/field/hidden_array.tt
 delete mode 100644 share/skin/default/layout/field/number
 create mode 100644 share/skin/default/layout/field/number.tt
 delete mode 100644 share/skin/default/layout/field/password
 create mode 100644 share/skin/default/layout/field/password.tt
 delete mode 100644 share/skin/default/layout/field/string
 create mode 100644 share/skin/default/layout/field/string.tt
 delete mode 100644 share/skin/default/layout/field/text
 create mode 100644 share/skin/default/layout/field/text.tt
 delete mode 100644 share/skin/default/layout/field/time_range
 create mode 100644 share/skin/default/layout/field/time_range.tt
 delete mode 100644 share/skin/default/layout/grid_view
 create mode 100644 share/skin/default/layout/grid_view.tt
 delete mode 100644 share/skin/default/layout/index
 create mode 100644 share/skin/default/layout/index.tt
 delete mode 100644 share/skin/default/layout/layout
 create mode 100644 share/skin/default/layout/layout.tt
 delete mode 100644 share/skin/default/layout/list_view
 create mode 100644 share/skin/default/layout/list_view.tt
 delete mode 100644 share/skin/default/layout/object_view
 create mode 100644 share/skin/default/layout/object_view.tt
 delete mode 100644 share/skin/default/layout/value/boolean
 create mode 100644 share/skin/default/layout/value/boolean.tt
 delete mode 100644 share/skin/default/layout/value/collection
 create mode 100644 share/skin/default/layout/value/collection.tt
 delete mode 100644 share/skin/default/layout/value/date_time
 create mode 100644 share/skin/default/layout/value/date_time.tt
 delete mode 100644 share/skin/default/layout/value/list
 create mode 100644 share/skin/default/layout/value/list.tt
 delete mode 100644 share/skin/default/layout/value/number
 create mode 100644 share/skin/default/layout/value/number.tt
 delete mode 100644 share/skin/default/layout/value/related_object
 create mode 100644 share/skin/default/layout/value/related_object.tt
 delete mode 100644 share/skin/default/layout/value/string
 create mode 100644 share/skin/default/layout/value/string.tt
 delete mode 100644 share/skin/default/layout/value/text
 create mode 100644 share/skin/default/layout/value/text.tt

diff --git a/componentui.conf b/componentui.conf
index 9a0ed59..008ce1d 100644
--- a/componentui.conf
+++ b/componentui.conf
@@ -1,15 +1,5 @@
 using_frontend_proxy 1
 
-<Controller Foo>
-  <action update>
-    <ViewPort>
-      <Field baz_list>
-        layout checkbox_group
-      </Field>
-    </ViewPort>
-  </Action>
-</Controller>
-
 <View Site>
   skin_name default
 </View>
\ No newline at end of file
diff --git a/lib/ComponentUI/Controller/TestModel/Bar.pm b/lib/ComponentUI/Controller/TestModel/Bar.pm
index 2cf7681..644a20f 100644
--- a/lib/ComponentUI/Controller/TestModel/Bar.pm
+++ b/lib/ComponentUI/Controller/TestModel/Bar.pm
@@ -6,10 +6,7 @@ use Reaction::Class;
 __PACKAGE__->config(
   model_base => 'TestModel',
   model_name => 'Bar',
-  action => { base => { Chained => '/base', PathPart => 'testmodel/bar' },
-              list => { ViewPort => { layout => 'bar_list' } },
-              update => { ViewPort => { layout => 'bar_form' } },
-              create => { ViewPort => { layout => 'bar_form' } } },
+  action => { base => { Chained => '/base', PathPart => 'testmodel/bar' }},
 );
 
 1;
diff --git a/lib/Reaction/UI/ViewPort/GridView.pm b/lib/Reaction/UI/ViewPort/GridView.pm
index 542af62..5691ff1 100644
--- a/lib/Reaction/UI/ViewPort/GridView.pm
+++ b/lib/Reaction/UI/ViewPort/GridView.pm
@@ -2,8 +2,14 @@ package Reaction::UI::ViewPort::GridView;
 
 use Reaction::Class;
 
-use aliased 'Reaction::UI::ViewPort::GridView::Row';
-use aliased 'Reaction::InterfaceModel::Collection';
+use aliased 'Reaction::UI::ViewPort::DisplayField::Text';
+use aliased 'Reaction::UI::ViewPort::DisplayField::Number';
+use aliased 'Reaction::UI::ViewPort::DisplayField::Boolean';
+use aliased 'Reaction::UI::ViewPort::DisplayField::String';
+use aliased 'Reaction::UI::ViewPort::DisplayField::DateTime';
+use aliased 'Reaction::UI::ViewPort::DisplayField::RelatedObject';
+
+use aliased 'Reaction::InterfaceModel::Collection' => 'IM_Collection';
 
 class GridView is 'Reaction::UI::ViewPort', which {
 
@@ -12,38 +18,23 @@ class GridView is 'Reaction::UI::ViewPort', which {
   has rows            => ( isa => 'ArrayRef', is => 'ro', lazy_build => 1);
   has row_args        => ( isa => 'HashRef',  is => 'ro');
 
-  has collection         => (isa => Collection, is => 'ro', required   => 1);
-  has current_collection => (isa => Collection, is => 'rw', lazy_build => 1);
-
-  implements build_rows => as{
-    my $self = shift;
+  has collection         => (isa => IM_Collection, is => 'ro', required   => 1);
+  has current_collection => (isa => IM_Collection, is => 'rw', lazy_build => 1);
 
-    my (@rows, $i);
-    for my $object ( $self->current_collection->members ){
-      my $row = Row->new
-        (
-         ctx            => $self->ctx,
-         object         => $object,
-         location       => join('-', $self->location, 'row', ++$i),
-         column_order   => $self->column_order, #XXX clean from ViewPort
-         exclude_fields => $self->exclude_columns || [],
-         $self->has_row_args ? %{ $self->row_args } : (),
-
-        );
-      push(@rows, $row);
-    }
-    return \@rows;
-  };
+  has ordered_columns => (is => 'ro', isa => 'ArrayRef', lazy_build => 1);
 
-  implements build_column_names => as {
+  implements build_ordered_columns => as {
     my ($self) = @_;
     my %excluded = map { $_ => undef }
       @{ $self->has_exclude_columns ? $self->exclude_columns : [] };
     #XXX this abuse of '_im_class' needs to be fixed ASAP
     my $object_class = $self->collection->_im_class;
-    my @fields = $object_class->meta->compute_all_applicable_attributes;
+    my @fields = $object_class->meta->parameter_attributes;
+    #obviously only get fields with readers.
+    @fields = grep { $_->get_read_method } @fields;
     #eliminate excluded fields & treat names that start with an underscore as private
     @fields = grep {$_->name !~ /^_/ && !exists $excluded{$_->name} } @fields;
+
     #eliminate fields marked as collections, or fields that are arrayrefs
     @fields = grep {
       !($_->has_type_constraint &&
@@ -54,14 +45,172 @@ class GridView is 'Reaction::UI::ViewPort', which {
        )  } @fields;
 
     #order the columns all nice and pretty, and only get fields with readers, duh
-    return $self->sort_by_spec
-      ( $self->column_order, [ map { (($_->get_read_method) || ()) } @fields] );
+    my $ordered = $self->sort_by_spec
+      ( $self->column_order, [ map { (($_->name) || ()) } @fields] );
+
+    return $ordered;
   };
 
   implements build_current_collection => as {
     shift->collection;
   };
 
+  implements build_column_names => as {
+    my $self = shift;
+    [ map{ join(' ', map{ ucfirst } split('_', $_)) } @{$self->ordered_columns} ];
+  }
+
+    implements build_rows => as {
+      my ($self) = @_;
+      my @columns = @{ $self->ordered_columns };
+
+      my (@rows, $i);
+      my $builders = {};
+      for my $obj ( $self->current_collection->members ) {
+        $i++;
+        my @cells;
+        for my $col (@columns) {
+          my $attr = $obj->meta->find_attribute_by_name($col);
+          my $build_meth = $builders->{$col} ||= $self->build_fields_for($attr);
+          my $loc =  join('-', $self->location, 'row', $i, 'field', $attr->name);
+          my $args = {Field => { $attr->name => {location => $loc} } };
+          my $cell = $self->$build_meth($obj, $attr, $args);
+          push(@cells, $cell) if $cell;
+        }
+        push(@rows,\@cells)
+      }
+
+      return \@rows;
+    };
+
+  implements build_fields_for => as {
+    my ($self, $attr) = @_;
+    my $attr_name = $attr->name;
+    my $builder = "build_fields_for_name_${attr_name}";
+    return $builder if $self->can($builder);
+    if ($attr->has_type_constraint) {
+      my $constraint = $attr->type_constraint;
+      my $base_name = $constraint->name;
+      my $tried_isa = 0;
+    CONSTRAINT: while (defined($constraint)) {
+        my $name = $constraint->name;
+        if (eval { $name->can('meta') } && !$tried_isa++) {
+          foreach my $class ($name->meta->class_precedence_list) {
+            my $mangled_name = $class;
+            $mangled_name =~ s/:+/_/g;
+            my $builder = "build_fields_for_type_${mangled_name}";
+            return $builder if $self->can($builder);
+          }
+        }
+        if (defined($name)) {
+          unless (defined($base_name)) {
+            $base_name = "(anon subtype of ${name})";
+          }
+          my $mangled_name = $name;
+          $mangled_name =~ s/:+/_/g;
+          my $builder = "build_fields_for_type_${mangled_name}";
+          return $builder if $self->can($builder);
+        }
+        $constraint = $constraint->parent;
+      }
+      if (!defined($constraint)) {
+        confess "Can't build field ${attr_name} of type ${base_name} without $builder method or build_fields_for_type_<type> method for type or any supertype";
+      }
+    } else {
+      confess "Can't build field ${attr} without $builder method or type constraint";
+    }
+  };
+
+
+  implements build_simple_field => as {
+    my ($self, $class, $obj, $attr, $args) = @_;
+    my $attr_name = $attr->name;
+    my %extra;
+    if (my $config = $args->{Field}{$attr_name}) {
+      %extra = %$config;
+    }
+
+    return $class->new(
+                       object => $obj,
+                       attribute => $attr,
+                       name => $attr->name,
+                       ctx => $self->ctx,
+                       %extra
+                      );
+  };
+
+  implements build_fields_for_type_Num => as {
+    my ($self, $obj, $attr, $args) = @_;
+    $args->{Field}{$attr->name}{layout} = 'value/number'
+      unless( exists  $args->{Field}{$attr->name}         &&
+              exists  $args->{Field}{$attr->name}{layout} &&
+              defined $args->{Field}{$attr->name}{layout}
+            );
+    return $self->build_simple_field(Number, $obj, $attr, $args);
+  };
+
+  implements build_fields_for_type_Int => as {
+    my ($self, $obj, $attr, $args) = @_;
+    $args->{Field}{$attr->name}{layout} = 'value/number'
+      unless( exists  $args->{Field}{$attr->name}         &&
+              exists  $args->{Field}{$attr->name}{layout} &&
+              defined $args->{Field}{$attr->name}{layout}
+            );
+    return $self->build_simple_field(Number, $obj, $attr, $args);
+  };
+
+  implements build_fields_for_type_Bool => as {
+    my ($self, $obj, $attr, $args) = @_;
+    $args->{Field}{$attr->name}{layout} = 'value/boolean'
+      unless( exists  $args->{Field}{$attr->name}         &&
+              exists  $args->{Field}{$attr->name}{layout} &&
+              defined $args->{Field}{$attr->name}{layout}
+            );
+    return $self->build_simple_field(Boolean, $obj, $attr, $args);
+  };
+
+  implements build_fields_for_type_Password => as { return };
+
+  implements build_fields_for_type_Str => as {
+    my ($self, $obj, $attr, $args) = @_;
+    $args->{Field}{$attr->name}{layout} = 'value/string'
+      unless( exists  $args->{Field}{$attr->name}         &&
+              exists  $args->{Field}{$attr->name}{layout} &&
+              defined $args->{Field}{$attr->name}{layout}
+            );
+    return $self->build_simple_field(String, $obj, $attr, $args);
+  };
+
+  implements build_fields_for_type_SimpleStr => as {
+    my ($self, $obj, $attr, $args) = @_;
+    $args->{Field}{$attr->name}{layout} = 'value/string'
+      unless( exists  $args->{Field}{$attr->name}         &&
+              exists  $args->{Field}{$attr->name}{layout} &&
+              defined $args->{Field}{$attr->name}{layout}
+            );
+    return $self->build_simple_field(String, $obj, $attr, $args);
+  };
+
+  implements build_fields_for_type_DateTime => as {
+    my ($self, $obj, $attr, $args) = @_;
+    $args->{Field}{$attr->name}{layout} = 'value/date_time'
+      unless( exists  $args->{Field}{$attr->name}         &&
+              exists  $args->{Field}{$attr->name}{layout} &&
+              defined $args->{Field}{$attr->name}{layout}
+            );
+    return $self->build_simple_field(DateTime, $obj, $attr, $args);
+  };
+
+  implements build_fields_for_type_Enum => as {
+    my ($self, $obj, $attr, $args) = @_;
+    $args->{Field}{$attr->name}{layout} = 'value/string'
+      unless( exists  $args->{Field}{$attr->name}         &&
+              exists  $args->{Field}{$attr->name}{layout} &&
+              defined $args->{Field}{$attr->name}{layout}
+            );
+    return $self->build_simple_field(String, $obj, $attr, $args);
+  };
+
 };
 
 
diff --git a/lib/Reaction/UI/ViewPort/GridView/Row.pm b/lib/Reaction/UI/ViewPort/GridView/Row.pm
index 2edb06a..6c84967 100644
--- a/lib/Reaction/UI/ViewPort/GridView/Row.pm
+++ b/lib/Reaction/UI/ViewPort/GridView/Row.pm
@@ -77,6 +77,7 @@ class Row is 'Reaction::UI::ViewPort::ObjectView', which {
 
   around build_fields_for_type_ArrayRef => sub {
     my ($orig, $self, $attr, $args) = @_;
+    return;
     $args->{Field}{$attr->name}{layout} = 'value/list'
       unless( exists  $args->{Field}{$attr->name}         &&
               exists  $args->{Field}{$attr->name}{layout} &&
@@ -87,6 +88,7 @@ class Row is 'Reaction::UI::ViewPort::ObjectView', which {
 
   around build_fields_for_type_Reaction_InterfaceModel_Collection => sub {
     my ($orig, $self, $attr, $args) = @_;
+    return;
     $args->{Field}{$attr->name}{layout} = 'value/collection'
       unless( exists  $args->{Field}{$attr->name}         &&
               exists  $args->{Field}{$attr->name}{layout} &&
@@ -97,6 +99,7 @@ class Row is 'Reaction::UI::ViewPort::ObjectView', which {
 
   around build_fields_for_type_Reaction_InterfaceModel_Object => sub {
     my ($orig, $self, $attr, $args) = @_;
+    return;
     $args->{Field}{$attr->name}{layout} = 'value/related_object'
       unless( exists  $args->{Field}{$attr->name}         &&
               exists  $args->{Field}{$attr->name}{layout} &&
diff --git a/lib/Reaction/UI/ViewPort/ListView.pm b/lib/Reaction/UI/ViewPort/ListView.pm
index 94e4de1..7430413 100644
--- a/lib/Reaction/UI/ViewPort/ListView.pm
+++ b/lib/Reaction/UI/ViewPort/ListView.pm
@@ -4,8 +4,8 @@ use Reaction::Class;
 
 class ListView is 'Reaction::UI::ViewPort::GridView', which {
 
-  does 'Reaction::UI::ViewPort::GridView::Role::Order';
-  does 'Reaction::UI::ViewPort::GridView::Role::Pager';
+  #does 'Reaction::UI::ViewPort::GridView::Role::Order';
+  #does 'Reaction::UI::ViewPort::GridView::Role::Pager';
 
 };
 
diff --git a/lib/Reaction/UI/Widget/GridView.pm b/lib/Reaction/UI/Widget/GridView.pm
index bb2f526..bb7494c 100644
--- a/lib/Reaction/UI/Widget/GridView.pm
+++ b/lib/Reaction/UI/Widget/GridView.pm
@@ -3,7 +3,7 @@ package Reaction::UI::Widget::GridView;
 use Reaction::UI::WidgetClass;
 
 class GridView, which {
-  widget renders [ qw/header rows footer/
+  widget renders [ qw/header body footer/
                    => { viewport => func('self', 'viewport') }
                  ];
 
@@ -15,58 +15,11 @@ class GridView, which {
   footer_row  renders [ footer_cell over func('viewport', 'column_names') ];
   footer_cell renders [ string { $_ } ];
 
-  rows renders [ viewport over func('viewport','rows') ];
+
+  body      renders [ body_row over func('viewport','rows')];
+  body_row  renders [ body_cell over $_ ]; #over $_ ? heeelp
+  body_cell renders [ 'viewport' ];
 
 };
 
 1;
-
-
-=for layout widget
-<table>
-  [% header %]
-<tbody>
-  [% rows %]
-</tbody>
-<tfoot>
-  [% footer %]
-</tfoot>
-</table>
-
-=for layout header
-
-<thead>
-  [% content %]
-</thead>
-
-=for layout header_row
-
-<tr>
-  [% content %]
-</tr>
-
-=for layout header_cell
-
-<th> [% content %] </th>
-
-=for layout footer
-
-<tfoot>
-  [% content %]
-</tfoot>
-
-=for layout footer_row
-
-<tr> [% content %] </tr>
-
-=for layout footer_cell
-
-<td> [% content %] </td>
-
-=for layout rows
-
-<tbody>
-  [% content %]
-</tbody>
-
-=cut
diff --git a/lib/Reaction/UI/Widget/GridView/Row.pm b/lib/Reaction/UI/Widget/GridView/Row.pm
index 8ed46e0..24cb098 100644
--- a/lib/Reaction/UI/Widget/GridView/Row.pm
+++ b/lib/Reaction/UI/Widget/GridView/Row.pm
@@ -1,8 +1,8 @@
-package Reaction::UI::Widget::ObjectView;
+package Reaction::UI::Widget::GridView::Row;
 
 use Reaction::UI::WidgetClass;
 
-class ObjectView, which {
+class Row, which {
   widget renders [ cells => { viewport => func('self', 'viewport') } ];
   cells  renders [ cell over func('viewport', 'ordered_fields')   ];
   cell   renders [ 'viewport' ];
diff --git a/lib/Reaction/UI/WidgetClass.pm b/lib/Reaction/UI/WidgetClass.pm
index 9e40936..83e3076 100644
--- a/lib/Reaction/UI/WidgetClass.pm
+++ b/lib/Reaction/UI/WidgetClass.pm
@@ -65,11 +65,11 @@ class WidgetClass, which {
       if (defined($args) && (ref($args) ne 'HASH'));
 
     $sig .= '
-  where content spec is [ fragment_name over func(...), \%args? ]
+where content spec is [ fragment_name over (func(...)|$_|$_{keyname}), \%args? ]
   or [ qw(list of fragment names), \%args ]'; # explain the mistake, yea
 
     my $inner_args = ((ref($content->[-1]) eq 'HASH') ? pop(@$content) : {});
-     # [ blah over func(...), { ... } ] or [ qw(foo bar), { ... } ]
+    # [ blah over (func(...)|$_|$_{keyname}), { ... } ] or [ qw(foo bar), { ... } ]
 
     # predeclare since content_gen gets populated somewhere in an if
     # and inner_args_gen wants to be closed over by content_gen
@@ -95,13 +95,23 @@ class WidgetClass, which {
         # - if arrayref, render fragment per entry
         # - if obj and can('next') call that until undef
         # - else scream loudly
-        my ($func_key, $func_meth) = @$func;
+        unless ((ref($func) eq 'ARRAY') || ($func =~ /^-topic:(.*)$/)) {
+          confess "over value wrong, should be ${sig}";
+        }
         $content_gen = sub {
           my ($widget, $args) = @_;
-          my $topic = eval { $args->{$func_key}->$func_meth };
-          confess "Error calling ${func_meth} on ${func_key} argument "
-                 .($args->{$func_key}||'').": $@"
-            if $@;
+          my $topic;
+          if (ref($func) eq 'ARRAY') {
+            my ($func_key, $func_meth)  = @$func;
+            $topic = eval { $args->{$func_key}->$func_meth };
+            confess "Error calling ${func_meth} on ${func_key} argument "
+              .($args->{$func_key}||'').": $@"
+                if $@;
+          } elsif ($func =~ /^-topic:(.*)$/) {
+            $topic = $args->{$1};
+          } else {
+            confess "Shouldn't get here";
+          }
           my $iter_sub;
           if (ref $topic eq 'ARRAY') {
             my @copy = @$topic; # non-destructive on original data
diff --git a/share/skin/default/layout/action_form b/share/skin/default/layout/action_form
deleted file mode 100644
index 0e18a36..0000000
--- a/share/skin/default/layout/action_form
+++ /dev/null
@@ -1,46 +0,0 @@
-=for layout widget
-
-  <form action="" method="post" enctype="multipart/form-data">
-    [% header  %]
-    [% fields  %]
-    [% buttons %]
-    [% footer  %]
-  </form>
-
-=for layout header
-
-<h2>Le Header</h2>
-
-=for layout fields
-
-<p> [% content %] </p>
-
-=for layout field
-
-[% content %] <br />
-
-=for layout buttons
-
-  [% IF message; %]
-    <span>[% message %]</span> <br />
-  [% END; %]
-
-  [% allowed_events = viewport.accept_events; %]
-  [% IF allowed_events.grep('^ok$').size; %]
-    <input type="submit" name="[% viewport.event_id_for('ok')    | html%]" value="ok" />
-  [% END; %]
-
-  [% IF (viewport.ordered_fields.size != 0) && allowed_events.grep('^apply$').size; %]
-    <input type="submit" name="[% viewport.event_id_for('apply') | html%]" value="apply" />
-  [% END; %]
-
-  [% IF allowed_events.grep('^close$').size; %]
-    <input type="submit" name="[% viewport.event_id_for('close') | html%]" value="cancel" />
-  [% END; %]
-  <br />
-
-=for layout footer
-
-  <h2>Le Footer</h2>
-
-=cut
diff --git a/share/skin/default/layout/action_form.tt b/share/skin/default/layout/action_form.tt
new file mode 100644
index 0000000..0e18a36
--- /dev/null
+++ b/share/skin/default/layout/action_form.tt
@@ -0,0 +1,46 @@
+=for layout widget
+
+  <form action="" method="post" enctype="multipart/form-data">
+    [% header  %]
+    [% fields  %]
+    [% buttons %]
+    [% footer  %]
+  </form>
+
+=for layout header
+
+<h2>Le Header</h2>
+
+=for layout fields
+
+<p> [% content %] </p>
+
+=for layout field
+
+[% content %] <br />
+
+=for layout buttons
+
+  [% IF message; %]
+    <span>[% message %]</span> <br />
+  [% END; %]
+
+  [% allowed_events = viewport.accept_events; %]
+  [% IF allowed_events.grep('^ok$').size; %]
+    <input type="submit" name="[% viewport.event_id_for('ok')    | html%]" value="ok" />
+  [% END; %]
+
+  [% IF (viewport.ordered_fields.size != 0) && allowed_events.grep('^apply$').size; %]
+    <input type="submit" name="[% viewport.event_id_for('apply') | html%]" value="apply" />
+  [% END; %]
+
+  [% IF allowed_events.grep('^close$').size; %]
+    <input type="submit" name="[% viewport.event_id_for('close') | html%]" value="cancel" />
+  [% END; %]
+  <br />
+
+=for layout footer
+
+  <h2>Le Footer</h2>
+
+=cut
diff --git a/share/skin/default/layout/display_field/boolean b/share/skin/default/layout/display_field/boolean
deleted file mode 100644
index 74e02e4..0000000
--- a/share/skin/default/layout/display_field/boolean
+++ /dev/null
@@ -1,13 +0,0 @@
-=for layout widget
-
-[% content %]
-
-=for layout label
-
-<strong > [% content | html %]: </strong>
-
-=for layout value
-
-[% content | html %]
-
-=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/display_field/boolean.tt b/share/skin/default/layout/display_field/boolean.tt
new file mode 100644
index 0000000..74e02e4
--- /dev/null
+++ b/share/skin/default/layout/display_field/boolean.tt
@@ -0,0 +1,13 @@
+=for layout widget
+
+[% content %]
+
+=for layout label
+
+<strong > [% content | html %]: </strong>
+
+=for layout value
+
+[% content | html %]
+
+=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/display_field/collection b/share/skin/default/layout/display_field/collection
deleted file mode 100644
index 3bc65a9..0000000
--- a/share/skin/default/layout/display_field/collection
+++ /dev/null
@@ -1,20 +0,0 @@
-=for layout widget
-
-[% label %]
-[% list  %]
-
-=for layout label
-
-<strong > [% content | html %]: </strong>
-
-=for layout list
-
-<ul>
-[% content %]
-</ul>
-
-=for layout item
-
-<li>[% content | html %]</li>
-
-=cut
diff --git a/share/skin/default/layout/display_field/collection.tt b/share/skin/default/layout/display_field/collection.tt
new file mode 100644
index 0000000..3bc65a9
--- /dev/null
+++ b/share/skin/default/layout/display_field/collection.tt
@@ -0,0 +1,20 @@
+=for layout widget
+
+[% label %]
+[% list  %]
+
+=for layout label
+
+<strong > [% content | html %]: </strong>
+
+=for layout list
+
+<ul>
+[% content %]
+</ul>
+
+=for layout item
+
+<li>[% content | html %]</li>
+
+=cut
diff --git a/share/skin/default/layout/display_field/date_time b/share/skin/default/layout/display_field/date_time
deleted file mode 100644
index 1fcad1a..0000000
--- a/share/skin/default/layout/display_field/date_time
+++ /dev/null
@@ -1,13 +0,0 @@
-=for layout widget
-
-[% content %]
-
-=for layout label
-
-<strong> [% content | html %]: </strong>
-
-=for layout value
-
-[% content | html %]
-
-=cut
diff --git a/share/skin/default/layout/display_field/date_time.tt b/share/skin/default/layout/display_field/date_time.tt
new file mode 100644
index 0000000..1fcad1a
--- /dev/null
+++ b/share/skin/default/layout/display_field/date_time.tt
@@ -0,0 +1,13 @@
+=for layout widget
+
+[% content %]
+
+=for layout label
+
+<strong> [% content | html %]: </strong>
+
+=for layout value
+
+[% content | html %]
+
+=cut
diff --git a/share/skin/default/layout/display_field/list b/share/skin/default/layout/display_field/list
deleted file mode 100644
index 2b049b5..0000000
--- a/share/skin/default/layout/display_field/list
+++ /dev/null
@@ -1,20 +0,0 @@
-=for layout widget
-
-[% label %]
-[% list  %]
-
-=for layout label
-
-<strong > [% content | html %]: </strong>
-
-=for layout list
-
-<ul>
-[% content %]
-</ul>
-
-=for layout item
-
-<li>[% content | html %]</li>
-
-=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/display_field/list.tt b/share/skin/default/layout/display_field/list.tt
new file mode 100644
index 0000000..2b049b5
--- /dev/null
+++ b/share/skin/default/layout/display_field/list.tt
@@ -0,0 +1,20 @@
+=for layout widget
+
+[% label %]
+[% list  %]
+
+=for layout label
+
+<strong > [% content | html %]: </strong>
+
+=for layout list
+
+<ul>
+[% content %]
+</ul>
+
+=for layout item
+
+<li>[% content | html %]</li>
+
+=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/display_field/number b/share/skin/default/layout/display_field/number
deleted file mode 100644
index 1fcad1a..0000000
--- a/share/skin/default/layout/display_field/number
+++ /dev/null
@@ -1,13 +0,0 @@
-=for layout widget
-
-[% content %]
-
-=for layout label
-
-<strong> [% content | html %]: </strong>
-
-=for layout value
-
-[% content | html %]
-
-=cut
diff --git a/share/skin/default/layout/display_field/number.tt b/share/skin/default/layout/display_field/number.tt
new file mode 100644
index 0000000..1fcad1a
--- /dev/null
+++ b/share/skin/default/layout/display_field/number.tt
@@ -0,0 +1,13 @@
+=for layout widget
+
+[% content %]
+
+=for layout label
+
+<strong> [% content | html %]: </strong>
+
+=for layout value
+
+[% content | html %]
+
+=cut
diff --git a/share/skin/default/layout/display_field/related_object b/share/skin/default/layout/display_field/related_object
deleted file mode 100644
index 1fcad1a..0000000
--- a/share/skin/default/layout/display_field/related_object
+++ /dev/null
@@ -1,13 +0,0 @@
-=for layout widget
-
-[% content %]
-
-=for layout label
-
-<strong> [% content | html %]: </strong>
-
-=for layout value
-
-[% content | html %]
-
-=cut
diff --git a/share/skin/default/layout/display_field/related_object.tt b/share/skin/default/layout/display_field/related_object.tt
new file mode 100644
index 0000000..1fcad1a
--- /dev/null
+++ b/share/skin/default/layout/display_field/related_object.tt
@@ -0,0 +1,13 @@
+=for layout widget
+
+[% content %]
+
+=for layout label
+
+<strong> [% content | html %]: </strong>
+
+=for layout value
+
+[% content | html %]
+
+=cut
diff --git a/share/skin/default/layout/display_field/string b/share/skin/default/layout/display_field/string
deleted file mode 100644
index 831cad4..0000000
--- a/share/skin/default/layout/display_field/string
+++ /dev/null
@@ -1,13 +0,0 @@
-=for layout widget
-
-[% content %]
-
-=for layout label
-
-<strong> [% content | html %]: </strong>
-
-=for layout value
-
-[% content | html %]
-
-=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/display_field/string.tt b/share/skin/default/layout/display_field/string.tt
new file mode 100644
index 0000000..831cad4
--- /dev/null
+++ b/share/skin/default/layout/display_field/string.tt
@@ -0,0 +1,13 @@
+=for layout widget
+
+[% content %]
+
+=for layout label
+
+<strong> [% content | html %]: </strong>
+
+=for layout value
+
+[% content | html %]
+
+=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/display_field/text b/share/skin/default/layout/display_field/text
deleted file mode 100644
index 831cad4..0000000
--- a/share/skin/default/layout/display_field/text
+++ /dev/null
@@ -1,13 +0,0 @@
-=for layout widget
-
-[% content %]
-
-=for layout label
-
-<strong> [% content | html %]: </strong>
-
-=for layout value
-
-[% content | html %]
-
-=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/display_field/text.tt b/share/skin/default/layout/display_field/text.tt
new file mode 100644
index 0000000..831cad4
--- /dev/null
+++ b/share/skin/default/layout/display_field/text.tt
@@ -0,0 +1,13 @@
+=for layout widget
+
+[% content %]
+
+=for layout label
+
+<strong> [% content | html %]: </strong>
+
+=for layout value
+
+[% content | html %]
+
+=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/field/boolean b/share/skin/default/layout/field/boolean
deleted file mode 100644
index 73b817e..0000000
--- a/share/skin/default/layout/field/boolean
+++ /dev/null
@@ -1,34 +0,0 @@
-=for layout widget
-
-[% label %] [% field %] [% message %] <br>
-
-=for layout field
-
-[%
-   IF content;
-    checked = 'checked="checked"';
-   ELSE;
-    checked = "";
-   END;
-%]
-
-<!-- We need a replacement for process_attrs -->
-<input type="checkbox" id="[% id | html %]" name="[% name | html %]" value="1" [% checked %] />
-
-=for layout label
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <label> [% content_str | html %]: </label>
-[% END; %]
-
-=for layout message
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <span> [% content_str | html %] </span> <br />
-[% END %]
-
-=cut
diff --git a/share/skin/default/layout/field/boolean.tt b/share/skin/default/layout/field/boolean.tt
new file mode 100644
index 0000000..73b817e
--- /dev/null
+++ b/share/skin/default/layout/field/boolean.tt
@@ -0,0 +1,34 @@
+=for layout widget
+
+[% label %] [% field %] [% message %] <br>
+
+=for layout field
+
+[%
+   IF content;
+    checked = 'checked="checked"';
+   ELSE;
+    checked = "";
+   END;
+%]
+
+<!-- We need a replacement for process_attrs -->
+<input type="checkbox" id="[% id | html %]" name="[% name | html %]" value="1" [% checked %] />
+
+=for layout label
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
+
+=for layout message
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
+[% END %]
+
+=cut
diff --git a/share/skin/default/layout/field/choose_many b/share/skin/default/layout/field/choose_many
deleted file mode 100644
index 1479de8..0000000
--- a/share/skin/default/layout/field/choose_many
+++ /dev/null
@@ -1,68 +0,0 @@
-=for layout widget
-
-[% label %]
-<br />
-[% message %]
-[% field %]
-
-=for layout field
-
-<table>
-  <tr>
-    <td> [% available_values %] </td>
-    <td>  [% action_buttons %]  </td>
-    <td>
-      [% selected_values %]
-      [% current_values  %]
-    </td>
-  </tr>
-</table>
-
-=for layout available_values
-
-<select size="10" multiple="multiple"  name="[% viewport.event_id_for('add_values') | html %]">
-  [% content %]
-</select>
-
-=for layout selected_values
-
-<select size="10" multiple="multiple"  name="[% viewport.event_id_for('remove_values') | html %]">
-  [% content %]
-</select>
-
-=for layout current_values
-
-[% content %]
-
-=for layout hidden_value
-
-<input type="hidden" name="[% viewport.event_id_for('value') | html %]" value="[% content | html %]">
-
-=for layout option
-
-<option value="[% v_value | html %]">[% v_name | html %]</option>
-
-=for layout action_buttons
-
-<input type="submit" value="&gt;&gt;" name="[% viewport.event_id_for('add_all_values') | html %]" /> <br />
-<input type="submit" value="&gt;" name="[% viewport.event_id_for('do_add_values') | html %]" /> <br />
-<input type="submit" value="&lt;" name="[% viewport.event_id_for('do_remove_values') | html %]" /> <br />
-<input type="submit" value="&lt;&lt;" name="[% viewport.event_id_for('remove_all_values') | html %]" /> <br />
-
-=for layout label
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <label> [% content_str | html %]: </label>
-[% END; %]
-
-=for layout message
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <span> [% content_str | html %] </span> <br />
-[% END %]
-
-=cut
diff --git a/share/skin/default/layout/field/choose_many.tt b/share/skin/default/layout/field/choose_many.tt
new file mode 100644
index 0000000..1479de8
--- /dev/null
+++ b/share/skin/default/layout/field/choose_many.tt
@@ -0,0 +1,68 @@
+=for layout widget
+
+[% label %]
+<br />
+[% message %]
+[% field %]
+
+=for layout field
+
+<table>
+  <tr>
+    <td> [% available_values %] </td>
+    <td>  [% action_buttons %]  </td>
+    <td>
+      [% selected_values %]
+      [% current_values  %]
+    </td>
+  </tr>
+</table>
+
+=for layout available_values
+
+<select size="10" multiple="multiple"  name="[% viewport.event_id_for('add_values') | html %]">
+  [% content %]
+</select>
+
+=for layout selected_values
+
+<select size="10" multiple="multiple"  name="[% viewport.event_id_for('remove_values') | html %]">
+  [% content %]
+</select>
+
+=for layout current_values
+
+[% content %]
+
+=for layout hidden_value
+
+<input type="hidden" name="[% viewport.event_id_for('value') | html %]" value="[% content | html %]">
+
+=for layout option
+
+<option value="[% v_value | html %]">[% v_name | html %]</option>
+
+=for layout action_buttons
+
+<input type="submit" value="&gt;&gt;" name="[% viewport.event_id_for('add_all_values') | html %]" /> <br />
+<input type="submit" value="&gt;" name="[% viewport.event_id_for('do_add_values') | html %]" /> <br />
+<input type="submit" value="&lt;" name="[% viewport.event_id_for('do_remove_values') | html %]" /> <br />
+<input type="submit" value="&lt;&lt;" name="[% viewport.event_id_for('remove_all_values') | html %]" /> <br />
+
+=for layout label
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
+
+=for layout message
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
+[% END %]
+
+=cut
diff --git a/share/skin/default/layout/field/choose_one b/share/skin/default/layout/field/choose_one
deleted file mode 100644
index 2fd39d6..0000000
--- a/share/skin/default/layout/field/choose_one
+++ /dev/null
@@ -1,42 +0,0 @@
-=for layout widget
-
-[% label %] [% field %] [% message %]
-
-=for layout field
-
-<!-- We need a replacement for process_attrs -->
-<select name="[% name | html %]" id="[% id | html %]">
-  [% IF is_required %]
-    <option value="">--</option>
-  [% END %]
-  [% content %]
-</select>
-
-=for layout option
-
-  [% IF is_selected;
-       selected = ' selected="selected"';
-     ELSE;
-       selected =  '';
-     END;
-  %]
-  <!-- I should convert this stuff to process_attrs to keep it cleaner -->
-  <option value="[% v_value | html%]" [% selected %]> [% v_name | html %]</option>
-
-=for layout label
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <label> [% content_str | html %]: </label>
-[% END; %]
-
-=for layout message
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <span> [% content_str | html %] </span> <br />
-[% END %]
-
-=cut
diff --git a/share/skin/default/layout/field/choose_one.tt b/share/skin/default/layout/field/choose_one.tt
new file mode 100644
index 0000000..2fd39d6
--- /dev/null
+++ b/share/skin/default/layout/field/choose_one.tt
@@ -0,0 +1,42 @@
+=for layout widget
+
+[% label %] [% field %] [% message %]
+
+=for layout field
+
+<!-- We need a replacement for process_attrs -->
+<select name="[% name | html %]" id="[% id | html %]">
+  [% IF is_required %]
+    <option value="">--</option>
+  [% END %]
+  [% content %]
+</select>
+
+=for layout option
+
+  [% IF is_selected;
+       selected = ' selected="selected"';
+     ELSE;
+       selected =  '';
+     END;
+  %]
+  <!-- I should convert this stuff to process_attrs to keep it cleaner -->
+  <option value="[% v_value | html%]" [% selected %]> [% v_name | html %]</option>
+
+=for layout label
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
+
+=for layout message
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
+[% END %]
+
+=cut
diff --git a/share/skin/default/layout/field/date_time b/share/skin/default/layout/field/date_time
deleted file mode 100644
index 4dbd294..0000000
--- a/share/skin/default/layout/field/date_time
+++ /dev/null
@@ -1,26 +0,0 @@
-=for layout widget
-
-[% label %] [% field %] [% message %]
-
-=for layout field
-
-<!-- We need a replacement for process_attrs -->
-<input type="text" name="[% name | html %]" id="[% id | html%]" value="[% content | html %]" />
-
-=for layout label
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <label> [% content_str | html %]: </label>
-[% END; %]
-
-=for layout message
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <span> [% content_str | html %] </span> <br />
-[% END %]
-
-=cut
diff --git a/share/skin/default/layout/field/date_time.tt b/share/skin/default/layout/field/date_time.tt
new file mode 100644
index 0000000..4dbd294
--- /dev/null
+++ b/share/skin/default/layout/field/date_time.tt
@@ -0,0 +1,26 @@
+=for layout widget
+
+[% label %] [% field %] [% message %]
+
+=for layout field
+
+<!-- We need a replacement for process_attrs -->
+<input type="text" name="[% name | html %]" id="[% id | html%]" value="[% content | html %]" />
+
+=for layout label
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
+
+=for layout message
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
+[% END %]
+
+=cut
diff --git a/share/skin/default/layout/field/file b/share/skin/default/layout/field/file
deleted file mode 100644
index 7d323d8..0000000
--- a/share/skin/default/layout/field/file
+++ /dev/null
@@ -1,25 +0,0 @@
-=for layout widget
-
-[% label %] [% field %] [% message %]
-
-=for layout field
-
-<input type="file" name="[% name | html%]" id="[% id | html %]" />
-
-=for layout label
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <label> [% content_str | html %]: </label>
-[% END; %]
-
-=for layout message
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <span> [% content_str | html %] </span> <br />
-[% END %]
-
-=cut
diff --git a/share/skin/default/layout/field/file.tt b/share/skin/default/layout/field/file.tt
new file mode 100644
index 0000000..7d323d8
--- /dev/null
+++ b/share/skin/default/layout/field/file.tt
@@ -0,0 +1,25 @@
+=for layout widget
+
+[% label %] [% field %] [% message %]
+
+=for layout field
+
+<input type="file" name="[% name | html%]" id="[% id | html %]" />
+
+=for layout label
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
+
+=for layout message
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
+[% END %]
+
+=cut
diff --git a/share/skin/default/layout/field/hidden_array b/share/skin/default/layout/field/hidden_array
deleted file mode 100644
index ebc06af..0000000
--- a/share/skin/default/layout/field/hidden_array
+++ /dev/null
@@ -1,17 +0,0 @@
-=for layout widget
-
-[% field %]
-
-=for layout field
-
-[% item %]
-
-=for layout item
-
-<input type="hidden" name="[% name | html %]" value="[% content | html %]" />
-
-=for layout label
-
-=for layout message
-
-=cut
diff --git a/share/skin/default/layout/field/hidden_array.tt b/share/skin/default/layout/field/hidden_array.tt
new file mode 100644
index 0000000..ebc06af
--- /dev/null
+++ b/share/skin/default/layout/field/hidden_array.tt
@@ -0,0 +1,17 @@
+=for layout widget
+
+[% field %]
+
+=for layout field
+
+[% item %]
+
+=for layout item
+
+<input type="hidden" name="[% name | html %]" value="[% content | html %]" />
+
+=for layout label
+
+=for layout message
+
+=cut
diff --git a/share/skin/default/layout/field/number b/share/skin/default/layout/field/number
deleted file mode 100644
index 201220f..0000000
--- a/share/skin/default/layout/field/number
+++ /dev/null
@@ -1,26 +0,0 @@
-=for layout widget
-
-[% label %] [% field %] [% message %]
-
-=for layout field
-
-<!-- We need a replacement for process_attrs -->
-<input type="text" name="[% name | html%]" id="[% id | html %]" value="[% content | html %]" />
-
-=for layout label
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <label> [% content_str | html %]: </label>
-[% END; %]
-
-=for layout message
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <span> [% content_str | html %] </span> <br />
-[% END %]
-
-=cut
diff --git a/share/skin/default/layout/field/number.tt b/share/skin/default/layout/field/number.tt
new file mode 100644
index 0000000..201220f
--- /dev/null
+++ b/share/skin/default/layout/field/number.tt
@@ -0,0 +1,26 @@
+=for layout widget
+
+[% label %] [% field %] [% message %]
+
+=for layout field
+
+<!-- We need a replacement for process_attrs -->
+<input type="text" name="[% name | html%]" id="[% id | html %]" value="[% content | html %]" />
+
+=for layout label
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
+
+=for layout message
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
+[% END %]
+
+=cut
diff --git a/share/skin/default/layout/field/password b/share/skin/default/layout/field/password
deleted file mode 100644
index e29029a..0000000
--- a/share/skin/default/layout/field/password
+++ /dev/null
@@ -1,26 +0,0 @@
-=for layout widget
-
-[% label %] [% field %] [% message %]
-
-=for layout field
-
-<!-- We need a replacement for process_attrs -->
-<input type="password" name="[% name | html %]" id="[% id | html %]" value="[% content | html %]" />
-
-=for layout label
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <label> [% content_str | html %]: </label>
-[% END; %]
-
-=for layout message
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <span> [% content_str | html %] </span> <br />
-[% END %]
-
-=cut
diff --git a/share/skin/default/layout/field/password.tt b/share/skin/default/layout/field/password.tt
new file mode 100644
index 0000000..e29029a
--- /dev/null
+++ b/share/skin/default/layout/field/password.tt
@@ -0,0 +1,26 @@
+=for layout widget
+
+[% label %] [% field %] [% message %]
+
+=for layout field
+
+<!-- We need a replacement for process_attrs -->
+<input type="password" name="[% name | html %]" id="[% id | html %]" value="[% content | html %]" />
+
+=for layout label
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
+
+=for layout message
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
+[% END %]
+
+=cut
diff --git a/share/skin/default/layout/field/string b/share/skin/default/layout/field/string
deleted file mode 100644
index 40f3789..0000000
--- a/share/skin/default/layout/field/string
+++ /dev/null
@@ -1,26 +0,0 @@
-=for layout widget
-
-[% label %] [% field %] [% message %]
-
-=for layout field
-
-<!-- We need a replacement for process_attrs -->
-<input type="text" name="[% name | html %]" id="[% id | html %]" value="[% content | html %]" />
-
-=for layout label
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <label> [% content_str | html %]: </label>
-[% END; %]
-
-=for layout message
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <span> [% content_str | html %] </span> <br />
-[% END %]
-
-=cut
diff --git a/share/skin/default/layout/field/string.tt b/share/skin/default/layout/field/string.tt
new file mode 100644
index 0000000..40f3789
--- /dev/null
+++ b/share/skin/default/layout/field/string.tt
@@ -0,0 +1,26 @@
+=for layout widget
+
+[% label %] [% field %] [% message %]
+
+=for layout field
+
+<!-- We need a replacement for process_attrs -->
+<input type="text" name="[% name | html %]" id="[% id | html %]" value="[% content | html %]" />
+
+=for layout label
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
+
+=for layout message
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
+[% END %]
+
+=cut
diff --git a/share/skin/default/layout/field/text b/share/skin/default/layout/field/text
deleted file mode 100644
index b68ce67..0000000
--- a/share/skin/default/layout/field/text
+++ /dev/null
@@ -1,28 +0,0 @@
-=for layout widget
-
-[% label %] [% field %] [% message %]
-
-=for layout field
-
-<!-- We need a replacement for process_attrs -->
-<textarea name="[% name | html %]" id="[% id | html %]">
-  [% content | html %]
-</textarea>
-
-=for layout label
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <label> [% content_str | html %]: </label>
-[% END; %]
-
-=for layout message
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <span> [% content_str | html %] </span> <br />
-[% END %]
-
-=cut
diff --git a/share/skin/default/layout/field/text.tt b/share/skin/default/layout/field/text.tt
new file mode 100644
index 0000000..b68ce67
--- /dev/null
+++ b/share/skin/default/layout/field/text.tt
@@ -0,0 +1,28 @@
+=for layout widget
+
+[% label %] [% field %] [% message %]
+
+=for layout field
+
+<!-- We need a replacement for process_attrs -->
+<textarea name="[% name | html %]" id="[% id | html %]">
+  [% content | html %]
+</textarea>
+
+=for layout label
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
+
+=for layout message
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
+[% END %]
+
+=cut
diff --git a/share/skin/default/layout/field/time_range b/share/skin/default/layout/field/time_range
deleted file mode 100644
index 954c40b..0000000
--- a/share/skin/default/layout/field/time_range
+++ /dev/null
@@ -1,25 +0,0 @@
-=for layout widget
-
-[% label %] [% field %] [% message %]
-
-=for layout field
-
-TODO
-
-=for layout label
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <label> [% content_str | html %]: </label>
-[% END; %]
-
-=for layout message
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <span> [% content_str | html %] </span> <br />
-[% END %]
-
-=cut
diff --git a/share/skin/default/layout/field/time_range.tt b/share/skin/default/layout/field/time_range.tt
new file mode 100644
index 0000000..954c40b
--- /dev/null
+++ b/share/skin/default/layout/field/time_range.tt
@@ -0,0 +1,25 @@
+=for layout widget
+
+[% label %] [% field %] [% message %]
+
+=for layout field
+
+TODO
+
+=for layout label
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
+
+=for layout message
+
+<!-- This conditional goes away when mst comes up with something better -->
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
+[% END %]
+
+=cut
diff --git a/share/skin/default/layout/grid_view b/share/skin/default/layout/grid_view
deleted file mode 100644
index d4826b0..0000000
--- a/share/skin/default/layout/grid_view
+++ /dev/null
@@ -1,49 +0,0 @@
-=for layout widget
-
-<table>
-  [% header %]
-<tbody>
-  [% rows %]
-</tbody>
-<tfoot>
-  [% footer %]
-</tfoot>
-</table>
-
-=for layout header
-
-<thead>
-  [% content %]
-</thead>
-
-=for layout header_row
-
-<tr>
-  [% content %]
-</tr>
-
-=for layout header_cell
-
-<th> [% content %] </th>
-
-=for layout footer
-
-<tfoot>
-  [% content %]
-</tfoot>
-
-=for layout footer_row
-
-<tr> [% content %] </tr>
-
-=for layout footer_cell
-
-<td> [% content %] </td>
-
-=for layout rows
-
-<tbody>
-  [% content %]
-</tbody>
-
-=cut
diff --git a/share/skin/default/layout/grid_view.tt b/share/skin/default/layout/grid_view.tt
new file mode 100644
index 0000000..3205e60
--- /dev/null
+++ b/share/skin/default/layout/grid_view.tt
@@ -0,0 +1,53 @@
+=for layout widget
+
+<table>
+  [% header %]
+  [% body   %]
+  [% footer %]
+</table>
+
+=for layout header
+
+<thead>
+  [% content %]
+</thead>
+
+=for layout header_row
+
+<tr>
+  [% content %]
+</tr>
+
+=for layout header_cell
+
+<th> [% content %] </th>
+
+=for layout footer
+
+<tfoot>
+  [% content %]
+</tfoot>
+
+=for layout footer_row
+
+<tr> [% content %] </tr>
+
+=for layout footer_cell
+
+<td> [% content %] </td>
+
+=for layout body
+
+<tbody>
+  [% content %]
+</tbody>
+
+=for layout body_row
+
+<tr> [% content %] </tr>
+
+=for layout body_cell
+
+<td> [% content %] </td>
+
+=cut
diff --git a/share/skin/default/layout/index b/share/skin/default/layout/index
deleted file mode 100644
index 9a9bc9c..0000000
--- a/share/skin/default/layout/index
+++ /dev/null
@@ -1,5 +0,0 @@
-=for layout widget
-
-<p>I hate programming.</p>
-
-=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/index.tt b/share/skin/default/layout/index.tt
new file mode 100644
index 0000000..9a9bc9c
--- /dev/null
+++ b/share/skin/default/layout/index.tt
@@ -0,0 +1,5 @@
+=for layout widget
+
+<p>I hate programming.</p>
+
+=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/layout b/share/skin/default/layout/layout
deleted file mode 100644
index af59032..0000000
--- a/share/skin/default/layout/layout
+++ /dev/null
@@ -1,56 +0,0 @@
-=for layout widget
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-
-<head>
-  <title>Component UI Test Title</title>
-  
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <link rel="stylesheet" type="text/css" href="/static/componentui-basic.css" />
-
-</head>
-
-<body>
-  <div id="container">
-    <div id="header">
-     [% header %]
-    </div>
-
-    <div id="nav">
-       [% menu %]
-    </div>
-
-    <div id="contents">
-      <div id="wrapper">
-        [% sidebar %]
-        [% main_content %]
-      </div>
-      <div class="spacer"></div>
-    </div>
-  </div>
-</body>
-
-</html>
-
-=for layout main_content
-
-    [% content %]
-
-=for layout header
-
-<h1>Component UI Header</h1>
-
-=for layout sidebar
-        <div class="sidebar">
-          [% content %]
-        </div>
-
-=for layout menu
-        <ul class="menu">
-          <li> <a href="/testmodel/foo">Foo</a> </li>
-          <li> <a href="/testmodel/bar">Bar</a> </li>
-          <li> <a href="/testmodel/baz">Baz</a> </li>
-        </ul>
-=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/layout.tt b/share/skin/default/layout/layout.tt
new file mode 100644
index 0000000..af59032
--- /dev/null
+++ b/share/skin/default/layout/layout.tt
@@ -0,0 +1,56 @@
+=for layout widget
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+<head>
+  <title>Component UI Test Title</title>
+  
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" type="text/css" href="/static/componentui-basic.css" />
+
+</head>
+
+<body>
+  <div id="container">
+    <div id="header">
+     [% header %]
+    </div>
+
+    <div id="nav">
+       [% menu %]
+    </div>
+
+    <div id="contents">
+      <div id="wrapper">
+        [% sidebar %]
+        [% main_content %]
+      </div>
+      <div class="spacer"></div>
+    </div>
+  </div>
+</body>
+
+</html>
+
+=for layout main_content
+
+    [% content %]
+
+=for layout header
+
+<h1>Component UI Header</h1>
+
+=for layout sidebar
+        <div class="sidebar">
+          [% content %]
+        </div>
+
+=for layout menu
+        <ul class="menu">
+          <li> <a href="/testmodel/foo">Foo</a> </li>
+          <li> <a href="/testmodel/bar">Bar</a> </li>
+          <li> <a href="/testmodel/baz">Baz</a> </li>
+        </ul>
+=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/list_view b/share/skin/default/layout/list_view
deleted file mode 100644
index d4826b0..0000000
--- a/share/skin/default/layout/list_view
+++ /dev/null
@@ -1,49 +0,0 @@
-=for layout widget
-
-<table>
-  [% header %]
-<tbody>
-  [% rows %]
-</tbody>
-<tfoot>
-  [% footer %]
-</tfoot>
-</table>
-
-=for layout header
-
-<thead>
-  [% content %]
-</thead>
-
-=for layout header_row
-
-<tr>
-  [% content %]
-</tr>
-
-=for layout header_cell
-
-<th> [% content %] </th>
-
-=for layout footer
-
-<tfoot>
-  [% content %]
-</tfoot>
-
-=for layout footer_row
-
-<tr> [% content %] </tr>
-
-=for layout footer_cell
-
-<td> [% content %] </td>
-
-=for layout rows
-
-<tbody>
-  [% content %]
-</tbody>
-
-=cut
diff --git a/share/skin/default/layout/list_view.tt b/share/skin/default/layout/list_view.tt
new file mode 100644
index 0000000..3205e60
--- /dev/null
+++ b/share/skin/default/layout/list_view.tt
@@ -0,0 +1,53 @@
+=for layout widget
+
+<table>
+  [% header %]
+  [% body   %]
+  [% footer %]
+</table>
+
+=for layout header
+
+<thead>
+  [% content %]
+</thead>
+
+=for layout header_row
+
+<tr>
+  [% content %]
+</tr>
+
+=for layout header_cell
+
+<th> [% content %] </th>
+
+=for layout footer
+
+<tfoot>
+  [% content %]
+</tfoot>
+
+=for layout footer_row
+
+<tr> [% content %] </tr>
+
+=for layout footer_cell
+
+<td> [% content %] </td>
+
+=for layout body
+
+<tbody>
+  [% content %]
+</tbody>
+
+=for layout body_row
+
+<tr> [% content %] </tr>
+
+=for layout body_cell
+
+<td> [% content %] </td>
+
+=cut
diff --git a/share/skin/default/layout/object_view b/share/skin/default/layout/object_view
deleted file mode 100644
index 4e6e1b3..0000000
--- a/share/skin/default/layout/object_view
+++ /dev/null
@@ -1,15 +0,0 @@
-=for layout widget
-
-  [% fields %]
-
-=for layout fields
-
- <p> [% content %] </p>
-
-=cut
-
-=for layout field
-
-  [% content %] <br>
-
-=cut
diff --git a/share/skin/default/layout/object_view.tt b/share/skin/default/layout/object_view.tt
new file mode 100644
index 0000000..4e6e1b3
--- /dev/null
+++ b/share/skin/default/layout/object_view.tt
@@ -0,0 +1,15 @@
+=for layout widget
+
+  [% fields %]
+
+=for layout fields
+
+ <p> [% content %] </p>
+
+=cut
+
+=for layout field
+
+  [% content %] <br>
+
+=cut
diff --git a/share/skin/default/layout/value/boolean b/share/skin/default/layout/value/boolean
deleted file mode 100644
index 1ce3367..0000000
--- a/share/skin/default/layout/value/boolean
+++ /dev/null
@@ -1,9 +0,0 @@
-=for layout widget
-
-[% content %]
-
-=for layout value
-
-[% content | html %]
-
-=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/value/boolean.tt b/share/skin/default/layout/value/boolean.tt
new file mode 100644
index 0000000..1ce3367
--- /dev/null
+++ b/share/skin/default/layout/value/boolean.tt
@@ -0,0 +1,9 @@
+=for layout widget
+
+[% content %]
+
+=for layout value
+
+[% content | html %]
+
+=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/value/collection b/share/skin/default/layout/value/collection
deleted file mode 100644
index d376ecc..0000000
--- a/share/skin/default/layout/value/collection
+++ /dev/null
@@ -1,15 +0,0 @@
-=for layout widget
-
-[% list  %]
-
-=for layout list
-
-<ul>
-[% content %]
-</ul>
-
-=for layout item
-
-<li>[% content | html %]</li>
-
-=cut
diff --git a/share/skin/default/layout/value/collection.tt b/share/skin/default/layout/value/collection.tt
new file mode 100644
index 0000000..d376ecc
--- /dev/null
+++ b/share/skin/default/layout/value/collection.tt
@@ -0,0 +1,15 @@
+=for layout widget
+
+[% list  %]
+
+=for layout list
+
+<ul>
+[% content %]
+</ul>
+
+=for layout item
+
+<li>[% content | html %]</li>
+
+=cut
diff --git a/share/skin/default/layout/value/date_time b/share/skin/default/layout/value/date_time
deleted file mode 100644
index e35741c..0000000
--- a/share/skin/default/layout/value/date_time
+++ /dev/null
@@ -1,9 +0,0 @@
-=for layout widget
-
-[% content %]
-
-=for layout value
-
-[% content | html %]
-
-=cut
diff --git a/share/skin/default/layout/value/date_time.tt b/share/skin/default/layout/value/date_time.tt
new file mode 100644
index 0000000..e35741c
--- /dev/null
+++ b/share/skin/default/layout/value/date_time.tt
@@ -0,0 +1,9 @@
+=for layout widget
+
+[% content %]
+
+=for layout value
+
+[% content | html %]
+
+=cut
diff --git a/share/skin/default/layout/value/list b/share/skin/default/layout/value/list
deleted file mode 100644
index eea4e02..0000000
--- a/share/skin/default/layout/value/list
+++ /dev/null
@@ -1,15 +0,0 @@
-=for layout widget
-
-[% list  %]
-
-=for layout list
-
-<ul>
-[% content %]
-</ul>
-
-=for layout item
-
-<li>[% content | html %]</li>
-
-=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/value/list.tt b/share/skin/default/layout/value/list.tt
new file mode 100644
index 0000000..eea4e02
--- /dev/null
+++ b/share/skin/default/layout/value/list.tt
@@ -0,0 +1,15 @@
+=for layout widget
+
+[% list  %]
+
+=for layout list
+
+<ul>
+[% content %]
+</ul>
+
+=for layout item
+
+<li>[% content | html %]</li>
+
+=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/value/number b/share/skin/default/layout/value/number
deleted file mode 100644
index e35741c..0000000
--- a/share/skin/default/layout/value/number
+++ /dev/null
@@ -1,9 +0,0 @@
-=for layout widget
-
-[% content %]
-
-=for layout value
-
-[% content | html %]
-
-=cut
diff --git a/share/skin/default/layout/value/number.tt b/share/skin/default/layout/value/number.tt
new file mode 100644
index 0000000..e35741c
--- /dev/null
+++ b/share/skin/default/layout/value/number.tt
@@ -0,0 +1,9 @@
+=for layout widget
+
+[% content %]
+
+=for layout value
+
+[% content | html %]
+
+=cut
diff --git a/share/skin/default/layout/value/related_object b/share/skin/default/layout/value/related_object
deleted file mode 100644
index e35741c..0000000
--- a/share/skin/default/layout/value/related_object
+++ /dev/null
@@ -1,9 +0,0 @@
-=for layout widget
-
-[% content %]
-
-=for layout value
-
-[% content | html %]
-
-=cut
diff --git a/share/skin/default/layout/value/related_object.tt b/share/skin/default/layout/value/related_object.tt
new file mode 100644
index 0000000..e35741c
--- /dev/null
+++ b/share/skin/default/layout/value/related_object.tt
@@ -0,0 +1,9 @@
+=for layout widget
+
+[% content %]
+
+=for layout value
+
+[% content | html %]
+
+=cut
diff --git a/share/skin/default/layout/value/string b/share/skin/default/layout/value/string
deleted file mode 100644
index 1ce3367..0000000
--- a/share/skin/default/layout/value/string
+++ /dev/null
@@ -1,9 +0,0 @@
-=for layout widget
-
-[% content %]
-
-=for layout value
-
-[% content | html %]
-
-=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/value/string.tt b/share/skin/default/layout/value/string.tt
new file mode 100644
index 0000000..1ce3367
--- /dev/null
+++ b/share/skin/default/layout/value/string.tt
@@ -0,0 +1,9 @@
+=for layout widget
+
+[% content %]
+
+=for layout value
+
+[% content | html %]
+
+=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/value/text b/share/skin/default/layout/value/text
deleted file mode 100644
index 1ce3367..0000000
--- a/share/skin/default/layout/value/text
+++ /dev/null
@@ -1,9 +0,0 @@
-=for layout widget
-
-[% content %]
-
-=for layout value
-
-[% content | html %]
-
-=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/value/text.tt b/share/skin/default/layout/value/text.tt
new file mode 100644
index 0000000..1ce3367
--- /dev/null
+++ b/share/skin/default/layout/value/text.tt
@@ -0,0 +1,9 @@
+=for layout widget
+
+[% content %]
+
+=for layout value
+
+[% content | html %]
+
+=cut
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf