From d738d11fb21607bb66617ac95a455be8c9fa9e62 Mon Sep 17 00:00:00 2001 From: wreis Date: Mon, 27 Jul 2009 18:34:34 +0000 Subject: Object consumes Action and Collection consumes Pager and Action, so Member::WithActions go away --- lib/ComponentUI/UI/ViewPort/Baz/ListView/Member.pm | 4 +- lib/Reaction/Manual/ActionPrototypes.pod | 2 +- lib/Reaction/UI/ViewPort/Collection.pm | 6 +- lib/Reaction/UI/ViewPort/Collection/Grid.pm | 4 +- .../ViewPort/Collection/Grid/Member/WithActions.pm | 13 --- lib/Reaction/UI/ViewPort/ListView.pm | 3 - lib/Reaction/UI/ViewPort/Object.pm | 2 + lib/Reaction/UI/Widget/Collection/Grid/Member.pm | 2 +- .../Widget/Collection/Grid/Member/WithActions.pm | 105 --------------------- lib/Reaction/UI/Widget/Object.pm | 18 ++++ .../layout/collection/grid/member/with_actions.tt | 12 --- share/skin/base/layout/object.tt | 9 ++ .../layout/collection/grid/member/with_actions.tt | 12 --- share/skin/default/layout/object.tt | 4 + 14 files changed, 43 insertions(+), 153 deletions(-) delete mode 100644 lib/Reaction/UI/ViewPort/Collection/Grid/Member/WithActions.pm delete mode 100644 lib/Reaction/UI/Widget/Collection/Grid/Member/WithActions.pm delete mode 100644 share/skin/base/layout/collection/grid/member/with_actions.tt delete mode 100644 share/skin/default/layout/collection/grid/member/with_actions.tt diff --git a/lib/ComponentUI/UI/ViewPort/Baz/ListView/Member.pm b/lib/ComponentUI/UI/ViewPort/Baz/ListView/Member.pm index 26740ce..ca534aa 100644 --- a/lib/ComponentUI/UI/ViewPort/Baz/ListView/Member.pm +++ b/lib/ComponentUI/UI/ViewPort/Baz/ListView/Member.pm @@ -4,10 +4,10 @@ use Reaction::Class; use namespace::clean -except => [ qw(meta) ]; use aliased 'Reaction::UI::ViewPort::Field::String::Fragment'; -extends 'Reaction::UI::ViewPort::Collection::Grid::Member::WithActions'; +extends 'Reaction::UI::ViewPort::Collection::Grid::Member'; sub _build_layout { - 'collection/grid/member/with_actions'; + 'collection/grid/member'; } sub _build_fields_for_name_description { diff --git a/lib/Reaction/Manual/ActionPrototypes.pod b/lib/Reaction/Manual/ActionPrototypes.pod index abf3a2d..388dc4c 100644 --- a/lib/Reaction/Manual/ActionPrototypes.pod +++ b/lib/Reaction/Manual/ActionPrototypes.pod @@ -42,7 +42,7 @@ By default, enable C, C, C, C, actions. know how many actions to expect to lay out the UI properly. =item Default to member-class -L +L =back diff --git a/lib/Reaction/UI/ViewPort/Collection.pm b/lib/Reaction/UI/ViewPort/Collection.pm index a3cb0af..d64ab42 100644 --- a/lib/Reaction/UI/ViewPort/Collection.pm +++ b/lib/Reaction/UI/ViewPort/Collection.pm @@ -10,6 +10,9 @@ use MooseX::Types::Moose qw/Str HashRef/; use namespace::clean -except => [ qw(meta) ]; extends 'Reaction::UI::ViewPort'; +with 'Reaction::UI::ViewPort::Collection::Role::Pager'; +with 'Reaction::UI::ViewPort::Role::Actions'; + has members => (is => 'rw', isa => 'ArrayRef', lazy_build => 1); has collection => (is => 'ro', isa => IM_Collection, required => 1); @@ -120,8 +123,7 @@ constructor as items are instantiated. The class to use when instantiating items to represent the member items. See: L, -L, -L, +L. =head1 INTERNAL METHODS diff --git a/lib/Reaction/UI/ViewPort/Collection/Grid.pm b/lib/Reaction/UI/ViewPort/Collection/Grid.pm index 1cf3fd9..eb10d3d 100644 --- a/lib/Reaction/UI/ViewPort/Collection/Grid.pm +++ b/lib/Reaction/UI/ViewPort/Collection/Grid.pm @@ -3,7 +3,7 @@ package Reaction::UI::ViewPort::Collection::Grid; use Reaction::Class; use aliased 'Reaction::InterfaceModel::Collection' => 'IM_Collection'; -use aliased 'Reaction::UI::ViewPort::Collection::Grid::Member::WithActions'; +use aliased 'Reaction::UI::ViewPort::Collection::Grid::Member'; use namespace::clean -except => [ qw(meta) ]; use MooseX::Types::Moose qw/ArrayRef HashRef Int/; @@ -44,7 +44,7 @@ has member_action_count => ( ); #################################### -sub _build_member_class { WithActions }; +sub _build_member_class { Member }; sub _build_field_labels { my $self = shift; diff --git a/lib/Reaction/UI/ViewPort/Collection/Grid/Member/WithActions.pm b/lib/Reaction/UI/ViewPort/Collection/Grid/Member/WithActions.pm deleted file mode 100644 index ea3d832..0000000 --- a/lib/Reaction/UI/ViewPort/Collection/Grid/Member/WithActions.pm +++ /dev/null @@ -1,13 +0,0 @@ -package Reaction::UI::ViewPort::Collection::Grid::Member::WithActions; - -use Reaction::Class; - -use namespace::clean -except => [ qw(meta) ]; -extends 'Reaction::UI::ViewPort::Collection::Grid::Member'; - -with 'Reaction::UI::ViewPort::Role::Actions'; - -__PACKAGE__->meta->make_immutable; - - -1; diff --git a/lib/Reaction/UI/ViewPort/ListView.pm b/lib/Reaction/UI/ViewPort/ListView.pm index d1778bd..d2574bb 100644 --- a/lib/Reaction/UI/ViewPort/ListView.pm +++ b/lib/Reaction/UI/ViewPort/ListView.pm @@ -5,10 +5,7 @@ use namespace::clean -except => [ qw(meta) ]; extends 'Reaction::UI::ViewPort::Collection::Grid'; with 'Reaction::UI::ViewPort::Collection::Role::Order'; -with 'Reaction::UI::ViewPort::Collection::Role::Pager'; -with 'Reaction::UI::ViewPort::Role::Actions'; __PACKAGE__->meta->make_immutable; - 1; diff --git a/lib/Reaction/UI/ViewPort/Object.pm b/lib/Reaction/UI/ViewPort/Object.pm index 9a8738e..37dfdc5 100644 --- a/lib/Reaction/UI/ViewPort/Object.pm +++ b/lib/Reaction/UI/ViewPort/Object.pm @@ -21,6 +21,8 @@ use MooseX::Types::Moose qw/ArrayRef HashRef/; use namespace::clean -except => [ qw(meta) ]; extends 'Reaction::UI::ViewPort'; +with 'Reaction::UI::ViewPort::Role::Actions'; + #everything is read only right now. Later I can make somethings read-write #but first I need to figure out what depends on what so we can have decent triggers has model => (is => 'ro', isa => IM_Object, required => 1); diff --git a/lib/Reaction/UI/Widget/Collection/Grid/Member.pm b/lib/Reaction/UI/Widget/Collection/Grid/Member.pm index 24168a6..3a47aa0 100644 --- a/lib/Reaction/UI/Widget/Collection/Grid/Member.pm +++ b/lib/Reaction/UI/Widget/Collection/Grid/Member.pm @@ -73,7 +73,7 @@ Renders the next C fragment surrounded by a C element. =item * L -=item * L +=item * L =back diff --git a/lib/Reaction/UI/Widget/Collection/Grid/Member/WithActions.pm b/lib/Reaction/UI/Widget/Collection/Grid/Member/WithActions.pm deleted file mode 100644 index f9ed586..0000000 --- a/lib/Reaction/UI/Widget/Collection/Grid/Member/WithActions.pm +++ /dev/null @@ -1,105 +0,0 @@ -package Reaction::UI::Widget::Collection::Grid::Member::WithActions; - -use Reaction::UI::WidgetClass; - -use namespace::clean -except => [ qw(meta) ]; -extends 'Reaction::UI::Widget::Collection::Grid::Member'; - -implements fragment actions { - render action => over $_{viewport}->actions; -}; - -implements fragment action { - render 'viewport'; -}; - -__PACKAGE__->meta->make_immutable; - -1; - -__END__; - -=head1 NAME - -Reaction::UI::Widget::Collection::Grid::Member::WithActions - Grid members with actions - -=head1 DESCRIPTION - -This is a subclass of L additionally -providing actions per member. - -=head1 FRAGMENTS - -=head2 actions - -Renders the C fragment with every item in the viewports C. - -=head2 action - -Renders the C fragment provided by L, thus -rendering the current viewport stored in the C<_> topic argument provided -by the C fragment. - -=head1 LAYOUT SETS - -=head2 base - - share/skin/base/layout/collection/grid/member/with_actions.tt - -This layout set extends the C layout set in the parent -skin. - -The following layouts are provided: - -=over 4 - -=item field_list - -First renders the original C fragment, then the C fragment. - -=item action - -Simply renders the next C fragment in line. - -=back - -=head2 default - - share/skin/default/layout/collection/grid/member/with_actions.tt - -This layout skin extends the C layout set in the parent -skin. - -The following layouts are provided: - -=over 4 - -=item field_list - -The same as in the C skin. - -=item action - -Renders the original C fragment surrounded by a C element. - -=back - -=head1 SEE ALSO - -=over 4 - -=item * L - -=item * L - -=back - -=head1 AUTHORS - -See L for authors. - -=head1 LICENSE - -See L for the license. - -=cut diff --git a/lib/Reaction/UI/Widget/Object.pm b/lib/Reaction/UI/Widget/Object.pm index de83e25..8674e44 100644 --- a/lib/Reaction/UI/Widget/Object.pm +++ b/lib/Reaction/UI/Widget/Object.pm @@ -21,6 +21,14 @@ implements fragment field { render 'viewport'; }; +implements fragment actions { + render action => over $_{viewport}->actions; +}; + +implements fragment action { + render 'viewport'; +}; + __PACKAGE__->meta->make_immutable; 1; @@ -44,6 +52,16 @@ method return values. Renders the C viewport passed by C. +=head2 actions + +Renders the C fragment with every item in the viewports C. + +=head2 action + +Renders the C fragment provided by L, thus +rendering the current viewport stored in the C<_> topic argument provided +by the C fragment. + =head1 DEPRECATED FRAGMENTS =head2 field_list diff --git a/share/skin/base/layout/collection/grid/member/with_actions.tt b/share/skin/base/layout/collection/grid/member/with_actions.tt deleted file mode 100644 index e7ba750..0000000 --- a/share/skin/base/layout/collection/grid/member/with_actions.tt +++ /dev/null @@ -1,12 +0,0 @@ -=extends collection/grid/member - -=for layout field_list - -[% call_next %] -[% actions %] - -=for layout action - -[% call_next %] - -=cut diff --git a/share/skin/base/layout/object.tt b/share/skin/base/layout/object.tt index 8a5074a..2a7f37e 100644 --- a/share/skin/base/layout/object.tt +++ b/share/skin/base/layout/object.tt @@ -6,5 +6,14 @@ [% call_next %] +=for layout field_list + +[% call_next %] +[% actions %] + +=for layout action + +[% call_next %] + =cut diff --git a/share/skin/default/layout/collection/grid/member/with_actions.tt b/share/skin/default/layout/collection/grid/member/with_actions.tt deleted file mode 100644 index a0bca88..0000000 --- a/share/skin/default/layout/collection/grid/member/with_actions.tt +++ /dev/null @@ -1,12 +0,0 @@ -=extends collection/grid/member - -=for layout field_list - -[% call_next %] -[% actions %] - -=for layout action - -[% call_next %] - -=cut diff --git a/share/skin/default/layout/object.tt b/share/skin/default/layout/object.tt index 0f32321..8413f23 100644 --- a/share/skin/default/layout/object.tt +++ b/share/skin/default/layout/object.tt @@ -4,4 +4,8 @@ [% call_next %]
+=for layout action + +[% call_next %] + =cut -- cgit v1.2.3-54-g00ecf