port actionform, field widgets to declarative system

11 files changed, 121 insertions, 209 deletions

diff --git a/share/skin/default/layout/action_form.tt b/share/skin/default/layout/action_form.tt
index 473c4cd..fa71d79 100644
--- a/share/skin/default/layout/action_form.tt
+++ b/share/skin/default/layout/action_form.tt
@@ -9,26 +9,39 @@
 
 =for layout header
 
-<h2>Le Header</h2>
+<!-- header -->
 
 =for layout field_list
 
-<p> [% content %] </p>
+<p> [% call_next %] </p>
 
 =for layout field
 
-[% content %] <br />
+[% call_next %] <br />
 
-=for layout buttons
+=for layout message_layout
 
-  [% 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_label %]" />
-  [% END; %]
+=for layout buttons
+  [% message %]
+  [% ok_button_fragment %]
+  [% apply_button_fragment %]
+  [% cancel_button_fragment %]
+
+=for layout ok_button
+
+  <input type="submit" name="[% event_id %]" value="[% label %]" />
+
+=for layout apply_button
+
+  <input type="submit" name="[% event_id %]" value="[% label %]" />
+
+=for layout cancel_button
+
+  <input type="submit" name="[% event_id %]" value="[% label %]" />
+
+=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 %]" />
@@ -41,6 +54,6 @@
 
 =for layout footer
 
-  <h2>Le Footer</h2>
+  <!-- footer -->
 
 =cut
diff --git a/share/skin/default/layout/field.tt b/share/skin/default/layout/field.tt
new file mode 100644
index 0000000..fbda583
--- /dev/null
+++ b/share/skin/default/layout/field.tt
@@ -0,0 +1,26 @@
+=for layout widget
+
+[% label_fragment %] [% field %] [% message_fragment %] <br />
+
+=for layout label
+
+<label>[% label %]:</label>
+
+=for layout field
+
+FIELD GOES HERE
+
+=for layout message
+
+<span>[% message %]</span><br />
+
+=for layout field
+
+<input type="[% field_type %]" name="[% field_name %]" id="[% field_id %]"
+  [% field_body %] />
+
+=for layout field_body
+
+value="[% field_value %]"
+
+=cut
diff --git a/share/skin/default/layout/field/boolean.tt b/share/skin/default/layout/field/boolean.tt
index 73b817e..b750116 100644
--- a/share/skin/default/layout/field/boolean.tt
+++ b/share/skin/default/layout/field/boolean.tt
@@ -1,34 +1,13 @@
-=for layout widget
+=extends field
 
-[% label %] [% field %] [% message %] <br>
+=for layout field_body
 
-=for layout field
+value="1" [% is_checked %]
 
-[%
-   IF content;
-    checked = 'checked="checked"';
-   ELSE;
-    checked = "";
-   END;
-%]
+=for layout is_checked_yes
 
-<!-- We need a replacement for process_attrs -->
-<input type="checkbox" id="[% id | html %]" name="[% name | html %]" value="1" [% checked %] />
+checked="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 %]
+=for layout is_checked_no
 
 =cut
diff --git a/share/skin/default/layout/field/choose_many.tt b/share/skin/default/layout/field/choose_many.tt
index 1479de8..ba4543a 100644
--- a/share/skin/default/layout/field/choose_many.tt
+++ b/share/skin/default/layout/field/choose_many.tt
@@ -1,8 +1,10 @@
+=extends field
+
 =for layout widget
 
-[% label %]
+[% label_fragment %]
 <br />
-[% message %]
+[% message_fragment %]
 [% field %]
 
 =for layout field
@@ -20,49 +22,29 @@
 
 =for layout available_values
 
-<select size="10" multiple="multiple"  name="[% viewport.event_id_for('add_values') | html %]">
-  [% content %]
+<select size="10" multiple="multiple"  name="[% event_id_add_values %]">
+  [% call_next %]
 </select>
 
 =for layout selected_values
 
-<select size="10" multiple="multiple"  name="[% viewport.event_id_for('remove_values') | html %]">
-  [% content %]
+<select size="10" multiple="multiple"  name="[% event_id_remove_values %]">
+  [% call_next %]
 </select>
 
-=for layout current_values
-
-[% content %]
-
 =for layout hidden_value
 
