fixes for base collection widget+template

[catagits/Reaction.git] / share / skin / base / layout / action.tt

diff --git a/share/skin/base/layout/action.tt b/share/skin/base/layout/action.tt
index 67d6c37..b5cb708 100644 (file)
--- a/share/skin/base/layout/action.tt
+++ b/share/skin/base/layout/action.tt
@@ -1,27 +1,25 @@
 =for layout widget
 
-  <form action="" method="post" enctype="multipart/form-data">
+<div class="action_form">
+  <form action="[% action %]" id="[% form_id %]" method="[% method %]" enctype="multipart/form-data">
     [% header  %]
-    [% field_list  %]
+    [% container_list %]
     [% buttons %]
     [% footer  %]
   </form>
+</div>
 
 =for layout header
 
-<!-- header -->
+[% error_message %]
 
-=for layout field_list
+=for layout container_list
 
-<p> [% call_next %] </p>
+[% call_next %]
 
-=for layout field
+=for layout container
 
-[% call_next %] <br />
-
-=for layout message_layout
-
-    <span>[% message %]</span> <br />
+[% call_next %]
 
 =for layout buttons
   [% message %]
@@ -29,9 +27,19 @@
   [% apply_button_fragment %]
   [% cancel_button_fragment %]
 
+=for layout message_layout
+
+<span class="action_message">[% message_string %]</span>
+
+=for layout error_message_layout
+
+<span class="action_error_message">[% message_string %]</span>
+
 =for layout standard_button
 
+<span class="action_button">
   <input type="submit" class="button" name="[% event_id %]" value="[% label %]" />
+</span>
 
 =for layout ok_button
 
@@ -45,19 +53,6 @@
 
 [% 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 -->
-
 =cut