Skip to content

Commit

Permalink
Don't close contributor popup when hit enter key.
Browse files Browse the repository at this point in the history
Hitting the "enter" key when searching for contributors in the contributor
popup no longer closes the window, but properly submits the search.

Also note the "Delete" button fix from the previous commit.
  • Loading branch information
theory committed Mar 23, 2010
1 parent 96413be commit e883ebb
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 41 deletions.
5 changes: 4 additions & 1 deletion comp/widgets/profile/contributors/edit.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<form action="<% $r->uri %>" method="post" name="theForm">
<& '/widgets/wrappers/table_top.mc',
caption => 'Current Contributors'
&>
Expand Down Expand Up @@ -30,14 +31,16 @@
useTable => 0
&>
</div>

</form>
<form action="<% $r->uri %>" method="post" name="searchForm">
<& /widgets/search/search.mc,
object => 'contrib',
field => 'lname',
type => 'dual',
use_form_tag => 0,
state_key => "$asset_type\_contrib",
&>
</form>

<& '/widgets/wrappers/table_top.mc', caption => 'Choose Contributors' &>
<& /widgets/listManager/listManager.mc,
Expand Down
12 changes: 2 additions & 10 deletions comp/workflow/profile/media/category.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,17 @@
title => 'Edit Category',
context => $context . $r->pnotes('media_prof|title') . ' | Category'
&>
<form action="<% $r->uri %>" method="post" name="theForm">
<% $content %>
</form>

<& /widgets/wrappers/footer.mc &>


<%once>;
my $type = 'element';
my $disp = get_disp_name('media');
my $context = "Workflow | Profile | $disp | ";
</%once>

<%args>
$id => undef
</%args>

<%init>
<%init>;
# Do any redirects first.
do_queued_redirect();

Expand All @@ -28,7 +21,6 @@
section => 'category',
param => \%ARGS);
</%init>

<%doc>
###############################################################################

Expand All @@ -43,4 +35,4 @@
factored out into an association.html component.)

=cut
</%doc>
</%doc>
46 changes: 16 additions & 30 deletions comp/workflow/profile/story/categories.html
Original file line number Diff line number Diff line change
@@ -1,32 +1,18 @@
<%doc>
###############################################################################

=head1 Name

categories.html -- associates a category to a story asset

=head1 Description

Top-level component to associate a category to a story asset.
(I think this, keywords.html, and contributors.html should be
factored out into an association.html component.)

=cut
</%doc>
<& /widgets/wrappers/header.mc,
title => 'Edit Categories',
context => $context . $r->pnotes('story_prof|title') . ' | Categories'
&>
<% $content %>

%#-- Once Section --#
<& /widgets/wrappers/footer.mc &>
<%once>;
my $type = 'element';
my $disp = get_disp_name('story');
my $context = "Workflow | Profile | $disp | ";
</%once>

%#-- Args Section --#
<%args>
$id => undef
</%args>

%#-- Init Section --#
<%init>
# Do any redirects first.
do_queued_redirect();
Expand All @@ -36,18 +22,18 @@
section => 'categories',
param => \%ARGS);
</%init>
<%doc>
###############################################################################

%#-- Begin HTML --#
=head1 Name

<& /widgets/wrappers/header.mc,
title => 'Edit Categories',
context => $context . $r->pnotes('story_prof|title') . ' | Categories'
&>
<form action="<% $r->uri %>" method="post" name="theForm">
<% $content %>
</form>
categories.html -- associates a category to a story asset

<& /widgets/wrappers/footer.mc &>
=head1 Description

%#-- End HTML --#
Top-level component to associate a category to a story asset.
(I think this, keywords.html, and contributors.html should be
factored out into an association.html component.)

=cut
</%doc>
11 changes: 11 additions & 0 deletions lib/Bric/Changes.pod
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,17 @@ Media no longer throw the exception “Can't call method "write" on an undefined
value” when L<Imager> is doesn't recognize an image file format. Thanks to
Matt Rolf for the report (Bug #146). [David]

=item *

Deleting contributors in the contibutor popup window now works the same as it
does when deleting them in the story or media profile. [David]

=item *

Hitting the "enter" key when searching for contributors in the contributor
popup no longer closes the window, but properly submits the search. Thanks to
Matt Rolf for the report (Bug #147).

=back

=head1 Version 1.11.3 (2010-01-28)
Expand Down

0 comments on commit e883ebb

Please sign in to comment.