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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc (-19 / +9 lines)
Lines 1-11 Link Here
1
[% BLOCK showreference %]
1
[% BLOCK showreference %]
2
[%#
2
[%# Parameters: %]
3
    Parameters:
3
[%# heading: the heading itself %]
4
    heading: the heading itself
4
[%# linkType: currently 'seefrom' or 'seealso', controls the label for the entry type: %]
5
    linkType: currently 'seefrom' or 'seealso', controls the label for the entry
5
[%# authid: if it is a linked authority, its authid %]
6
    type:
6
7
    authid: if it is a linked authority, its authid
8
%]
9
    [% SET authidurl = '/cgi-bin/koha/authorities/detail.pl?authid=' %]
7
    [% SET authidurl = '/cgi-bin/koha/authorities/detail.pl?authid=' %]
10
    [% SET searchurl = '/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&marclist=any&operator=contains&orderby=HeadingAsc&value=' %]
8
    [% SET searchurl = '/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&marclist=any&operator=contains&orderby=HeadingAsc&value=' %]
11
9
Lines 102-113 Link Here
102
                <span class="seefrom">used for/see from:</span>
100
                <span class="seefrom">used for/see from:</span>
103
                [% FOREACH seefro IN summary.seefrom %]
101
                [% FOREACH seefro IN summary.seefrom %]
104
                    <div class="authref">
102
                    <div class="authref">
105
                    [% PROCESS showreference
103
                    [%# Following on one line for translatability %]
106
                        heading=seefro.heading
104
                    [% PROCESS showreference heading=seefro.heading linkType='seefrom' type=seefro.type authid=seefro.authid %]
107
                        linkType='seefrom'
108
                        type=seefro.type
109
                        authid=seefro.authid
110
                    %]
111
                    </div>
105
                    </div>
112
                [% END %]
106
                [% END %]
113
            </div>
107
            </div>
Lines 117-128 Link Here
117
                <span class="seealso">see also:</span>
111
                <span class="seealso">see also:</span>
118
                [% FOREACH seeals IN summary.seealso %]
112
                [% FOREACH seeals IN summary.seealso %]
119
                    <div class="authref">
113
                    <div class="authref">
120
                    [% PROCESS showreference
114
                    [%# Following on one line for translatability %]
121
                        heading=seeals.heading
115
                    [% PROCESS showreference heading=seeals.heading linkType='seealso' type=seeals.type authid=seeals.authid %]
122
                        linkType='seealso'
123
                        type=seeals.type
124
                        authid=seeals.authid
125
                    %]
126
                    </div>
116
                    </div>
127
                [% END %]
117
                [% END %]
128
            </div>
118
            </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-2 / +1 lines)
Lines 69-76 Link Here
69
<ul>
69
<ul>
70
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
70
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
71
        [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check out</a></li>
71
        [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check out</a></li>
72
        [% IF Koha.Preference('BatchCheckouts') &&
72
        [% IF Koha.Preference('BatchCheckouts') && Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ categorycode _ '$').size > 0 %]
73
              Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ categorycode _ '$').size > 0 %]
74
          [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]&amp;batch=1">Batch check out</a></li>
73
          [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]&amp;batch=1">Batch check out</a></li>
75
        [% END %]
74
        [% END %]
76
    [% END %]
75
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc (-8 / +6 lines)
Lines 40-54 Link Here
40
    [% END %]
40
    [% END %]
41
    <option value="pb">Publisher</option>
41
    <option value="pb">Publisher</option>
42
    <option value="pl">Publisher location</option>
42
    <option value="pl">Publisher location</option>
43
    [%#
44
        Use non-normalized st-year instead of st-numeric,
45
        since pubdate can include 'u' to signify unkown
46
        dates. See "Legal Characters" at:
47
        http://www.loc.gov/marc/bibliographic/bd008a.html
48
43
49
        This search is also for date ranges due to the
44
    [%# Use non-normalized st-year instead of st-numeric, %]
50
        special Zebra r=r CCL mapping for 'yr'
45
    [%# since pubdate can include 'u' to signify unkown %]
51
    %]
46
    [%# dates. See "Legal Characters" at: %]
47
    [%# http://www.loc.gov/marc/bibliographic/bd008a.html %]
48
    [%# This search is also for date ranges due to the %]
49
    [%# special Zebra r=r CCL mapping for 'yr' %]
52
    <option value="yr,st-year">Publication date (yyyy-yyyy)</option>
50
    <option value="yr,st-year">Publication date (yyyy-yyyy)</option>
53
    <option value="acqdate,st-date-normalized">Acquisition date (yyyy-mm-dd)</option>
51
    <option value="acqdate,st-date-normalized">Acquisition date (yyyy-mm-dd)</option>
54
</select>
52
</select>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt (-4 / +2 lines)
Lines 39-46 $(document).ready(function() { Link Here
39
        <h4>Checked out [% total %] times</h4>
39
        <h4>Checked out [% total %] times</h4>
40
        <table id="table_issues">
40
        <table id="table_issues">
41
            <thead><tr>
41
            <thead><tr>
42
            [% IF Koha.Preference('intranetreadinghistory')
42
            [% IF Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %]
43
              AND CAN_user_circulate_circulate_remaining_permissions %]
44
            <th>Patron</th>
43
            <th>Patron</th>
45
            [% END %]
44
            [% END %]
46
            <th>Barcode</th>
45
            <th>Barcode</th>
Lines 53-60 $(document).ready(function() { Link Here
53
            <tbody>
52
            <tbody>
54
        [% FOREACH issue IN issues %]
53
        [% FOREACH issue IN issues %]
55
            <tr>
54
            <tr>
56
                [% IF Koha.Preference('intranetreadinghistory')
55
                [% IF Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %]
57
                  AND CAN_user_circulate_circulate_remaining_permissions %]
58
                <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% issue.borrowernumber %]">[% IF HidePatronName %][% issue.cardnumber %][% ELSE %][% issue.surname %][% IF ( issue.firstname ) %], [% issue.firstname %][% END %][% END %]</a></td>
56
                <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% issue.borrowernumber %]">[% IF HidePatronName %][% issue.cardnumber %][% ELSE %][% issue.surname %][% IF ( issue.firstname ) %], [% issue.firstname %][% END %][% END %]</a></td>
59
                [% END %]
57
                [% END %]
60
                <td>[% IF ( issue.barcode ) %]
58
                <td>[% IF ( issue.barcode ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-7 / +2 lines)
Lines 107-119 Link Here
107
        </div><!-- /yui-u -->
107
        </div><!-- /yui-u -->
108
</div><!-- /yui-g -->
108
</div><!-- /yui-g -->
109
<div class="yui-g">
109
<div class="yui-g">
110
            [% IF ( ( CAN_user_tools_moderate_comments  && pendingcomments ) 
110
            [%# Following statment must be in one line for translatability %]
111
                    || ( CAN_user_tools_moderate_tags && pendingtags )
111
            [% IF ( ( CAN_user_tools_moderate_comments  && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers && pending_borrower_modifications ) || ( CAN_user_acquisition && pendingsuggestions ) || ( CAN_user_borrowers && pending_discharge_requests ) || pending_article_requests) %]
112
                    || ( CAN_user_borrowers && pending_borrower_modifications )
113
                    || ( CAN_user_acquisition && pendingsuggestions )
114
                    || ( CAN_user_borrowers && pending_discharge_requests )
115
                    || pending_article_requests
116
            ) %]
117
                <div id="area-pending">
112
                <div id="area-pending">
118
                    [% IF pending_article_requests %]
113
                    [% IF pending_article_requests %]
119
                    <div class="pending-info" id="article_requests_pending">
114
                    <div class="pending-info" id="article_requests_pending">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt (-3 / +1 lines)
Lines 114-121 Link Here
114
                                        <label for="ignore_modify_[% pm.borrowernumber %]">Ignore</label>
114
                                        <label for="ignore_modify_[% pm.borrowernumber %]">Ignore</label>
115
                                        | <a target="_blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% pm.borrowernumber %]" >Patron details</a>
115
                                        | <a target="_blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% pm.borrowernumber %]" >Patron details</a>
116
                                    </div>
116
                                    </div>
117
                                  [% IF !pm.extended_attributes and pm.size > 3 or
117
                                  [% IF !pm.extended_attributes and pm.size > 3 or pm.extended_attributes and pm.size > 4 %]
118
                                         pm.extended_attributes and pm.size > 4  %]
119
                                  [%# timestamp+verification_token+borrowernumber=3 %]
118
                                  [%# timestamp+verification_token+borrowernumber=3 %]
120
                                    <div class="members-update-table">
119
                                    <div class="members-update-table">
121
                                        <table>
120
                                        <table>
122
- 

Return to bug 18703