Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 16549 - Remove the use of "onclick" from header search forms

Browse source 
This patch removes the use of "onclick" from all header search forms for
the purpose of triggering the "keep_text" function. This behavior is now
handled in the globally-included JS file.

To test, apply the patch and clear your cache if necessary.

- Enter text in any header search form field. Click to each other tab
  in the header and confirm that your text is copied to each.
- Test the behavior of the header search form on at least one page where
  each is included:

  - The staff client home page
  - The advanced search page
  - The authorities home page
  - The administration home page
  - The cataloging home page
  - The checkin page
  - The circulation home page
  - The patrons home page
  - Acquisitions -> Vendor -> Contracts
  - Administration -> Cities
  - Administration -> Currencies and exchange rates
  - Administration -> Patron categories
  - Administration -> Printers (why is this page still around?)
  - Administration -> System preferences
  - Administration -> Z39.50/SRU servers
  - Tools -> Notices & slips

This patch modifies does not fix the existing (unreported) bug which
prevents the keep text function from working in the include file used on
these pages:

  - Acquisitions -> Vendor -> Basket -> New order from suggestion
  - Administration -> Budgets
  - The serials home page

Signed-off-by: Claire Gravely <c.gravely@arts.ac.uk>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Owen Leonard 2016-05-18 21:23:14 -04:00 committed by Kyle M Hall
parent 90a1d98e06
commit 6524e6d957
20 changed files with 70 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
View file

