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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc (-15 / +25 lines)
Lines 12-33 Link Here
12
        <input value="Submit" class="submit" type="submit" />
12
        <input value="Submit" class="submit" type="submit" />
13
    </form>
13
    </form>
14
</div>
14
</div>
15
	[% END %]
15
<div id="renew_search" class="residentsearch">
16
	[% IF ( CAN_user_catalogue ) %]
16
    <p class="tip">Scan a barcode to renew:</p>
17
	<div id="catalog_search" class="residentsearch">
17
    <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
18
	<p class="tip">Enter search keywords:</p>
18
        <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
19
		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
19
        <input value="Submit" class="submit" type="submit" />
20
             <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" />
20
    </form>
21
				<input type="submit" class="submit" value="Submit" />
21
</div>
22
		</form>
22
[% END %]
23
	</div>
23
24
	[% END %]
24
[% IF ( CAN_user_catalogue ) %]
25
	
25
<div id="catalog_search" class="residentsearch">
26
			<ul>
26
    <p class="tip">Enter search keywords:</p>
27
            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
27
    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
28
        <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" />
29
        <input type="submit" class="submit" value="Submit" />
30
    </form>
31
</div>
32
[% END %]
33
34
<ul>
35
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
28
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
36
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
29
            [% IF ( CAN_user_catalogue ) %]<li onclick="keep_text(2)" class="ui-tabs-active"><a href="#catalog_search">Search the catalog</a></li>[% END %]
37
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
30
			</ul>	
38
    [% IF ( CAN_user_catalogue ) %]<li onclick="keep_text(3)" class="ui-tabs-active"><a href="#catalog_search">Search the catalog</a></li>[% END %]
39
</ul>
40
31
</div><!-- /header_search -->
41
</div><!-- /header_search -->
32
</div><!-- /gradient -->
42
</div><!-- /gradient -->
33
<!-- End Catalogue Resident Search Box -->
43
<!-- End Catalogue Resident Search Box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc (-1 / +10 lines)
Lines 20-27 Link Here
20
                <input value="Submit" class="submit" type="submit" />
20
                <input value="Submit" class="submit" type="submit" />
21
            </form>
21
            </form>
22
        </div>
22
        </div>
23
        <div id="renew_search" class="residentsearch">
24
        <p class="tip">Scan a barcode to renew:</p>
25
            <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
26
                <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
27
                <input value="Submit" class="submit" type="submit" />
28
            </form>
29
        </div>
23
        [% END %]
30
        [% END %]
24
31
32
25
        <div id="catalog_search" class="residentsearch">
33
        <div id="catalog_search" class="residentsearch">
26
            <p class="tip">Enter search keywords:</p>
34
            <p class="tip">Enter search keywords:</p>
27
            <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
35
            <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
Lines 34-40 Link Here
34
            <li><a onclick="keep_text(0)" href="#addbooks_search">Cataloging search</a></li>
42
            <li><a onclick="keep_text(0)" href="#addbooks_search">Cataloging search</a></li>
35
            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
43
            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
36
            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
44
            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
37
            <li><a onclick="keep_text(3)" href="#catalog_search">Search the catalog</a></li>
45
            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(3)" href="#renew_search">Renew</a></li>[% END %]
46
            <li><a onclick="keep_text(4)" href="#catalog_search">Search the catalog</a></li>
38
        </ul>
47
        </ul>
39
    </div><!-- /header_search -->
48
    </div><!-- /header_search -->
40
</div><!-- /gradient -->
49
</div><!-- /gradient -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc (-1 / +12 lines)
Lines 11-19 Link Here
11
    </form>
11
    </form>
12
</div>
12
</div>
13
[% END %]
13
[% END %]
14
[% IF ( CAN_user_circulate ) %]
15
<div id="renew_search" class="residentsearch">
16
    <p class="tip">Scan a barcode to renew:</p>
17
    <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
18
        <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
19
        <input value="Submit" class="submit" type="submit" />
20
    </form>
21
</div>
22
[% END %]
23
14
<ul>
24
<ul>
15
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
25
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
16
    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(1)" href="#catalog_search">Search the catalog</a></li>[% END %]
26
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#renew_search">Renew</a></li>[% END %]
27
    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
