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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc (-2 / +2 lines)
Lines 17-24 Link Here
17
[% IF ( facets_loo.type_label_Series ) %]Series[% END %]
17
[% IF ( facets_loo.type_label_Series ) %]Series[% END %]
18
[% IF ( facets_loo.type_label_Libraries ) %]Libraries[% END %]
18
[% IF ( facets_loo.type_label_Libraries ) %]Libraries[% END %]
19
<ul>
19
<ul>
20
        [% FOREACH facet IN facets_loo.facets %]<li><a href="/cgi-bin/koha/catalogue/search.pl?[% facet.query_cgi |html %][% facet.limit_cgi |html %][% IF ( facet.sort_by ) %]&amp;sort_by=[% facet.sort_by %][% END %]&amp;limit=[% facet.type_link_value %]:[% facet.facet_link_value %]" title="[% facet.facet_title_value %]">[% facet.facet_label_value %]</a> [% IF ( facet.displayFacetCount ) %]([% facet.facet_count %])[% END %]</li>[% END %][% IF ( facets_loo.expandable ) %]
20
        [% FOREACH facet IN facets_loo.facets %]<li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by %][% END %]&amp;limit=[% facet.type_link_value %]:[% facet.facet_link_value %]" title="[% facet.facet_title_value %]">[% facet.facet_label_value %]</a> [% IF ( facet.displayFacetCount ) %]([% facet.facet_count %])[% END %]</li>[% END %][% IF ( facets_loo.expandable ) %]
21
        <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?[% facets_loo.query_cgi |html %][% facets_loo.limit_cgi |html %][% IF ( facets_loo.sort_by ) %]&amp;sort_by=[% facets_loo.sort_by %][% END %]&amp;expand=[% facets_loo.expand %]#[% facets_loo.type_id %]">Show More</a></li>
21
        <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by %][% END %]&amp;expand=[% facets_loo.expand %]#[% facets_loo.type_id %]">Show More</a></li>
22
[% END %]
22
[% END %]
23
</ul></li>
23
</ul></li>
24
[% END %]
24
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc (-12 / +12 lines)
Lines 2-13 Link Here
2
2
3
<optgroup label="Popularity">
3
<optgroup label="Popularity">
4
	
4
	
5
	[% IF ( popularity_dsc ) %]
5
	[% IF ( sort_by == "popularity_dsc" ) %]
6
<option value="popularity_dsc" selected="selected">Popularity (Most to Least)</option>
6
<option value="popularity_dsc" selected="selected">Popularity (Most to Least)</option>
7
[% ELSE %]
7
[% ELSE %]
8
	<option value="popularity_dsc">Popularity (Most to Least)</option>
8
	<option value="popularity_dsc">Popularity (Most to Least)</option>
9
 [% END %]
9
 [% END %]
10
[% IF ( popularity_asc ) %]
10
[% IF ( sort_by == "popularity_asc" ) %]
11
<option value="popularity_asc" selected="selected">Popularity (Least to Most)</option>
11
<option value="popularity_asc" selected="selected">Popularity (Least to Most)</option>
12
[% ELSE %]
12
[% ELSE %]
13
	<option value="popularity_asc">Popularity (Least to Most)</option>
13
	<option value="popularity_asc">Popularity (Least to Most)</option>
Lines 17-28 Link Here
17
17
18
<optgroup label="Author">
18
<optgroup label="Author">
19
	
19
	
20
	[% IF ( author_az ) %]
20
	[% IF ( sort_by == "author_az" || sort_by == "author_asc" ) %]
21
<option value="author_az" selected="selected">Author (A-Z)</option>	
21
<option value="author_az" selected="selected">Author (A-Z)</option>	
22
[% ELSE %]
22
[% ELSE %]
23
<option value="author_az">Author (A-Z)</option>
23
<option value="author_az">Author (A-Z)</option>
24
 [% END %]
24
 [% END %]
