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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-1 / +1 lines)
Lines 351-357 Link Here
351
                [% IF subscription %]
351
                [% IF subscription %]
352
                    <br/>
352
                    <br/>
353
                    <div class="hint">
353
                    <div class="hint">
354
                        <span>Frequency: [% subscription.frequency.description | html %]</span> |
354
                        <span>Frequency:</span> [% subscription.frequency.description | html %] |
355
                        [% IF subscription.numberlength %]<span>Number of issues: [% subscription.numberlength | html %]</span>[% END %]
355
                        [% IF subscription.numberlength %]<span>Number of issues: [% subscription.numberlength | html %]</span>[% END %]
356
                        [% IF subscription.weeklength   %]<span>Number of weeks: [% subscription.weeklength | html %]</span>[% END %]
356
                        [% IF subscription.weeklength   %]<span>Number of weeks: [% subscription.weeklength | html %]</span>[% END %]
357
                        [% IF subscription.monthlength  %]<span>Number of months: [% subscription.monthlength | html %]</span>[% END %]
357
                        [% IF subscription.monthlength  %]<span>Number of months: [% subscription.monthlength | html %]</span>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt (-7 / +7 lines)
Lines 398-415 Link Here
398
                                            [% IF loo.tab == -1 %]
398
                                            [% IF loo.tab == -1 %]
399
                                                <em>subfield ignored</em>
399
                                                <em>subfield ignored</em>
400
                                            [% ELSE %]
400
                                            [% ELSE %]
401
                                                <span>Tab:[% loo.tab | html %]</span>,
401
                                                <span>Tab:</span>[% loo.tab | html %],
402
                                                [% IF ( loo.kohafield ) %] | <span>Koha field: [% loo.kohafield | html %]</span>, [% END %]
402
                                                [% IF ( loo.kohafield ) %] | <span>Koha field:</span> [% loo.kohafield | html %], [% END %]
403
                                                [% IF ( loo.repeatable ) %]<span>Repeatable</span>, [% ELSE %]<span>Not repeatable</span>,[% END %]
403
                                                [% IF ( loo.repeatable ) %]<span>Repeatable</span>, [% ELSE %]<span>Not repeatable</span>,[% END %]
404
                                                [% IF ( loo.mandatory ) %]<span>Mandatory</span>, [% ELSE %]<span>Not mandatory</span>,[% END %]
404
                                                [% IF ( loo.mandatory ) %]<span>Mandatory</span>, [% ELSE %]<span>Not mandatory</span>,[% END %]
405
                                                [% IF ( loo.important ) %]<span>Important</span>, [% ELSE %]<span>Not important</span>,[% END %]
405
                                                [% IF ( loo.important ) %]<span>Important</span>, [% ELSE %]<span>Not important</span>,[% END %]
406
                                                [% IF ( loo.seealso ) %] | <span>See also: [% loo.seealso | html %]</span>,[% END %]
406
                                                [% IF ( loo.seealso ) %] | <span>See also:</span> [% loo.seealso | html %],[% END %]
407
                                                [% IF ( loo.hidden ) %]<span>hidden</span>,[% END %]
407
                                                [% IF ( loo.hidden ) %]<span>hidden</span>,[% END %]
408
                                                [% IF ( loo.isurl ) %]<span>is a URL</span>,[% END %]
408
                                                [% IF ( loo.isurl ) %]<span>is a URL</span>,[% END %]
409
                                                [% IF ( loo.authorised_value ) %] | <span>Auth value:[% loo.authorised_value | html %]</span>,[% END %]
409
                                                [% IF ( loo.authorised_value ) %] | <span>Auth value:</span>[% loo.authorised_value | html %],[% END %]
410
                                                [% IF ( loo.authtypecode ) %] | <span>Authority:[% loo.authtypecode | html %]</span>,[% END %]
410
                                                [% IF ( loo.authtypecode ) %] | <span>Authority:</span>[% loo.authtypecode | html %],[% END %]
411
                                                [% IF ( loo.value_builder ) %] | <span>Plugin:[% loo.value_builder | html %]</span>,[% END %]
411
                                                [% IF ( loo.value_builder ) %] | <span>Plugin:</span>[% loo.value_builder | html %],[% END %]
412
                                                [% IF ( loo.link ) %] | <span>Link:[% loo.link | html %]</span>,[% END %]
412
                                                [% IF ( loo.link ) %] | <span>Link:</span>[% loo.link | html %],[% END %]
413
                                            [% END %]
413
                                            [% END %]
414
                                        </td>
414
                                        </td>
415
                                        <td class="actions">
415
                                        <td class="actions">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt (-1 / +1 lines)
