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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc (-1 / +1 lines)
Lines 17-23 Link Here
17
                                <option value="[% av.authorised_value | html %]">[% av.lib | html %]</option>
17
                                <option value="[% av.authorised_value | html %]">[% av.lib | html %]</option>
18
                            [% END %]
18
                            [% END %]
19
                        [% END %]
19
                        [% END %]
20
                    </select> (Authorised values for [% field.authorised_value_category | html %])
20
                    </select> <span>(Authorised values for [% field.authorised_value_category | html %])</span>
21
                [% ELSE %]
21
                [% ELSE %]
22
                    [% IF field.marcfield %]
22
                    [% IF field.marcfield %]
23
                        <input type="text" value="[% values.${field.id} | html %]" id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]" readonly="readonly" />
23
                        <input type="text" value="[% values.${field.id} | html %]" id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]" readonly="readonly" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_deletion.inc (-3 / +3 lines)
Lines 28-38 Link Here
28
                <i class="fa fa-exclamation error"></i>
28
                <i class="fa fa-exclamation error"></i>
29
            [% END %]
29
            [% END %]
30
            [% IF m.code == 'authority_not_exists' %]
30
            [% IF m.code == 'authority_not_exists' %]
31
                The authority id [% m.authid | html %] does not exist in the database.
31
                <span>The authority id [% m.authid | html %] does not exist in the database.</span>
32
            [% ELSIF m.code == 'authority_not_deleted' %]
32
            [% ELSIF m.code == 'authority_not_deleted' %]
33
                Authority record [% m.authid | html %] was not deleted. An error occurred.
33
                <span>Authority record [% m.authid | html %] was not deleted. An error occurred.</span>
34
            [% ELSIF m.code == 'authority_deleted' %]
34
            [% ELSIF m.code == 'authority_deleted' %]
35
                Authority [% m.authid | html %] has been deleted successfully.
35
                <span>Authority [% m.authid | html %] has been deleted successfully.</span>
36
            [% END %]
36
            [% END %]
37
        </div>
37
        </div>
38
    [% END %]
38
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc (-2 / +2 lines)
Lines 8-15 Link Here
8
            </div>
8
            </div>
9
        [% ELSE %]
9
        [% ELSE %]
10
            <div class="dialog message">
10
            <div class="dialog message">
11
                [% report.total_success | html %] / [% report.total_records | html %] records have successfully been modified. Some errors occurred.
11
                <span>[% report.total_success | html %] / [% report.total_records | html %] records have successfully been modified. Some errors occurred.</span>
12
                [% IF job.status == 'cancelled' %]The job has been cancelled before it finished.[% END %]
12
                [% IF job.status == 'cancelled' %]<span>The job has been cancelled before it finished.</span>[% END %]
13
                <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a>
13
                <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a>
14
            </div>
14
            </div>
15
        [% END %]
15
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc (-2 / +2 lines)
Lines 9-15 Link Here
9
                    <p>[% report.deleted_biblionumbers.size | html %] record(s) deleted.</p>
9
                    <p>[% report.deleted_biblionumbers.size | html %] record(s) deleted.</p>
10
                [% END %]
10
                [% END %]
11
            [% ELSE %]
11
            [% ELSE %]
12
                No items deleted.
12
                <p>No items deleted.</p>
13
            [% END %]
13
            [% END %]
14
        </div>
14
        </div>
15
15
Lines 21-27 Link Here
21
21
22
        [% IF job.status == 'cancelled' %]
22
        [% IF job.status == 'cancelled' %]
23
            <div class="dialog error">
23
            <div class="dialog error">
24
                The job has been cancelled before it finished.
24
                <span>The job has been cancelled before it finished.</span>
25
                <a href="/cgi-bin/koha/tools/batchMod.pl" title="New batch item modification">New batch item modification</a>
25
                <a href="/cgi-bin/koha/tools/batchMod.pl" title="New batch item modification">New batch item modification</a>
26
            </div>
26
            </div>
27
        [% END %]
27
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc (-1 / +1 lines)
Lines 13-19 Link Here
13
[% IF ( biblio.title ) %]
13
[% IF ( biblio.title ) %]
14
    <span class="biblio-title">[% biblio.title | html %]</span>
14
    <span class="biblio-title">[% biblio.title | html %]</span>
15
[% ELSE %]
15
[% ELSE %]
16
    No title
16
    <span>No title</span>
17
[% END %]
17
[% END %]
18
[% IF ( biblio.medium ) %]
18
[% IF ( biblio.medium ) %]
19
    <span class="biblio-medium">[% biblio.medium | html %]</span>
