diff options
Diffstat (limited to 'share')
-rw-r--r-- | share/skin/base/layout/action.tt | 14 | ||||
-rw-r--r-- | share/skin/base/layout/collection.tt | 4 | ||||
-rw-r--r-- | share/skin/base/layout/field/array.tt | 4 | ||||
-rw-r--r-- | share/skin/base/layout/field/collection.tt | 4 | ||||
-rw-r--r-- | share/skin/base/layout/field/container.tt | 4 | ||||
-rw-r--r-- | share/skin/base/layout/field/mutable.tt | 5 | ||||
-rw-r--r-- | share/skin/base/layout/field/mutable/choose_many.tt | 12 | ||||
-rw-r--r-- | share/skin/base/layout/field/mutable/choose_one.tt | 3 | ||||
-rw-r--r-- | share/skin/default/layout/action.tt | 6 | ||||
-rw-r--r-- | share/skin/default/layout/field/array.tt | 6 | ||||
-rw-r--r-- | share/skin/default/layout/field/collection.tt | 6 | ||||
-rw-r--r-- | share/skin/default/layout/field/mutable.tt | 4 | ||||
-rw-r--r-- | share/skin/default/layout/field/mutable/choose_many.tt | 11 |
13 files changed, 46 insertions, 37 deletions
diff --git a/share/skin/base/layout/action.tt b/share/skin/base/layout/action.tt index b5cb708..dba41d0 100644 --- a/share/skin/base/layout/action.tt +++ b/share/skin/base/layout/action.tt @@ -1,13 +1,11 @@ =for layout widget -<div class="action_form"> - <form action="[% action %]" id="[% form_id %]" method="[% method %]" enctype="multipart/form-data"> - [% header %] - [% container_list %] - [% buttons %] - [% footer %] - </form> -</div> +<form action="[% action %]" id="[% form_id %]" method="[% method %]" enctype="multipart/form-data"> + [% header %] + [% container_list %] + [% buttons %] + [% footer %] +</form> =for layout header diff --git a/share/skin/base/layout/collection.tt b/share/skin/base/layout/collection.tt index 6becfb1..da0cd2f 100644 --- a/share/skin/base/layout/collection.tt +++ b/share/skin/base/layout/collection.tt @@ -6,9 +6,7 @@ =for layout body -<div class="collection_members"> - [% members %] -</div> +[% members %] =for layout footer diff --git a/share/skin/base/layout/field/array.tt b/share/skin/base/layout/field/array.tt index cd9c0c2..ac62db7 100644 --- a/share/skin/base/layout/field/array.tt +++ b/share/skin/base/layout/field/array.tt @@ -9,11 +9,9 @@ =for layout list -<div class="array_list"> <ul> -[% content %] + [% content %] </ul> -</div> =for layout item diff --git a/share/skin/base/layout/field/collection.tt b/share/skin/base/layout/field/collection.tt index 2203344..1f6ae9e 100644 --- a/share/skin/base/layout/field/collection.tt +++ b/share/skin/base/layout/field/collection.tt @@ -9,11 +9,9 @@ =for layout list -<div class="collection_list"> <ul> -[% call_next %] + [% call_next %] </ul> -</div> =for layout item diff --git a/share/skin/base/layout/field/container.tt b/share/skin/base/layout/field/container.tt index c504e55..d9e0ced 100644 --- a/share/skin/base/layout/field/container.tt +++ b/share/skin/base/layout/field/container.tt @@ -11,8 +11,6 @@ =for layout field -<div class="field_container_field"> - [% call_next %] -</div> +[% call_next %] =cut diff --git a/share/skin/base/layout/field/mutable.tt b/share/skin/base/layout/field/mutable.tt index d21e979..c4ef2e1 100644 --- a/share/skin/base/layout/field/mutable.tt +++ b/share/skin/base/layout/field/mutable.tt @@ -1,6 +1,6 @@ =for layout widget -<div class="[% field_class %]">[% label_fragment %] [% field %] [% message_fragment %]</div> +[% label_fragment %] [% field %] [% message_fragment %] =for layout label @@ -18,8 +18,7 @@ class="required_field" =for layout field -<input type="[% field_type %]" name="[% field_name %]" id="[% field_id %]" - [% field_body %] /> +<input type="[% field_type %]" name="[% field_name %]" id="[% field_id %]" [% field_body %] /> =for layout field_body diff --git a/share/skin/base/layout/field/mutable/choose_many.tt b/share/skin/base/layout/field/mutable/choose_many.tt index 51f315e..9d19fff 100644 --- a/share/skin/base/layout/field/mutable/choose_many.tt +++ b/share/skin/base/layout/field/mutable/choose_many.tt @@ -8,7 +8,6 @@ =for layout field -<div class="choose_many_field"> <table> <tr> <td> [% available_values %] </td> @@ -19,7 +18,6 @@ </td> </tr> </table> -</div> =for layout available_values @@ -43,12 +41,10 @@ =for layout action_buttons -<div class="choose_many_buttons"> - <input type="submit" value=">>" name="[% event_id_add_all_values %]" /> - <input type="submit" value=">" name="[% event_id_do_add_values %]" /> - <input type="submit" value="<" name="[% event_id_do_remove_values %]" /> - <input type="submit" value="<<" name="[% event_id_remove_all_values %]" /> -</div> +<input type="submit" value=">>" name="[% event_id_add_all_values %]" /> +<input type="submit" value=">" name="[% event_id_do_add_values %]" /> +<input type="submit" value="<" name="[% event_id_do_remove_values %]" /> +<input type="submit" value="<<" name="[% event_id_remove_all_values %]" /> =for layout message diff --git a/share/skin/base/layout/field/mutable/choose_one.tt b/share/skin/base/layout/field/mutable/choose_one.tt index 0db3ffd..c366a86 100644 --- a/share/skin/base/layout/field/mutable/choose_one.tt +++ b/share/skin/base/layout/field/mutable/choose_one.tt @@ -15,8 +15,7 @@ =for layout option - <option value="[% option_value %]" [% option_is_selected %] - > [% option_name %]</option> + <option value="[% option_value %]" [% option_is_selected %]>[% option_name %]</option> =for layout option_is_selected_yes diff --git a/share/skin/default/layout/action.tt b/share/skin/default/layout/action.tt index a18e51d..e1b003f 100644 --- a/share/skin/default/layout/action.tt +++ b/share/skin/default/layout/action.tt @@ -1,5 +1,11 @@ =extends NEXT +=for layout widget + +<div class="action_form"> + [% call_next %] +</div> + =for layout container [% call_next %] <br /> diff --git a/share/skin/default/layout/field/array.tt b/share/skin/default/layout/field/array.tt index acb2cce..60c86b1 100644 --- a/share/skin/default/layout/field/array.tt +++ b/share/skin/default/layout/field/array.tt @@ -4,4 +4,10 @@ <span class="field_array_label"><strong > [% content | html %]: </strong></span> +=for layout list + +<div class="array_list"> + [% call_next %] +</div> + =cut diff --git a/share/skin/default/layout/field/collection.tt b/share/skin/default/layout/field/collection.tt index f513e94..16789bf 100644 --- a/share/skin/default/layout/field/collection.tt +++ b/share/skin/default/layout/field/collection.tt @@ -4,4 +4,10 @@ <span class="field_collection_label_box"><strong> [% label %]: </strong></span> +=for layout list + +<div class="collection_list"> + [% call_next %] +</div> + =cut diff --git a/share/skin/default/layout/field/mutable.tt b/share/skin/default/layout/field/mutable.tt index 615e14e..ec10a4c 100644 --- a/share/skin/default/layout/field/mutable.tt +++ b/share/skin/default/layout/field/mutable.tt @@ -1,5 +1,9 @@ =extends NEXT +=for layout widget + +<div class="[% field_class %]">[% call_next %]</div> + =for layout message [% call_next %]<br /> diff --git a/share/skin/default/layout/field/mutable/choose_many.tt b/share/skin/default/layout/field/mutable/choose_many.tt index e01a1ba..117f39e 100644 --- a/share/skin/default/layout/field/mutable/choose_many.tt +++ b/share/skin/default/layout/field/mutable/choose_many.tt @@ -6,13 +6,16 @@ [% message_fragment %] [% field %] +=for layout field + +<div class="choose_many_field"> + [% call_next %] +</div> + =for layout action_buttons <div class="choose_many_buttons"> -<input type="submit" value=">>" name="[% event_id_add_all_values %]" /> <br /> -<input type="submit" value=">" name="[% event_id_do_add_values %]" /> <br /> -<input type="submit" value="<" name="[% event_id_do_remove_values %]" /> <br /> -<input type="submit" value="<<" name="[% event_id_remove_all_values %]" /> <br /> + [% call_next %] </div> =cut |