Lines 277-283 MARC frameworks &rsaquo; Administration &rsaquo; Koha Link Here
277
                [% FOREACH subfield IN loo.subfields %]
277
                [% FOREACH subfield IN loo.subfields %]
278
                    <p>
278
                    <p>
279
                        <span>Tab:[% subfield.tab | html %]</span> | $[% subfield.tagsubfield | html %]
279
                        <span>Tab:[% subfield.tab | html %]</span> | $[% subfield.tagsubfield | html %]
280
                        [% subfield.liblibrarian | html %] [% IF ( subfield.kohafield ) %][% subfield.kohafield | html %][% END %][% IF ( subfield.repeatable ) %], <span>repeatable</span>[% END %][% IF ( subfield.mandatory ) %], <span>Mandatory</span>[% END %][% IF ( subfield.seealso ) %], <span>See</span> [% subfield.seealso | html %][% END %][% IF ( subfield.authorised_value ) %], [% subfield.authorised_value | html %][% END %][% IF ( subfield.authtypecode ) %], [% subfield.authtypecode | html %][% END %][% IF ( subfield.value_builder ) %], [% subfield.value_builder | html %][% END %]
280
                        [% subfield.liblibrarian | html %] [% IF ( subfield.kohafield ) %][% subfield.kohafield | html %][% END %][% IF ( subfield.repeatable ) %], <span>repeatable</span>[% END %][% IF ( subfield.mandatory ) %], <span>Mandatory</span>[% END %][% IF ( subfield.seealso ) %], <span>See [% subfield.seealso | html %]</span>[% END %][% IF ( subfield.authorised_value ) %], [% subfield.authorised_value | html %][% END %][% IF ( subfield.authtypecode ) %], [% subfield.authtypecode | html %][% END %][% IF ( subfield.value_builder ) %], [% subfield.value_builder | html %][% END %]
281
                    </p>
281
                    </p>
282
                [% END %]
282
                [% END %]
283
            [% END %]
283
            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt (-1 / +1 lines)
Lines 38-44 Your cart Link Here
38
38
39
            <p>
39
            <p>
