From f38511c5ebf5947ce2a22fe72ec27c16631def86 Mon Sep 17 00:00:00 2001 From: wreis Date: Tue, 27 May 2008 18:19:52 +0000 Subject: changed approach as requested by mdk --- share/skin/default/layout/action.tt | 58 ++++++++++++++++++++-- share/skin/default/layout/action/link.tt | 3 ++ share/skin/default/layout/field.tt | 7 --- share/skin/default/layout/field/array.tt | 19 +++++-- share/skin/default/layout/field/boolean.tt | 3 ++ share/skin/default/layout/field/collection.tt | 17 ++++++- share/skin/default/layout/field/date_time.tt | 3 ++ share/skin/default/layout/field/integer.tt | 3 ++ share/skin/default/layout/field/mutable.tt | 30 ++++++++++- share/skin/default/layout/field/mutable/boolean.tt | 18 +++++++ .../default/layout/field/mutable/choose_many.tt | 44 ++++++++++++++-- .../default/layout/field/mutable/choose_one.tt | 27 ++++++++++ .../skin/default/layout/field/mutable/date_time.tt | 3 ++ share/skin/default/layout/field/mutable/file.tt | 3 ++ .../default/layout/field/mutable/hidden_array.tt | 9 ++++ share/skin/default/layout/field/mutable/integer.tt | 3 ++ .../layout/field/mutable/matching_passwords.tt | 8 +++ share/skin/default/layout/field/mutable/number.tt | 3 ++ .../skin/default/layout/field/mutable/password.tt | 3 ++ share/skin/default/layout/field/mutable/string.tt | 3 ++ share/skin/default/layout/field/mutable/text.tt | 9 ++++ .../default/layout/field/mutable/time_range.tt | 18 ++++++- share/skin/default/layout/field/number.tt | 3 ++ share/skin/default/layout/field/related_object.tt | 3 ++ share/skin/default/layout/field/string.tt | 3 ++ share/skin/default/layout/field/text.tt | 3 ++ share/skin/default/layout/list_view.tt | 19 ------- share/skin/default/layout/object.tt | 2 +- share/skin/default/layout/site_layout.tt | 22 ++++++++ share/skin/default/layout/value/boolean.tt | 5 ++ share/skin/default/layout/value/collection.tt | 15 ++++++ share/skin/default/layout/value/date_time.tt | 5 ++ share/skin/default/layout/value/image.tt | 11 ++++ share/skin/default/layout/value/list.tt | 15 ++++++ share/skin/default/layout/value/number.tt | 5 ++ share/skin/default/layout/value/related_object.tt | 5 ++ share/skin/default/layout/value/string.tt | 5 ++ share/skin/default/layout/value/text.tt | 5 ++ 38 files changed, 376 insertions(+), 44 deletions(-) create mode 100644 share/skin/default/layout/action/link.tt delete mode 100644 share/skin/default/layout/field.tt create mode 100644 share/skin/default/layout/field/boolean.tt create mode 100644 share/skin/default/layout/field/date_time.tt create mode 100644 share/skin/default/layout/field/integer.tt create mode 100644 share/skin/default/layout/field/mutable/boolean.tt create mode 100644 share/skin/default/layout/field/mutable/choose_one.tt create mode 100644 share/skin/default/layout/field/mutable/date_time.tt create mode 100644 share/skin/default/layout/field/mutable/file.tt create mode 100644 share/skin/default/layout/field/mutable/hidden_array.tt create mode 100644 share/skin/default/layout/field/mutable/integer.tt create mode 100644 share/skin/default/layout/field/mutable/matching_passwords.tt create mode 100644 share/skin/default/layout/field/mutable/number.tt create mode 100644 share/skin/default/layout/field/mutable/password.tt create mode 100644 share/skin/default/layout/field/mutable/string.tt create mode 100644 share/skin/default/layout/field/mutable/text.tt create mode 100644 share/skin/default/layout/field/number.tt create mode 100644 share/skin/default/layout/field/related_object.tt create mode 100644 share/skin/default/layout/field/string.tt create mode 100644 share/skin/default/layout/field/text.tt delete mode 100644 share/skin/default/layout/list_view.tt create mode 100644 share/skin/default/layout/site_layout.tt create mode 100644 share/skin/default/layout/value/boolean.tt create mode 100644 share/skin/default/layout/value/collection.tt create mode 100644 share/skin/default/layout/value/date_time.tt create mode 100644 share/skin/default/layout/value/image.tt create mode 100644 share/skin/default/layout/value/list.tt create mode 100644 share/skin/default/layout/value/number.tt create mode 100644 share/skin/default/layout/value/related_object.tt create mode 100644 share/skin/default/layout/value/string.tt create mode 100644 share/skin/default/layout/value/text.tt (limited to 'share/skin/default') diff --git a/share/skin/default/layout/action.tt b/share/skin/default/layout/action.tt index d2d7617..67d6c37 100644 --- a/share/skin/default/layout/action.tt +++ b/share/skin/default/layout/action.tt @@ -1,11 +1,63 @@ -=extends NEXT +=for layout widget + +
+ [% header %] + [% field_list %] + [% buttons %] + [% footer %] +
+ +=for layout header + + + +=for layout field_list + +

