diff options
Diffstat (limited to 'share')
34 files changed, 83 insertions, 157 deletions
diff --git a/share/skin/default/layout/action_form.tt b/share/skin/default/layout/action.tt index fa71d79..fa71d79 100644 --- a/share/skin/default/layout/action_form.tt +++ b/share/skin/default/layout/action.tt diff --git a/share/skin/default/layout/grid_view/action.tt b/share/skin/default/layout/action/link.tt index 7c07d31..7c07d31 100644 --- a/share/skin/default/layout/grid_view/action.tt +++ b/share/skin/default/layout/action/link.tt diff --git a/share/skin/default/layout/collection.tt b/share/skin/default/layout/collection.tt new file mode 100644 index 0000000..d4703f1 --- /dev/null +++ b/share/skin/default/layout/collection.tt @@ -0,0 +1,5 @@ +=for layout widget + +[% members %] + +=cut
\ No newline at end of file diff --git a/share/skin/default/layout/grid_view.tt b/share/skin/default/layout/collection/grid.tt index 310fe66..bfde10d 100644 --- a/share/skin/default/layout/grid_view.tt +++ b/share/skin/default/layout/collection/grid.tt @@ -26,20 +26,12 @@ [% label %] -=for layout footer - -<tfoot> - [% footer_row %] -</tfoot> - -=for layout footer_row - -[% header_row %] - =for layout body <tbody> - [% body_rows %] + + [% members %] + </tbody> =cut diff --git a/share/skin/default/layout/grid_view/entity.tt b/share/skin/default/layout/collection/grid/member.tt index 9cf24e2..9cf24e2 100644 --- a/share/skin/default/layout/grid_view/entity.tt +++ b/share/skin/default/layout/collection/grid/member.tt diff --git a/share/skin/default/layout/grid_view/entity/with_actions.tt b/share/skin/default/layout/collection/grid/member/with_actions.tt index 7f84147..a0bca88 100644 --- a/share/skin/default/layout/grid_view/entity/with_actions.tt +++ b/share/skin/default/layout/collection/grid/member/with_actions.tt @@ -1,4 +1,4 @@ -=extends grid_view/entity +=extends collection/grid/member =for layout field_list diff --git a/share/skin/default/layout/display_field/boolean.tt b/share/skin/default/layout/display_field/boolean.tt deleted file mode 100644 index d531087..0000000 --- a/share/skin/default/layout/display_field/boolean.tt +++ /dev/null @@ -1,14 +0,0 @@ -=for layout widget - -[% label_layout %] -[% value_layout %] - -=for layout label_layout - -<strong > [% label %]: </strong> - -=for layout value_layout - -[% value %] - -=cut diff --git a/share/skin/default/layout/display_field/date_time.tt b/share/skin/default/layout/display_field/date_time.tt deleted file mode 100644 index d531087..0000000 --- a/share/skin/default/layout/display_field/date_time.tt +++ /dev/null @@ -1,14 +0,0 @@ -=for layout widget - -[% label_layout %] -[% value_layout %] - -=for layout label_layout - -<strong > [% label %]: </strong> - -=for layout value_layout - -[% value %] - -=cut diff --git a/share/skin/default/layout/display_field/number.tt b/share/skin/default/layout/display_field/number.tt deleted file mode 100644 index d531087..0000000 --- a/share/skin/default/layout/display_field/number.tt +++ /dev/null @@ -1,14 +0,0 @@ -=for layout widget - -[% label_layout %] -[% value_layout %] - -=for layout label_layout - -<strong > [% label %]: </strong> - -=for layout value_layout - -[% value %] - -=cut diff --git a/share/skin/default/layout/display_field/related_object.tt b/share/skin/default/layout/display_field/related_object.tt deleted file mode 100644 index d531087..0000000 --- a/share/skin/default/layout/display_field/related_object.tt +++ /dev/null @@ -1,14 +0,0 @@ -=for layout widget - -[% label_layout %] -[% value_layout %] - -=for layout label_layout - -<strong > [% label %]: </strong> - -=for layout value_layout - -[% value %] - -=cut diff --git a/share/skin/default/layout/display_field/string.tt b/share/skin/default/layout/display_field/string.tt deleted file mode 100644 index d531087..0000000 --- a/share/skin/default/layout/display_field/string.tt +++ /dev/null @@ -1,14 +0,0 @@ -=for layout widget - -[% label_layout %] -[% value_layout %] - -=for layout label_layout - -<strong > [% label %]: </strong> - -=for layout value_layout - -[% value %] - -=cut diff --git a/share/skin/default/layout/display_field/text.tt b/share/skin/default/layout/display_field/text.tt deleted file mode 100644 index d531087..0000000 --- a/share/skin/default/layout/display_field/text.tt +++ /dev/null @@ -1,14 +0,0 @@ -=for layout widget - -[% label_layout %] -[% value_layout %] - -=for layout label_layout - -<strong > [% label %]: </strong> - -=for layout value_layout - -[% value %] - -=cut diff --git a/share/skin/default/layout/field.tt b/share/skin/default/layout/field.tt index fbda583..d531087 100644 --- a/share/skin/default/layout/field.tt +++ b/share/skin/default/layout/field.tt @@ -1,26 +1,14 @@ =for layout widget -[% label_fragment %] [% field %] [% message_fragment %] <br /> +[% label_layout %] +[% value_layout %] -=for layout label +=for layout label_layout -<label>[% label %]:</label> +<strong > [% label %]: </strong> -=for layout field +=for layout value_layout -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 %]" +[% value %] =cut diff --git a/share/skin/default/layout/display_field/list.tt b/share/skin/default/layout/field/array.tt index 2b049b5..2b049b5 100644 --- a/share/skin/default/layout/display_field/list.tt +++ b/share/skin/default/layout/field/array.tt diff --git a/share/skin/default/layout/field/boolean.tt b/share/skin/default/layout/field/boolean.tt index b750116..18ab448 100644 --- a/share/skin/default/layout/field/boolean.tt +++ b/share/skin/default/layout/field/boolean.tt @@ -1,13 +1,3 @@ =extends field -=for layout field_body - -value="1" [% is_checked %] - -=for layout is_checked_yes - -checked="checked" - -=for layout is_checked_no - =cut diff --git a/share/skin/default/layout/display_field/collection.tt b/share/skin/default/layout/field/collection.tt index 47244e7..47244e7 100644 --- a/share/skin/default/layout/display_field/collection.tt +++ b/share/skin/default/layout/field/collection.tt diff --git a/share/skin/default/layout/field/file.tt b/share/skin/default/layout/field/integer.tt index 18ab448..18ab448 100644 --- a/share/skin/default/layout/field/file.tt +++ b/share/skin/default/layout/field/integer.tt diff --git a/share/skin/default/layout/field/mutable.tt b/share/skin/default/layout/field/mutable.tt new file mode 100644 index 0000000..c4b3205 --- /dev/null +++ b/share/skin/default/layout/field/mutable.tt @@ -0,0 +1,27 @@ +=for layout widget + +[% label_fragment %] [% field %] [% message_fragment %] <br /> + +=for layout label + +<label for="[%field_id%]">[% label %]:</label> + +=for layout field + +<!-- Why is this here??? --> +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/mutable/boolean.tt b/share/skin/default/layout/field/mutable/boolean.tt new file mode 100644 index 0000000..f50b377 --- /dev/null +++ b/share/skin/default/layout/field/mutable/boolean.tt @@ -0,0 +1,13 @@ +=extends field/mutable + +=for layout field_body + +value="1" [% is_checked %] + +=for layout is_checked_yes + +checked="checked" + +=for layout is_checked_no + +=cut diff --git a/share/skin/default/layout/field/choose_many.tt b/share/skin/default/layout/field/mutable/choose_many.tt index ba4543a..ef0b937 100644 --- a/share/skin/default/layout/field/choose_many.tt +++ b/share/skin/default/layout/field/mutable/choose_many.tt @@ -1,4 +1,4 @@ -=extends field +=extends field/mutable =for layout widget diff --git a/share/skin/default/layout/field/choose_one.tt b/share/skin/default/layout/field/mutable/choose_one.tt index f0f2fb4..74e8d8c 100644 --- a/share/skin/default/layout/field/choose_one.tt +++ b/share/skin/default/layout/field/mutable/choose_one.tt @@ -1,4 +1,4 @@ -=extends field +=extends field/mutable =for layout field diff --git a/share/skin/default/layout/field/mutable/date_time.tt b/share/skin/default/layout/field/mutable/date_time.tt new file mode 100644 index 0000000..05a69a5 --- /dev/null +++ b/share/skin/default/layout/field/mutable/date_time.tt @@ -0,0 +1,3 @@ +=extends field/mutable + +=cut diff --git a/share/skin/default/layout/field/mutable/file.tt b/share/skin/default/layout/field/mutable/file.tt new file mode 100644 index 0000000..05a69a5 --- /dev/null +++ b/share/skin/default/layout/field/mutable/file.tt @@ -0,0 +1,3 @@ +=extends field/mutable + +=cut diff --git a/share/skin/default/layout/field/hidden_array.tt b/share/skin/default/layout/field/mutable/hidden_array.tt index 0f5e35d..0f5e35d 100644 --- a/share/skin/default/layout/field/hidden_array.tt +++ b/share/skin/default/layout/field/mutable/hidden_array.tt diff --git a/share/skin/default/layout/field/mutable/number.tt b/share/skin/default/layout/field/mutable/number.tt new file mode 100644 index 0000000..05a69a5 --- /dev/null +++ b/share/skin/default/layout/field/mutable/number.tt @@ -0,0 +1,3 @@ +=extends field/mutable + +=cut diff --git a/share/skin/default/layout/field/mutable/password.tt b/share/skin/default/layout/field/mutable/password.tt new file mode 100644 index 0000000..05a69a5 --- /dev/null +++ b/share/skin/default/layout/field/mutable/password.tt @@ -0,0 +1,3 @@ +=extends field/mutable + +=cut diff --git a/share/skin/default/layout/field/mutable/string.tt b/share/skin/default/layout/field/mutable/string.tt new file mode 100644 index 0000000..05a69a5 --- /dev/null +++ b/share/skin/default/layout/field/mutable/string.tt @@ -0,0 +1,3 @@ +=extends field/mutable + +=cut diff --git a/share/skin/default/layout/field/mutable/text.tt b/share/skin/default/layout/field/mutable/text.tt new file mode 100644 index 0000000..c038280 --- /dev/null +++ b/share/skin/default/layout/field/mutable/text.tt @@ -0,0 +1,9 @@ +=extends field/mutable + +=for layout field + +<textarea name="[% field_name %]" id="[% field_id %]"> + [% field_value %] +</textarea> + +=cut diff --git a/share/skin/default/layout/field/time_range.tt b/share/skin/default/layout/field/mutable/time_range.tt index 954c40b..954c40b 100644 --- a/share/skin/default/layout/field/time_range.tt +++ b/share/skin/default/layout/field/mutable/time_range.tt diff --git a/share/skin/default/layout/field/number.tt b/share/skin/default/layout/field/number.tt index 201220f..18ab448 100644 --- a/share/skin/default/layout/field/number.tt +++ b/share/skin/default/layout/field/number.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/password.tt b/share/skin/default/layout/field/related_object.tt index 18ab448..18ab448 100644 --- a/share/skin/default/layout/field/password.tt +++ b/share/skin/default/layout/field/related_object.tt diff --git a/share/skin/default/layout/field/text.tt b/share/skin/default/layout/field/text.tt index e472cc8..18ab448 100644 --- a/share/skin/default/layout/field/text.tt +++ b/share/skin/default/layout/field/text.tt @@ -1,9 +1,3 @@ =extends field -=for layout field - -<textarea name="[% field_name %]" id="[% field_id %]"> - [% field_value %] -</textarea> - =cut diff --git a/share/skin/default/layout/list_view.tt b/share/skin/default/layout/list_view.tt index 61e92a8..f4f6501 100644 --- a/share/skin/default/layout/list_view.tt +++ b/share/skin/default/layout/list_view.tt @@ -1,4 +1,4 @@ -=extends grid_view +=extends collection/grid =for layout widget diff --git a/share/skin/default/layout/object_view.tt b/share/skin/default/layout/object.tt index cec7b4d..cec7b4d 100644 --- a/share/skin/default/layout/object_view.tt +++ b/share/skin/default/layout/object.tt |