From 3d113b44c6d9f321d49e815898870c449837d3a8 Mon Sep 17 00:00:00 2001 From: wreis Date: Tue, 22 Jul 2008 23:29:04 +0000 Subject: fixes for fields --- share/skin/base/layout/field/array.tt | 6 ++-- share/skin/base/layout/field/collection.tt | 4 ++- share/skin/base/layout/field/mutable.tt | 9 ++--- .../skin/base/layout/field/mutable/choose_many.tt | 13 ++++--- share/skin/base/layout/field/mutable/time_range.tt | 4 +-- share/skin/default/layout/field.tt | 7 ++++ share/skin/default/layout/field/array.tt | 7 ++++ share/skin/default/layout/field/collection.tt | 7 ++++ share/skin/default/layout/field/mutable.tt | 7 ++++ .../default/layout/field/mutable/choose_many.tt | 40 +++------------------- .../default/layout/field/mutable/time_range.tt | 18 ++-------- 11 files changed, 53 insertions(+), 69 deletions(-) create mode 100644 share/skin/default/layout/field.tt create mode 100644 share/skin/default/layout/field/array.tt create mode 100644 share/skin/default/layout/field/collection.tt create mode 100644 share/skin/default/layout/field/mutable.tt (limited to 'share') diff --git a/share/skin/base/layout/field/array.tt b/share/skin/base/layout/field/array.tt index 2b049b5..35c6429 100644 --- a/share/skin/base/layout/field/array.tt +++ b/share/skin/base/layout/field/array.tt @@ -5,16 +5,18 @@ =for layout label - [% content | html %]: + [% content | html %]: =for layout list +
+
=for layout item
  • [% content | html %]
    • -=cut \ No newline at end of file +=cut diff --git a/share/skin/base/layout/field/collection.tt b/share/skin/base/layout/field/collection.tt index 47244e7..abd7e56 100644 --- a/share/skin/base/layout/field/collection.tt +++ b/share/skin/base/layout/field/collection.tt @@ -5,13 +5,15 @@ =for layout label_box - [% label %]: + [% label %]: =for layout list +
    +
    =for layout item diff --git a/share/skin/base/layout/field/mutable.tt b/share/skin/base/layout/field/mutable.tt index 3983263..ee6cf08 100644 --- a/share/skin/base/layout/field/mutable.tt +++ b/share/skin/base/layout/field/mutable.tt @@ -1,6 +1,6 @@ =for layout widget -[% label_fragment %] [% field %] [% message_fragment %] +
    [% label_fragment %] [% field %] [% message_fragment %]
    =for layout label @@ -12,14 +12,9 @@ class="required_field" =for layout field_is_required_no -=for layout field - - -FIELD GOES HERE - =for layout message -[% message %]
    +[% message %] =for layout field diff --git a/share/skin/base/layout/field/mutable/choose_many.tt b/share/skin/base/layout/field/mutable/choose_many.tt index ed6c136..f6658c6 100644 --- a/share/skin/base/layout/field/mutable/choose_many.tt +++ b/share/skin/base/layout/field/mutable/choose_many.tt @@ -3,12 +3,12 @@ =for layout widget [% label_fragment %] -
    [% message_fragment %] [% field %] =for layout field +
    @@ -19,6 +19,7 @@
    [% available_values %]
    +
    =for layout available_values @@ -42,9 +43,11 @@ =for layout action_buttons -
    -
    -
    -
    +
    + + + + +
    =cut diff --git a/share/skin/base/layout/field/mutable/time_range.tt b/share/skin/base/layout/field/mutable/time_range.tt index 954c40b..3ce9c24 100644 --- a/share/skin/base/layout/field/mutable/time_range.tt +++ b/share/skin/base/layout/field/mutable/time_range.tt @@ -11,7 +11,7 @@ TODO [% content_str = GET content; %] [% IF content_str.length; %] - + [% END; %] =for layout message @@ -19,7 +19,7 @@ TODO [% content_str = GET content; %] [% IF content_str.length; %] - [% content_str | html %]
    + [% content_str | html %] [% END %] =cut diff --git a/share/skin/default/layout/field.tt b/share/skin/default/layout/field.tt new file mode 100644 index 0000000..d800da9 --- /dev/null +++ b/share/skin/default/layout/field.tt @@ -0,0 +1,7 @@ +=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 new file mode 100644 index 0000000..acb2cce --- /dev/null +++ b/share/skin/default/layout/field/array.tt @@ -0,0 +1,7 @@ +=extends NEXT + +=for layout label + + [% content | html %]: + +=cut diff --git a/share/skin/default/layout/field/collection.tt b/share/skin/default/layout/field/collection.tt new file mode 100644 index 0000000..f513e94 --- /dev/null +++ b/share/skin/default/layout/field/collection.tt @@ -0,0 +1,7 @@ +=extends NEXT + +=for layout label_box + + [% label %]: + +=cut diff --git a/share/skin/default/layout/field/mutable.tt b/share/skin/default/layout/field/mutable.tt new file mode 100644 index 0000000..615e14e --- /dev/null +++ b/share/skin/default/layout/field/mutable.tt @@ -0,0 +1,7 @@ +=extends NEXT + +=for layout message + +[% call_next %]
    + +=cut diff --git a/share/skin/default/layout/field/mutable/choose_many.tt b/share/skin/default/layout/field/mutable/choose_many.tt index ed6c136..177030f 100644 --- a/share/skin/default/layout/field/mutable/choose_many.tt +++ b/share/skin/default/layout/field/mutable/choose_many.tt @@ -1,50 +1,18 @@ -=extends field/mutable +=extends NEXT =for layout widget -[% label_fragment %] -
    +[% 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/time_range.tt b/share/skin/default/layout/field/mutable/time_range.tt index 954c40b..04c6165 100644 --- a/share/skin/default/layout/field/mutable/time_range.tt +++ b/share/skin/default/layout/field/mutable/time_range.tt @@ -1,25 +1,11 @@ -=for layout widget - -[% label %] [% field %] [% message %] - -=for layout field - -TODO - -=for layout label - - -[% content_str = GET content; %] -[% IF content_str.length; %] - -[% END; %] +=extends NEXT =for layout message [% content_str = GET content; %] [% IF content_str.length; %] - [% content_str | html %]
    + [% content_str | html %]
    [% END %] =cut -- cgit v1.2.3-54-g00ecf