17
</ul>   
28
</ul>   
18
29
19
</div>
30
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc (-3 / +13 lines)
Lines 10-16 Link Here
10
        <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" />
10
        <input class="head-searchbox" 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>
14
<div id="renew_search" class="residentsearch">
15
    <p class="tip">Scan a barcode to renew:</p>
16
    <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
17
        <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
18
        <input value="Submit" class="submit" type="submit" />
19
    </form>
20
</div>
21
[% END %]
14
[% IF ( CAN_user_catalogue ) %]
22
[% IF ( CAN_user_catalogue ) %]
15
<div id="catalog_search" class="residentsearch">
23
<div id="catalog_search" class="residentsearch">
16
    <p class="tip">Enter search keywords:</p>
24
    <p class="tip">Enter search keywords:</p>
Lines 18-29 Link Here
18
        <input class="head-searchbox" type="text" name="q" id="search-form" size="40" accesskey="q" />
26
        <input class="head-searchbox" type="text" name="q" id="search-form" size="40" accesskey="q" />
19
        <input type="submit" class="submit" value="Submit"/>
27
        <input type="submit" class="submit" value="Submit"/>
20
    </form>
28
    </form>
21
</div>[% END %]
29
</div>
30
[% END %]
22
31
23
<ul>
32
<ul>
24
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
33
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
25
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
34
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
26
    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
35
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
36
    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(3)" href="#catalog_search">Search the catalog</a></li>[% END %]
27
</ul>   
37
</ul>   
28
38
29
</div><!-- /header_search -->
39
</div><!-- /header_search -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc (-2 / +3 lines)
Lines 20-30 Link Here
20
				<input type="submit" value="Submit"  class="submit" />
20
				<input type="submit" value="Submit"  class="submit" />
21
		</form>
21
		</form>
22
	</div>[% END %]
22
	</div>[% END %]
23
			<ul>
23
24
	<ul>
24
            <li><a onclick="keep_text(0)" href="#contract_description_search">Search contracts</a></li>
25
            <li><a onclick="keep_text(0)" href="#contract_description_search">Search contracts</a></li>
25
            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
26
            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
26
            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
27
            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
27
			</ul>	
28
	</ul>
28
</div>
29
</div>
29
</div><!-- /gradient -->
30
</div><!-- /gradient -->
30
<!-- End Patrons Admin Resident Search Box -->
31
<!-- End Patrons Admin Resident Search Box -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc (-3 / +13 lines)
Lines 10-16 Link Here
10
        <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" />
10
        <input name="barcode" class="head-searchbox" 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>
14
<div id="renew_search" class="residentsearch">
15
    <p class="tip">Scan a barcode to renew:</p>
16
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
17
            <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
18
            <input value="Submit" class="submit" type="submit" />
19
        </form>
20
    </div>
21
[% END %]
22
14
[% IF ( CAN_user_borrowers ) %]
23
[% IF ( CAN_user_borrowers ) %]
15
<div id="patron_search" class="residentsearch">
24
<div id="patron_search" class="residentsearch">
16
    <p class="tip">Enter patron card number or partial name:</p>
25
    <p class="tip">Enter patron card number or partial name:</p>
Lines 32-39 Link Here
32
<ul>
41
<ul>
33
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
42
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
34
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
43
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
35
    [% IF ( CAN_user_borrowers ) %]<li><a onclick="keep_text(2)" href="#patron_search">Search patrons</a></li>[% END %]
44
    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
36
    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(3)" href="#catalog_search">Search the catalog</a></li>[% END %]
45
    [% IF ( CAN_user_borrowers ) %]<li><a onclick="keep_text(3)" href="#patron_search">Search patrons</a></li>[% END %]
46
    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(4)" href="#catalog_search">Search the catalog</a></li>[% END %]
37
</ul>
47
</ul>
38
48
39
</div><!-- /header_search -->
49
</div><!-- /header_search -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-1 / +9 lines)
Lines 122-127 Link Here
122
    <input value="Submit" class="submit" type="submit" />
122
    <input value="Submit" class="submit" type="submit" />
123
    </form>
123
    </form>
124
    </div>
124
    </div>
125
        <div id="renew_search" class="residentsearch">
