Bugzilla – Attachment 39462 Details for
Bug 14189
Make text persist/populate hidden fields for the Staff searchbox
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14189 refactor after failed QA.
Bug-14189-refactor-after-failed-QA.patch (text/plain), 31.68 KB, created by
Eivin Giske Skaaren
on 2015-05-24 14:48:20 UTC
(
hide
)
Description:
Bug 14189 refactor after failed QA.
Filename:
MIME Type:
Creator:
Eivin Giske Skaaren
Created:
2015-05-24 14:48:20 UTC
Size:
31.68 KB
patch
obsolete
>From 27f80efb64dca559bc272fbd75112dae72dba210 Mon Sep 17 00:00:00 2001 >From: Eivin Giske Skaaren <eskaaren@yahoo.no> >Date: Sun, 24 May 2015 14:38:37 +0000 >Subject: [PATCH] Bug 14189 refactor after failed QA. > >--- > .../prog/en/includes/budgets-admin-search.inc | 1 - > .../intranet-tmpl/prog/en/includes/cat-search.inc | 5 ++- > .../prog/en/includes/cataloging-search.inc | 7 ++--- > .../prog/en/includes/checkin-search.inc | 3 +- > .../intranet-tmpl/prog/en/includes/circ-search.inc | 5 ++- > .../prog/en/includes/cities-admin-search.inc | 5 ++- > .../prog/en/includes/contracts-admin-search.inc | 5 ++- > .../prog/en/includes/currencies-admin-search.inc | 5 ++- > .../prog/en/includes/doc-head-close.inc | 3 ++ > .../intranet-tmpl/prog/en/includes/home-search.inc | 7 ++--- > .../prog/en/includes/letters-search.inc | 5 ++- > .../prog/en/includes/patron-search-box.inc | 4 +-- > .../prog/en/includes/patron-search.inc | 7 ++--- > .../prog/en/includes/patrons-admin-search.inc | 5 ++- > .../prog/en/includes/prefs-admin-search.inc | 5 ++- > .../prog/en/includes/printers-admin-search.inc | 5 ++- > .../prog/en/includes/searchbox-keep-text.inc | 32 ++++++++++---------- > .../prog/en/includes/serials-search.inc | 3 +- > .../prog/en/includes/stopwords-admin-search.inc | 5 ++- > .../prog/en/includes/suggestions-add-search.inc | 3 +- > .../prog/en/includes/z3950-admin-search.inc | 5 ++- > 21 files changed, 55 insertions(+), 70 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc >index e03e51d..86d9b92 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc >@@ -39,5 +39,4 @@ > </ul> > </div> > </div> >-[% INCLUDE 'searchbox-keep-text' %] > <!-- End Suggestions Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >index 32e455a..6876305 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >@@ -8,7 +8,7 @@ > <div id="checkin_search" class="residentsearch"> > <p class="tip">Scan a barcode to check in:</p> > <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <input class="query" name="barcode" id="ret_barcode" size="40" /> >+ <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" /> > <input value="Submit" class="submit" type="submit" /> > </form> > </div> >@@ -17,7 +17,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" /> >+ <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> > <input type="submit" class="submit" value="Submit" /> > </form> > </div> >@@ -30,5 +30,4 @@ > </ul> > </div><!-- /header_search --> > </div><!-- /gradient --> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Catalogue Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >index 962c71f..1fda946 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >@@ -5,7 +5,7 @@ > <div id="addbooks_search" class="residentsearch"> > <p class="tip">Search the catalog and the reservoir:</p> > <form name="search" action="addbooks.pl"> >- <input class="query" type="text" name="q" size="40" /> >+ <input class="head-searchbox" type="text" name="q" size="40" /> > <input type="submit" class="submit" value="Submit" /> > </form> > </div> >@@ -14,7 +14,7 @@ > <div id="checkin_search" class="residentsearch"> > <p class="tip">Scan a barcode to check in:</p> > <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <input class="query" name="barcode" id="ret_barcode" size="40" /> >+ <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" /> > <input value="Submit" class="submit" type="submit" /> > </form> > </div> >@@ -23,7 +23,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" /> >+ <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> > <input type="submit" class="submit" value="Submit" /> > </form> > </div> >@@ -37,5 +37,4 @@ > </ul> > </div><!-- /header_search --> > </div><!-- /gradient --> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Cataloging Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc >index db213a4..4f1e2b9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc >@@ -6,7 +6,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input class="query" type="text" name="q" id="search-form" size="40" /> >+ <input class="head-searchbox" type="text" name="q" id="search-form" size="40" /> > <input type="submit" class="submit" value="Submit"/> > </form> > </div> >@@ -18,5 +18,4 @@ > > </div> > </div><!-- /gradient --> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Checkin Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >index 0292114..ab730ba 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >@@ -7,7 +7,7 @@ > <div id="checkin_search" class="residentsearch"> > <p class="tip">Scan a barcode to check in:</p> > <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <input class="query" name="barcode" id="ret_barcode" size="40" accesskey="r" /> >+ <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" /> > <input value="Submit" class="submit" type="submit" /> > </form> > </div>[% END %] >@@ -15,7 +15,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input class="query" type="text" name="q" id="search-form" size="40" accesskey="q" /> >+ <input class="head-searchbox" type="text" name="q" id="search-form" size="40" accesskey="q" /> > <input type="submit" class="submit" value="Submit"/> > </form> > </div>[% END %] >@@ -28,5 +28,4 @@ > > </div><!-- /header_search --> > </div><!-- /gradient --> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Circulation Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc >index f15dbce..fdf254a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc >@@ -4,7 +4,7 @@ > <div id="city_search" class="residentsearch"> > <p class="tip">City search:</p> > <form action="[% script_name %]" method="post"> >- <input class="query" type="text" name="city_name" value="[% searchfield %]" size="40" /> >+ <input class="head-searchbox" type="text" name="city_name" value="[% searchfield %]" size="40" /> > <input type="submit" name="submit" value="OK" class="submit" /> > </form> > </div> >@@ -15,7 +15,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" /> >+ <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> > <input type="submit" value="Submit" class="submit" /> > </form> > </div>[% END %] >@@ -26,5 +26,4 @@ > </ul> > </div> > </div> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Cities Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc >index ba39375..440e437 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc >@@ -5,7 +5,7 @@ > <div id="contract_description_search" class="residentsearch"> > <p class="tip">Search by contract name or/and description:</p> > <form action="[% script_name %]" method="post"> >- <input class="query" type="text" name="searchfield" size="40" value="[% searchfield %]" /> >+ <input class="head-searchbox" type="text" name="searchfield" size="40" value="[% searchfield %]" /> > <input type="submit" class="submit" name="search" value="Search" /> > </form> > </div> >@@ -16,7 +16,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" /> >+ <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> > <input type="submit" value="Submit" class="submit" /> > </form> > </div>[% END %] >@@ -27,5 +27,4 @@ > </ul> > </div> > </div><!-- /gradient --> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Patrons Admin Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc >index b421057..e138c30 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc >@@ -4,7 +4,7 @@ > <div id="currency_search" class="residentsearch"> > <p class="tip">Currencies search:</p> > <form action="[% script_name %]" method="post"> >- <input class="query" type="text" name="description" size="40" value="[% searchfield %]" /> >+ <input class="head-searchbox" type="text" name="description" size="40" value="[% searchfield %]" /> > <input type="submit" class="submit" name="search" value="Search" /> > </form> > </div> >@@ -13,7 +13,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" /> >+ <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> > <input type="submit" value="Submit" class="submit" /> > </form> > </div>[% END %] >@@ -24,5 +24,4 @@ > </ul> > </div> > </div><!-- /gradient --> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Currencies Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >index f6269de..800d589 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >@@ -56,3 +56,6 @@ var NO_LOCAL_JACKET = _("No cover image available"); > //]]> > </script> > [% END %] >+ >+<!-- For keeping the text when navigating the search tabs --> >+[% INCLUDE 'searchbox-keep-text.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc >index 7b4eded..fbf3618 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc >@@ -7,7 +7,7 @@ > <div id="checkin_search" class="residentsearch"> > <p class="tip">Scan a barcode to check in:</p> > <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <input name="barcode" class="query" id="ret_barcode" size="40" accesskey="r" /> >+ <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" /> > <input value="Submit" class="submit" type="submit" /> > </form> > </div>[% END %] >@@ -15,7 +15,7 @@ > <div id="patron_search" class="residentsearch"> > <p class="tip">Enter patron card number or partial name:</p> > <form action="/cgi-bin/koha/members/member.pl" method="post"> >- <input name="searchmember" class="query" id="searchmember" size="40" type="text"/> >+ <input name="searchmember" class="head-searchbox" id="searchmember" size="40" type="text"/> > <input type="hidden" name="quicksearch" value="1" /> > <input value="Submit" class="submit" type="submit" /> > </form> >@@ -24,7 +24,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input type="text" name="q" id="search-form" class="query" size="40" accesskey="q" /> >+ <input type="text" name="q" id="search-form" class="head-searchbox" size="40" accesskey="q" /> > <input type="submit" class="submit" value="Submit"/> > </form> > </div>[% END %] >@@ -38,5 +38,4 @@ > > </div><!-- /header_search --> > </div><!-- /gradient --> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Main page Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >index d22d949..99c5bb0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >@@ -4,7 +4,7 @@ > <div id="notices_search" class="residentsearch"> > <p class="tip">Search existing notices:</p> > <form action="/cgi-bin/koha/tools/letter.pl" method="post"> >- <input class="query" type="text" name="searchfield" size="40" value="" /> >+ <input class="head-searchbox" type="text" name="searchfield" size="40" value="" /> > <input type="submit" class="submit" name="search" value="Search" /> > </form> > </div> >@@ -13,7 +13,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" /> >+ <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> > <input type="submit" name="op" value="Submit" class="submit" /> > </form> > </div>[% END %] >@@ -24,5 +24,4 @@ > </ul> > </div> > </div><!-- /gradient --> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Notices Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc >index 2b93441..a7e9061 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc >@@ -26,7 +26,7 @@ $(document).ready(function(){ > <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post"> > [% IF ( CircAutocompl ) %] > <div class="autocomplete"> >- <input autocomplete="off" id="findborrower" name="findborrower" size="40" class="query focus" type="text" /> >+ <input autocomplete="off" id="findborrower" name="findborrower" size="40" class="head-searchbox focus" type="text" /> > <input id="autocsubmit" type="submit" class="submit" value="Submit" /> > <input name="branch" value="[% Branches.GetLoggedInBranchcode() %]" type="hidden" /> > <input name="printer" value="" type="hidden" /> >@@ -36,7 +36,7 @@ $(document).ready(function(){ > [% END %] > </div> > [% ELSE %] >- <input id="findborrower" name="findborrower" size="40" class="query focus" type="text" /> >+ <input id="findborrower" name="findborrower" size="40" class="head-searchbox focus" type="text" /> > <input name="branch" value="[% branch %]" type="hidden" /> > <input name="printer" value="" type="hidden" /> > [% IF ( stickyduedate ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >index e105879..646c70a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >@@ -7,7 +7,7 @@ > <div id="patron_search" class="residentsearch"> > <p class="tip">Enter patron card number or partial name:</p> > <form action="/cgi-bin/koha/members/member.pl" method="post"> >- <input id="searchmember" data-toggle="tooltip" size="25" class="query focus" name="searchmember" type="text" value="[% searchmember %]"/> >+ <input id="searchmember" data-toggle="tooltip" size="25" class="head-searchbox focus" name="searchmember" type="text" value="[% searchmember %]"/> > <input type="hidden" name="quicksearch" value="1" /> > <span class="filteraction" id="filteraction_off"> <a href="#">[-]</a></span> > <span class="filteraction" id="filteraction_on"> <a href="#">[+]</a></span> >@@ -113,7 +113,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" /> >+ <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> > <input type="submit" name="op" id="opac-submit" value="Submit" class="submit" /> > </form> > </div>[% END %] >@@ -121,7 +121,7 @@ > <div id="checkin_search" class="residentsearch"> > <p class="tip">Scan a barcode to check in:</p> > <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <input class="query" name="barcode" id="ret_barcode" size="40" accesskey="r" /> >+ <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" /> > <input value="Submit" class="submit" type="submit" /> > </form> > </div> >@@ -134,7 +134,6 @@ > </ul> > </div><!-- /header_search --> > </div><!-- /gradient --> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <script type="text/javascript">//<![CDATA[ > $(document).ready(function() { > $("#filteraction_off, #filteraction_on").on('click', function(e) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc >index 9b88b04..ebfb53f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc >@@ -4,7 +4,7 @@ > <div id="patron_category_search" class="residentsearch"> > <p class="tip">Search by patron category name:</p> > <form action="[% script_name %]" method="post"> >- <input class="query" type="text" name="description" size="40" value="[% searchfield %]" /> >+ <input class="head-searchbox" type="text" name="description" size="40" value="[% searchfield %]" /> > <input type="submit" class="submit" name="search" value="Search" /> > </form> > </div> >@@ -13,7 +13,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" /> >+ <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> > <input type="submit" value="Submit" class="submit" /> > </form> > </div>[% END %] >@@ -24,5 +24,4 @@ > </ul> > </div> > </div> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Patrons Admin Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc >index a1e416a..1951f45 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc >@@ -6,7 +6,7 @@ > <form action="/cgi-bin/koha/admin/preferences.pl"> > <input type="hidden" name="tab" value="[% last_tab %]" /> > <input type="hidden" name="op" value="search" /> >- <input class="query" type="text" size="40" name="searchfield" value="[% searchfield |html %]" /> >+ <input class="head-searchbox" type="text" size="40" name="searchfield" value="[% searchfield |html %]" /> > <input type="submit" class="submit" value="Search" /> > </form> > </div> >@@ -15,7 +15,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" /> >+ <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> > <input type="submit" value="Submit" class="submit" /> > </form> > </div> >@@ -27,5 +27,4 @@ > </ul> > </div> > </div> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Stopwords Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc >index 938a5a1..004aa66 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc >@@ -4,7 +4,7 @@ > <div id="printer_search" class="residentsearch"> > <p class="tip">Printer search:</p> > <form action="[% script_name %]" method="post"> >- <input class="query" type="text" size="40" name="description" value="[% searchfield %]" /> >+ <input class="head-searchbox" type="text" size="40" name="description" value="[% searchfield %]" /> > <input type="submit" name="submit" value="Search" /> > </form> > </div> >@@ -13,7 +13,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" /> >+ <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> > <input type="submit" value="Submit" class="submit" /> > </form> > </div> >@@ -25,5 +25,4 @@ > </ul> > </div> > </div><!-- /gradient --> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Printers Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/searchbox-keep-text.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/searchbox-keep-text.inc >index af5486f..3d7dbc2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/searchbox-keep-text.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/searchbox-keep-text.inc >@@ -1,29 +1,29 @@ > <script type="text/javascript"> > //<![CDATA[ >-function keep_text(clicked) { >- var queries = document.getElementsByClassName("query"); >- var persist = queries[0].value; >+function keep_text(clicked_index) { >+ var searchboxes = document.getElementsByClassName("head-searchbox"); >+ var persist = searchboxes[0].value; > >- for (i = 0; i < queries.length - 1; i++) { >- if (queries[i].value != queries[i+1].value) { >- if (i === queries.length-2) { >- if (queries[i].value != queries[0].value) { >- persist = queries[i].value; >- } else if (queries.length === 2) { >- if (clicked === 0) { >- persist = queries[1].value; >+ for (i = 0; i < searchboxes.length - 1; i++) { >+ if (searchboxes[i].value != searchboxes[i+1].value) { >+ if (i === searchboxes.length-2) { >+ if (searchboxes[i].value != searchboxes[0].value) { >+ persist = searchboxes[i].value; >+ } else if (searchboxes.length === 2) { >+ if (clicked_index === 0) { >+ persist = searchboxes[1].value; > } > } else { >- persist = queries[i+1].value; >+ persist = searchboxes[i+1].value; > } >- } else if (queries[i+1].value != queries[i+2].value) { >- persist = queries[i+1].value; >+ } else if (searchboxes[i+1].value != searchboxes[i+2].value) { >+ persist = searchboxes[i+1].value; > } > } > } > >- for (i = 0; i < queries.length; i++) { >- queries[i].value = persist; >+ for (i = 0; i < searchboxes.length; i++) { >+ searchboxes[i].value = persist; > } > } > //]]> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >index e4d9313..8ba2b15 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >@@ -22,7 +22,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" /> >+ <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> > <input type="submit" value="Submit" class="submit" /> > </form> > </div> >@@ -34,5 +34,4 @@ > </ul> > </div><!-- /header_search --> > </div><!-- /gradient --> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Serials Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc >index 9d5fe9a..c6b1620 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc >@@ -4,7 +4,7 @@ > <div id="stopword_search" class="residentsearch"> > <p class="tip">Stop word search:</p> > <form action="[% script_name %]" method="post"> >- <input class="query" type="text" size="40" name="searchfield" value="[% searchfield %]" /> >+ <input class="head-searchbox" type="text" size="40" name="searchfield" value="[% searchfield %]" /> > <input type="submit" name="ok" class="submit" value="Search" /> > </form> > </div> >@@ -13,7 +13,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" /> >+ <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> > <input type="submit" value="Submit" class="submit" /> > </form> > </div> >@@ -25,5 +25,4 @@ > </ul> > </div> > </div><!-- /gradient --> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Stopwords Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc >index 5f69b5d..8df92ab 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc >@@ -18,7 +18,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" /> >+ <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> > <input type="submit" value="Submit" class="submit" /> > </form> > </div> >@@ -30,5 +30,4 @@ > </ul> > </div> > </div><!-- /gradient --> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Suggestions Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc >index 16c0594..d637aac 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc >@@ -4,7 +4,7 @@ > <div id="z3950_search" class="residentsearch"> > <p class="tip">Z39.50/SRU server search:</p> > <form action="/cgi-bin/koha/admin/z3950servers.pl" method="post"> >- <input class="query" type="text" name="searchfield" size="40" value="[% searchfield %]" /> >+ <input class="head-searchbox" type="text" name="searchfield" size="40" value="[% searchfield %]" /> > <input type="submit" class="submit" name="search" value="Search" /> > </form> > </div> >@@ -15,7 +15,7 @@ > <div id="catalog_search" class="residentsearch"> > <p class="tip">Enter search keywords:</p> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" /> >+ <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> > <input type="submit" value="Submit" class="submit" /> > </form> > </div> >@@ -27,5 +27,4 @@ > </ul> > </div> > </div> >-[% INCLUDE 'searchbox-keep-text.inc' %] > <!-- End Members Resident Search Box --> >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14189
:
39104
|
39105
|
39106
|
39107
|
39108
|
39110
|
39112
|
39462
|
39505
|
39506
|
39543
|
39587
|
39588