[% call_next %]

=for layout field -[% call_next %] +[% call_next %]
=for layout message_layout - [% message %] + [% message %]
+ +=for layout buttons + [% message %] + [% ok_button_fragment %] + [% apply_button_fragment %] + [% cancel_button_fragment %] + +=for layout standard_button + + + +=for layout ok_button + +[% standard_button %] + +=for layout apply_button + +[% standard_button %] + +=for layout cancel_button + +[% standard_button %] + +=for layout whut + + [% IF (viewport.ordered_fields.size != 0) && allowed_events.grep('^apply$').size; %] + + [% END; %] + + [% IF allowed_events.grep('^close$').size; %] + + [% END; %] +
+ +=for layout footer + + =cut diff --git a/share/skin/default/layout/action/link.tt b/share/skin/default/layout/action/link.tt new file mode 100644 index 0000000..7c07d31 --- /dev/null +++ b/share/skin/default/layout/action/link.tt @@ -0,0 +1,3 @@ +=for layout widget + [% label %] +=cut diff --git a/share/skin/default/layout/field.tt b/share/skin/default/layout/field.tt deleted file mode 100644 index a5273bb..0000000 --- a/share/skin/default/layout/field.tt +++ /dev/null @@ -1,7 +0,0 @@ -=extends NEXT - -=for layout label - - [% label %]: - -=cut diff --git a/share/skin/default/layout/field/array.tt b/share/skin/default/layout/field/array.tt index 39ae09d..2b049b5 100644 --- a/share/skin/default/layout/field/array.tt +++ b/share/skin/default/layout/field/array.tt @@ -1,7 +1,20 @@ -=extends NEXT +=for layout widget + +[% label %] +[% list %] =for layout label - [% content | html %]: + [% content | html %]: + +=for layout list + + + +=for layout item + +
  • [% content | html %]
  • -=cut +=cut \ No newline at end of file diff --git a/share/skin/default/layout/field/boolean.tt b/share/skin/default/layout/field/boolean.tt new file mode 100644 index 0000000..18ab448 --- /dev/null +++ b/share/skin/default/layout/field/boolean.tt @@ -0,0 +1,3 @@ +=extends field + +=cut diff --git a/share/skin/default/layout/field/collection.tt b/share/skin/default/layout/field/collection.tt index cb76a86..47244e7 100644 --- a/share/skin/default/layout/field/collection.tt +++ b/share/skin/default/layout/field/collection.tt @@ -1,7 +1,20 @@ -=extends NEXT +=for layout widget + +[% label_box %] +[% list %] =for layout label_box - [% label %]: + [% label %]: + +=for layout list + + + +=for layout item + +
  • [% name %]
  • =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..18ab448 --- /dev/null +++ b/share/skin/default/layout/field/date_time.tt @@ -0,0 +1,3 @@ +=extends field + +=cut diff --git a/share/skin/default/layout/field/integer.tt b/share/skin/default/layout/field/integer.tt new file mode 100644 index 0000000..18ab448 --- /dev/null +++ b/share/skin/default/layout/field/integer.tt @@ -0,0 +1,3 @@ +=extends field + +=cut diff --git a/share/skin/default/layout/field/mutable.tt b/share/skin/default/layout/field/mutable.tt index 936c392..3983263 100644 --- a/share/skin/default/layout/field/mutable.tt +++ b/share/skin/default/layout/field/mutable.tt @@ -1,7 +1,33 @@ -=extends NEXT +=for layout widget + +[% label_fragment %] [% field %] [% message_fragment %] + +=for layout label + + + +=for layout field_is_required_yes + +class="required_field" + +=for layout field_is_required_no + +=for layout field + + +FIELD GOES HERE =for layout message -[% message %] +[% message %]
    + +=for layout field + + + +=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..6d70f36 --- /dev/null +++ b/share/skin/default/layout/field/mutable/boolean.tt @@ -0,0 +1,18 @@ +=extends field/mutable + +=for layout widget + + +[% call_next %] + +=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/mutable/choose_many.tt b/share/skin/default/layout/field/mutable/choose_many.tt index 1b6cd2c..ed6c136 100644 --- a/share/skin/default/layout/field/mutable/choose_many.tt +++ b/share/skin/default/layout/field/mutable/choose_many.tt @@ -1,16 +1,50 @@ -=extends NEXT +=extends field/mutable =for layout widget [% label_fragment %] +
    [% message_fragment %] [% field %] +=for layout field + + + + + + + +
    [% available_values %] [% action_buttons %] + [% selected_values %] + [% current_values %] +
    + +=for layout available_values + + + +=for layout selected_values + + + +=for layout hidden_value + + + +=for layout value_option + + + =for layout action_buttons - - - - +
    +
    +
    +
    =cut diff --git a/share/skin/default/layout/field/mutable/choose_one.tt b/share/skin/default/layout/field/mutable/choose_one.tt new file mode 100644 index 0000000..74e8d8c --- /dev/null +++ b/share/skin/default/layout/field/mutable/choose_one.tt @@ -0,0 +1,27 @@ +=extends field/mutable + +=for layout field + + + +=for layout option_is_required_yes + +=for layout option_is_required_no + + + +=for layout option + + + +=for layout option_is_selected_yes + +selected="selected" + +=for layout option_is_selected_no + +=cut 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/mutable/hidden_array.tt b/share/skin/default/layout/field/mutable/hidden_array.tt new file mode 100644 index 0000000..0f5e35d --- /dev/null +++ b/share/skin/default/layout/field/mutable/hidden_array.tt @@ -0,0 +1,9 @@ +=for layout widget + +[% hidden_list %] + +=for layout hidden_field + + + +=cut diff --git a/share/skin/default/layout/field/mutable/integer.tt b/share/skin/default/layout/field/mutable/integer.tt new file mode 100644 index 0000000..05a69a5 --- /dev/null +++ b/share/skin/default/layout/field/mutable/integer.tt @@ -0,0 +1,3 @@ +=extends field/mutable + +=cut diff --git a/share/skin/default/layout/field/mutable/matching_passwords.tt b/share/skin/default/layout/field/mutable/matching_passwords.tt new file mode 100644 index 0000000..d07b784 --- /dev/null +++ b/share/skin/default/layout/field/mutable/matching_passwords.tt @@ -0,0 +1,8 @@ +=extends field/mutable/password + +=for layout widget + +[% call_next %] +[% check_value %] + +=cut 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..b4038aa --- /dev/null +++ b/share/skin/default/layout/field/mutable/text.tt @@ -0,0 +1,9 @@ +=extends field/mutable + +=for layout field + + + +=cut diff --git a/share/skin/default/layout/field/mutable/time_range.tt b/share/skin/default/layout/field/mutable/time_range.tt index 9a53cb2..954c40b 100644 --- a/share/skin/default/layout/field/mutable/time_range.tt +++ b/share/skin/default/layout/field/mutable/time_range.tt @@ -1,11 +1,25 @@ -=extends NEXT +=for layout widget + +[% label %] [% field %] [% message %] + +=for layout field + +TODO + +=for layout label + + +[% content_str = GET content; %] +[% IF content_str.length; %] + +[% END; %] =for layout message [% content_str = GET content; %] [% IF content_str.length; %] - [% content_str | html %] + [% content_str | html %]
    [% 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..18ab448 --- /dev/null +++ b/share/skin/default/layout/field/number.tt @@ -0,0 +1,3 @@ +=extends field + +=cut diff --git a/share/skin/default/layout/field/related_object.tt b/share/skin/default/layout/field/related_object.tt new file mode 100644 index 0000000..18ab448 --- /dev/null +++ b/share/skin/default/layout/field/related_object.tt @@ -0,0 +1,3 @@ +=extends field + +=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..18ab448 --- /dev/null +++ b/share/skin/default/layout/field/string.tt @@ -0,0 +1,3 @@ +=extends field + +=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..18ab448 --- /dev/null +++ b/share/skin/default/layout/field/text.tt @@ -0,0 +1,3 @@ +=extends field + +=cut diff --git a/share/skin/default/layout/list_view.tt b/share/skin/default/layout/list_view.tt deleted file mode 100644 index 5712596..0000000 --- a/share/skin/default/layout/list_view.tt +++ /dev/null @@ -1,19 +0,0 @@ -=extends NEXT - -=for layout actions - - - -=for layout pager - - - -=cut diff --git a/share/skin/default/layout/object.tt b/share/skin/default/layout/object.tt index 21def52..20dee31 100644 --- a/share/skin/default/layout/object.tt +++ b/share/skin/default/layout/object.tt @@ -2,6 +2,6 @@ =for layout field - [% call_next %] + [% call_next %]
    =cut diff --git a/share/skin/default/layout/site_layout.tt b/share/skin/default/layout/site_layout.tt new file mode 100644 index 0000000..17d78ca --- /dev/null +++ b/share/skin/default/layout/site_layout.tt @@ -0,0 +1,22 @@ +=extends NEXT + +=for layout widget + + + + + + + [% head %] + + + + [% body %] + + + + +=for layout head_style + +=cut diff --git a/share/skin/default/layout/value/boolean.tt b/share/skin/default/layout/value/boolean.tt new file mode 100644 index 0000000..310783b --- /dev/null +++ b/share/skin/default/layout/value/boolean.tt @@ -0,0 +1,5 @@ +=for layout widget + +[% value | html %] + +=cut \ No newline at end of file diff --git a/share/skin/default/layout/value/collection.tt b/share/skin/default/layout/value/collection.tt new file mode 100644 index 0000000..c866aa8 --- /dev/null +++ b/share/skin/default/layout/value/collection.tt @@ -0,0 +1,15 @@ +=for layout widget + +[% list %] + +=for layout list + + + +=for layout item + +
  • [% value | 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..0ee0d75 --- /dev/null +++ b/share/skin/default/layout/value/date_time.tt @@ -0,0 +1,5 @@ +=for layout widget + +[% value | html %] + +=cut diff --git a/share/skin/default/layout/value/image.tt b/share/skin/default/layout/value/image.tt new file mode 100644 index 0000000..5ebea74 --- /dev/null +++ b/share/skin/default/layout/value/image.tt @@ -0,0 +1,11 @@ +=for layout widget + +[% image %] + +=for layout has_image + + + +=for layout no_image + +=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..bd8ad27 --- /dev/null +++ b/share/skin/default/layout/value/list.tt @@ -0,0 +1,15 @@ +=for layout widget + +[% list %] + +=for layout list + + + +=for layout item + +
  • [% value | html %]
  • + +=cut \ No newline at end of file diff --git a/share/skin/default/layout/value/number.tt b/share/skin/default/layout/value/number.tt new file mode 100644 index 0000000..0ee0d75 --- /dev/null +++ b/share/skin/default/layout/value/number.tt @@ -0,0 +1,5 @@ +=for layout widget + +[% value | 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..0ee0d75 --- /dev/null +++ b/share/skin/default/layout/value/related_object.tt @@ -0,0 +1,5 @@ +=for layout widget + +[% value | html %] + +=cut diff --git a/share/skin/default/layout/value/string.tt b/share/skin/default/layout/value/string.tt new file mode 100644 index 0000000..310783b --- /dev/null +++ b/share/skin/default/layout/value/string.tt @@ -0,0 +1,5 @@ +=for layout widget + +[% value | 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..310783b --- /dev/null +++ b/share/skin/default/layout/value/text.tt @@ -0,0 +1,5 @@ +=for layout widget + +[% value | html %] + +=cut \ No newline at end of file -- cgit v1.2.3-54-g00ecf