19
    <span class="biblio-medium">[% biblio.medium | html %]</span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc (-1 / +1 lines)
Lines 3-9 Link Here
3
[% IF fines and fines > 0 %]
3
[% IF fines and fines > 0 %]
4
    <li>
4
    <li>
5
        <span class="circ-hlt">Charges:</span>
5
        <span class="circ-hlt">Charges:</span>
6
        Patron has outstanding charges of [% fines | $Price %].
6
        <span>Patron has outstanding charges of [% fines | $Price %].</span>
7
        [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %]
7
        [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %]
8
           <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
8
           <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
9
        [% END %]
9
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc (-6 / +6 lines)
Lines 31-42 Link Here
31
                            [% END %]
31
                            [% END %]
32
                        </td>
32
                        </td>
33
                        <td>
33
                        <td>
34
			    [% IF d.comment.search('OVERDUES_PROCESS') %]
34
                            [% IF d.comment.search('OVERDUES_PROCESS') %]
35
				Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') | $raw %]
35
                                <span>Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') | $raw %]</span>
36
			    [% ELSE %]
36
                            [% ELSE %]
37
                [% d.comment | $raw %]
37
                                [% d.comment | $raw %]
38
			    [% END %]
38
                            [% END %]
39
			</td>
39
                        </td>
40
                        <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <em>Indefinite</em> [% END %]</td>
40
                        <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <em>Indefinite</em> [% END %]</td>
41
                        <td>[% d.created | $KohaDates %]</td>
41
                        <td>[% d.created | $KohaDates %]</td>
42
                        [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
42
                        [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc (-4 / +4 lines)
Lines 40-55 Link Here
40
                [% UNLESS destination == 'holds' %]
40
                [% UNLESS destination == 'holds' %]
41
                    <td>
41
                    <td>
42
                        [% IF c.club_template.is_enrollable_from_opac %]
42
                        [% IF c.club_template.is_enrollable_from_opac %]
43
                            Yes
43
                            <span>Yes</span>
44
                        [% ELSE %]
44
                        [% ELSE %]
45
                            No
45
                            <span>No</span>
46
                        [% END %]
46
                        [% END %]
47
                    </td>
47
                    </td>
48
                    <td>
48
                    <td>
49
                        [% IF c.club_template.is_email_required %]
49
                        [% IF c.club_template.is_email_required %]
50
                            Yes
50
                            <span>Yes</span>
51
                        [% ELSE %]
51
                        [% ELSE %]
52
                            No
52
                            <span>No</span>
53
                        [% END %]
53
                        [% END %]
54
                    </td>
54
                    </td>
55
                [% END %]
55
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc (-3 / +3 lines)
Lines 148-166 Link Here
148
                            [%- hold.barcodenumber | html -%]
148
                            [%- hold.barcodenumber | html -%]
149
                            <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
149
                            <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
150
                        [%- ELSE -%]
150
                        [%- ELSE -%]
151
                            No barcode
151
                            <span>No barcode</span>
152
                        [%- END -%]
152
                        [%- END -%]
153
                    </a>
153
                    </a>
154
                [%- ELSE -%]
154
                [%- ELSE -%]
155
                    [%- IF ( hold.item_level_hold ) -%]
155
                    [%- IF ( hold.item_level_hold ) -%]
156
                        <em>
156
                        <em>
157
                            Only item
157
                            <span>Only item</span>
158
                            <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% hold.biblionumber | uri %]&amp;itemnumber=[% hold.itemnumber | uri %]#item[% hold.itemnumber | uri %]">
158
                            <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% hold.biblionumber | uri %]&amp;itemnumber=[% hold.itemnumber | uri %]#item[% hold.itemnumber | uri %]">
159
                                [%- IF ( hold.barcodenumber ) -%]
159
                                [%- IF ( hold.barcodenumber ) -%]
160
                                    [%- hold.barcodenumber | html -%]
160
                                    [%- hold.barcodenumber | html -%]
161
                                    <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
161
                                    <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
162
                                [%- ELSE -%]
162
                                [%- ELSE -%]
163
                                    No barcode
163
                                    <span>No barcode</span>
164
                                [%- END -%]
164
                                [%- END -%]
165
                            </a>
165
                            </a>
166
                        </em>
166
                        </em>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc (-1 / +1 lines)
Lines 52-58 Link Here
52
            <li>
52
            <li>
53
                <a href="#tabrecord[% record.recordid | uri %]">
