View | Details | Raw Unified | Return to bug 14189
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc (-5 / +6 lines)
Lines 8-14 Link Here
8
<div id="checkin_search" class="residentsearch">
8
<div id="checkin_search" class="residentsearch">
9
    <p class="tip">Scan a barcode to check in:</p>
9
    <p class="tip">Scan a barcode to check in:</p>
10
    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
10
    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
11
        <input name="barcode" id="ret_barcode" size="40" />
11
        <input class="query" name="barcode" id="ret_barcode" size="40" />
12
        <input value="Submit" class="submit" type="submit" />
12
        <input value="Submit" class="submit" type="submit" />
13
    </form>
13
    </form>
14
</div>
14
</div>
Lines 17-33 Link Here
17
	<div id="catalog_search" class="residentsearch">
17
	<div id="catalog_search" class="residentsearch">
18
	<p class="tip">Enter search keywords:</p>
18
	<p class="tip">Enter search keywords:</p>
19
		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
19
		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
20
			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
20
			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" />
21
				<input type="submit" class="submit" value="Submit" />
21
				<input type="submit" class="submit" value="Submit" />
22
		</form>
22
		</form>
23
	</div>
23
	</div>
24
	[% END %]
24
	[% END %]
25
	
25
	
26
			<ul>
26
			<ul>
27
            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
27
            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text()" href="#circ_search">Check out</a></li>[% END %]