40
            [% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
40
            [% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
41
            <span><span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% END %]</span>
41
            <span><span>Author(s):</span> [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% END %]
42
42
43
            [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
43
            [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
44
                [% IF ( BIBLIO_RESULT.author ) %]; [% END %]
44
                [% IF ( BIBLIO_RESULT.author ) %]; [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-2 / +3 lines)
Lines 518-529 Note that permanent location is a code, and location may be an authval. Link Here
518
                            [% IF item.recall.waiting_date %]
518
                            [% IF item.recall.waiting_date %]
519
                                <span>Waiting at [% Branches.GetName( item.recall.pickup_library_id ) | html %] since [% item.recall.waiting_date | $KohaDates %]</span>
519
                                <span>Waiting at [% Branches.GetName( item.recall.pickup_library_id ) | html %] since [% item.recall.waiting_date | $KohaDates %]</span>
520
                            [% ELSE %]
520
                            [% ELSE %]
521
                                <span>Item recalled by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.recall.patron_id | uri %]">[% item.recall.patron.firstname | html %] [% item.recall.patron.surname | html %] ([% item.recall.patron.cardnumber | html %])</a> on [% item.recall.created_date | $KohaDates %]</span>
521
                                [% patron_link = BLOCK %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.recall.patron_id | uri %]">[% item.recall.patron.firstname | html %] [% item.recall.patron.surname | html %] ([% item.recall.patron.cardnumber | html %])</a>[% END %]
522
                                <span>Item recalled by [% patron_link| $raw %] on [% item.recall.created_date | $KohaDates %]</span>
522
                            [% END %]
523
                            [% END %]
523
                        [% END %]
524
                        [% END %]
524
525
525
                        [% UNLESS ( item.itemnotforloan || item.notforloan_per_itemtype || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfertwhen || hold || item.recalled ) %]
526
                        [% UNLESS ( item.itemnotforloan || item.notforloan_per_itemtype || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfertwhen || hold || item.recalled ) %]
526
                            Available
527
                            <span>Available</span>
527
                        [% END %]
528
                        [% END %]
528
529
529
                        [% IF ( item.restricted ) %]
530
                        [% IF ( item.restricted ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (-2 / +2 lines)
Lines 119-126 Link Here
119
            <ol class="bibliodetails">
119
            <ol class="bibliodetails">
120
            <li><span class="label">Current library:</span> [% Branches.GetName( ITEM_DAT.holdingbranch ) | html %]&nbsp;</li>
120
            <li><span class="label">Current library:</span> [% Branches.GetName( ITEM_DAT.holdingbranch ) | html %]&nbsp;</li>
121
            <li><span class="label">Checkout status:</span>
121
            <li><span class="label">Checkout status:</span>
122
            [% IF ( ITEM_DAT.issue ) %]<span>Checked out to</span>
122
            [% IF ( ITEM_DAT.issue ) %]<span>Checked out to
123
                [% INCLUDE 'patron-title.inc' patron => ITEM_DAT.patron hide_patron_infos_if_needed=1 %]
123
                [% INCLUDE 'patron-title.inc' patron => ITEM_DAT.patron hide_patron_infos_if_needed=1 %]</span>
124
                [% IF ( ITEM_DAT.lastreneweddate ) %]
124
                [% IF ( ITEM_DAT.lastreneweddate ) %]
125
                    <span>Last renewed [% ITEM_DAT.lastreneweddate | $KohaDates %]</span>,
125
                    <span>Last renewed [% ITEM_DAT.lastreneweddate | $KohaDates %]</span>,
126
                [% END %]
126
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt (-1 / +1 lines)
Lines 54-60 Link Here
54
                                  <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=marc21_linking_section.pl&amp;index=[% index | html %]&amp;startfrom=[% startfromnext | html %]&amp;search=[% search | html %]&amp;resultsperpage=[% resultsperpage | html %]&amp;type=intranet&amp;op=do_search">Next&gt;&gt;</a>
54
                                  <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=marc21_linking_section.pl&amp;index=[% index | html %]&amp;startfrom=[% startfromnext | html %]&amp;search=[% search | html %]&amp;resultsperpage=[% resultsperpage | html %]&amp;type=intranet&amp;op=do_search">Next&gt;&gt;</a>
55
                                [% END %]</p>
55
                                [% END %]</p>
56
                  <p class="resultcount">
56
                  <p class="resultcount">
57
                          [% IF ( total ) %]Results [% from | html %] to [% to | html %] of [% total | html %]
57
                          [% IF ( total ) %]<span>Results [% from | html %] to [% to | html %] of [% total | html %]</span>
58
                          [% ELSE %]<span>No results found</span>
58
                          [% ELSE %]<span>No results found</span>
59
                          [% END %]</p></div>
59
                          [% END %]</p></div>
60
            <div id="resultlist">
60
            <div id="resultlist">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt (-1 / +1 lines)
Lines 52-58 Link Here
52
                                  <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=[% index | html %]&amp;startfrom=[% startfromnext | html %]&amp;search=[% search |uri %]&amp;resultsperpage=[% resultsperpage | html %]&amp;type=intranet&amp;op=do_search">Next&gt;&gt;</a>
52
                                  <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=[% index | html %]&amp;startfrom=[% startfromnext | html %]&amp;search=[% search |uri %]&amp;resultsperpage=[% resultsperpage | html %]&amp;type=intranet&amp;op=do_search">Next&gt;&gt;</a>
53
                                [% END %]</p>
53
                                [% END %]</p>
54
			<p class="resultcount">
54
			<p class="resultcount">
55
                          [% IF ( total ) %]Results [% from | html %] to [% to | html %] of [% total | html %]
55
                          [% IF ( total ) %]<span>Results [% from | html %] to [% to | html %] of [% total | html %]</span>
56
                          [% ELSE %]<span>No results found</span>
56
                          [% ELSE %]<span>No results found</span>
57
                          [% END %]</p></div>
57
                          [% END %]</p></div>
58
		<div id="resultlist">
58
		<div id="resultlist">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt (-3 / +3 lines)
Lines 42-54 Link Here
42
    <table>
42
    <table>
43
        <caption>
43
        <caption>
44
            [% IF ( reserved ) %]
44
            [% IF ( reserved ) %]
45
                Hold found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
45
                <span>Hold found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %]</span> (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
46
            [% END %]
46
            [% END %]
47
            [% IF ( waiting ) %]
47
            [% IF ( waiting ) %]
48
                Item is marked waiting at [% branchname | html %] for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
48
                <span>Item is marked waiting at [% branchname | html %] for [% name | html %]</span> (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
49
            [% END %]
49
            [% END %]
50
            [% IF ( transferred ) %]
50
            [% IF ( transferred ) %]
51
                Item has been trapped to fill a hold and is in transit for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
51
                <span>Item has been trapped to fill a hold and is in transit for [% name | html %]</span> (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
52
            [% END %]
52
            [% END %]
53
        </caption>
53
        </caption>
54
        <tr>
54
        <tr>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (-2 / +3 lines)
Lines 113-124 Link Here
113
                            [% ELSE %]
113
                            [% ELSE %]
114
                                [% IF ( HOLD.is_in_transit ) %]
114
                                [% IF ( HOLD.is_in_transit ) %]
115
                                    [% SET transfer = HOLD.item.get_transfer %]
115
                                    [% SET transfer = HOLD.item.get_transfer %]
116
                                    <span>Item in transit from <strong> [% Branches.GetName( transfer.frombranch ) | html %]</strong> since</span>
116
                                    [% branch_name = BLOCK %]<strong>[% Branches.GetName( transfer.frombranch ) | html %]</strong>[% END %]
117
                                    <span>Item in transit from [% branch_name| $raw %] since</span>
117
                                    [% transfer.datesent | $KohaDates %]
118
                                    [% transfer.datesent | $KohaDates %]
118
                                [% ELSIF ( HOLD.is_in_processing ) %]
119
                                [% ELSIF ( HOLD.is_in_processing ) %]
119
                                    <span>Item in processing</span>
120
                                    <span>Item in processing</span>
120
                                [% ELSIF ( HOLD.suspend ) %]
121
                                [% ELSIF ( HOLD.suspend ) %]
121
                                    <span>Suspended [% IF ( HOLD.suspend_until ) %] until [% HOLD.suspend_until | $KohaDates %] [% END %]</span>
122
                                    <span>Suspended</span>[% IF ( HOLD.suspend_until ) %] <span>until</span> [% HOLD.suspend_until | $KohaDates %][% END %]
122
                                [% ELSE %]
123
                                [% ELSE %]
123
                                    [% IF HOLD.itemtype %]
124
                                    [% IF HOLD.itemtype %]
124
                                        <span>Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]'</span>
125
                                        <span>Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]'</span>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt (-2 / +2 lines)
Lines 142-150 Link Here
142
                                                        [% IF ( item.recall ) %]
142
                                                        [% IF ( item.recall ) %]
143
                                                            <span class="waiting">
143
                                                            <span class="waiting">
144
                                                            [% IF ( item.recall.waitingdate ) %]
144
                                                            [% IF ( item.recall.waitingdate ) %]
145
                                                                <span>Waiting for patron at</span> [% Branches.GetName( item.recall.branchcode ) | html %] <span>since</span> [% item.recall.waitingdate | $KohaDates %].
145
                                                                <span>Waiting for patron at [% Branches.GetName( item.recall.branchcode ) | html %]</span> <span>since</span> [% item.recall.waitingdate | $KohaDates %].
146
                                                            [% ELSE %]
146
                                                            [% ELSE %]
147
                                                                <span>Recalled by patron expected at</span> [% Branches.GetName( item.recall.branchcode ) | html %] <span>since</span> [% item.recall.recalldate | $KohaDates %].
147
                                                                <span>Recalled by patron expected at [% Branches.GetName( item.recall.branchcode ) | html %]</span> <span>since</span> [% item.recall.recalldate | $KohaDates %].
148
                                                            [% END %]
148
                                                            [% END %]
149
                                                            </span>
149
                                                            </span>
150
                                                        [% ELSIF ( hold.waitingdate ) %]
150
                                                        [% ELSIF ( hold.waitingdate ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt (-2 / +1 lines)
Lines 50-56 Link Here
50
                                        [% CASE 'invalid_credentials' %]
50
                                        [% CASE 'invalid_credentials' %]
51
                                            <span>You entered an incorrect username or password. Please try again! But note that passwords are case sensitive[% IF Koha.Preference('FailedLoginAttempts') %] and that your account will be locked out after a fixed number of failed login attempts[% END %]. Please contact a library staff member if you continue to have problems.</span>
51
                                            <span>You entered an incorrect username or password. Please try again! But note that passwords are case sensitive[% IF Koha.Preference('FailedLoginAttempts') %] and that your account will be locked out after a fixed number of failed login attempts[% END %]. Please contact a library staff member if you continue to have problems.</span>
52
                                        [% CASE 'no_expire' %]
52
                                        [% CASE 'no_expire' %]
53
                                            Please log-in to account to update your password.</br>
53
                                            <span>Please log-in to account to update your password.</span></br>
54
                                            <a href="/cgi-bin/koha/opac-user.pl" class="nav-link login-link loginModal-trigger"><i class="fa fa-user fa-icon-black fa-fw" aria-hidden="true"></i> <span class="userlabel">Log in to your account</span></a>.
54
                                            <a href="/cgi-bin/koha/opac-user.pl" class="nav-link login-link loginModal-trigger"><i class="fa fa-user fa-icon-black fa-fw" aria-hidden="true"></i> <span class="userlabel">Log in to your account</span></a>.
55
                                        [% CASE 'account_locked' %]
55
                                        [% CASE 'account_locked' %]
56
                                            This account has been locked!
56
                                            This account has been locked!
57
- 

Return to bug 30733