-<input type="hidden" name="[% viewport.event_id_for('value') | html %]" value="[% content | html %]">
+<input type="hidden" name="[% field_name %]" value="[% hidden_value %]">
 
-=for layout option
+=for layout value_option
 
-<option value="[% v_value | html %]">[% v_name | html %]</option>
+<option value="[% option_value %]">[% option_name %]</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 %]
+<input type="submit" value="&gt;&gt;" name="[% event_id_add_all_values %]" /> <br />
+<input type="submit" value="&gt;" name="[% event_id_do_add_values %]" /> <br />
+<input type="submit" value="&lt;" name="[% event_id_do_remove_values %]" /> <br />
+<input type="submit" value="&lt;&lt;" name="[% event_id_remove_all_values %]" /> <br />
 
 =cut
diff --git a/share/skin/default/layout/field/choose_one.tt b/share/skin/default/layout/field/choose_one.tt
index 2fd39d6..ec1814a 100644
--- a/share/skin/default/layout/field/choose_one.tt
+++ b/share/skin/default/layout/field/choose_one.tt
@@ -1,42 +1,28 @@
-=for layout widget
-
-[% label %] [% field %] [% message %]
+=extends field
 
 =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 name="[% field_name %]" id="[% field_id %]">
+  [% option_is_required %]
+  [% option_list %]
 </select>
 
+=for layout option_is_required_yes
+
+=for layout option_is_required_no
+
+<option value="">--</option>
+
 =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 %]
+  <option value="[% option_value %]" [% option_is_selected %]
+    > [% option_name %]</option>
+
+=for options_is_selected_yes
+
+selected="selected"
+
+=for option_is_selected_no
 
 =cut
diff --git a/share/skin/default/layout/field/date_time.tt b/share/skin/default/layout/field/date_time.tt
index 4dbd294..18ab448 100644
--- a/share/skin/default/layout/field/date_time.tt
+++ b/share/skin/default/layout/field/date_time.tt
@@ -1,26 +1,3 @@
-=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 %]
+=extends field
 
 =cut
diff --git a/share/skin/default/layout/field/hidden_array.tt b/share/skin/default/layout/field/hidden_array.tt
index ebc06af..0f5e35d 100644
--- a/share/skin/default/layout/field/hidden_array.tt
+++ b/share/skin/default/layout/field/hidden_array.tt
@@ -1,17 +1,9 @@
 =for layout widget
 
-[% field %]
+[% hidden_list %]
 
-=for layout field
+=for layout hidden_field
 
-[% item %]
-
-=for layout item
-
-<input type="hidden" name="[% name | html %]" value="[% content | html %]" />
-
-=for layout label
-
-=for layout message
+<input type="hidden" name="[% field_name %]" value="[% field_value %]" />
 
 =cut
diff --git a/share/skin/default/layout/field/password.tt b/share/skin/default/layout/field/password.tt
index e29029a..18ab448 100644
--- a/share/skin/default/layout/field/password.tt
+++ b/share/skin/default/layout/field/password.tt
@@ -1,26 +1,3 @@
-=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 %]
+=extends field
 
 =cut
diff --git a/share/skin/default/layout/field/string.tt b/share/skin/default/layout/field/string.tt
index 40f3789..18ab448 100644
--- a/share/skin/default/layout/field/string.tt
+++ b/share/skin/default/layout/field/string.tt
@@ -1,26 +1,3 @@
-=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 %]
+=extends field
 
 =cut
diff --git a/share/skin/default/layout/field/text.tt b/share/skin/default/layout/field/text.tt
index b68ce67..e472cc8 100644
--- a/share/skin/default/layout/field/text.tt
+++ b/share/skin/default/layout/field/text.tt
@@ -1,28 +1,9 @@
-=for layout widget
-
-[% label %] [% field %] [% message %]
+=extends field
 
 =for layout field
 
-<!-- We need a replacement for process_attrs -->
-<textarea name="[% name | html %]" id="[% id | html %]">
-  [% content | html %]
+<textarea name="[% field_name %]" id="[% field_id %]">
+  [% field_value %]
 </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/list_view.tt b/share/skin/default/layout/list_view.tt
index d74e2b4..61e92a8 100644
--- a/share/skin/default/layout/list_view.tt
+++ b/share/skin/default/layout/list_view.tt
@@ -30,6 +30,28 @@
 
 =for layout pager
 
-<p>Pager would be here. But it isn't.</p>
+<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