25
[% IF ( author_za ) %]
25
[% IF ( sort_by == "author_za" || sort_by == "author_dsc" ) %]
26
<option value="author_za" selected="selected">Author (Z-A)</option>
26
<option value="author_za" selected="selected">Author (Z-A)</option>
27
[% ELSE %]
27
[% ELSE %]
28
<option value="author_za">Author (Z-A)</option>
28
<option value="author_za">Author (Z-A)</option>
Lines 32-44 Link Here
32
32
33
<optgroup label="Call Number">
33
<optgroup label="Call Number">
34
	
34
	
35
	[% IF ( call_number_asc ) %]
35
	[% IF ( sort_by == "call_number_asc" ) %]
36
<option value="call_number_asc" selected="selected">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
36
<option value="call_number_asc" selected="selected">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
37
[% ELSE %]
37
[% ELSE %]
38
	<option value="call_number_asc">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
38
	<option value="call_number_asc">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
39
[% END %]
39
[% END %]
40
40
41
[% IF ( call_number_dsc ) %]
41
[% IF ( sort_by == "call_number_dsc" ) %]
42
<option value="call_number_dsc" selected="selected">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
42
<option value="call_number_dsc" selected="selected">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
43
[% ELSE %]
43
[% ELSE %]
44
	<option value="call_number_dsc">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
44
	<option value="call_number_dsc">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
Lines 47-71 Link Here
47
</optgroup>
47
</optgroup>
48
48
49
<optgroup label="Dates">
49
<optgroup label="Dates">
50
	[% IF ( pubdate_dsc ) %]
50
	[% IF ( sort_by == "pubdate_dsc" ) %]
51
<option value="pubdate_dsc" selected="selected" >Publication/Copyright Date: Newest to Oldest</option>
51
<option value="pubdate_dsc" selected="selected" >Publication/Copyright Date: Newest to Oldest</option>
52
	[% ELSE %]
52
	[% ELSE %]
53
<option value="pubdate_dsc">Publication/Copyright Date: Newest to Oldest</option>
53
<option value="pubdate_dsc">Publication/Copyright Date: Newest to Oldest</option>
54
[% END %]
54
[% END %]
55
55
56
[% IF ( pubdate_asc ) %]
56
[% IF ( sort_by == "pubdate_asc" ) %]
57
<option value="pubdate_asc" selected="selected" >Publication/Copyright Date: Oldest to Newest</option>
57
<option value="pubdate_asc" selected="selected" >Publication/Copyright Date: Oldest to Newest</option>
58
[% ELSE %]
58
[% ELSE %]
59
<option value="pubdate_asc">Publication/Copyright Date: Oldest to Newest</option>
59
<option value="pubdate_asc">Publication/Copyright Date: Oldest to Newest</option>
60
[% END %]
60
[% END %]
61
61
62
[% IF ( acqdate_dsc ) %]
62
[% IF ( sort_by == "acqdate_dsc" ) %]
63
<option value="acqdate_dsc" selected="selected">Acquisition Date: Newest to Oldest</option>
63
<option value="acqdate_dsc" selected="selected">Acquisition Date: Newest to Oldest</option>
64
[% ELSE %]
64
[% ELSE %]
65
<option value="acqdate_dsc">Acquisition Date: Newest to Oldest</option>
65
<option value="acqdate_dsc">Acquisition Date: Newest to Oldest</option>
66
 [% END %]
66
 [% END %]
67
67
68
 [% IF ( acqdate_asc ) %]
68
 [% IF ( sort_by == "acqdate_asc" ) %]
69
<option value="acqdate_asc" selected="selected">Acquisition Date: Oldest to Newest</option>
69
<option value="acqdate_asc" selected="selected">Acquisition Date: Oldest to Newest</option>
70
[% ELSE %]
70
[% ELSE %]
71
<option value="acqdate_asc">Acquisition Date: Oldest to Newest</option>
71
<option value="acqdate_asc">Acquisition Date: Oldest to Newest</option>
Lines 73-84 Link Here
73
</optgroup>
73
</optgroup>
74
74
75
<optgroup label="Title">
75
<optgroup label="Title">
76
	[% IF ( title_az ) %]