53
                <a href="#tabrecord[% record.recordid | uri %]">
54
                    [% record.recordid | html %]
54
                    [% record.recordid | html %]
55
                    [% IF record.reference %](ref)[% END %]
55
                    [% IF record.reference %]<span>(ref)</span>[% END %]
56
                </a>
56
                </a>
57
            </li>
57
            </li>
58
        [% END %]
58
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc (-11 / +13 lines)
Lines 16-36 Link Here
16
    [% NEXT IF !Koha.Preference( 'ILLModule' ) && messaging_preference.message_name.match('^Ill_') %]
16
    [% NEXT IF !Koha.Preference( 'ILLModule' ) && messaging_preference.message_name.match('^Ill_') %]
17
    [% NEXT IF messaging_preference.Auto_Renewals && Koha.Preference('AutoRenewalNotices') != 'preferences' %]
17
    [% NEXT IF messaging_preference.Auto_Renewals && Koha.Preference('AutoRenewalNotices') != 'preferences' %]
18
    <tr>
18
    <tr>
19
      <td>[% IF ( messaging_preference.Item_Due ) %]Item due
19
      <td>[% IF ( messaging_preference.Item_Due ) %]<span>Item due</span>
20
          [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance notice
20
          [% ELSIF ( messaging_preference.Advance_Notice ) %]<span>Advance notice</span>
21
          [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold filled
21
          [% ELSIF ( messaging_preference.Hold_Filled ) %]<span>Hold filled</span>
22
          [% ELSIF ( messaging_preference.Hold_Reminder ) %]Hold reminder
22
          [% ELSIF ( messaging_preference.Hold_Reminder ) %]<span>Hold reminder</span>
23
          [% ELSIF ( messaging_preference.Item_Check_in ) %]Item check-in
23
          [% ELSIF ( messaging_preference.Item_Check_in ) %]<span>Item check-in</span>
24
          [% ELSIF ( messaging_preference.Item_Checkout ) %]
24
          [% ELSIF ( messaging_preference.Item_Checkout ) %]
25
            [% IF Koha.Preference( 'RenewalSendNotice' ) %]
25
            [% IF Koha.Preference( 'RenewalSendNotice' ) %]
26
                Item checkout and renewal
26
                <span>Item checkout and renewal</span>
27
            [% ELSE %]
27
            [% ELSE %]
28
                Item checkout
28
                <span>Item checkout</span>
29
            [% END %]
29
            [% END %]
30
          [% ELSIF ( messaging_preference.Ill_ready ) %]Interlibrary loan ready
30
          [% ELSIF ( messaging_preference.Ill_ready ) %]<span>Interlibrary loan ready</span>
31
          [% ELSIF ( messaging_preference.Ill_unavailable ) %]Interlibrary loan unavailable
31
          [% ELSIF ( messaging_preference.Ill_unavailable ) %]<span>Interlibrary loan unavailable</span>
32
          [% ELSIF ( messaging_preference.Auto_Renewals ) %]Auto renewal
32
          [% ELSIF ( messaging_preference.Auto_Renewals ) %]<span>Auto renewal</span>
33
          [% ELSE %]Unknown [% END %]</td>
33
          [% ELSE %]<span>Unknown</span>
34
          [% END %]
35
      </td>
34
      [% IF ( messaging_preference.takes_days ) %]
36
      [% IF ( messaging_preference.takes_days ) %]
35
      <td>
37
      <td>
36
          [% IF ( messaging_form_inactive ) %]
38
          [% IF ( messaging_form_inactive ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc (-7 / +11 lines)
Lines 59-65 Link Here
59
                    </td>
59
                    </td>
60
60
61
                    <td class="article-request-toc">
61
                    <td class="article-request-toc">
62
                        [% IF ar.toc_request %]Yes[% END %]
62
                        [% IF ar.toc_request %]<span>Yes</span>[% END %]
63
                    </td>
63
                    </td>
64
64
65
                    <td class="article-request-pages">
65
                    <td class="article-request-pages">
Lines 74-90 Link Here
74
                        [% ar.patron_notes | html %]
74
                        [% ar.patron_notes | html %]
75
                    </td>
75
                    </td>
76
76
77
                    <td class="article-request-format">[% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %]</td>
77
                    <td class="article-request-format">
78
                        [% IF ar.format == 'PHOTOCOPY' %]<span>Copy</span>
79
                        [% ELSIF ar.format == 'SCAN' %]<span>Scan</span>
80
                        [% END %]
81
                    </td>
78
82
79
                    <td class="article-request-status">
83
                    <td class="article-request-status">
80
                        [% IF ar.status == 'PENDING' %]
84
                        [% IF ar.status == 'PENDING' %]
81
                            Pending
85
                            <span>Pending</span>
82
                        [% ELSIF ar.status == 'PROCESSING' %]
86
                        [% ELSIF ar.status == 'PROCESSING' %]
83
                            Processing
87
                            <span>Processing</span>
84
                        [% ELSIF ar.status == 'COMPLETED' %]
88
                        [% ELSIF ar.status == 'COMPLETED' %]
85
                            Completed
89
                            <span>Completed</span>
86
                        [% ELSIF ar.status == 'CANCELED' %]
90
                        [% ELSIF ar.status == 'CANCELED' %]
87
                            Canceled
91
                            <span>Canceled</span>
88
                        [% END %]
92
                        [% END %]
89
                    </td>
93
                    </td>
90
94
Lines 96-101 Link Here
96
        </tbody>
100
        </tbody>
97
    </table>
101
    </table>
98
    [% ELSE %]
102
    [% ELSE %]
99
        Patron has no current article requests.
103
        <span>Patron has no current article requests.</span>
100
    [% END %]
104
    [% END %]
101
</div>
105
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-9 / +10 lines)
Lines 10-25 Link Here
10
                [% IF CAN_user_borrowers_edit_borrowers && ( !Koha.Preference('IndependentBranchesPatronModifications') || borrower.branch == branch ) %]
10
                [% IF CAN_user_borrowers_edit_borrowers && ( !Koha.Preference('IndependentBranchesPatronModifications') || borrower.branch == branch ) %]
11
                    <a href="/cgi-bin/koha/members/members-update.pl?active=[% patron.borrowernumber | uri %]">Review pending modifications</a>
11
                    <a href="/cgi-bin/koha/members/members-update.pl?active=[% patron.borrowernumber | uri %]">Review pending modifications</a>
12
                [% ELSE %]
12
                [% ELSE %]
13
                    Patron has pending modifications
13
                    <span>Patron has pending modifications</span>
14
                [% END %]
14
                [% END %]
15
            </li>
15
            </li>
16
        [% END %]
16
        [% END %]
17
17
18
        [% IF ( warndeparture ) %]
18
        [% IF ( warndeparture ) %]
19
            <li class="warndeparture">
19
            <li class="warndeparture">
20
                <span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
20
                <span class="circ-hlt">Expiration:</span>
21
                Patron's card expires on [% expiry | $KohaDates %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]">Edit details</a>
21
                <span>Patron's card will expire soon.</span>
22
22
                <span>Patron's card expires on [% expiry | $KohaDates %]</span>
23
                <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]">Edit details</a>
23
            </li>
24
            </li>
24
        [% END %]
25
        [% END %]
25
26
Lines 31-39 Link Here
31
32
32
        [% IF ( expired ) %]
33
        [% IF ( expired ) %]
33
            <li class="expired">
34
            <li class="expired">
34
                <span class="circ-hlt">Expiration:</span> Patron's card has expired.
35
                <span class="circ-hlt">Expiration:</span>
36
                <span>Patron's card has expired.</span>
35
                [% IF ( expiry ) %]
37
                [% IF ( expiry ) %]
36
                    Patron's card expired on [% expiry | $KohaDates %]
38
                    <span>Patron's card expired on [% expiry | $KohaDates %]</span>
37
                [% END %]
39
                [% END %]
38
                <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]">Edit details</a>
40
                <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]">Edit details</a>
39
            </li>
41
            </li>
Lines 150-156 Link Here
150
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
152
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
151
                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
153
                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
152
                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
154
                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
153
                            Hold placed on [% w.reservedate | $KohaDates %].
155
                            <span>Hold placed on [% w.reservedate | $KohaDates %].</span>
154
                            <br />
156
                            <br />
155
                            <strong class="waitinghere">
157
                            <strong class="waitinghere">
156
                                [% SET expires_on = w.expirationdate %]
158
                                [% SET expires_on = w.expirationdate %]
Lines 172-178 Link Here
172
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
174
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
173
                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
175
                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
174
                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
176
                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
175
                            Hold placed on [% w.reservedate | $KohaDates %].
177
                            <span>Hold placed on [% w.reservedate | $KohaDates %].</span>
176
                            <br />
178
                            <br />
177
                            <strong>
179
                            <strong>
178
                                [% SET expires_on = w.expirationdate %]
180
                                [% SET expires_on = w.expirationdate %]
179
- 

Return to bug 29602