rolfm at bricolage
Mar 2, 2009, 6:21 PM
Post #1 of 1
(352 views)
Permalink
|
|
[8433] Fixed bug where enter button would not submit the advanced
|
|
Revision: 8433
Author: rolfm
Date: 2009-03-02 18:21:03 -0800 (Mon, 02 Mar 2009)
ViewCVS: http://viewsvn.bricolage.cc/?rev=8433&view=rev
Log Message:
-----------
Fixed bug where enter button would not submit the advanced search.
Modified Paths:
--------------
bricolage/trunk/comp/widgets/search/media.html
bricolage/trunk/comp/widgets/search/story.html
bricolage/trunk/comp/widgets/search/template.html
bricolage/trunk/lib/Bric/Changes.pod
Modified: bricolage/trunk/comp/widgets/search/media.html
===================================================================
--- bricolage/trunk/comp/widgets/search/media.html 2009-03-02 17:36:51 UTC (rev 8432)
+++ bricolage/trunk/comp/widgets/search/media.html 2009-03-03 02:21:03 UTC (rev 8433)
@@ -11,6 +11,8 @@
my $advanced_search = $state->{advanced_search};
$advanced_search = get_pref('Default Search')
unless defined $advanced_search;
+my $initial_search_type = 'simple';
+$initial_search_type = 'advanced' if $advanced_search;
my $asset_opts = {
'' => $lang->maketext('All Types'),
map { $_->get_id, $_->get_name }
@@ -54,15 +56,8 @@
name => $widget.'|media_cb',
value => 'simple' &>
- <& '/widgets/profile/button.mc',
- disp => $lang->maketext('Search'),
- name => 'simple_search',
- button => 'search_red',
- js => qq{onclick="\$('search-type').value = 'simple'"},
- useTable => 0 &>
+ <a href="#" class="small" style="margin-left: 10px;" onclick="$('search_name').value = $('search_simple').value; $('search-button').name = 'advanced_search'; $('search-button').onclick = $('search-type').value = 'advanced'; $('basic-search', 'advanced-search', 'clear-button').invoke('toggle'); $('button-wrap').setStyle({margin: '0 0 0 0'}); return false">Show more options »</a>
- <a href="#" class="small" style="margin-left: 10px;" onclick="$('search_name').value = $('search_simple').value; $('basic-search', 'advanced-search').invoke('toggle'); return false">Show more options »</a>
-
</div>
<div id="advanced-search"<% ($advanced_search) ? '' : ' style="display: none"' %>>
@@ -191,28 +186,33 @@
compact => 1,
style => 'inline',
&>
+
+ <a href="#" class="small" style="margin-left: 10px;" onclick="$('search_simple').value = $('search_name').value; $('search-button').name = 'simple_search'; $('search-button').onclick = $('search-type').value = 'simple'; $('basic-search', 'advanced-search', 'clear-button').invoke('toggle'); $('button-wrap').setStyle({margin: '5px 0 0 -140px'}); return false">« Show fewer options</a>
+
</div>
</div>
- <div class="row">
- <div class="input">
+</div>
+
+<div id="button-wrap" class="row"<% ($advanced_search) ? '' : ' style="margin: 5px 0 0 -140px;"' %>>
+ <div class="input" id="search-buttons">
+ <& /widgets/profile/button.mc,
+ id => 'search-button',
+ disp => $lang->maketext('Search'),
+ name => $initial_search_type.'_search',
+ button => 'search_red',
+ js => qq{onclick="\$('search-type').value = '$initial_search_type'"},
+ useTable => 0 &>
+ <span id="clear-button"<% ($advanced_search) ? '' : ' style="display: none"' %>>
<& /widgets/profile/button.mc,
- disp => $lang->maketext('Search'),
- name => 'advanced_search',
- button => 'search_red',
- js => qq{onclick="\$('search-type').value = 'advanced'"},
- useTable => 0 &>
- <& /widgets/profile/button.mc,
- disp => $lang->maketext('Clear Values'),
- widget => $widget,
- cb => 'clear_cb',
- button => 'clear_values_lgreen',
- useTable => 0 &>
-
- <a href="#" class="small" style="margin-left: 10px;" onclick="$('search_simple').value = $('search_name').value; $('basic-search', 'advanced-search').invoke('toggle'); return false">« Show fewer options</a>
-
- </div>
+ disp => $lang->maketext('Clear Values'),
+ widget => $widget,
+ cb => 'clear_cb',
+ button => 'clear_values_lgreen',
+ useTable => 0 &>
+ </span>
</div>
</div>
+
<% $insert %>
<& '/widgets/wrappers/table_bottom.mc' &>
Modified: bricolage/trunk/comp/widgets/search/story.html
===================================================================
--- bricolage/trunk/comp/widgets/search/story.html 2009-03-02 17:36:51 UTC (rev 8432)
+++ bricolage/trunk/comp/widgets/search/story.html 2009-03-03 02:21:03 UTC (rev 8433)
@@ -10,6 +10,8 @@
my $advanced_search = $state->{advanced_search};
$advanced_search = get_pref('Default Search')
unless defined $advanced_search;
+my $initial_search_type = 'simple';
+$initial_search_type = 'advanced' if $advanced_search;
my $asset_opts = {
'' => $lang->maketext('All Types'),
@@ -63,14 +65,7 @@
name => $widget.'|story_cb',
value => 'simple' &>
- <& '/widgets/profile/button.mc',
- disp => $lang->maketext('Search'),
- name => 'simple_search',
- button => 'search_red',
- js => qq{onclick="\$('search-type').value = 'simple'"},
- useTable => 0 &>
-
- <a href="#" class="small" style="margin-left: 10px;" onclick="$('search_title').value = $('search_simple').value; $('basic-search', 'advanced-search').invoke('toggle'); return false">Show more options »</a>
+ <a href="#" class="small" style="margin-left: 10px;" onclick="$('search_title').value = $('search_simple').value; $('search-button').name = 'advanced_search'; $('search-button').onclick = $('search-type').value = 'advanced'; $('basic-search', 'advanced-search', 'clear-button').invoke('toggle'); $('button-wrap').setStyle({margin: '0 0 0 0'}); return false">Show more options »</a>
</div>
@@ -212,26 +207,30 @@
compact => 1,
style => 'inline',
&>
+
+ <a href="#" class="small" style="margin-left: 10px;" onclick="$('search_simple').value = $('search_title').value; $('search-button').name = 'simple_search'; $('search-button').onclick = $('search-type').value = 'simple'; $('basic-search', 'advanced-search', 'clear-button').invoke('toggle'); $('button-wrap').setStyle({margin: '5px 0 0 -140px'}); return false">« Show fewer options</a>
+
</div>
</div>
- <div class="row">
- <div class="input">
- <& /widgets/profile/button.mc,
- disp => $lang->maketext('Search'),
- name => 'advanced_search',
- button => 'search_red',
- js => qq{onclick="\$('search-type').value = 'advanced'"},
- useTable => 0 &>
- <& /widgets/profile/button.mc,
- disp => $lang->maketext('Clear Values'),
- widget => $widget,
- cb => 'clear_cb',
- button => 'clear_values_lgreen',
- useTable => 0 &>
-
- <a href="#" class="small" style="margin-left: 10px;" onclick="$('search_simple').value = $('search_title').value; $('basic-search', 'advanced-search').invoke('toggle'); return false">« Show fewer options</a>
+</div>
- </div>
+<div id="button-wrap" class="row"<% ($advanced_search) ? '' : ' style="margin: 5px 0 0 -140px;"' %>>
+ <div class="input" id="search-buttons">
+ <& /widgets/profile/button.mc,
+ id => 'search-button',
+ disp => $lang->maketext('Search'),
+ name => $initial_search_type.'_search',
+ button => 'search_red',
+ js => qq{onclick="\$('search-type').value = '$initial_search_type'"},
+ useTable => 0 &>
+ <span id="clear-button"<% ($advanced_search) ? '' : ' style="display: none"' %>>
+ <& /widgets/profile/button.mc,
+ disp => $lang->maketext('Clear Values'),
+ widget => $widget,
+ cb => 'clear_cb',
+ button => 'clear_values_lgreen',
+ useTable => 0 &>
+ </span>
</div>
</div>
Modified: bricolage/trunk/comp/widgets/search/template.html
===================================================================
--- bricolage/trunk/comp/widgets/search/template.html 2009-03-02 17:36:51 UTC (rev 8432)
+++ bricolage/trunk/comp/widgets/search/template.html 2009-03-03 02:21:03 UTC (rev 8433)
@@ -9,6 +9,8 @@
my $advanced_search = $state->{advanced_search};
$advanced_search = get_pref('Default Search')
unless defined $advanced_search;
+my $initial_search_type = 'simple';
+$initial_search_type = 'advanced' if $advanced_search;
my $sites = $c->get('__SITES__');
unless ($sites) {
@@ -43,16 +45,8 @@
name => $widget.'|template_cb',
value => 'simple' &>
- <& '/widgets/profile/button.mc',
- disp => $lang->maketext('Search'),
- name => 'simple_search',
- button => 'search_red',
- js => qq{onclick="\$('search-type').value = 'simple'"},
- useTable => 0 &>
+ <a href="#" class="small" style="margin-left: 10px;" onclick="$('search_name').value = $('search_simple').value; $('search-button').name = 'advanced_search'; $('search-button').onclick = $('search-type').value = 'advanced'; $('basic-search', 'advanced-search', 'clear-button').invoke('toggle'); $('button-wrap').setStyle({margin: '0 0 0 0'}); return false">Show more options »</a>
-
- <a href="#" class="small" style="margin-left: 10px;" onclick="$('search_name').value = $('search_simple').value; $('basic-search', 'advanced-search').invoke('toggle'); return false">Show more options »</a>
-
</div>
<div id="advanced-search"<% ($advanced_search) ? '' : ' style="display: none"' %>>
@@ -188,28 +182,33 @@
compact => 1,
style => 'inline',
&>
- </div>
- </div>
- <div class="row">
- <div class="input">
- <& /widgets/profile/button.mc,
- disp => $lang->maketext('Search'),
- name => 'advanced_search',
- button => 'search_red',
- js => qq{onclick="\$('search-type').value = 'advanced'"},
- useTable => 0 &>
- <& /widgets/profile/button.mc,
- disp => $lang->maketext('Clear Values'),
- widget => $widget,
- cb => 'clear_cb',
- button => 'clear_values_lgreen',
- useTable => 0 &>
- <a href="#" class="small" style="margin-left: 10px;" onclick="$('search_simple').value = $('search_name').value; $('basic-search', 'advanced-search').invoke('toggle'); return false">« Show fewer options</a>
+ <a href="#" class="small" style="margin-left: 10px;" onclick="$('search_simple').value = $('search_name').value; $('search-button').name = 'simple_search'; $('search-button').onclick = $('search-type').value = 'simple'; $('basic-search', 'advanced-search', 'clear-button').invoke('toggle'); $('button-wrap').setStyle({margin: '5px 0 0 -140px'}); return false">« Show fewer options</a>
</div>
</div>
</div>
+
+<div id="button-wrap" class="row"<% ($advanced_search) ? '' : ' style="margin: 5px 0 0 -140px;"' %>>
+ <div class="input" id="search-buttons">
+ <& /widgets/profile/button.mc,
+ id => 'search-button',
+ disp => $lang->maketext('Search'),
+ name => $initial_search_type.'_search',
+ button => 'search_red',
+ js => qq{onclick="\$('search-type').value = '$initial_search_type'"},
+ useTable => 0 &>
+ <span id="clear-button"<% ($advanced_search) ? '' : ' style="display: none"' %>>
+ <& /widgets/profile/button.mc,
+ disp => $lang->maketext('Clear Values'),
+ widget => $widget,
+ cb => 'clear_cb',
+ button => 'clear_values_lgreen',
+ useTable => 0 &>
+ </span>
+ </div>
+</div>
+
<& '/widgets/wrappers/table_bottom.mc' &>
% if ($use_form_tag) {
Modified: bricolage/trunk/lib/Bric/Changes.pod
===================================================================
--- bricolage/trunk/lib/Bric/Changes.pod 2009-03-02 17:36:51 UTC (rev 8432)
+++ bricolage/trunk/lib/Bric/Changes.pod 2009-03-03 02:21:03 UTC (rev 8433)
@@ -179,6 +179,11 @@
New bulk edit button would cause submit error in IE7 because it didn't call
the customSubmit function. [Kahil Jallad, Sarah Mercier]
+=item *
+
+Fixed bug #1425, where the enter key would not submit an advanced search form.
+[Bret Dawson]
+
=head1 VERSION 1.11.1 (2008-10-03)
=head2 Improvements
|