28
    [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
28
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text()" href="#checkin_search">Check in</a></li>[% END %]
29
            [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-active"><a href="#catalog_search">Search the catalog</a></li>[% END %]
29
            [% IF ( CAN_user_catalogue ) %]<li onclick="keep_text()" class="ui-tabs-active"><a href="#catalog_search">Search the catalog</a></li>[% END %]
30
			</ul>	
30
			</ul>	
31
</div><!-- /header_search -->
31
</div><!-- /header_search -->
32
</div><!-- /gradient -->
32
</div><!-- /gradient -->
33
[% INCLUDE 'searchbox-keep-text.inc' %]
33
<!-- End Catalogue Resident Search Box -->
34
<!-- End Catalogue Resident Search Box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc (-7 / +8 lines)
Lines 5-11 Link Here
5
        <div id="addbooks_search" class="residentsearch">
5
        <div id="addbooks_search" class="residentsearch">
6
        <p class="tip">Search the catalog and the reservoir:</p>
6
        <p class="tip">Search the catalog and the reservoir:</p>
7
            <form name="search" action="addbooks.pl">
7
            <form name="search" action="addbooks.pl">
8
                <input type="text" name="q" size="40" />
8
                <input class="query" type="text" name="q" size="40" />
9
                <input type="submit" class="submit" value="Submit" />
9
                <input type="submit" class="submit" value="Submit" />
10
            </form>
10
            </form>
11
        </div>
11
        </div>
Lines 14-20 Link Here
14
        <div id="checkin_search" class="residentsearch">
14
        <div id="checkin_search" class="residentsearch">
15
            <p class="tip">Scan a barcode to check in:</p>
15
            <p class="tip">Scan a barcode to check in:</p>
16
            <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
16
            <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
17
                <input name="barcode" id="ret_barcode" size="40" />
17
                <input class="query" name="barcode" id="ret_barcode" size="40" />
18
                <input value="Submit" class="submit" type="submit" />
18
                <input value="Submit" class="submit" type="submit" />
19
            </form>
19
            </form>
20
        </div>
20
        </div>
Lines 23-40 Link Here
23
        <div id="catalog_search" class="residentsearch">
23
        <div id="catalog_search" class="residentsearch">
24
            <p class="tip">Enter search keywords:</p>
24
            <p class="tip">Enter search keywords:</p>
25
            <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
25
            <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
26
                <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
26
                <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" />
27
                <input type="submit" class="submit" value="Submit" />
27
                <input type="submit" class="submit" value="Submit" />
28
            </form>
28
            </form>
29
        </div>
29
        </div>
30
30
31
        [% INCLUDE 'patron-search-box.inc' %]
31
        [% INCLUDE 'patron-search-box.inc' %]
32
        <ul>
32
        <ul>
33
            <li><a href="#addbooks_search">Cataloging search</a></li>
33
            <li><a onclick="keep_text()" href="#addbooks_search">Cataloging search</a></li>
34
            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
34
            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text()" href="#circ_search">Check out</a></li>[% END %]
35
            [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
35
            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text()" href="#checkin_search">Check in</a></li>[% END %]
36
            <li><a href="#catalog_search">Search the catalog</a></li>
36
            <li><a onclick="keep_text()" href="#catalog_search">Search the catalog</a></li>
37
        </ul>
37
        </ul>
38
    </div><!-- /header_search -->
38
    </div><!-- /header_search -->
39
</div><!-- /gradient -->
39
</div><!-- /gradient -->
40
[% INCLUDE 'searchbox-keep-text.inc' %]
40
<!-- End Cataloging Resident Search Box -->
41
<!-- End Cataloging Resident Search Box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc (-5 / +6 lines)
Lines 7-13 Link Here
7
<div id="checkin_search" class="residentsearch">
7
<div id="checkin_search" class="residentsearch">
8
    <p class="tip">Scan a barcode to check in:</p>
8
    <p class="tip">Scan a barcode to check in:</p>
9
    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
9
    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
10
        <input name="barcode" id="ret_barcode" size="40" accesskey="r" />
10
        <input class="query" name="barcode" id="ret_barcode" size="40" accesskey="r" />
11
        <input value="Submit" class="submit" type="submit" />
11
        <input value="Submit" class="submit" type="submit" />
12
    </form>
12
    </form>
13
</div>[% END %]
13
</div>[% END %]
Lines 15-31 Link Here
15
<div id="catalog_search" class="residentsearch">
15
<div id="catalog_search" class="residentsearch">
16
    <p class="tip">Enter search keywords:</p>
16
    <p class="tip">Enter search keywords:</p>
17
    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
17
    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
18
        <input type="text" name="q" id="search-form" size="40" accesskey="q" />
18
        <input class="query" type="text" name="q" id="search-form" size="40" accesskey="q" />
19
        <input type="submit" class="submit" value="Submit"/>
19
        <input type="submit" class="submit" value="Submit"/>
20
    </form>
20
    </form>
21
</div>[% END %]
21
</div>[% END %]
22
22
23
<ul>
23
<ul>
24
    [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
24
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text()" href="#circ_search">Check out</a></li>[% END %]
25
    [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
25
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text()" href="#checkin_search">Check in</a></li>[% END %]
26
    [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
26
    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text()" href="#catalog_search">Search the catalog</a></li>[% END %]
27
</ul>   
27
</ul>   
28
28
29
</div><!-- /header_search -->
29
</div><!-- /header_search -->
30
</div><!-- /gradient -->
30
</div><!-- /gradient -->
31
[% INCLUDE 'searchbox-keep-text.inc' %]
31
<!-- End Circulation Resident Search Box -->
32
<!-- End Circulation Resident Search Box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc (-7 / +8 lines)
Lines 7-13 Link Here
7
<div id="checkin_search" class="residentsearch">
7
<div id="checkin_search" class="residentsearch">
8
    <p class="tip">Scan a barcode to check in:</p>
8
    <p class="tip">Scan a barcode to check in:</p>
9
    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
9
    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
10
        <input name="barcode" id="ret_barcode" size="40" accesskey="r" />
10
        <input name="barcode" class="query" id="ret_barcode" size="40" accesskey="r" />
11
        <input value="Submit" class="submit" type="submit" />
11
        <input value="Submit" class="submit" type="submit" />
12
    </form>
12
    </form>
13
</div>[% END %]
13
</div>[% END %]
Lines 15-21 Link Here
15
<div id="patron_search" class="residentsearch">
15
<div id="patron_search" class="residentsearch">
16
    <p class="tip">Enter patron card number or partial name:</p>
16
    <p class="tip">Enter patron card number or partial name:</p>
17
    <form action="/cgi-bin/koha/members/member.pl" method="post">
17
    <form action="/cgi-bin/koha/members/member.pl" method="post">
18
        <input name="searchmember" id="searchmember" size="40" type="text"/>
18
        <input name="searchmember" class="query" id="searchmember" size="40" type="text"/>
19
        <input type="hidden" name="quicksearch" value="1" />
19
        <input type="hidden" name="quicksearch" value="1" />
20
        <input value="Submit" class="submit" type="submit" />
20
        <input value="Submit" class="submit" type="submit" />
21
    </form>
21
    </form>
Lines 24-41 Link Here
24
<div id="catalog_search" class="residentsearch">
24
<div id="catalog_search" class="residentsearch">
25
    <p class="tip">Enter search keywords:</p>
25
    <p class="tip">Enter search keywords:</p>
26
    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
26
    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
27
        <input type="text" name="q" id="search-form" size="40" accesskey="q" />
27
        <input type="text" name="q" id="search-form" class="query" size="40" accesskey="q" />
28
        <input type="submit" class="submit" value="Submit"/>
28
        <input type="submit" class="submit" value="Submit"/>
29
    </form>
29
    </form>
30
</div>[% END %]
30
</div>[% END %]
31
31
32
<ul>
32
<ul>
33
    [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
33
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text()" href="#circ_search">Check out</a></li>[% END %]
34
    [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
34
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text()" href="#checkin_search">Check in</a></li>[% END %]
35
    [% IF ( CAN_user_borrowers ) %]<li><a href="#patron_search">Search patrons</a></li>[% END %]
35
    [% IF ( CAN_user_borrowers ) %]<li><a onclick="keep_text()" href="#patron_search">Search patrons</a></li>[% END %]
36
    [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
36
    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text()" href="#catalog_search">Search the catalog</a></li>[% END %]
37
</ul>
37
</ul>
38
38
39
</div><!-- /header_search -->
39
</div><!-- /header_search -->
40
</div><!-- /gradient -->
40
</div><!-- /gradient -->
41
[% INCLUDE 'searchbox-keep-text.inc' %]
41
<!-- End Main page Resident Search Box -->
42
<!-- End Main page Resident Search Box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc (-2 / +2 lines)
Lines 26-32 $(document).ready(function(){ Link Here
26
    <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post">
26
    <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post">
27
    [% IF ( CircAutocompl ) %]
27
    [% IF ( CircAutocompl ) %]
28
    <div class="autocomplete">
28
    <div class="autocomplete">
29
                <input autocomplete="off" id="findborrower" name="findborrower" size="40" class="focus" type="text" />
29
                <input autocomplete="off" id="findborrower" name="findborrower" size="40" class="query focus" type="text" />
30
                <input id="autocsubmit" type="submit" class="submit" value="Submit" />
30
                <input id="autocsubmit" type="submit" class="submit" value="Submit" />
31
                <input name="branch" value="[% Branches.GetLoggedInBranchcode() %]" type="hidden" />
31
                <input name="branch" value="[% Branches.GetLoggedInBranchcode() %]" type="hidden" />
32
                <input name="printer" value="" type="hidden" />
32
                <input name="printer" value="" type="hidden" />
Lines 36-42 $(document).ready(function(){ Link Here
36
            [% END %]
36
            [% END %]
37
        </div>
37
        </div>
38
	[% ELSE %]
38
	[% ELSE %]
39
            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
39
            <input id="findborrower" name="findborrower" size="40" class="query focus" type="text" />
40
            <input name="branch" value="[% branch %]" type="hidden" />
40
            <input name="branch" value="[% branch %]" type="hidden" />
41
            <input name="printer" value="" type="hidden" />
41
            <input name="printer" value="" type="hidden" />
42
            [% IF ( stickyduedate ) %]
42
            [% IF ( stickyduedate ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-7 / +8 lines)
Lines 5-11 Link Here
5
    <div id="patron_search" class="residentsearch">
5
    <div id="patron_search" class="residentsearch">
6
    <p class="tip">Enter patron card number or partial name:</p>
6
    <p class="tip">Enter patron card number or partial name:</p>
7
    <form action="/cgi-bin/koha/members/member.pl" method="post">
7
    <form action="/cgi-bin/koha/members/member.pl" method="post">
8
    <input id="searchmember" data-toggle="tooltip" size="25" class="focus" name="searchmember" type="text" value="[% searchmember %]"/>
8
    <input id="searchmember" data-toggle="tooltip" size="25" class="query focus" name="searchmember" type="text" value="[% searchmember %]"/>
9
    <input type="hidden" name="quicksearch" value="1" />
9
    <input type="hidden" name="quicksearch" value="1" />
10
    <span class="filteraction" id="filteraction_off"> <a href="#">[-]</a></span>
10
    <span class="filteraction" id="filteraction_off"> <a href="#">[-]</a></span>
11
    <span class="filteraction" id="filteraction_on"> <a href="#">[+]</a></span>
11
    <span class="filteraction" id="filteraction_on"> <a href="#">[+]</a></span>
Lines 103-109 Link Here
103
    <div id="catalog_search" class="residentsearch">
103
    <div id="catalog_search" class="residentsearch">
104
    <p class="tip">Enter search keywords:</p>
104
    <p class="tip">Enter search keywords:</p>
105
        <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
105
        <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
106
             <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
106
             <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" />
107
                <input type="submit" name="op" id="opac-submit" value="Submit" class="submit" />
107
                <input type="submit" name="op" id="opac-submit" value="Submit" class="submit" />
108
        </form>
108
        </form>
109
    </div>[% END %]
109
    </div>[% END %]
Lines 111-129 Link Here
111
    <div id="checkin_search" class="residentsearch">
111
    <div id="checkin_search" class="residentsearch">
112
    <p class="tip">Scan a barcode to check in:</p>
112
    <p class="tip">Scan a barcode to check in:</p>
113
    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
113
    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
114
    <input name="barcode" id="ret_barcode" size="40" accesskey="r" />
114
    <input class="query" name="barcode" id="ret_barcode" size="40" accesskey="r" />
115
    <input value="Submit" class="submit" type="submit" />
115
    <input value="Submit" class="submit" type="submit" />
116
    </form>
116
    </form>
117
    </div>
117
    </div>
118
    [% END %]
118
    [% END %]
119
    <ul>
119
    <ul>
120
            <li><a href="#patron_search">Search patrons</a></li>
120
        <li><a onclick="keep_text()" href="#patron_search">Search patrons</a></li>
121
            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
121
        [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text()" href="#circ_search">Check out</a></li>[% END %]
122
    [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
122
        [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text()" href="#checkin_search">Check in</a></li>[% END %]
123
            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
123
        [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text()" href="#catalog_search">Search the catalog</a></li>[% END %]
124
    </ul>
124
    </ul>
125
</div><!-- /header_search -->
125
</div><!-- /header_search -->
126
</div><!-- /gradient -->
126
</div><!-- /gradient -->
127
[% INCLUDE 'searchbox-keep-text.inc' %]
127
<script type="text/javascript">//<![CDATA[
128
<script type="text/javascript">//<![CDATA[
128
$(document).ready(function() {
129
$(document).ready(function() {
129
    $("#filteraction_off, #filteraction_on").on('click', function(e) {
130
    $("#filteraction_off, #filteraction_on").on('click', function(e) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/searchbox-keep-text.inc (-1 / +26 lines)
Line 0 Link Here
0
- 
1
<script type="text/javascript">
2
//<![CDATA[
3
function keep_text() {
4
    var queries = document.getElementsByClassName("query");
5
    var persist = queries[0].value;
6
7
    for (i = 0; i < queries.length - 1; i++) {
8
        if (queries[i].value != queries[i+1].value) {
9
            if (i === queries.length-2) {
10
                if (queries[i].value != queries[0].value) {
11
                    persist = queries[i].value;
12
                } else {
13
                    persist = queries[i+1].value;
14
                }
15
            } else if (queries[i+1].value != queries[i+2].value) {
16
                persist = queries[i+1].value;
17
            }
18
        }
19
    }
20
21
    for (i = 0; i < queries.length; i++) {
22
        queries[i].value = persist;
23
    }
24
}
25
//]]>
26
</script>

Return to bug 14189