76
	[% IF ( sort_by == "title_az" || sort_by == "title_asc" ) %]
77
<option value="title_az" selected="selected">Title (A-Z)</option>
77
<option value="title_az" selected="selected">Title (A-Z)</option>
78
	[% ELSE %]
78
	[% ELSE %]
79
<option value="title_az">Title (A-Z)</option>
79
<option value="title_az">Title (A-Z)</option>
80
	 [% END %]
80
	 [% END %]
81
	[% IF ( title_za ) %]
81
	[% IF ( sort_by == "title_za" || sort_by == "title_dsc" ) %]
82
<option value="title_za" selected="selected">Title (Z-A)</option>	
82
<option value="title_za" selected="selected">Title (Z-A)</option>	
83
	[% ELSE %]
83
	[% ELSE %]
84
<option value="title_za">Title (Z-A)</option>
84
<option value="title_za">Title (Z-A)</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-12 / +11 lines)
Lines 412-418 YAHOO.util.Event.onContentReady("searchheader", function () { Link Here
412
                <table>
412
                <table>
413
                    <tr>
413
                    <tr>
414
                        [% IF ( AmazonEnabled ) %][% IF ( AmazonCoverImages ) %]<th>&nbsp;</th>[% END %][% END %]
414
                        [% IF ( AmazonEnabled ) %][% IF ( AmazonCoverImages ) %]<th>&nbsp;</th>[% END %][% END %]
415
                        <th colspan="2">Results</th>
415
                        <th>Results</th>
416
                        <th>Location</th>
416
                        <th>Location</th>
417
                    </tr>
417
                    </tr>
418
                        <!-- Actual Search Results -->
418
                        <!-- Actual Search Results -->
Lines 491-510 YAHOO.util.Event.onContentReady("searchheader", function () { Link Here
491
                                  <a id="reserve_[% SEARCH_RESULT.biblionumber %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Holds</a>
491
                                  <a id="reserve_[% SEARCH_RESULT.biblionumber %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Holds</a>
492
                                  [% IF ( SEARCH_RESULT.holdfor ) %] | <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]&amp;findborrower=[% SEARCH_RESULT.holdfor_cardnumber %]">Hold for [% SEARCH_RESULT.holdfor_firstname %] [% SEARCH_RESULT.holdfor_surname %] ([% SEARCH_RESULT.holdfor_cardnumber %])</a>[% END %]
492
                                  [% IF ( SEARCH_RESULT.holdfor ) %] | <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]&amp;findborrower=[% SEARCH_RESULT.holdfor_cardnumber %]">Hold for [% SEARCH_RESULT.holdfor_firstname %] [% SEARCH_RESULT.holdfor_surname %] ([% SEARCH_RESULT.holdfor_cardnumber %])</a>[% END %]
493
                              [% END %]
493
                              [% END %]
494
                          [% IF ( SEARCH_RESULT.CAN_user_editcatalogue_edit_catalogue ) %]
494
                          [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
495
                          | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Edit record</a>
495
                          | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Edit record</a>
496
                          [% END %]
496
                          [% END %]
497
                          [% IF ( SEARCH_RESULT.CAN_user_editcatalogue_edit_items ) %]
497
                          [% IF ( CAN_user_editcatalogue_edit_items ) %]
498
                          | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Edit items</a>
498
                          | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Edit items</a>
499
                          [% END %]</p>
499
                          [% END %]</p>
500
                                </td>
500
                                </td>
501
501
502
                                <td><div class="availability">
502
                                <td><div class="availability">
503
                                    [% IF ( SEARCH_RESULT.items_count ) %]<strong>[% SEARCH_RESULT.items_count %]
503
                                    [% IF ( SEARCH_RESULT.items_count ) %]<strong>[% SEARCH_RESULT.items_count %]
504
                                    [% IF ( SEARCH_RESULT.itemsplural ) %]items[% ELSE %]item[% END %][% IF ( SEARCH_RESULT.available_items_loop ) %], [% IF ( SEARCH_RESULT.availablecount ) %][% SEARCH_RESULT.availablecount %] available:[% END %][% ELSE %], None available[% END %]</strong>
504
                                    [% IF ( SEARCH_RESULT.itemsplural ) %]items[% ELSE %]item[% END %][% IF ( SEARCH_RESULT.availablecount ) %], [% SEARCH_RESULT.availablecount %] available:[% ELSE %], None available[% END %]</strong>
505
505
506
                                    [% IF ( SEARCH_RESULT.available_items_loop ) %]
506
                                    [% IF ( SEARCH_RESULT.availablecount ) %]
507
                                    [% IF ( SEARCH_RESULT.availablecount ) %][% SEARCH_RESULT.availablecount %][% END %] available:
507
                                    [% SEARCH_RESULT.availablecount %] available:
508
                                    <ul>
508
                                    <ul>
509
                                    [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %]
509
                                    [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %]
510
510
Lines 516-523 YAHOO.util.Event.onContentReady("searchheader", function () { Link Here
516
                                    [% END %]</ul>
516
                                    [% END %]</ul>
517
                                    [% END %]
517
                                    [% END %]
518
518
519
                                   [% IF ( SEARCH_RESULT.onloan_items_loop ) %]
519
                                   [% IF ( SEARCH_RESULT.onloancount ) %]
520
                                   <span class="status">[% IF ( SEARCH_RESULT.onloancount ) %][% SEARCH_RESULT.onloancount %][% END %] on loan:</span>
520
                                   <span class="status">[% SEARCH_RESULT.onloancount %] on loan:</span>
521
                                    <ul>
521
                                    <ul>
522
                                    [% FOREACH onloan_items_loo IN SEARCH_RESULT.onloan_items_loop %]
522
                                    [% FOREACH onloan_items_loo IN SEARCH_RESULT.onloan_items_loop %]
523
                                       [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %]
523
                                       [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %]
Lines 533-540 YAHOO.util.Event.onContentReady("searchheader", function () { Link Here
533
                                    [% END %]</ul>
533
                                    [% END %]</ul>
534
                                    [% END %]
534
                                    [% END %]
535
535
536
                                    [% IF ( SEARCH_RESULT.other_items_loop ) %]
536
                                    [% IF ( SEARCH_RESULT.othercount ) %]
537
                                    <span class="unavailable">[% IF ( SEARCH_RESULT.othercount ) %][% SEARCH_RESULT.othercount %][% END %] unavailable:</span>
537
                                    <span class="unavailable">[% SEARCH_RESULT.othercount %] unavailable:</span>
538
                                    <ul>
538
                                    <ul>
539
                                    [% FOREACH other_items_loo IN SEARCH_RESULT.other_items_loop %]
539
                                    [% FOREACH other_items_loo IN SEARCH_RESULT.other_items_loop %]
540
                                        [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %]
540
                                        [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %]
Lines 556-562 YAHOO.util.Event.onContentReady("searchheader", function () { Link Here
556
                                    [% END %]</ul>
556
                                    [% END %]</ul>
557
                                    [% END %]
557
                                    [% END %]
558
                                    [% ELSE %]
558
                                    [% ELSE %]
559
                                    [% IF ( SEARCH_RESULT.ALTERNATEHOLDINGS ) %]
559
                                    [% IF ( SEARCH_RESULT.ALTERNATEHOLDINGS.count ) %]
560
                                    <strong id="altholdings_heading">Other holdings:</strong>
560
                                    <strong id="altholdings_heading">Other holdings:</strong>
561
                                    <ul>
561
                                    <ul>
562
                                    [% FOREACH ALTERNATEHOLDING IN SEARCH_RESULT.ALTERNATEHOLDINGS %]
562
                                    [% FOREACH ALTERNATEHOLDING IN SEARCH_RESULT.ALTERNATEHOLDINGS %]
563
- 

Return to bug 5917