126
        <p class="tip">Scan a barcode to renew:</p>
127
            <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
128
                <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
129
                <input value="Submit" class="submit" type="submit" />
130
            </form>
131
        </div>
125
    [% END %]
132
    [% END %]
126
133
127
    [% IF ( CAN_user_catalogue ) %]
134
    [% IF ( CAN_user_catalogue ) %]
Lines 137-143 Link Here
137
        <li><a onclick="keep_text(0)" href="#patron_search">Search patrons</a></li>
144
        <li><a onclick="keep_text(0)" href="#patron_search">Search patrons</a></li>
138
        [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
145
        [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
139
        [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
146
        [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
140
        [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(3)" href="#catalog_search">Search the catalog</a></li>[% END %]
147
        [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(3)" href="#renew_search">Renew</a></li>[% END %]
148
        [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(4)" href="#catalog_search">Search the catalog</a></li>[% END %]
141
    </ul>
149
    </ul>
142
</div><!-- /header_search -->
150
</div><!-- /header_search -->
143
</div><!-- /gradient -->
151
</div><!-- /gradient -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc (-1 / +2 lines)
Lines 17-23 Link Here
17
				<input type="submit" value="Submit"  class="submit" />
17
				<input type="submit" value="Submit"  class="submit" />
18
		</form>
18
		</form>
19
	</div>[% END %]
19
	</div>[% END %]
20
			<ul>
20
21
	<ul>
21
            <li><a onclick="keep_text(0)" href="#patron_category_search">Search patron categories</a></li>
22
            <li><a onclick="keep_text(0)" href="#patron_category_search">Search patron categories</a></li>
22
            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
23
            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
23
            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
24
            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js (-1 / +1 lines)
Lines 32-37 $.fn.selectTabByID = function (tabID) { Link Here
32
    if($("#header_search #checkin_search").length > 0){ shortcut.add('Alt+r',function (){ $("#header_search").selectTabByID("#checkin_search"); $("#ret_barcode").focus(); }); } else { shortcut.add('Alt+r',function (){ location.href="/cgi-bin/koha/circ/returns.pl"; }); }
32
    if($("#header_search #checkin_search").length > 0){ shortcut.add('Alt+r',function (){ $("#header_search").selectTabByID("#checkin_search"); $("#ret_barcode").focus(); }); } else { shortcut.add('Alt+r',function (){ location.href="/cgi-bin/koha/circ/returns.pl"; }); }
33
    if($("#header_search #circ_search").length > 0){ shortcut.add('Alt+u',function (){ $("#header_search").selectTabByID("#circ_search"); $("#findborrower").focus(); }); } else { shortcut.add('Alt+u',function(){ location.href="/cgi-bin/koha/circ/circulation.pl"; }); }
33
    if($("#header_search #circ_search").length > 0){ shortcut.add('Alt+u',function (){ $("#header_search").selectTabByID("#circ_search"); $("#findborrower").focus(); }); } else { shortcut.add('Alt+u',function(){ location.href="/cgi-bin/koha/circ/circulation.pl"; }); }
34
    if($("#header_search #catalog_search").length > 0){ shortcut.add('Alt+q',function (){ $("#header_search").selectTabByID("#catalog_search"); $("#search-form").focus(); }); } else { shortcut.add('Alt+q',function(){ location.href="/cgi-bin/koha/catalogue/search.pl"; }); }
34
    if($("#header_search #catalog_search").length > 0){ shortcut.add('Alt+q',function (){ $("#header_search").selectTabByID("#catalog_search"); $("#search-form").focus(); }); } else { shortcut.add('Alt+q',function(){ location.href="/cgi-bin/koha/catalogue/search.pl"; }); }
35
    if($("#header_search #renew_search").length > 0){ shortcut.add('Alt+y',function (){ $("#header_search").selectTabByID("#renew_search"); $("#ren_barcode").focus(); }); } else { shortcut.add('Alt+y',function(){ location.href="/cgi-bin/koha/circ/renew.pl"; }); }
35
36
36
    $(".focus").focus();
37
    $(".focus").focus();
37
    $(".validated").each(function() {
38
    $(".validated").each(function() {
38
- 

Return to bug 12051