@ -34,16 +34,16 @@
<ul>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>
<li><a class="keep_text" href="#circ_search">Check out</a></li>
[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>
<li><a class="keep_text" href="#checkin_search">Check in</a></li>
[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>
<li><a class="keep_text" href="#renew_search">Renew</a></li>
[% END %]
[% IF ( CAN_user_borrowers ) %]
<li><a onclick="keep_text(3)" href="#patron_search">Search patrons</a></li>
<li><a class="keep_text" href="#patron_search">Search patrons</a></li>
[% END %]
</ul>

8
koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
View file

@ -241,10 +241,10 @@
</form>
</div>
<ul>
<li><a onclick="keep_text(0)" href="#mainmain_heading">Search main heading ($a only)</a></li>
<li><a onclick="keep_text(1)" href="#main_heading">Search main heading</a></li>
<li><a onclick="keep_text(2)" href="#matchheading_search">Search all headings</a></li>
<li><a onclick="keep_text(3)" href="#entire_record">Search entire record</a></li>
<li><a class="keep_text" href="#mainmain_heading">Search main heading ($a only)</a></li>
<li><a class="keep_text" href="#main_heading">Search main heading</a></li>
<li><a class="keep_text" href="#matchheading_search">Search all headings</a></li>
<li><a class="keep_text" href="#entire_record">Search entire record</a></li>
</ul>
</div><!-- /header_search -->
</div><!-- /gradient -->

6
koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
View file

@ -33,9 +33,9 @@
</form>
</div>[% END %]
<ul>
<li><a onclick="keep_text(0)" href="#budgets_search">Search funds</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
<li><a class="keep_text" href="#budgets_search">Search funds</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div>
</div>

8
koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
View file

@ -32,10 +32,10 @@
[% END %]
<ul>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li onclick="keep_text(3)" class="ui-tabs-active"><a href="#catalog_search">Search the catalog</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li class="keep_text" class="ui-tabs-active"><a href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div><!-- /header_search -->

10
koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
View file

@ -39,11 +39,11 @@
</div>
<ul>
<li><a onclick="keep_text(0)" href="#addbooks_search">Cataloging search</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(3)" href="#renew_search">Renew</a></li>[% END %]
<li><a onclick="keep_text(4)" href="#catalog_search">Search the catalog</a></li>
<li><a class="keep_text" href="#addbooks_search">Cataloging search</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>
</ul>
</div><!-- /header_search -->
</div><!-- /gradient -->

6
koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
View file

@ -22,9 +22,9 @@
[% END %]
<ul>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#renew_search">Renew</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div>

8
koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
View file

@ -30,10 +30,10 @@
[% END %]
<ul>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(3)" href="#catalog_search">Search the catalog</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div><!-- /header_search -->

6
koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
View file

@ -20,9 +20,9 @@
</form>
</div>[% END %]
<ul>
<li><a onclick="keep_text(0)" href="#city_search">Search cities</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
<li><a class="keep_text" href="#city_search">Search cities</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div>
</div>

6
koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
View file

@ -22,9 +22,9 @@
</div>[% END %]
<ul>
<li><a onclick="keep_text(0)" href="#contract_description_search">Search contracts</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
<li><a class="keep_text" href="#contract_description_search">Search contracts</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div>
</div><!-- /gradient -->

6
koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
View file

@ -18,9 +18,9 @@
</form>
</div>[% END %]
<ul>
<li><a onclick="keep_text(0)" href="#currency_search">Search currencies</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
<li><a class="keep_text" href="#currency_search">Search currencies</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div>
</div><!-- /gradient -->

10
koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
View file

@ -39,11 +39,11 @@
</div>[% END %]
<ul>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
[% IF ( CAN_user_borrowers ) %]<li><a onclick="keep_text(3)" href="#patron_search">Search patrons</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(4)" href="#catalog_search">Search the catalog</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
[% IF ( CAN_user_borrowers ) %]<li><a class="keep_text" href="#patron_search">Search patrons</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div><!-- /header_search -->

6
koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
View file

@ -18,9 +18,9 @@
</form>
</div>[% END %]
<ul>
<li><a onclick="keep_text(0)" href="#notices_search">Search notices</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
<li><a class="keep_text" href="#notices_search">Search notices</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div>
</div><!-- /gradient -->

10
koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
View file

@ -146,11 +146,11 @@
</div>[% END %]
<ul>
<li><a onclick="keep_text(0)" href="#patron_search">Search patrons</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(3)" href="#renew_search">Renew</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(4)" href="#catalog_search">Search the catalog</a></li>[% END %]
<li><a class="keep_text" href="#patron_search">Search patrons</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div><!-- /header_search -->
</div><!-- /gradient -->

6
koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
View file

@ -19,9 +19,9 @@
</div>[% END %]
<ul>
<li><a onclick="keep_text(0)" href="#patron_category_search">Search patron categories</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
<li><a class="keep_text" href="#patron_category_search">Search patron categories</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div>
</div>

6
koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
View file

@ -21,9 +21,9 @@
</div>
[% END %]
<ul>
<li><a onclick="keep_text(0)" href="#syspref_search">Search system preferences</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
<li><a class="keep_text" href="#syspref_search">Search system preferences</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div>
</div>

6
koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
View file

@ -19,9 +19,9 @@
</div>
[% END %]
<ul>
<li><a onclick="keep_text(0)" href="#printer_search">Search printers</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
<li><a class="keep_text" href="#printer_search">Search printers</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div>
</div><!-- /gradient -->

4
koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
View file

@ -29,8 +29,8 @@
[% END %]
<ul>
<li><a href="#subscription_search">Search subscriptions</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(1)" href="#catalog_search">Search the catalog</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div><!-- /header_search -->
</div><!-- /gradient -->

4
koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
View file

@ -25,8 +25,8 @@
[% END %]
<ul>
<li><a href="#suggestions_search">Search suggestions</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(1)" href="#catalog_search">Search the catalog</a></li>[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div>
</div><!-- /gradient -->

6
koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
View file

@ -21,9 +21,9 @@
</div>
[% END %]
<ul>
<li><a onclick="keep_text(0)" href="#z3950_search">Search Z39.50/SRU servers</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
<li><a class="keep_text" href="#z3950_search">Search Z39.50/SRU servers</a></li>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>
</div>
</div>

6
koha-tmpl/intranet-tmpl/prog/js/staff-global.js
View file

@ -52,6 +52,10 @@ $.fn.selectTabByID = function (tabID) {
$("body").on("keypress", ".noEnterSubmit", function(e){
return checkEnter(e);
});
$(".keep_text").on("click",function(){
var field_index = $(this).parent().index();
keep_text( field_index );
});
});
// http://jennifermadden.com/javascript/stringEnterKeyDetector.html
@ -158,4 +162,4 @@ function keep_text(clicked_index) {
for (i = 0; i < searchboxes.length; i++) {
searchboxes[i].value = persist;
}
}
}