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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc (-7 / +7 lines)
Lines 12-24 Link Here
12
            <input type="submit" class="submit" value="Search" />
12
            <input type="submit" class="submit" value="Search" />
13
          </form>
13
          </form>
14
        </li>
14
        </li>
15
        <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">From a suggestion</a></li>
15
        <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a suggestion</a></li>
16
        <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">From a subscription</a></li>
16
        <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a subscription</a></li>
17
        <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">From a new (empty) record</a></li>
17
        <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a new (empty) record</a></li>
18
        <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">From an external source</a></li>
18
        <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From an external source</a></li>
19
        <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basketno | html %]&amp;booksellerid=[% booksellerid | html %]"> From a new file</a></li>
19
        <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"> From a new file</a></li>
20
        <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]"> From a staged file</a></li>
20
        <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]"> From a staged file</a></li>
21
        [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">From titles with highest hold ratios</a></li>[% END %]
21
        [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From titles with highest hold ratios</a></li>[% END %]
22
      </ul>
22
      </ul>
23
    [% ELSE %]
23
    [% ELSE %]
24
        <div class="dialog alert">
24
        <div class="dialog alert">
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc (-2 / +2 lines)
Lines 16-25 function confirm_deletion() { Link Here
16
        </a>
16
        </a>
17
        <ul class="dropdown-menu">
17
        <ul class="dropdown-menu">
18
            [% IF CAN_user_acquisition_order_manage && active %]
18
            [% IF CAN_user_acquisition_order_manage && active %]
19
                <li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid | html %]&amp;op=add_form">Basket</a></li>
19
                <li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid | uri %]&amp;op=add_form">Basket</a></li>
20
            [% END %]
20
            [% END %]
21
            [% IF CAN_user_acquisition_contracts_manage && active %]
21
            [% IF CAN_user_acquisition_contracts_manage && active %]
22
                <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid | html %]">Contract</a></li>
22
                <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid | uri %]">Contract</a></li>
23
            [% END %]
23
            [% END %]
24
            [% IF ( CAN_user_acquisition_vendors_manage ) %]
24
            [% IF ( CAN_user_acquisition_vendors_manage ) %]
25
                <li><a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Vendor</a></li>
25
                <li><a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Vendor</a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc (-1 / +1 lines)
Lines 30-36 Link Here
30
            [% IF ( authid ) %]
30
            [% IF ( authid ) %]
31
            <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
31
            <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
32
            [% ELSE %]
32
            [% ELSE %]
33
            <a href="[% searchurl | url %][% heading | html %]">[% heading | html %]</a>
33
            <a href="[% searchurl | url %][% heading | uri %]">[% heading | html %]</a>
34
            [% END %]
34
            [% END %]
35
        [% ELSE %]
35
        [% ELSE %]
36
            [% heading | html %]
36
            [% heading | html %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc (-5 / +5 lines)
Lines 14-20 Link Here
14
                        <li role="separator" class="divider"></li>
14
                        <li role="separator" class="divider"></li>
15
                    [% END %]
15
                    [% END %]
16
                    [% FOREACH authority_type IN authority_types %]
16
                    [% FOREACH authority_type IN authority_types %]
17
                        <li><a href="/cgi-bin/koha/authorities/authorities.pl?authtypecode=[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</a></li>
17
                        <li><a href="/cgi-bin/koha/authorities/authorities.pl?authtypecode=[% authority_type.authtypecode | uri %]">[% authority_type.authtypetext | html %]</a></li>
18
                    [% END %]
18
                    [% END %]
19
                </ul>
19
                </ul>
20
            </div>
20
            </div>
Lines 44-53 Link Here
44
                <span class="caret"></span>
44
                <span class="caret"></span>
45
                </a>
45
                </a>
46
                <ul class="dropdown-menu">
46
                <ul class="dropdown-menu">
47
                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=mads&amp;op=export&amp;authid=[% authid | html %]">MADS (XML)</a></li>
47
                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=mads&amp;op=export&amp;authid=[% authid | uri %]">MADS (XML)</a></li>
48
                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=marcxml&amp;op=export&amp;authid=[% authid | html %]">MARCXML</a></li>
48
                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=marcxml&amp;op=export&amp;authid=[% authid | uri %]">MARCXML</a></li>
49
                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=marc8&amp;op=export&amp;authid=[% authid | html %]">MARC (non-Unicode/MARC-8)</a></li>
49
                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=marc8&amp;op=export&amp;authid=[% authid | uri %]">MARC (non-Unicode/MARC-8)</a></li>
50
                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=utf8&amp;op=export&amp;authid=[% authid | html %]">MARC (Unicode/UTF-8)</a></li>
50
                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=utf8&amp;op=export&amp;authid=[% authid | uri %]">MARC (Unicode/UTF-8)</a></li>
51
                </ul>
51
                </ul>
52
            </div>
52
            </div>
53
        [% END %]
53
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc (-1 / +1 lines)
Lines 10-16 Link Here
10
            [% IF ( node.current_value ) %]
10
            [% IF ( node.current_value ) %]
11
                <span class='currentauth'>[% node.value | html %]</span>
11
                <span class='currentauth'>[% node.value | html %]</span>
12
            [% ELSE %]
12
            [% ELSE %]
13
                <a href="detail.pl?authid=[% node.authid | html %]" title="Term">[% node.value | html %]</a>
13
                <a href="detail.pl?authid=[% node.authid | uri %]" title="Term">[% node.value | html %]</a>
14
            [% END %]
14
            [% END %]
15
            [% IF ( node.children && node.children.size > 0 ) %]
15
            [% IF ( node.children && node.children.size > 0 ) %]
16
                [% PROCESS showtree tree = node.children %]
16
                [% PROCESS showtree tree = node.children %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc (-1 / +1 lines)
Lines 31-37 Link Here
31
31
32
    [% IF Koha.Preference('ArticleRequests') %]
32
    [% IF Koha.Preference('ArticleRequests') %]
33
        [% IF ( article_requests_view ) %]<li class="active">[% ELSE %]<li>[% END %]
33
        [% IF ( article_requests_view ) %]<li class="active">[% ELSE %]<li>[% END %]
34
        <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% IF ( object ) %][% object | html %][% ELSE %][% biblionumber | html %][% END %]">Article requests ([% Biblio.ArticleRequestsActiveCount( biblio_object_id ) | html %])</a></li>
34
        <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% IF ( object ) %][% object | uri %][% ELSE %][% biblionumber | uri %][% END %]">Article requests ([% Biblio.ArticleRequestsActiveCount( biblio_object_id ) | html %])</a></li>
35
    [% END %]
35
    [% END %]
36
36
37
    [% IF ( subscriptionsnumber ) %]<li><a href="/cgi-bin/koha/serials/serials-search.pl?searched=1&amp;biblionumber=[% biblio_object_id | url  %]">Subscription(s)</a></li>[% END %]
37
    [% IF ( subscriptionsnumber ) %]<li><a href="/cgi-bin/koha/serials/serials-search.pl?searched=1&amp;biblionumber=[% biblio_object_id | url  %]">Subscription(s)</a></li>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc (-2 / +2 lines)
Lines 7-13 Link Here
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 %]
10
        <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber | html %]" class="btn btn-default btn-xs" >Make payment</a>
10
        <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber | uri %]" class="btn btn-default btn-xs" >Make payment</a>
11
        <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber | html %]" class="btn btn-default btn-xs" >Pay all fines</a></li>
11
        <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber | uri %]" class="btn btn-default btn-xs" >Pay all fines</a></li>
12
    </li>
12
    </li>
13
[% END %]
13
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc (-7 / +7 lines)
Lines 10-24 Link Here
10
                    [% ELSE %]
10
                    [% ELSE %]
11
                        <li>
11
                        <li>
12
                    [% END %]
12
                    [% END %]
13
                    <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% budget_period_id | html %]">New fund for [% budget_period_description | html %]</a></li>
13
                    <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% budget_period_id | uri %]">New fund for [% budget_period_description | html %]</a></li>
14
                </ul>
14
                </ul>
15
        </div>
15
        </div>
16
16
17
        <div class="btn-group">
17
        <div class="btn-group">
18
            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
18
            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
19
                <ul class="dropdown-menu">
19
                <ul class="dropdown-menu">
20
                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&amp;budget_period_id=[% budget_period_id | html %]">Edit budget [% budget_period_description | html %]</a></li>
20
                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&amp;budget_period_id=[% budget_period_id | uri %]">Edit budget [% budget_period_description | html %]</a></li>
21
                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=duplicate_form&amp;budget_period_id=[% budget_period_id | html %]">Duplicate budget [% budget_period_description | html %]</a></li>
21
                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=duplicate_form&amp;budget_period_id=[% budget_period_id | uri %]">Duplicate budget [% budget_period_description | html %]</a></li>
22
                </ul>
22
                </ul>
23
        </div>
23
        </div>
24
24
Lines 30-55 Link Here
30
                    [% ELSE %]
30
                    [% ELSE %]
31
                    <li class="disabled">
31
                    <li class="disabled">
32
                    [% END %]
32
                    [% END %]
33
                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | html %]&amp;authcat=MONTHS">Plan by months</a></li>
33
                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&amp;authcat=MONTHS">Plan by months</a></li>
34
                    [% IF ( CAN_user_acquisition_planning_manage ) %]
34
                    [% IF ( CAN_user_acquisition_planning_manage ) %]
35
                    <li>
35
                    <li>
36
                    [% ELSE %]
36
                    [% ELSE %]
37
                    <li class="disabled">
37
                    <li class="disabled">
38
                    [% END %]
38
                    [% END %]
39
                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | html %]&amp;authcat=BRANCHES">Plan by libraries</a></li>
39
                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&amp;authcat=BRANCHES">Plan by libraries</a></li>
40
                    [% IF ( CAN_user_acquisition_planning_manage ) %]
40
                    [% IF ( CAN_user_acquisition_planning_manage ) %]
41
                    <li>
41
                    <li>
42
                    [% ELSE %]
42
                    [% ELSE %]
43
                    <li class="disabled">
43
                    <li class="disabled">
44
                    [% END %]
44
                    [% END %]
45
                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | html %]&amp;authcat=ITEMTYPES">Plan by item types</a></li>
45
                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&amp;authcat=ITEMTYPES">Plan by item types</a></li>
46
                    [% FOREACH auth_cats_loo IN auth_cats_loop %]
46
                    [% FOREACH auth_cats_loo IN auth_cats_loop %]
47
                        [% IF ( CAN_user_acquisition_planning_manage ) %]
47
                        [% IF ( CAN_user_acquisition_planning_manage ) %]
48
                        <li>
48
                        <li>
49
                        [% ELSE %]
49
                        [% ELSE %]
50
                        <li class="disabled">
50
                        <li class="disabled">
51
                        [% END %]
51
                        [% END %]
52
                        <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | html %]&amp;authcat=[% auth_cats_loo | html %]">Plan by [% auth_cats_loo | html %]</a>
52
                        <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&amp;authcat=[% auth_cats_loo | uri %]">Plan by [% auth_cats_loo | html %]</a>
53
                        </li>
53
                        </li>
54
                    [% END %]
54
                    [% END %]
55
                </ul>
55
                </ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc (-14 / +14 lines)
Lines 18-27 CAN_user_serials_create_subscription ) %] Link Here
18
            [% END %]
18
            [% END %]
19
19
20
            [% IF ( EasyAnalyticalRecords && CAN_user_editcatalogue_edit_catalogue ) %]
20
            [% IF ( EasyAnalyticalRecords && CAN_user_editcatalogue_edit_catalogue ) %]
21
                <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]&amp;analyze=1">Analyze items</a></li>
21
                <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&amp;analyze=1">Analyze items</a></li>
22
            [% END %]
22
            [% END %]
23
            [% IF CAN_user_editcatalogue_edit_catalogue && ! EasyAnalyticalRecords %]
23
            [% IF CAN_user_editcatalogue_edit_catalogue && ! EasyAnalyticalRecords %]
24
                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber | html %]">New child record</a></li>
24
                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber | uri %]">New child record</a></li>
25
            [% END %]
25
            [% END %]
26
    </ul>
26
    </ul>
27
    </div>
27
    </div>
Lines 55-64 CAN_user_serials_create_subscription ) %] Link Here
55
                [% END %]
55
                [% END %]
56
            [% END %]
56
            [% END %]
57
57
58
            [% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber | html %]">Attach item</a></li>[% END %]
58
            [% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber | uri %]">Attach item</a></li>[% END %]
59
59
60
            [% IF ( EasyAnalyticalRecords ) %][% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=[% biblionumber | html %]">Link to host item</a>[% END %][% END %]
60
            [% IF ( EasyAnalyticalRecords ) %][% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=[% biblionumber | uri %]">Link to host item</a>[% END %][% END %]
61
            [% IF ( LocalCoverImages || OPACLocalCoverImages) %][% IF ( CAN_user_tools_upload_local_cover_images ) %]<li><a href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber | html %]&amp;filetype=image">Upload image</a>[% END %][% END %]
61
            [% IF ( LocalCoverImages || OPACLocalCoverImages) %][% IF ( CAN_user_tools_upload_local_cover_images ) %]<li><a href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber | uri %]&amp;filetype=image">Upload image</a>[% END %][% END %]
62
62
63
            [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
63
            [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
64
                <li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]&amp;op=duplicate">Edit as new (duplicate)</a></li>
64
                <li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]&amp;op=duplicate">Edit as new (duplicate)</a></li>
Lines 88-101 CAN_user_serials_create_subscription ) %] Link Here
88
    <div class="btn-group">
88
    <div class="btn-group">
89
    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Save <span class="caret"></span></button>
89
    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Save <span class="caret"></span></button>
90
    <ul class="dropdown-menu">
90
    <ul class="dropdown-menu">
91
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&amp;op=export&amp;bib=[% biblionumber | html %]">BIBTEX</a></li>
91
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&amp;op=export&amp;bib=[% biblionumber | uri %]">BIBTEX</a></li>
92
        <li><a href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a></li>
92
        <li><a href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a></li>
93
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marcxml&amp;op=export&amp;bib=[% biblionumber | html %]">MARCXML</a></li>
93
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marcxml&amp;op=export&amp;bib=[% biblionumber | uri %]">MARCXML</a></li>
94
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marc8&amp;op=export&amp;bib=[% biblionumber | html %]">MARC (non-Unicode/MARC-8)</a></li>
94
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marc8&amp;op=export&amp;bib=[% biblionumber | uri %]">MARC (non-Unicode/MARC-8)</a></li>
95
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=utf8&amp;op=export&amp;bib=[% biblionumber | html %]">MARC (Unicode/UTF-8)</a></li>
95
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=utf8&amp;op=export&amp;bib=[% biblionumber | uri %]">MARC (Unicode/UTF-8)</a></li>
96
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marcstd&amp;op=export&amp;bib=[% biblionumber | html %]">MARC (Unicode/UTF-8, Standard)</a></li>
96
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marcstd&amp;op=export&amp;bib=[% biblionumber | uri %]">MARC (Unicode/UTF-8, Standard)</a></li>
97
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=mods&amp;op=export&amp;bib=[% biblionumber | html %]">MODS (XML)</a></li>
97
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=mods&amp;op=export&amp;bib=[% biblionumber | uri %]">MODS (XML)</a></li>
98
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=ris&amp;op=export&amp;bib=[% biblionumber | html %]">RIS</a></li>
98
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=ris&amp;op=export&amp;bib=[% biblionumber | uri %]">RIS</a></li>
99
    </ul>
99
    </ul>
100
    </div>
100
    </div>
101
101
Lines 125-132 CAN_user_serials_create_subscription ) %] Link Here
125
                    <span class="caret"></span>
125
                    <span class="caret"></span>
126
                </button>
126
                </button>
127
                <ul class="dropdown-menu">
127
                <ul class="dropdown-menu">
128
                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | html %]">Place hold</a></li>
128
                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]">Place hold</a></li>
129
                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | html %]&amp;findborrower=[% holdfor_cardnumber | html %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></li>
129
                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]&amp;findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></li>
130
                </ul>
130
                </ul>
131
            </div>
131
            </div>
132
        [% ELSE %]
132
        [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc (-3 / +3 lines)
Lines 5-17 Link Here
5
[%- biblioitem = item.biblioitem -%]
5
[%- biblioitem = item.biblioitem -%]
6
[
6
[
7
  "[% FILTER escape_quotes = replace('"', '\"') ~%]
7
  "[% FILTER escape_quotes = replace('"', '\"') ~%]
8
    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | html %]" title="Go to record detail page">[% biblio.title | html %]</a>[% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %] by[% END %] [% biblio.author | html %]
8
    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]" title="Go to record detail page">[% biblio.title | html %]</a>[% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %] by[% END %] [% biblio.author | html %]
9
  [%~ END %]",
9
  [%~ END %]",
10
  "[% (biblioitem.publicationyear || biblio.copyrightdate) | html %]",
10
  "[% (biblioitem.publicationyear || biblio.copyrightdate) | html %]",
11
  "[% biblioitem.publishercode | html %]",
11
  "[% biblioitem.publishercode | html %]",
12
  "[% AuthorisedValues.GetByCode( 'CCODE', item.ccode ) | html %]",
12
  "[% AuthorisedValues.GetByCode( 'CCODE', item.ccode ) | html %]",
13
  "[% FILTER escape_quotes ~%]
13
  "[% FILTER escape_quotes ~%]
14
    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | html %]#item[% item.itemnumber | html %]" title="Go to item details">[% item.barcode | html %]</a>
14
    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | uri %]#item[% item.itemnumber | uri %]" title="Go to item details">[% item.barcode | html %]</a>
15
  [%~ END %]",
15
  [%~ END %]",
16
  "[% item.itemcallnumber | html %]",
16
  "[% item.itemcallnumber | html %]",
17
  "[% Branches.GetName(item.homebranch) | html %]",
17
  "[% Branches.GetName(item.homebranch) | html %]",
Lines 21-26 Link Here
21
  "[% item.status | html %]",
21
  "[% item.status | html %]",
22
  "[% (item.issues || 0) | html %]",
22
  "[% (item.issues || 0) | html %]",
23
  "[% FILTER escape_quotes ~%]
23
  "[% FILTER escape_quotes ~%]
24
    <div class="btn-group dropup"><button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-pencil"></i> Edit <span class="caret"></span> </button> <ul class="dropdown-menu"> <li><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]">Edit item</a></li> <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% item.biblionumber | html %]">Edit record</a></li> </ul> </div>
24
    <div class="btn-group dropup"><button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-pencil"></i> Edit <span class="caret"></span> </button> <ul class="dropdown-menu"> <li><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]">Edit item</a></li> <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% item.biblionumber | html %]">Edit record</a></li> </ul> </div>
25
  [%~ END %]"
25
  [%~ END %]"
26
]
26
]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-15 / +15 lines)
Lines 73-128 Link Here
73
<div id="menu">
73
<div id="menu">
74
<ul>
74
<ul>
75
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
75
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
76
        [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber | html %]">Check out</a></li>
76
        [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber | uri %]">Check out</a></li>
77
        [% IF Koha.Preference('BatchCheckouts') && Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ patron.categorycode _ '$').size > 0 %]
77
        [% IF Koha.Preference('BatchCheckouts') && Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ patron.categorycode _ '$').size > 0 %]
78
          [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber | html %]&amp;batch=1">Batch check out</a></li>
78
          [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;batch=1">Batch check out</a></li>
79
        [% END %]
79
        [% END %]
80
    [% END %]
80
    [% END %]
81
    [% IF CAN_user_borrowers_edit_borrowers %]
81
    [% IF CAN_user_borrowers_edit_borrowers %]
82
        [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">Details</a></li>
82
        [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">Details</a></li>
83
    [% END %]
83
    [% END %]
84
    [% IF ( CAN_user_updatecharges ) %]
84
    [% IF ( CAN_user_updatecharges ) %]
85
        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]">Fines</a></li>
85
        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">Fines</a></li>
86
    [% END %]
86
    [% END %]
87
    [% IF ( CAN_user_circulate_circulate_remaining_permissions  )  %]
87
    [% IF ( CAN_user_circulate_circulate_remaining_permissions  )  %]
88
        [% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% patron.borrowernumber | html %]">Routing lists</a></li>[% END %]
88
        [% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% patron.borrowernumber | uri %]">Routing lists</a></li>[% END %]
89
    [% END %]
89
    [% END %]
90
    [% IF CAN_user_borrowers_edit_borrowers %]
90
    [% IF CAN_user_borrowers_edit_borrowers %]
91
        [% IF ( intranetreadinghistory ) %]
91
        [% IF ( intranetreadinghistory ) %]
92
            [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% patron.borrowernumber | html %]">Circulation history</a></li>
92
            [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% patron.borrowernumber | uri %]">Circulation history</a></li>
93
        [% END %]
93
        [% END %]
94
    [% END %]
94
    [% END %]
95
    [% IF CAN_user_borrowers_edit_borrowers %]
95
    [% IF CAN_user_borrowers_edit_borrowers %]
96
        [% IF ( intranetreadinghistory ) %]
96
        [% IF ( intranetreadinghistory ) %]
97
            [% IF ( holdshistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/holdshistory.pl?borrowernumber=[% patron.borrowernumber | html %]">Holds history</a></li>
97
            [% IF ( holdshistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/holdshistory.pl?borrowernumber=[% patron.borrowernumber | uri %]">Holds history</a></li>
98
        [% END %]
98
        [% END %]
99
    [% END %]
99
    [% END %]
100
    [% IF ( CAN_user_tools_view_system_logs ) %]
100
    [% IF ( CAN_user_tools_view_system_logs ) %]
101
        [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[% patron.borrowernumber | html %]&amp;src=circ">Modification log</a></li>
101
        [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[% patron.borrowernumber | uri %]&amp;src=circ">Modification log</a></li>
102
    [% END %]
102
    [% END %]
103
    [% IF CAN_user_borrowers_edit_borrowers %]
103
    [% IF CAN_user_borrowers_edit_borrowers %]
104
    [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber | html %]">Notices</a></li>
104
    [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber | uri %]">Notices</a></li>
105
    [% END %]
105
    [% END %]
106
    [% IF CAN_user_borrowers_edit_borrowers %]
106
    [% IF CAN_user_borrowers_edit_borrowers %]
107
        [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% patron.borrowernumber | html %]">Statistics</a></li>
107
        [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% patron.borrowernumber | uri %]">Statistics</a></li>
108
    [% END %]
108
    [% END %]
109
    [% IF CAN_user_borrowers_edit_borrowers %]
109
    [% IF CAN_user_borrowers_edit_borrowers %]
110
        [% IF ( EnableBorrowerFiles ) %]
110
        [% IF ( EnableBorrowerFiles ) %]
111
            [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber | html %]">Files</a></li>
111
            [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber | uri %]">Files</a></li>
112
        [% END %]
112
        [% END %]
113
    [% END %]
113
    [% END %]
114
114
115
    [% IF CAN_user_acquisition_suggestions_manage %]
115
    [% IF CAN_user_acquisition_suggestions_manage %]
116
        [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% patron.borrowernumber | html %]">Purchase suggestions</a></li>
116
        [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% patron.borrowernumber | uri %]">Purchase suggestions</a></li>
117
    [% END %]
117
    [% END %]
118
    [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
118
    [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
119
        [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber | html %]">Discharges</a></li>
119
        [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber | uri %]">Discharges</a></li>
120
    [% END %]
120
    [% END %]
121
    [% IF Koha.Preference('HouseboundModule') %]
121
    [% IF Koha.Preference('HouseboundModule') %]
122
        [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | html %]">Housebound</a></li>
122
        [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | uri %]">Housebound</a></li>
123
    [% END %]
123
    [% END %]
124
    [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
124
    [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
125
        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% patron.borrowernumber | html %]">Interlibrary loans</a></li>
125
        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% patron.borrowernumber | uri %]">Interlibrary loans</a></li>
126
    [% END %]
126
    [% END %]
127
</ul></div>
127
</ul></div>
128
[% END %]
128
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc (-2 / +2 lines)
Lines 15-21 Link Here
15
        [% FOREACH borrower IN borrowers %]
15
        [% FOREACH borrower IN borrowers %]
16
            [% IF destination == "circ" %]
16
            [% IF destination == "circ" %]
17
                <tr class="clickable" data-url="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrower.borrowernumber | html %]">
17
                <tr class="clickable" data-url="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrower.borrowernumber | html %]">
18
                    <td><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrower.borrowernumber | html %]">[% borrower.surname | html %], [% borrower.firstname | html %]</a></td>
18
                    <td><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrower.borrowernumber | uri %]">[% borrower.surname | html %], [% borrower.firstname | html %]</a></td>
19
            [% ELSIF destination == "holds" %]
19
            [% ELSIF destination == "holds" %]
20
                [% IF multi_hold %]
20
                [% IF multi_hold %]
21
                    [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&amp;multi_hold=1&amp;biblionumbers=" _ biblionumbers %]
21
                    [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&amp;multi_hold=1&amp;biblionumbers=" _ biblionumbers %]
Lines 23-29 Link Here
23
                    [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&amp;biblionumber=" _ biblionumber %]
23
                    [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&amp;biblionumber=" _ biblionumber %]
24
                [% END %]
24
                [% END %]
25
                <tr class="clickable" data-url="[% data_url | html %]">
25
                <tr class="clickable" data-url="[% data_url | html %]">
26
                    <td><a href="[% data_url | html %]">[% borrower.surname | html %], [% borrower.firstname | html %]</a></td>
26
                    <td><a href="[% data_url | uri %]">[% borrower.surname | html %], [% borrower.firstname | html %]</a></td>
27
            [% END %]
27
            [% END %]
28
                <td>[% borrower.cardnumber | html %]</td>
28
                <td>[% borrower.cardnumber | html %]</td>
29
                <td>[% borrower.dateofbirth | $KohaDates %]</td>
29
                <td>[% borrower.dateofbirth | $KohaDates %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc (-4 / +4 lines)
Lines 4-10 Link Here
4
<div id="search-facets">
4
<div id="search-facets">
5
<h4>Refine your search</h4>
5
<h4>Refine your search</h4>
6
<ul>
6
<ul>
7
    <li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | html %][% limit_cgi_not_availablity | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | html %][% limit_cgi | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]&amp;limit=available">Limit to currently available items</a>[% END %]</li></ul>
7
    <li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | uri %][% limit_cgi_not_availablity | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | html %][% limit_cgi | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]&amp;limit=available">Limit to currently available items</a>[% END %]</li></ul>
8
	[% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search | html %][% END %])</li>[% END %]
8
	[% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search | html %][% END %])</li>[% END %]
9
	</li>
9
	</li>
10
10
Lines 33-42 Link Here
33
      [% IF facet.active %]
33
      [% IF facet.active %]
34
        [% SET local_url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
34
        [% SET local_url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
35
        <span class="facet-label">[% facet.facet_label_value | html %]</span>
35
        <span class="facet-label">[% facet.facet_label_value | html %]</span>
36
        [<a href="[% local_url | html %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
36
        [<a href="[% local_url | uri %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
37
      [% ELSE %]
37
      [% ELSE %]
38
        [% SET local_url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
38
        [% SET local_url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
39
        <span class="facet-label"><a href="[% local_url | html %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span>
39
        <span class="facet-label"><a href="[% local_url | uri %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span>
40
        [% IF ( displayFacetCount ) %]
40
        [% IF ( displayFacetCount ) %]
41
          <span class="facet-count"> ([% facet.facet_count | html %])</span>
41
          <span class="facet-count"> ([% facet.facet_count | html %])</span>
42
        [% END %]
42
        [% END %]
Lines 45-51 Link Here
45
  [% END %]
45
  [% END %]
46
  [% IF ( facets_loo.expandable ) %]
46
  [% IF ( facets_loo.expandable ) %]
47
      <li class="showmore">
47
      <li class="showmore">
48
          <a href="[% url | html %][% IF offset %]&amp;offset=[% offset |url %][% END %]&amp;expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a>
48
          <a href="[% url | uri %][% IF offset %]&amp;offset=[% offset |url %][% END %]&amp;expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a>
49
      </li>
49
      </li>
50
  [% END %]
50
  [% END %]
51
</ul></li>
51
</ul></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc (-2 / +2 lines)
Lines 123-129 Link Here
123
123
124
            <td>
124
            <td>
125
                [% IF ( hold.found ) %]
125
                [% IF ( hold.found ) %]
126
                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblionumber | html %]">
126
                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblionumber | uri %]">
127
                        [% IF ( hold.barcodenumber ) %]
127
                        [% IF ( hold.barcodenumber ) %]
128
                            [% hold.barcodenumber | html %]
128
                            [% hold.barcodenumber | html %]
129
                            <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
129
                            <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
Lines 135-141 Link Here
135
                    [% IF ( hold.item_level_hold ) %]
135
                    [% IF ( hold.item_level_hold ) %]
136
                        <i>
136
                        <i>
137
                            Only item
137
                            Only item
138
                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblionumber | html %]">
138
                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblionumber | uri %]">
139
                                [% IF ( hold.barcodenumber ) %]
139
                                [% IF ( hold.barcodenumber ) %]
140
                                    [% hold.barcodenumber | html %]
140
                                    [% hold.barcodenumber | html %]
141
                                    <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
141
                                    <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc (-1 / +1 lines)
Lines 9-15 Link Here
9
                </button>
9
                </button>
10
                <ul class="dropdown-menu" aria-labelledby="ill-backend-dropdown">
10
                <ul class="dropdown-menu" aria-labelledby="ill-backend-dropdown">
11
                    [% FOREACH backend IN backends %]
11
                    [% FOREACH backend IN backends %]
12
                        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=create&amp;backend=[% backend | html %]">[% backend | html %]</a></li>
12
                        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=create&amp;backend=[% backend | uri %]">[% backend | html %]</a></li>
13
                    [% END %]
13
                    [% END %]
14
                </ul>
14
                </ul>
15
            </div>
15
            </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc (-2 / +2 lines)
Lines 31-37 Link Here
31
                [% IF ( sublanguages_loo.sublanguage_current ) %]
31
                [% IF ( sublanguages_loo.sublanguage_current ) %]
32
                    <li class="navbar-text"> <span class="currentlanguage disabled">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</span></li>
32
                    <li class="navbar-text"> <span class="currentlanguage disabled">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</span></li>
33
                [% ELSE %]
33
                [% ELSE %]
34
                <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | html %]"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</a></li>
34
                <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</a></li>
35
        [% END %]
35
        [% END %]
36
                [% END %]
36
                [% END %]
37
37
Lines 49-55 Link Here
49
                        [% END %]
49
                        [% END %]
50
                    </li>
50
                    </li>
51
                [% ELSE %]
51
                [% ELSE %]
52
                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | html %]">
52
                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]">
53
                        [% IF ( languages_loo.native_description ) %]
53
                        [% IF ( languages_loo.native_description ) %]
54
                            [% languages_loo.native_description | html %]
54
                            [% languages_loo.native_description | html %]
55
                        [% ELSE %]
55
                        [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc (-2 / +2 lines)
Lines 11-17 Link Here
11
                        [% IF ( sublanguages_loo.sublanguage_current ) %]
11
                        [% IF ( sublanguages_loo.sublanguage_current ) %]
12
                            <li role="presentation"> <a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]&nbsp;<i class="fa fa-check"></i></a></li>
12
                            <li role="presentation"> <a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]&nbsp;<i class="fa fa-check"></i></a></li>
13
                        [% ELSE %]
13
                        [% ELSE %]
14
                            <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | html %]"  tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a></li>
14
                            <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a></li>
15
                        [% END %]
15
                        [% END %]
16
                    [% END # / IF sublanguages_loo.enabled %]
16
                    [% END # / IF sublanguages_loo.enabled %]
17
                [% END # / FOREACH sublanguages_loo %]
17
                [% END # / FOREACH sublanguages_loo %]
Lines 20-26 Link Here
20
                    [% IF ( languages_loo.current ) %]
20
                    [% IF ( languages_loo.current ) %]
21
                        <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]&nbsp;<i class="fa fa-check"></i></a></li>
21
                        <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]&nbsp;<i class="fa fa-check"></i></a></li>
22
                    [% ELSE %]
22
                    [% ELSE %]
23
                        <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | html %]"  tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li>
23
                        <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li>
24
                    [% END %]
24
                    [% END %]
25
                [% END # / IF languages_loo.current %]
25
                [% END # / IF languages_loo.current %]
26
            [% END # / IF ( languages_loo.plural ) %]
26
            [% END # / IF ( languages_loo.plural ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-1 / +1 lines)
Lines 59-65 Link Here
59
                [% END %]
59
                [% END %]
60
60
61
                [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
61
                [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
62
                    <li><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber | html %]">Discharge</a></li>
62
                    <li><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber | uri %]">Discharge</a></li>
63
                [% END %]
63
                [% END %]
64
64
65
                [% IF Koha.Preference('RESTOAuth2ClientCredentials') %]
65
                [% IF Koha.Preference('RESTOAuth2ClientCredentials') %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc (-1 / +1 lines)
Lines 50-56 Link Here
50
    <ul>
50
    <ul>
51
        [% FOREACH record IN sourcerecords %]
51
        [% FOREACH record IN sourcerecords %]
52
            <li>
52
            <li>
53
                <a href="#tabrecord[% record.recordid | html %]">
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 %](ref)[% END %]
56
                </a>
56
                </a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc (-2 / +3 lines)
Lines 1-3 Link Here
1
[% USE raw %]
1
[%- USE raw -%]
2
[%- USE raw -%]
2
[%- USE Koha -%]
3
[%- USE Koha -%]
3
[%- USE Branches -%]
4
[%- USE Branches -%]
Lines 51-58 Link Here
51
    [%- END -%]
52
    [%- END -%]
52
[%- END -%]
53
[%- END -%]
53
[%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%]
54
[%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%]
54
    [%- IF link_to == 'circulation_reserves' %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | html %]#reserves">
55
    [%- IF link_to == 'circulation_reserves' %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | uri %]#reserves">
55
    [%- ELSE %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]">
56
    [%- ELSE %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | uri %]">
56
    [%- END -%]
57
    [%- END -%]
57
[%- END -%]
58
[%- END -%]
58
[%- IF display_patron_name -%]
59
[%- IF display_patron_name -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc (-2 / +2 lines)
Lines 8-21 Link Here
8
    <div class="btn-group" id="new-patron-button">
8
    <div class="btn-group" id="new-patron-button">
9
        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button>
9
        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button>
10
            <ul class="dropdown-menu">
10
            <ul class="dropdown-menu">
11
                [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;categorycode=[% category.categorycode | html %]">[% category.description | html %]</a></li>[% END %]
11
                [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;categorycode=[% category.categorycode | uri %]">[% category.description | html %]</a></li>[% END %]
12
            </ul>
12
            </ul>
13
    </div>
13
    </div>
14
    [% IF Koha.Preference('PatronQuickAddFields') || Koha.Preference('BorrowerMandatoryField') %]
14
    [% IF Koha.Preference('PatronQuickAddFields') || Koha.Preference('BorrowerMandatoryField') %]
15
    <div class="btn-group" id="quick-add-new-patron-button">
15
    <div class="btn-group" id="quick-add-new-patron-button">
16
        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button>
16
        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button>
17
            <ul class="dropdown-menu">
17
            <ul class="dropdown-menu">
18
                [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;categorycode=[% category.categorycode | html %]&amp;quickadd=true">[% category.description | html %]</a></li>[% END %]
18
                [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;categorycode=[% category.categorycode | uri %]&amp;quickadd=true">[% category.description | html %]</a></li>[% END %]
19
            </ul>
19
            </ul>
20
    </div>
20
    </div>
21
    [% END %]
21
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc (-3 / +3 lines)
Lines 1-12 Link Here
1
[% IF ( subscriptionid ) %]
1
[% IF ( subscriptionid ) %]
2
<ul>
2
<ul>
3
<li><a href="serials-collection.pl?subscriptionid=[% subscriptionid | html %]">Serial collection</a></li>
3
<li><a href="serials-collection.pl?subscriptionid=[% subscriptionid | uri %]">Serial collection</a></li>
4
  [% UNLESS closed %]
4
  [% UNLESS closed %]
5
    [% IF ( routing && CAN_user_serials_routing ) %]
5
    [% IF ( routing && CAN_user_serials_routing ) %]
6
        [% IF ( hasRouting ) %]
6
        [% IF ( hasRouting ) %]
7
             <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | html %]">Edit routing list</a></li>
7
             <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]">Edit routing list</a></li>
8
        [% ELSE %]
8
        [% ELSE %]
9
            <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | html %]&amp;op=new">Create routing list</a></li>
9
            <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]&amp;op=new">Create routing list</a></li>
10
        [% END %]
10
        [% END %]
11
    [% END %]
11
    [% END %]
12
  [% END %]
12
  [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc (-2 / +2 lines)
Lines 16-25 Link Here
16
                        <ul class="dropdown-menu">
16
                        <ul class="dropdown-menu">
17
                            [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
17
                            [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
18
                            <li> [% END %]
18
                            <li> [% END %]
19
                            <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid | html %]">Edit subscription</a></li>
19
                            <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid | uri %]">Edit subscription</a></li>
20
                            [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
20
                            [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
21
                            <li> [% END %]
21
                            <li> [% END %]
22
                            <a href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=[% subscriptionid | html %]">Edit as new (duplicate)</a></li>
22
                            <a href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=[% subscriptionid | uri %]">Edit as new (duplicate)</a></li>
23
23
24
                            [% IF CAN_user_editcatalogue_edit_catalogue %]
24
                            [% IF CAN_user_editcatalogue_edit_catalogue %]
25
                                <li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]">Edit record</a></li>
25
                                <li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]">Edit record</a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc (-6 / +6 lines)
Lines 1-14 Link Here
1
[% IF ( booksellerid ) %]
1
[% IF ( booksellerid ) %]
2
<div id="menu">
2
<div id="menu">
3
    <ul>
3
    <ul>
4
        [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | html %]">Baskets</a></li>[% END %]
4
        [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]">Baskets</a></li>[% END %]
5
        [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | html %]">Basket groups</a></li>[% END %]
5
        [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket groups</a></li>[% END %]
6
        [% IF ( CAN_user_acquisition_contracts_manage ) %]<li><a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]">Contracts</a></li>[% END %]
6
        [% IF ( CAN_user_acquisition_contracts_manage ) %]<li><a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a></li>[% END %]
7
        <li><a href="/cgi-bin/koha/acqui/invoices.pl?supplierid=[% booksellerid | html %]&amp;op=do_search">Invoices</a></li>
7
        <li><a href="/cgi-bin/koha/acqui/invoices.pl?supplierid=[% booksellerid | uri %]&amp;op=do_search">Invoices</a></li>
8
        [% IF ( CAN_user_acquisition_order_manage ) %][% IF ( basketno ) %]
8
        [% IF ( CAN_user_acquisition_order_manage ) %][% IF ( basketno ) %]
9
        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;owner=1">Uncertain prices</a></li>
9
        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;owner=1">Uncertain prices</a></li>
10
        [% ELSE %]
10
        [% ELSE %]
11
        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | html %]&amp;owner=1">Uncertain prices</a></li>
11
        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&amp;owner=1">Uncertain prices</a></li>
12
        [% END %] [% END %]
12
        [% END %] [% END %]
13
    </ul>
13
    </ul>
14
</div>
14
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc (-5 / +5 lines)
Lines 8-14 Link Here
8
        <div class="btn-group">
8
        <div class="btn-group">
9
            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
9
            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
10
            <ul class="dropdown-menu">
10
            <ul class="dropdown-menu">
11
                <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=edit_form&amp;shelfnumber=[% shelf.shelfnumber | html %]&amp;referer=[% op | html %]">Edit list</a></li>
11
                <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=edit_form&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;referer=[% op | uri %]">Edit list</a></li>
12
                <li><a id="deleteshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=delete&amp;shelfnumber=[% shelf.shelfnumber | html %]">Delete list</a></li>
12
                <li><a id="deleteshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=delete&amp;shelfnumber=[% shelf.shelfnumber | html %]">Delete list</a></li>
13
            </ul>
13
            </ul>
14
        </div>
14
        </div>
Lines 17-27 Link Here
17
        <div class="btn-group">
17
        <div class="btn-group">
18
            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Download list <span class="caret"></span></button>
18
            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Download list <span class="caret"></span></button>
19
                <ul class="dropdown-menu">
19
                <ul class="dropdown-menu">
20
                    <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=iso2709&amp;shelfid=[% shelf.shelfnumber | html %]">MARC</a></li>
20
                    <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=iso2709&amp;shelfid=[% shelf.shelfnumber | uri %]">iso2709</a></li>
21
                    <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=ris&amp;shelfid=[% shelf.shelfnumber | html %]">RIS</a></li>
21
                    <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=ris&amp;shelfid=[% shelf.shelfnumber | uri %]">RIS</a></li>
22
                    <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=bibtex&amp;shelfid=[% shelf.shelfnumber | html %]">BibTex</a></li>
22
                    <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=bibtex&amp;shelfid=[% shelf.shelfnumber | uri %]">BibTex</a></li>
23
                    [% FOREACH csv_profile IN csv_profiles %]
23
                    [% FOREACH csv_profile IN csv_profiles %]
24
                        <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=[% csv_profile.export_format_id | html %]&amp;shelfid=[% shelf.shelfnumber | html %]">CSV - [% csv_profile.profile | html %]</a></li>
24
                        <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=[% csv_profile.export_format_id | uri %]&amp;shelfid=[% shelf.shelfnumber | uri %]">CSV - [% csv_profile.profile | html %]</a></li>
25
                    [% END %]
25
                    [% END %]
26
                </ul>
26
                </ul>
27
        </div>
27
        </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-4 / +4 lines)
Lines 113-126 Link Here
113
                <td>Budget [% loop_budge.budget_period_description | html %] [id=[% loop_budge.budget_period_id | html %]][% UNLESS loop_budge.budget_period_active %] (inactive)[% END %]</td>
113
                <td>Budget [% loop_budge.budget_period_description | html %] [id=[% loop_budge.budget_period_id | html %]][% UNLESS loop_budge.budget_period_active %] (inactive)[% END %]</td>
114
                <td>
114
                <td>
115
                    [% IF ( CAN_user_acquisition_budget_manage ) %]
115
                    [% IF ( CAN_user_acquisition_budget_manage ) %]
116
                        <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% loop_budge.budget_period_id | html %]">[% loop_budge.budget_code | html %]</a>
116
                        <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% loop_budge.budget_period_id | uri %]">[% loop_budge.budget_code | html %]</a>
117
                    [% ELSE %]
117
                    [% ELSE %]
118
                        [% loop_budge.budget_code | html %]
118
                        [% loop_budge.budget_code | html %]
119
                    [% END %]
119
                    [% END %]
120
                </td>
120
                </td>
121
                <td>[% loop_budge.budget_name | html %]</td>
121
                <td>[% loop_budge.budget_name | html %]</td>
122
                <td>[% IF ( loop_budge.budget_owner ) %]
122
                <td>[% IF ( loop_budge.budget_owner ) %]
123
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loop_budge.budget_owner.borrowernumber | html %]">[% loop_budge.budget_owner.surname | html %], [% loop_budge.budget_owner.firstname | html %]</a>
123
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loop_budge.budget_owner.borrowernumber | uri %]">[% loop_budge.budget_owner.surname | html %], [% loop_budge.budget_owner.firstname | html %]</a>
124
                    [% ELSE %]
124
                    [% ELSE %]
125
                        &nbsp;
125
                        &nbsp;
126
                    [% END %]
126
                    [% END %]
Lines 134-140 Link Here
134
                    [% END %]
134
                    [% END %]
135
                </td>
135
                </td>
136
                <td class="data">
136
                <td class="data">
137
                    <a href="ordered.pl?fund=[% loop_budge.budget_id | html %]&amp;fund_code=[% loop_budge.budget_code | html %]">
137
                    <a href="ordered.pl?fund=[% loop_budge.budget_id | uri %]&amp;fund_code=[% loop_budge.budget_code | uri %]">
138
                    [% IF loop_budge.budget_parent_id %]
138
                    [% IF loop_budge.budget_parent_id %]
139
                        [% loop_budge.budget_ordered | $Price %]
139
                        [% loop_budge.budget_ordered | $Price %]
140
                    [% ELSE %]
140
                    [% ELSE %]
Lines 143-149 Link Here
143
                    </a>
143
                    </a>
144
                </td>
144
                </td>
145
                <td class="data">
145
                <td class="data">
146
                    <a href="spent.pl?fund=[% loop_budge.budget_id | html %]&amp;fund_code=[% loop_budge.budget_code | html %]">
146
                    <a href="spent.pl?fund=[% loop_budge.budget_id | uri %]&amp;fund_code=[% loop_budge.budget_code | uri %]">
147
                    [% IF loop_budge.budget_parent_id %]
147
                    [% IF loop_budge.budget_parent_id %]
148
                        [% loop_budge.budget_spent | $Price %]
148
                        [% loop_budge.budget_spent | $Price %]
149
                    [% ELSE %]
149
                    [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-3 / +3 lines)
Lines 88-94 Link Here
88
                              <span class="citation">[% biblio.citation | html %]</span>
88
                              <span class="citation">[% biblio.citation | html %]</span>
89
                            </label>
89
                            </label>
90
                            <span class="links" style="font-weight: normal;">
90
                            <span class="links" style="font-weight: normal;">
91
                              ( <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id | html %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% biblio.import_record_id | html %]" class="previewData">Card</a> | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;breedingid=[% biblio.import_record_id | html %]&amp;import_batch_id=[% biblio.import_batch_id | html %]&amp;biblionumber=[% biblio.match_biblionumber | html %]">Add order</a> )
91
                              ( <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id | uri %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% biblio.import_record_id | html %]" class="previewData">Card</a> | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;breedingid=[% biblio.import_record_id | html %]&amp;import_batch_id=[% biblio.import_batch_id | html %]&amp;biblionumber=[% biblio.match_biblionumber | html %]">Add order</a> )
92
                            </span>
92
                            </span>
93
                          </legend>
93
                          </legend>
94
                          <div style="float:left">
94
                          <div style="float:left">
Lines 105-111 Link Here
105
                                    [% biblio_lis.overlay_status | html %]
105
                                    [% biblio_lis.overlay_status | html %]
106
                                [% END %]
106
                                [% END %]
107
                                [% IF ( biblio.match_biblionumber ) %]
107
                                [% IF ( biblio.match_biblionumber ) %]
108
                                  Matches biblio [% biblio.match_biblionumber | html %] (score = [% biblio.match_score | html %]): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.match_biblionumber | html %]">[% biblio.match_citation | html %]</a>
108
                                  Matches biblio [% biblio.match_biblionumber | uri %] (score = [% biblio.match_score | html %]): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.match_biblionumber | uri %]">[% biblio.match_citation | html %]</a>
109
                                [% END %]
109
                                [% END %]
110
                              </span>
110
                              </span>
111
                            </li>
111
                            </li>
Lines 413-419 Link Here
413
                        </td>
413
                        </td>
414
                        <td><span title="[% batch_lis.staged_date | html %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 | html %]</span></td>
414
                        <td><span title="[% batch_lis.staged_date | html %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 | html %]</span></td>
415
                        <td>[% batch_lis.num_records | html %]</td>
415
                        <td>[% batch_lis.num_records | html %]</td>
416
                        <td><a href="[% batch_lis.scriptname | html %]?import_batch_id=[% batch_lis.import_batch_id | html %]&amp;basketno=[% basketno | html %]&amp;booksellerid=[% booksellerid | html %]">Add orders</a></td>
416
                        <td><a href="[% batch_lis.scriptname | uri %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]">Add orders</a></td>
417
                      </tr>
417
                      </tr>
418
                      [% END %]
418
                      [% END %]
419
                    </tbody>
419
                    </tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-20 / +20 lines)
Lines 36-42 Link Here
36
<div id="breadcrumbs">
36
<div id="breadcrumbs">
37
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
37
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
38
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
38
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
39
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> &rsaquo;
39
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> &rsaquo;
40
    [% UNLESS ( basketno ) %][% IF ( delete_confirmed ) %]Deleted [% ELSE %]New [% END %][% END %]Basket [% basketname | html %] [% IF ( basketno ) %]([% basketno | html %])[% END %] for [% booksellername | html %]
40
    [% UNLESS ( basketno ) %][% IF ( delete_confirmed ) %]Deleted [% ELSE %]New [% END %][% END %]Basket [% basketname | html %] [% IF ( basketno ) %]([% basketno | html %])[% END %] for [% booksellername | html %]
41
</div>
41
</div>
42
42
Lines 58-82 Link Here
58
                    [% IF active %]
58
                    [% IF active %]
59
                        <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-default btn-sm" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div>
59
                        <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-default btn-sm" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div>
60
                    [% END %]
60
                    [% END %]
61
                    <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;op=add_form" class="btn btn-default btn-sm" id="basketheadbutton"><i class="fa fa-pencil"></i> Edit basket</a></div>
61
                    <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;op=add_form" class="btn btn-default btn-sm" id="basketheadbutton"><i class="fa fa-pencil"></i> Edit basket</a></div>
62
                    [%# FIXME This action should not be available for everyone %]
62
                    [%# FIXME This action should not be available for everyone %]
63
                    <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-default btn-sm" data-toggle="modal" id="delbasketbutton"><i class="fa fa-trash"></i> Delete this basket</a></div>
63
                    <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-default btn-sm" data-toggle="modal" id="delbasketbutton"><i class="fa fa-trash"></i> Delete this basket</a></div>
64
                   [% IF ( unclosable ) %]
64
                   [% IF ( unclosable ) %]
65
                    [% ELSIF ( uncertainprices ) %]
65
                    [% ELSIF ( uncertainprices ) %]
66
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | html %]&amp;owner=1" class="btn btn-default btn-sm" id="uncertpricesbutton"><i class="fa fa-usd"></i> Uncertain prices</a></div>
66
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&amp;owner=1" class="btn btn-default btn-sm" id="uncertpricesbutton"><i class="fa fa-usd"></i> Uncertain prices</a></div>
67
                        <div title="Can not close baskets that have items with uncertain prices in them." class="btn-group">
67
                        <div title="Can not close baskets that have items with uncertain prices in them." class="btn-group">
68
                            <a href="" class="btn btn-default btn-sm disabled" id="closebutton"><i class="fa fa-times-circle"></i> Close this basket</a>
68
                            <a href="" class="btn btn-default btn-sm disabled" id="closebutton"><i class="fa fa-times-circle"></i> Close this basket</a>
69
                        </div>
69
                        </div>
70
                    [% ELSE %]
70
                    [% ELSE %]
71
                        <div class="btn-group">
71
                        <div class="btn-group">
72
                            <a href="/cgi-bin/koha/acqui/basket.pl?op=close&amp;basketno=[% basketno | html %]&amp;booksellerid=[% booksellerid | html %]" class="btn btn-default btn-sm" id="closebutton"><i class="fa fa-times-circle"></i> Close this basket</a>
72
                            <a href="/cgi-bin/koha/acqui/basket.pl?op=close&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm" id="closebutton"><i class="fa fa-times-circle"></i> Close this basket</a>
73
                        </div>
73
                        </div>
74
                    [% END %]
74
                    [% END %]
75
75
76
                    [% PROCESS csv_export %]
76
                    [% PROCESS csv_export %]
77
77
78
                        [% IF ediaccount %]
78
                        [% IF ediaccount %]
79
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&amp;basketno=[% basketno | html %]&amp;booksellerid=[% booksellerid | html %]" class="btn btn-default btn-sm" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div>
79
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div>
80
                        [% END %]
80
                        [% END %]
81
81
82
                        [% IF ( active && books_loop ) %]
82
                        [% IF ( active && books_loop ) %]
Lines 171-177 Link Here
171
                    <p><strong>The following records could not be deleted:</strong></p>
171
                    <p><strong>The following records could not be deleted:</strong></p>
172
                    <ul>
172
                    <ul>
173
                    [% FOREACH cannotdelbiblio IN cannotdelbiblios %]
173
                    [% FOREACH cannotdelbiblio IN cannotdelbiblios %]
174
                        <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cannotdelbiblio.biblionumber | html %]">[% cannotdelbiblio.title | html %]</a> by [% cannotdelbiblio.author | html %]:
174
                        <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cannotdelbiblio.biblionumber | uri %]">[% cannotdelbiblio.title | html %]</a> by [% cannotdelbiblio.author | html %]:
175
                            <ul>
175
                            <ul>
176
                            [% IF (cannotdelbiblio.itemcount) %]<li>[% cannotdelbiblio.itemcount | html %] item(s) attached.</li>[% END %]
176
                            [% IF (cannotdelbiblio.itemcount) %]<li>[% cannotdelbiblio.itemcount | html %] item(s) attached.</li>[% END %]
177
                            [% IF (cannotdelbiblio.subscriptions) %]<li>[% cannotdelbiblio.subscriptions | html %] subscription(s) attached.</li>[% END %]
177
                            [% IF (cannotdelbiblio.subscriptions) %]<li>[% cannotdelbiblio.subscriptions | html %] subscription(s) attached.</li>[% END %]
Lines 184-190 Link Here
184
                </div>
184
                </div>
185
                <a href="booksellers.pl">Click here to go back to booksellers page</a>
185
                <a href="booksellers.pl">Click here to go back to booksellers page</a>
186
            [% ELSE %]
186
            [% ELSE %]
187
                <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | html %]" class="btn btn-default btn-sm">Show baskets for vendor [% booksellername | html %]</a> <a href="/cgi-bin/koha/acqui/booksellers.pl" class="btn btn-default btn-sm">Show all active baskets</a>
187
                <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm">Show baskets for vendor [% booksellername | html %]</a> <a href="/cgi-bin/koha/acqui/booksellers.pl" class="btn btn-default btn-sm">Show all active baskets</a>
188
            [% END %]
188
            [% END %]
189
        [% ELSE %]
189
        [% ELSE %]
190
190
Lines 204-210 Link Here
204
                [% END %]
204
                [% END %]
205
            </div>
205
            </div>
206
        [% END %]
206
        [% END %]
207
        <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a></h1>
207
        <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
208
        [% IF ( basketno ) %]
208
        [% IF ( basketno ) %]
209
            <div id="acqui_basket_summary" class="yui-g">
209
            <div id="acqui_basket_summary" class="yui-g">
210
                <div class="rows">
210
                <div class="rows">
Lines 213-219 Link Here
213
                [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote | html %]</li>[% END %]
213
                [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote | html %]</li>[% END %]
214
                [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %]
214
                [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %]
215
                [% IF ( basketcontractno ) %]
215
                [% IF ( basketcontractno ) %]
216
                    <li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&amp;contractnumber=[% basketcontractno | html %]&amp;booksellerid=[% booksellerid | html %]">[% basketcontractname | html %]</a></li>
216
                    <li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&amp;contractnumber=[% basketcontractno | uri %]&amp;booksellerid=[% booksellerid | uri %]">[% basketcontractname | html %]</a></li>
217
                [% END %]
217
                [% END %]
218
                [% IF deliveryplace %]<li><span class="label">Delivery place:</span> [% Branches.GetName( deliveryplace ) | html %]</li>[% END %]
218
                [% IF deliveryplace %]<li><span class="label">Delivery place:</span> [% Branches.GetName( deliveryplace ) | html %]</li>[% END %]
219
                [% IF billingplace %]<li><span class="label">Billing place:</span> [% Branches.GetName( billingplace ) | html %]</li>[% END %]
219
                [% IF billingplace %]<li><span class="label">Billing place:</span> [% Branches.GetName( billingplace ) | html %]</li>[% END %]
Lines 294-300 Link Here
294
                          [% END %]
294
                          [% END %]
295
                          [% IF basketgroup.closed %]
295
                          [% IF basketgroup.closed %]
296
                              [% IF ( CAN_user_acquisition_group_manage ) %]
296
                              [% IF ( CAN_user_acquisition_group_manage ) %]
297
                                  <a href="basketgroup.pl?op=add&booksellerid=[% booksellerid | html %]&basketgroupid=[% basketgroup.id | html %]" title="basketgroup">[% basketgroup.name | html %] (closed)</a>
297
                                  <a href="basketgroup.pl?op=add&booksellerid=[% booksellerid | uri %]&basketgroupid=[% basketgroup.id | uri %]" title="basketgroup">[% basketgroup.name | html %] (closed)</a>
298
                              [% ELSE %]
298
                              [% ELSE %]
299
                                  [% basketgroup.name | html %] (closed)
299
                                  [% basketgroup.name | html %] (closed)
300
                              [% END %]
300
                              [% END %]
Lines 339-345 Link Here
339
        [% END %]
339
        [% END %]
340
        [% IF ( duplinbatch ) %]<div class="dialog alert">
340
        [% IF ( duplinbatch ) %]<div class="dialog alert">
341
        <h4>Duplicate warning</h4>
341
        <h4>Duplicate warning</h4>
342
        <p>Some records have not been automatically added because they match an existing record in your catalog:<a href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=[% duplinbatch | html %]&amp;basketno=[% basketno | html %]&amp;booksellerid=[% booksellerid | html %]" title="Open in new window" target="_blank" class="popup" style="margin-left:10px">Display them</a></p>
342
        <p>Some records have not been automatically added because they match an existing record in your catalog:<a href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=[% duplinbatch | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" title="Open in new window" target="_blank" class="popup" style="margin-left:10px">Display them</a></p>
343
        </div>[% END %]
343
        </div>[% END %]
344
344
345
        <div id="acqui_basket_content" class="yui-g">
345
        <div id="acqui_basket_content" class="yui-g">
Lines 436-442 Link Here
436
                            <p>
436
                            <p>
437
                                [% IF ( books_loo.order_received ) %] (rcvd)[% END %]
437
                                [% IF ( books_loo.order_received ) %] (rcvd)[% END %]
438
                                [% IF books_loo.title %]
438
                                [% IF books_loo.title %]
439
                                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber | html %]">[% books_loo.title | html %]</a>[% IF books_loo.author %] by [% books_loo.author | html %][% END %]
439
                                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber | uri %]">[% books_loo.title | html %]</a>[% IF books_loo.author %] by [% books_loo.author | html %][% END %]
440
                                [% ELSE %]
440
                                [% ELSE %]
441
                                    <em>Deleted bibliographic record, can't find title</em><br />
441
                                    <em>Deleted bibliographic record, can't find title</em><br />
442
                                [% END %]
442
                                [% END %]
Lines 450-456 Link Here
450
                                [% IF ( books_loo.suggestionid ) %]
450
                                [% IF ( books_loo.suggestionid ) %]
451
                                    <br/>
451
                                    <br/>
452
                                    Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby | html %] [% END %]
452
                                    Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby | html %] [% END %]
453
                                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid | html %]&amp;op=show">suggestion #[% books_loo.suggestionid | html %]</a>)
453
                                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid | uri %]&amp;op=show">suggestion #[% books_loo.suggestionid | html %]</a>)
454
                                [% END %]
454
                                [% END %]
455
                            </p>
455
                            </p>
456
                                [% IF ( books_loo.order_internalnote ) %]
456
                                [% IF ( books_loo.order_internalnote ) %]
Lines 468-475 Link Here
468
                              [% bookseller = books_loo.transferred_from.bookseller | html %]
468
                              [% bookseller = books_loo.transferred_from.bookseller | html %]
469
                              [% timestamp = books_loo.transferred_from.timestamp | html %]
469
                              [% timestamp = books_loo.transferred_from.timestamp | html %]
470
                              <p>Transferred from basket:
470
                              <p>Transferred from basket:
471
                                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"> [% basket.basketname | html %]</a>
471
                                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
472
                                (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | html %]">[% bookseller.name | html %]</a>)
472
                                (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
473
                                on <span title="[% timestamp | $KohaDates with_hours = 1 | html %]">
473
                                on <span title="[% timestamp | $KohaDates with_hours = 1 | html %]">
474
                                  [% timestamp | $KohaDates %]
474
                                  [% timestamp | $KohaDates %]
475
                                </span>
475
                                </span>
Lines 493-499 Link Here
493
                        [% IF ( active ) %]
493
                        [% IF ( active ) %]
494
                            [% UNLESS ( closedate ) %]
494
                            [% UNLESS ( closedate ) %]
495
                            <td>
495
                            <td>
496
                                <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber | html %]&amp;booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">Modify</a>
496
                                <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Modify</a>
497
                                [% UNLESS (books_loo.order_received) %]
497
                                [% UNLESS (books_loo.order_received) %]
498
                                    <br />
498
                                    <br />
499
                                    <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a>
499
                                    <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a>
Lines 503-512 Link Here
503
                            [% IF ( books_loo.left_holds_on_order ) %]
503
                            [% IF ( books_loo.left_holds_on_order ) %]
504
                            <span class="button" title="Can't cancel order, ([% books_loo.holds_on_order | html %]) holds are linked with this order cancel holds first">Can't cancel order</span><br>
504
                            <span class="button" title="Can't cancel order, ([% books_loo.holds_on_order | html %]) holds are linked with this order cancel holds first">Can't cancel order</span><br>
505
                            [% ELSE %]
505
                            [% ELSE %]
506
                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | html %]&biblionumber=[% books_loo.biblionumber | html %]&basketno=[% basketno | html %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | html %]" class="button">Cancel order</a><br>
506
                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order</a><br>
507
                            [% END %]
507
                            [% END %]
508
                            [% IF ( books_loo.can_del_bib ) %]
508
                            [% IF ( books_loo.can_del_bib ) %]
509
                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | html %]&biblionumber=[% books_loo.biblionumber | html %]&basketno=[% basketno | html %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | html %]" class="button">Cancel order and delete catalog record</a><br>
509
                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order and delete catalog record</a><br>
510
                            [% ELSE %]
510
                            [% ELSE %]
511
                            <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br>
511
                            <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br>
512
                            [% END %]
512
                            [% END %]
Lines 586-593 Link Here
586
                        [% bookseller = order.transferred_to.bookseller | html %]
586
                        [% bookseller = order.transferred_to.bookseller | html %]
587
                        [% timestamp = order.transferred_to.timestamp | html %]
587
                        [% timestamp = order.transferred_to.timestamp | html %]
588
                        <p>Transferred to basket:
588
                        <p>Transferred to basket:
589
                          <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"> [% basket.basketname | html %]</a>
589
                          <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
590
                          (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | html %]">[% bookseller.name | html %]</a>)
590
                          (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
591
                          on <span title="[% timestamp | $KohaDates with_hours = 1 | html %]">
591
                          on <span title="[% timestamp | $KohaDates with_hours = 1 | html %]">
592
                            [% timestamp | $KohaDates %]
592
                            [% timestamp | $KohaDates %]
593
                          </span>
593
                          </span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-9 / +9 lines)
Lines 130-138 function submitForm(form) { Link Here
130
130
131
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
131
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
132
[% IF ( grouping ) %]
132
[% IF ( grouping ) %]
133
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | html %]">Basket grouping</a> &rsaquo; Add basket group for [% booksellername | html %]</div>
133
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | html %]">Basket grouping</a> &rsaquo; Add basket group for [% booksellername | html %]</div>
134
[% ELSE %]
134
[% ELSE %]
135
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> &rsaquo; Basket grouping</div>
135
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> &rsaquo; Basket grouping</div>
136
[% END %]
136
[% END %]
137
137
138
138
Lines 153-163 function submitForm(form) { Link Here
153
                        </div>
153
                        </div>
154
                    [% END %]
154
                    [% END %]
155
                    [% IF (name && closedbg) %]
155
                    [% IF (name && closedbg) %]
156
                        <h1>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a></h1>
156
                        <h1>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
157
                    [% ELSIF (name) %]
157
                    [% ELSIF (name) %]
158
                        <h1>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a></h1>
158
                        <h1>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
159
                    [% ELSE %]
159
                    [% ELSE %]
160
                        <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a></h1>
160
                        <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
161
                    [% END %]
161
                    [% END %]
162
                    <div id="basketgroupcolumns" class="row">
162
                    <div id="basketgroupcolumns" class="row">
163
                        [% UNLESS (closedbg) %]
163
                        [% UNLESS (closedbg) %]
Lines 171-177 function submitForm(form) { Link Here
171
                                                    [% IF ( baskets ) %]
171
                                                    [% IF ( baskets ) %]
172
                                                        [% FOREACH basket IN baskets %]
172
                                                        [% FOREACH basket IN baskets %]
173
                                                            <li class="ungrouped" id="b-[% basket.basketno | html %]" >
173
                                                            <li class="ungrouped" id="b-[% basket.basketno | html %]" >
174
                                                                <a href="basket.pl?basketno=[% basket.basketno | html %]">
174
                                                                <a href="basket.pl?basketno=[% basket.basketno | uri %]">
175
                                                                    [% IF ( basket.basketname ) %]
175
                                                                    [% IF ( basket.basketname ) %]
176
                                                                        [% basket.basketname | html %]
176
                                                                        [% basket.basketname | html %]
177
                                                                    [% ELSE %]
177
                                                                    [% ELSE %]
Lines 261-267 function submitForm(form) { Link Here
261
                                                [% END %]
261
                                                [% END %]
262
                                                [% FOREACH selectedbasket IN selectedbaskets %]
262
                                                [% FOREACH selectedbasket IN selectedbaskets %]
263
                                                    <li class="grouped" id="b-[% selectedbasket.basketno | html %]" >
263
                                                    <li class="grouped" id="b-[% selectedbasket.basketno | html %]" >
264
                                                        <a href="basket.pl?basketno=[% selectedbasket.basketno | html %]">
264
                                                        <a href="basket.pl?basketno=[% selectedbasket.basketno | uri %]">
265
                                                            [% IF ( selectedbasket.basketname ) %]
265
                                                            [% IF ( selectedbasket.basketname ) %]
266
                                                                [% selectedbasket.basketname | html %]
266
                                                                [% selectedbasket.basketname | html %]
267
                                                            [% ELSE %]
267
                                                            [% ELSE %]
Lines 287-293 function submitForm(form) { Link Here
287
                                            <input type="hidden" name="basketgroupid" value="[% basketgroupid | html %]" />
287
                                            <input type="hidden" name="basketgroupid" value="[% basketgroupid | html %]" />
288
                                        [% END %]
288
                                        [% END %]
289
                                        <input type="hidden" name="op" value="attachbasket" />
289
                                        <input type="hidden" name="op" value="attachbasket" />
290
                                        <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | html %]" class="cancel">Cancel</a>
290
                                        <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]" class="cancel">Cancel</a>
291
                                    </fieldset>
291
                                    </fieldset>
292
                                [% END %]
292
                                [% END %]
293
                            </form>
293
                            </form>
Lines 295-301 function submitForm(form) { Link Here
295
                    </div>
295
                    </div>
296
                [% ELSE %]
296
                [% ELSE %]
297
                    <div id="toolbar" class="btn-toolbar">
297
                    <div id="toolbar" class="btn-toolbar">
298
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% booksellerid | html %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div>
298
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div>
299
                    </div>
299
                    </div>
300
                    <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
300
                    <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
301
                    [% IF (NoEDIMessage) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %]
301
                    [% IF (NoEDIMessage) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt (-1 / +1 lines)
Lines 21-27 Link Here
21
<div id="breadcrumbs">
21
<div id="breadcrumbs">
22
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
22
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
23
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
23
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
24
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> &rsaquo;
24
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> &rsaquo;
25
    [% IF ( add_form ) %]
25
    [% IF ( add_form ) %]
26
        [% IF ( basketno ) %]Edit basket '[% basketname | html %]'
26
        [% IF ( basketno ) %]Edit basket '[% basketname | html %]'
27
        [% ELSE %]Add a basket to [% booksellername | html %]
27
        [% ELSE %]Add a basket to [% booksellername | html %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-3 / +3 lines)
Lines 45-53 Link Here
45
        </p>
45
        </p>
46
    [% END %]
46
    [% END %]
47
    [% IF ( allbaskets ) %]
47
    [% IF ( allbaskets ) %]
48
        <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | html %]&amp;booksellerid=[% booksellerid | html %]">Show active baskets only</a>
48
        <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&amp;booksellerid=[% booksellerid | uri %]">Show active baskets only</a>
49
    [% ELSE %]
49
    [% ELSE %]
50
        <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | html %]&amp;booksellerid=[% booksellerid | html %]&amp;allbaskets=1">Show all baskets</a>
50
        <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;allbaskets=1">Show all baskets</a>
51
    [% END %]
51
    [% END %]
52
    [% UNLESS booksellerid %]
52
    [% UNLESS booksellerid %]
53
        | <a href="#" id="show_active_vendors">Show active vendors only</a><a href="#" id="show_all_vendors">Show all vendors</a>
53
        | <a href="#" id="show_active_vendors">Show active vendors only</a><a href="#" id="show_all_vendors">Show all vendors</a>
Lines 132-138 Link Here
132
                                            [% IF basketgroup.closed %]
132
                                            [% IF basketgroup.closed %]
133
                                              [% basketgroup.name | html %] (closed)
133
                                              [% basketgroup.name | html %] (closed)
134
                                            [% ELSE %]
134
                                            [% ELSE %]
135
                                              <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% basket.booksellerid | html %]&amp;basketgroupid=[% basketgroup.id | html %]">[% basketgroup.name | html %]</a>
135
                                              <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% basket.booksellerid | uri %]&amp;basketgroupid=[% basketgroup.id | uri %]">[% basketgroup.name | html %]</a>
136
                                            [% END %]
136
                                            [% END %]
137
                                          [% END %]
137
                                          [% END %]
138
                                        </td>
138
                                        </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt (-3 / +3 lines)
Lines 9-16 Link Here
9
<div id="breadcrumbs">
9
<div id="breadcrumbs">
10
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
10
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
11
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
11
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
12
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% basket.bookseller.id | html %]">[% basket.bookseller.name | html %]</a> &rsaquo;
12
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% basket.bookseller.id | uri %]">[% basket.bookseller.name | html %]</a> &rsaquo;
13
    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]">Basket [% basket.basketname | html %] ([% basket.basketno | html %]) for [% basket.bookseller.name | html %]</a> &rsaquo;
13
    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]">Basket [% basket.basketname | html %] ([% basket.basketno | html %]) for [% basket.bookseller.name | html %]</a> &rsaquo;
14
    Cancel order
14
    Cancel order
15
</div>
15
</div>
16
16
Lines 58-64 Link Here
58
                <p>The order has been cancelled, although the record has not been deleted.</p>
58
                <p>The order has been cancelled, although the record has not been deleted.</p>
59
                [% END %]
59
                [% END %]
60
        [% END %]
60
        [% END %]
61
                <p><a href="[% referrer | html %]">OK</a></p>
61
                <p><a href="[% referrer | uri %]">OK</a></p>
62
            </div>
62
            </div>
63
      [% END %]
63
      [% END %]
64
64
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt (-3 / +3 lines)
Lines 49-68 Link Here
49
<td><span title="[% msg.transfer_date | html %]">[% msg.transfer_date | $KohaDates %]</span></td>
49
<td><span title="[% msg.transfer_date | html %]">[% msg.transfer_date | $KohaDates %]</span></td>
50
<td>[% msg.status | html %]</td>
50
<td>[% msg.status | html %]</td>
51
<td>
51
<td>
52
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% msg.vendor_id | html %]">
52
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% msg.vendor_id | uri %]">
53
        [% msg.vendor.name | html %]
53
        [% msg.vendor.name | html %]
54
    </a>
54
    </a>
55
</td>
55
</td>
56
<td>
56
<td>
57
[% IF msg.message_type == 'QUOTE' || msg.message_type == 'ORDERS' %]
57
[% IF msg.message_type == 'QUOTE' || msg.message_type == 'ORDERS' %]
58
    [% IF msg.basketno %]
58
    [% IF msg.basketno %]
59
    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% msg.basketno.basketno | html %]">
59
    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% msg.basketno.basketno | uri %]">
60
    Basket: [% msg.basketno.basketno | html %]
60
    Basket: [% msg.basketno.basketno | html %]
61
    </a>
61
    </a>
62
    [% END %]
62
    [% END %]
63
[% ELSE %]
63
[% ELSE %]
64
<!-- Assuming invoices -->
64
<!-- Assuming invoices -->
65
     <a href="/cgi-bin/koha/acqui/invoices.pl?message_id=[% msg.id | html %]">
65
     <a href="/cgi-bin/koha/acqui/invoices.pl?message_id=[% msg.id | uri %]">
66
      Invoices
66
      Invoices
67
     </a>
67
     </a>
68
[% END %]
68
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-5 / +5 lines)
Lines 159-184 Link Here
159
                            [% CASE 'cancelled' %]Cancelled
159
                            [% CASE 'cancelled' %]Cancelled
160
                        [% END %]
160
                        [% END %]
161
                    </td>
161
                    </td>
162
                    <td>[% order.basketname | html %] (<a href="basket.pl?basketno=[% order.basketno | html %]">[% order.basketno | html %]</a>)</td>
162
                    <td>[% order.basketname | html %] (<a href="basket.pl?basketno=[% order.basketno | uri %]">[% order.basketno | html %]</a>)</td>
163
                    <td>[% order.authorisedbyname | html %]</td>
163
                    <td>[% order.authorisedbyname | html %]</td>
164
                    <td>
164
                    <td>
165
                        [% IF ( order.basketgroupid ) %]
165
                        [% IF ( order.basketgroupid ) %]
166
                            [% order.groupname | html %] (<a href="basketgroup.pl?op=add&booksellerid=[% order.id | html %]&basketgroupid=[% order.basketgroupid | html %]">[% order.basketgroupid | html %]</a>)
166
                            [% order.groupname | html %] (<a href="basketgroup.pl?op=add&booksellerid=[% order.id | uri %]&basketgroupid=[% order.basketgroupid | uri %]">[% order.basketgroupid | html %]</a>)
167
                        [% ELSE %]
167
                        [% ELSE %]
168
                            &nbsp;
168
                            &nbsp;
169
                        [% END %]
169
                        [% END %]
170
                    </td>
170
                    </td>
171
                    <td>[% IF ( order.invoicenumber ) %]
171
                    <td>[% IF ( order.invoicenumber ) %]
172
                            <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% order.invoiceid | html %]">[% order.invoicenumber | html %]</a>
172
                            <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a>
173
                        [% ELSE %]
173
                        [% ELSE %]
174
                            &nbsp;
174
                            &nbsp;
175
                        [% END %]
175
                        [% END %]
176
                    </td>
176
                    </td>
177
                    <td>
177
                    <td>
178
                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | html %]">[% order.title | html %]</a>
178
                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">[% order.title | html %]</a>
179
                        <br />[% order.author | html %] <br /> [% order.isbn | html %]
179
                        <br />[% order.author | html %] <br /> [% order.isbn | html %]
180
                    </td>
180
                    </td>
181
                    <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id | html %]">[% order.name | html %]</a></td>
181
                    <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id | uri %]">[% order.name | html %]</a></td>
182
                    <td><span title="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</span></td>
182
                    <td><span title="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</span></td>
183
                    <td>
183
                    <td>
184
                        [% IF order.datereceived %]
184
                        [% IF order.datereceived %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt (-3 / +3 lines)
Lines 20-26 Link Here
20
            <main>
20
            <main>
21
21
22
      <h2>Files for invoice: [% invoicenumber | html %]</h2>
22
      <h2>Files for invoice: [% invoicenumber | html %]</h2>
23
      <p><b>Vendor: </b><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% suppliername | html %]</a></p>
23
      <p><b>Vendor: </b><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a></p>
24
      <br />
24
      <br />
25
      [% IF errors %]
25
      [% IF errors %]
26
        <div class="dialog alert">
26
        <div class="dialog alert">
Lines 45-51 Link Here
45
              <tbody>
45
              <tbody>
46
                [% FOREACH f IN files %]
46
                [% FOREACH f IN files %]
47
                  <tr>
47
                  <tr>
48
                      <td><a href="?invoiceid=[% invoiceid | html %]&amp;op=download&amp;view=1&amp;file_id=[% f.file_id | html %]">[% f.file_name | html %]</a></td>
48
                      <td><a href="?invoiceid=[% invoiceid | uri %]&amp;op=download&amp;view=1&amp;file_id=[% f.file_id | uri %]">[% f.file_name | html %]</a></td>
49
                      <td>[% f.file_type | html %]</td>
49
                      <td>[% f.file_type | html %]</td>
50
                      <td>[% f.file_description | html %]</td>
50
                      <td>[% f.file_description | html %]</td>
51
                      <td class="title-string">
51
                      <td class="title-string">
Lines 53-59 Link Here
53
                      </td>
53
                      </td>
54
                      <td>[% f.file_size | html %]</td>
54
                      <td>[% f.file_size | html %]</td>
55
                      <td><a class="delete_file" href="?invoiceid=[% invoiceid | html %]&amp;op=delete&amp;file_id=[% f.file_id | html %]">Delete</a></td>
55
                      <td><a class="delete_file" href="?invoiceid=[% invoiceid | html %]&amp;op=delete&amp;file_id=[% f.file_id | html %]">Delete</a></td>
56
                      <td><a href="?invoiceid=[% invoiceid | html %]&amp;op=download&amp;file_id=[% f.file_id | html %]">Download</a></td>
56
                      <td><a href="?invoiceid=[% invoiceid | uri %]&amp;op=download&amp;file_id=[% f.file_id | uri %]">Download</a></td>
57
                  </tr>
57
                  </tr>
58
                [% END %]
58
                [% END %]
59
              </tbody>
59
              </tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-6 / +6 lines)
Lines 30-36 Link Here
30
      [% END %]
30
      [% END %]
31
      <h1>Invoice: [% invoicenumber | html %]</h1>
31
      <h1>Invoice: [% invoicenumber | html %]</h1>
32
32
33
      <p>Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% suppliername | html %]</a></p>
33
      <p>Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a></p>
34
        <form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated">
34
        <form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated">
35
        <fieldset class="rows">
35
        <fieldset class="rows">
36
            <ol>
36
            <ol>
Lines 80-86 Link Here
80
            <fieldset class="action">
80
            <fieldset class="action">
81
                <input type="submit" value="Save" />
81
                <input type="submit" value="Save" />
82
                [% UNLESS orders_loop.size %]
82
                [% UNLESS orders_loop.size %]
83
                <a href="invoice.pl?op=delete&invoiceid=[% invoiceid | html %]" id="delete">Delete</a>
83
                <a href="invoice.pl?op=delete&invoiceid=[% invoiceid | uri %]" id="delete">Delete</a>
84
                [% END %]
84
                [% END %]
85
            </fieldset>
85
            </fieldset>
86
        </fieldset>
86
        </fieldset>
Lines 227-234 Link Here
227
                  </fieldset>
227
                  </fieldset>
228
              </form>
228
              </form>
229
      <p>
229
      <p>
230
          <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]">Go to receipt page</a>
230
          <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]">Go to receipt page</a>
231
          [% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | html %]">Manage invoice files</a>[% END %]
231
          [% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]">Manage invoice files</a>[% END %]
232
      </p>
232
      </p>
233
      <h2>Invoice details</h2>
233
      <h2>Invoice details</h2>
234
      <fieldset>
234
      <fieldset>
Lines 258-264 Link Here
258
                <tr>
258
                <tr>
259
                  <td>
259
                  <td>
260
                    [% IF order.biblionumber %]
260
                    [% IF order.biblionumber %]
261
                      <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | html %]">[% order.title | html %]</a>
261
                      <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">[% order.title | html %]</a>
262
                      [% IF ( order.author ) %]
262
                      [% IF ( order.author ) %]
263
                        <br /><em>by</em> [% order.author | html %]
263
                        <br /><em>by</em> [% order.author | html %]
264
                      [% END %]
264
                      [% END %]
Lines 348-354 Link Here
348
                <tbody>
348
                <tbody>
349
                [% FOREACH f IN files %]
349
                [% FOREACH f IN files %]
350
                    <tr>
350
                    <tr>
351
                         <td><a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | html %]&amp;op=download&amp;view=1&amp;file_id=[% f.file_id | html %]">[% f.file_name | html %]</a></td>
351
                         <td><a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]&amp;op=download&amp;view=1&amp;file_id=[% f.file_id | uri %]">[% f.file_name | html %]</a></td>
352
                         <td>[% f.file_type | html %]</td>
352
                         <td>[% f.file_type | html %]</td>
353
                         <td>[% f.file_description | html %]</td>
353
                         <td>[% f.file_description | html %]</td>
354
                         <td class="title-string">
354
                         <td class="title-string">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-6 / +6 lines)
Lines 48-55 Link Here
48
                <tr data-invoiceid="[% invoice.invoiceid | html %]" data-booksellerid="[% invoice.booksellerid | html %]" data-shipmentdate="[% invoice.shipmentdate | $KohaDates %]" data-billingdate="[% invoice.billingdate | $KohaDates %]" data-shipmentcost="[% invoice.shipmentcost | html %]" data-shipment_budgetid="[% invoice.shipmentcost_budgetid | html %]" data-closedate="[% invoice.closedate | $KohaDates %]">
48
                <tr data-invoiceid="[% invoice.invoiceid | html %]" data-booksellerid="[% invoice.booksellerid | html %]" data-shipmentdate="[% invoice.shipmentdate | $KohaDates %]" data-billingdate="[% invoice.billingdate | $KohaDates %]" data-shipmentcost="[% invoice.shipmentcost | html %]" data-shipment_budgetid="[% invoice.shipmentcost_budgetid | html %]" data-closedate="[% invoice.closedate | $KohaDates %]">
49
                  <td>[% invoice.is_linked_to_subscriptions | html %]</td>
49
                  <td>[% invoice.is_linked_to_subscriptions | html %]</td>
50
                  <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td>
50
                  <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td>
51
                  <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | html %]">[% invoice.invoicenumber | html %]</a></td>
51
                  <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td>
52
                  <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid | html %]">[% invoice.suppliername | html %]</a></td>
52
                  <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td>
53
                  <td>
53
                  <td>
54
                    [% IF invoice.shipmentdate %]
54
                    [% IF invoice.shipmentdate %]
55
                      <span title="[% invoice.shipmentdate | html %]">[% invoice.shipmentdate | $KohaDates %]</span>
55
                      <span title="[% invoice.shipmentdate | html %]">[% invoice.shipmentdate | $KohaDates %]</span>
Lines 80-93 Link Here
80
                             Actions <b class="caret"></b>
80
                             Actions <b class="caret"></b>
81
                          </a>
81
                          </a>
82
                          <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid | html %]">
82
                          <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid | html %]">
83
                              <li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | html %]"><i class="fa fa-search"></i> Details</a></li>
83
                              <li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]"><i class="fa fa-search"></i> Details</a></li>
84
                            [% IF invoice.closedate %]
84
                            [% IF invoice.closedate %]
85
                                <li><a href="invoice.pl?op=reopen&amp;invoiceid=[% invoice.invoiceid | html %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | html %]%26supplier=[% booksellerid | html %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | html %]%26title=[% title | html %]%26author=[% author | html %]%26publisher=[% publisher | html %]%26publicationyear=[% publicationyear | html %]%26branch=[% branch | html %]"><i class="fa fa-refresh"></i> Reopen</a></li>
85
                                <li><a href="invoice.pl?op=reopen&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen</a></li>
86
                            [% ELSE %]
86
                            [% ELSE %]
87
                                <li><a href="invoice.pl?op=close&amp;invoiceid=[% invoice.invoiceid | html %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | html %]%26supplier=[% booksellerid | html %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | html %]%26title=[% title | html %]%26author=[% author | html %]%26publisher=[% publisher | html %]%26publicationyear=[% publicationyear | html %]%26branch=[% branch | html %]"><i class="fa fa-times-circle"></i> Close</a></li>
87
                                <li><a href="invoice.pl?op=close&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close</a></li>
88
                            [% END %]
88
                            [% END %]
89
                            [% UNLESS invoice.receivedbiblios || invoice.receiveditems %]
89
                            [% UNLESS invoice.receivedbiblios || invoice.receiveditems %]
90
                                <li><a href="invoice.pl?op=delete&amp;invoiceid=[% invoice.invoiceid | html %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | html %]%26supplier=[% booksellerid | html %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | html %]%26title=[% title | html %]%26author=[% author | html %]%26publisher=[% publisher | html %]%26publicationyear=[% publicationyear | html %]%26branch=[% branch | html %]" class="delete_invoice"><i class="fa fa-trash"></i> Delete</a></li>
90
                                <li><a href="invoice.pl?op=delete&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]" class="delete_invoice"><i class="fa fa-trash"></i> Delete</a></li>
91
                            [% END %]
91
                            [% END %]
92
                          </ul>
92
                          </ul>
93
                      </div>
93
                      </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-2 / +2 lines)
Lines 106-112 Link Here
106
            </td>
106
            </td>
107
            <td>
107
            <td>
108
                [% IF ( CAN_user_acquisition_order_manage ) %]
108
                [% IF ( CAN_user_acquisition_order_manage ) %]
109
                    <a href="basket.pl?basketno=[% lateorder.basketno | html %]" title="basket">[% lateorder.basketname | html %] ([% lateorder.basketno | html %])</a>
109
                    <a href="basket.pl?basketno=[% lateorder.basketno | uri %]" title="basket">[% lateorder.basketname | html %] ([% lateorder.basketno | html %])</a>
110
                [% ELSE %]
110
                [% ELSE %]
111
                    [% lateorder.basketname | html %] ([% lateorder.basketno | html %])
111
                    [% lateorder.basketname | html %] ([% lateorder.basketno | html %])
112
                [% END %]
112
                [% END %]
Lines 114-120 Link Here
114
            <td>
114
            <td>
115
                [% IF ( lateorder.basketgroupid ) %]
115
                [% IF ( lateorder.basketgroupid ) %]
116
                    [% IF ( CAN_user_acquisition_group_manage ) %]
116
                    [% IF ( CAN_user_acquisition_group_manage ) %]
117
                        <a href="basketgroup.pl?op=add&booksellerid=[% lateorder.supplierid | html %]&basketgroupid=[% lateorder.basketgroupid | html %]" title="basketgroup">[% lateorder.basketgroupname | html %] ([% lateorder.basketgroupid | html %])</a>
117
                        <a href="basketgroup.pl?op=add&booksellerid=[% lateorder.supplierid | uri %]&basketgroupid=[% lateorder.basketgroupid | uri %]" title="basketgroup">[% lateorder.basketgroupname | html %] ([% lateorder.basketgroupid | html %])</a>
118
                    [% ELSE %]
118
                    [% ELSE %]
119
                        [% lateorder.basketgroupname | html %] ([% lateorder.basketgroupid | html %])</a>
119
                        [% lateorder.basketgroupname | html %] ([% lateorder.basketgroupid | html %])</a>
120
                    [% END %]
120
                    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt (-4 / +4 lines)
Lines 51-57 Link Here
51
      [% FOREACH biblio IN resultsloop %]
51
      [% FOREACH biblio IN resultsloop %]
52
        <tr>
52
        <tr>
53
            <td>
53
            <td>
54
                <p><span class="title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | html %]">[% biblio.title | html %]</a></span>
54
                <p><span class="title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.title | html %]</a></span>
55
                [% FOREACH subtitle IN biblio.subtitles %] <span class="subtitle">[% subtitle.subfield | html %]</span>[% END %]
55
                [% FOREACH subtitle IN biblio.subtitles %] <span class="subtitle">[% subtitle.subfield | html %]</span>[% END %]
56
                [% IF ( biblio.author ) %]  by <span class="author">[% biblio.author | html %]</span>,[% END %]</p>
56
                [% IF ( biblio.author ) %]  by <span class="author">[% biblio.author | html %]</span>,[% END %]</p>
57
                <p>[% IF ( biblio.isbn ) %] [% biblio.isbn | html %][% END %]
57
                <p>[% IF ( biblio.isbn ) %] [% biblio.isbn | html %][% END %]
Lines 68-78 Link Here
68
                [% biblio.copyrightdate | html %]
68
                [% biblio.copyrightdate | html %]
69
            </td>
69
            </td>
70
        <td>
70
        <td>
71
        <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber | html %]&amp;viewas=html" class="btn btn-default btn-xs previewMARC">View MARC</a>
71
        <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber | uri %]&amp;viewas=html" class="btn btn-default btn-xs previewMARC">View MARC</a>
72
        </td>
72
        </td>
73
            <td>
73
            <td>
74
            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;biblionumber=[% biblio.biblionumber | html %]" class="btn btn-default btn-xs" title="Order this one">
74
            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% biblio.biblionumber | uri %]" class="btn btn-default btn-xs" title="Order this one">
75
                Place order
75
                Order
76
            </a>
76
            </a>
77
            </td>
77
            </td>
78
        </tr>
78
        </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-3 / +3 lines)
Lines 41-47 Link Here
41
        [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %]
41
        [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %]
42
        [% IF ( basketcontractno ) %]
42
        [% IF ( basketcontractno ) %]
43
            <li><span class="label">Contract number: </span>[% basketcontractno | html %]</li>
43
            <li><span class="label">Contract number: </span>[% basketcontractno | html %]</li>
44
            <li><span class="label">Contract name:</span> <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% basketcontractno | html %]">[% basketcontractname | html %]</a></li>
44
            <li><span class="label">Contract name:</span> <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% basketcontractno | uri %]">[% basketcontractname | html %]</a></li>
45
        [% END %]
45
        [% END %]
46
        [% IF ( authorisedbyname ) %]<li><span class="label">Managed by:</span>  [% authorisedbyname | html %]</li>[% END %]
46
        [% IF ( authorisedbyname ) %]<li><span class="label">Managed by:</span>  [% authorisedbyname | html %]</li>[% END %]
47
        [% IF ( creationdate ) %]<li><span class="label">Open on:</span>  [% creationdate | $KohaDates %]</li>[% END %]
47
        [% IF ( creationdate ) %]<li><span class="label">Open on:</span>  [% creationdate | $KohaDates %]</li>[% END %]
Lines 99-105 Link Here
99
        <legend>
99
        <legend>
100
            Catalog details
100
            Catalog details
101
            [% IF ( biblionumber ) %]
101
            [% IF ( biblionumber ) %]
102
                <span><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]"> Edit record</a></span>
102
                <span><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | uri %]"> Edit record</a></span>
103
            [% END %]
103
            [% END %]
104
        </legend>
104
        </legend>
105
        [% UNLESS ( existing ) %]
105
        [% UNLESS ( existing ) %]
Lines 241-247 Link Here
241
        <ol>
241
        <ol>
242
          <li>
242
          <li>
243
            <span class="label">Suggested by: </span>
243
            <span class="label">Suggested by: </span>
244
            [% surnamesuggestedby | html %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby | html %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid | html %]&amp;op=show">suggestion #[% suggestionid | html %]</a>)
244
            [% surnamesuggestedby | html %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby | html %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid | uri %]&amp;op=show">suggestion #[% suggestionid | html %]</a>)
245
          </li>
245
          </li>
246
        </ol>
246
        </ol>
247
        </fieldset>
247
        </fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-1 / +1 lines)
Lines 45-51 Link Here
45
                        [% FOREACH sub IN subs_loop %]
45
                        [% FOREACH sub IN subs_loop %]
46
                            <tr data-reneweddate="[% sub.reneweddate | html %]" >
46
                            <tr data-reneweddate="[% sub.reneweddate | html %]" >
47
                                <td>[% sub.issn | html %]</td>
47
                                <td>[% sub.issn | html %]</td>
48
                                <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | html %]" class="button" title="subscription detail">[% IF (sub.title) %][% sub.title | html %][% ELSE %]
48
                                <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | uri %]" class="button" title="subscription detail">[% IF (sub.title) %][% sub.title | html %][% ELSE %]
49
                                ---
49
                                ---
50
                            [% END %][% IF (sub.unititle) %], [% sub.unititle | html %][% END %]</a>
50
                            [% END %][% IF (sub.unititle) %], [% sub.unititle | html %][% END %]</a>
51
                                </td>
51
                                </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-2 / +2 lines)
Lines 55-63 Link Here
55
                </td>
55
                </td>
56
                <td class="actions">
56
                <td class="actions">
57
                    [% IF ( suggestions_loo.biblionumber ) %]
57
                    [% IF ( suggestions_loo.biblionumber ) %]
58
                        <a href="neworderempty.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;suggestionid=[% suggestions_loo.suggestionid | html %]&amp;biblio=[% suggestions_loo.biblionumber | html %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Place order</a>
58
                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestions_loo.suggestionid | uri %]&amp;biblio=[% suggestions_loo.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a>
59
                    [% ELSE %]
59
                    [% ELSE %]
60
                        <a href="neworderempty.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;suggestionid=[% suggestions_loo.suggestionid | html %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Place order</a>
60
                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestions_loo.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a>
61
                    [% END %]
61
                    [% END %]
62
                </td>
62
                </td>
63
            </tr>
63
            </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-3 / +3 lines)
Lines 40-58 Link Here
40
[% FOREACH order IN ordered %]
40
[% FOREACH order IN ordered %]
41
    <tr>
41
    <tr>
42
	<td class="cell">
42
	<td class="cell">
43
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | html %]">
43
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">
44
	    [% order.title | html %]
44
	    [% order.title | html %]
45
            </a>
45
            </a>
46
	</td>
46
	</td>
47
	<td class="cell">
47
	<td class="cell">
48
        [% IF ( CAN_user_acquisition_order_manage ) %]
48
        [% IF ( CAN_user_acquisition_order_manage ) %]
49
            <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber | html %]&amp;booksellerid=[% order.booksellerid | html %]&amp;basketno=[% order.basketno | html %]">[% order.ordernumber | html %]</a>
49
            <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber | uri %]&amp;booksellerid=[% order.booksellerid | uri %]&amp;basketno=[% order.basketno | uri %]">[% order.ordernumber | html %]</a>
50
        [% ELSE %]
50
        [% ELSE %]
51
            [% order.ordernumber | html %]
51
            [% order.ordernumber | html %]
52
        [% END %]
52
        [% END %]
53
	</td>
53
	</td>
54
	<td class="cell">
54
	<td class="cell">
55
	    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.vendorname | html %]</a>
55
	    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
56
	</td>
56
	</td>
57
	<td class="cell">
57
	<td class="cell">
58
        [% ItemTypes.GetDescription( order.itype ) | html %]
58
        [% ItemTypes.GetDescription( order.itype ) | html %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-1 / +1 lines)
Lines 48-54 Link Here
48
        <ol>
48
        <ol>
49
          <li>
49
          <li>
50
            <span class="label">Suggested by: </span>
50
            <span class="label">Suggested by: </span>
51
            [% surnamesuggestedby | html %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby | html %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid | html %]&amp;op=show">suggestion #[% suggestionid | html %]</a>)
51
            [% surnamesuggestedby | html %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby | html %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid | uri %]&amp;op=show">suggestion #[% suggestionid | html %]</a>)
52
          </li>
52
          </li>
53
        </ol>
53
        </ol>
54
        </fieldset>
54
        </fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-29 / +29 lines)
Lines 130-146 Link Here
130
        <tbody class="filterclass">
130
        <tbody class="filterclass">
131
        [% FOREACH loop_order IN loop_orders %]
131
        [% FOREACH loop_order IN loop_orders %]
132
            <tr>
132
            <tr>
133
                <td class="basketfilterclass">[% loop_order.basketname | html %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno | html %]">[% loop_order.basketno | html %]</a>)</td>
133
                <td class="basketfilterclass">[% loop_order.basketname | html %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno | uri %]">[% loop_order.basketno | html %]</a>)</td>
134
                <td>
134
                <td>
135
                  [% IF loop_order.basketgroupid %]
135
                  [% IF loop_order.basketgroupid %]
136
                    [% loop_order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% loop_order.booksellerid | html %]">[% loop_order.basketgroupid | html %]</a>)
136
                    [% loop_order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% loop_order.booksellerid | uri %]">[% loop_order.basketgroupid | html %]</a>)
137
                  [% ELSE %]
137
                  [% ELSE %]
138
                    No basket group
138
                    No basket group
139
                  [% END %]
139
                  [% END %]
140
                </td>
140
                </td>
141
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber | html %]&amp;booksellerid=[% loop_order.booksellerid | html %]">[% loop_order.ordernumber | html %]</a></td>
141
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber | uri %]&amp;booksellerid=[% loop_order.booksellerid | uri %]">[% loop_order.ordernumber | html %]</a></td>
142
                <td class="summaryfilterclass">
142
                <td class="summaryfilterclass">
143
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber | html %]">[% loop_order.title | html %]</a>
143
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber | uri %]">[% loop_order.title | html %]</a>
144
                [% IF ( loop_order.author ) %] by [% loop_order.author | html %][% END %]
144
                [% IF ( loop_order.author ) %] by [% loop_order.author | html %][% END %]
145
                [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn | html %][% END %]
145
                [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn | html %][% END %]
146
                [% IF ( loop_order.publishercode ) %]
146
                [% IF ( loop_order.publishercode ) %]
Lines 152-175 Link Here
152
                [% IF ( loop_order.suggestionid ) %]
152
                [% IF ( loop_order.suggestionid ) %]
153
                    <br/>
153
                    <br/>
154
                    Suggested by: [% loop_order.surnamesuggestedby | html %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby | html %] [% END %]
154
                    Suggested by: [% loop_order.surnamesuggestedby | html %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby | html %] [% END %]
155
                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_order.suggestionid | html %]&amp;op=show">suggestion #[% loop_order.suggestionid | html %]</a>)
155
                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_order.suggestionid | uri %]&amp;op=show">suggestion #[% loop_order.suggestionid | html %]</a>)
156
                [% END %]
156
                [% END %]
157
                <br />
157
                <br />
158
                [% IF ( loop_order.order_internalnote ) %]
158
                [% IF ( loop_order.order_internalnote ) %]
159
                    <p class="ordernote"><strong>Internal note: </strong>[% loop_order.order_internalnote | html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber | html %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | html %]&type=internal">Change internal note</a>]</p>
159
                    <p class="ordernote"><strong>Internal note: </strong>[% loop_order.order_internalnote | html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber | uri %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | uri %]&type=internal">Change internal note</a>]</p>
160
                [% ELSE %]
160
                [% ELSE %]
161
                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber | html %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | html %]&type=internal">Add internal note</a>]
161
                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber | uri %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | uri %]&type=internal">Add internal note</a>]
162
                [% END %]
162
                [% END %]
163
                [% IF ( loop_order.order_vendornote ) %]
163
                [% IF ( loop_order.order_vendornote ) %]
164
                    <p class="ordernote"><strong>Vendor note: </strong>[% loop_order.order_vendornote | html %]</p>
164
                    <p class="ordernote"><strong>Vendor note: </strong>[% loop_order.order_vendornote | html %]</p>
165
                [% ELSE %]
165
                [% ELSE %]
166
                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber | html %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | html %]&type=vendor">Add vendor note</a>]
166
                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber | uri %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | uri %]&type=vendor">Add vendor note</a>]
167
                [% END %]
167
                [% END %]
168
                </td>
168
                </td>
169
                <td>
169
                <td>
170
                  <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% loop_order.ordernumber | html %]" class="previewData">Order</a><br>
170
                  <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% loop_order.ordernumber | uri %]" class="previewData">Order</a><br>
171
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber | html %]" class="previewData">MARC</a><br>
171
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber | uri %]" class="previewData">MARC</a><br>
172
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_order.biblionumber | html %]" class="previewData">Card</a>
172
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_order.biblionumber | uri %]" class="previewData">Card</a>
173
                </td>
173
                </td>
174
                <td>[% loop_order.replacementprice | $Price %]</td>
174
                <td>[% loop_order.replacementprice | $Price %]</td>
175
                <td>[% loop_order.quantity | html %]</td>
175
                <td>[% loop_order.quantity | html %]</td>
Lines 177-183 Link Here
177
                <td>[% loop_order.total | $Price %]</td>
177
                <td>[% loop_order.total | $Price %]</td>
178
                <td>[% loop_order.budget_name | html %]</td>
178
                <td>[% loop_order.budget_name | html %]</td>
179
				<td>
179
				<td>
180
                              <a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber | html %]&amp;invoiceid=[% invoiceid | html %]">Receive</a>
180
                              <a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber | uri %]&amp;invoiceid=[% invoiceid | uri %]">Receive</a>
181
                    <br />
181
                    <br />
182
                    <a href="#" onclick="transfer_order_popup([% loop_order.ordernumber | html %]); return false;">Transfer</a>
182
                    <a href="#" onclick="transfer_order_popup([% loop_order.ordernumber | html %]); return false;">Transfer</a>
183
				</td>
183
				</td>
Lines 185-194 Link Here
185
                        [% IF ( loop_order.left_holds_on_order ) %]
185
                        [% IF ( loop_order.left_holds_on_order ) %]
186
                        <span class="button" title="Can't cancel order, ([% loop_order.holds_on_order | html %]) holds are linked with this order cancel holds first">Can't cancel order</span><br>
186
                        <span class="button" title="Can't cancel order, ([% loop_order.holds_on_order | html %]) holds are linked with this order cancel holds first">Can't cancel order</span><br>
187
                        [% ELSE %]
187
                        [% ELSE %]
188
                        <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber | html %]&biblionumber=[% loop_order.biblionumber | html %]&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Cancel order</a><br />
188
                        <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber | uri %]&biblionumber=[% loop_order.biblionumber | uri %]&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Cancel order</a><br />
189
                        [% END %]
189
                        [% END %]
190
                        [% IF ( loop_order.can_del_bib ) %]
190
                        [% IF ( loop_order.can_del_bib ) %]
191
                        <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber | html %]&biblionumber=[% loop_order.biblionumber | html %]&del_biblio=1&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Cancel order and catalog record</a><br />
191
                        <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber | uri %]&biblionumber=[% loop_order.biblionumber | uri %]&del_biblio=1&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Cancel order and catalog record</a><br />
192
                        [% ELSE %]
192
                        [% ELSE %]
193
                        <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br>
193
                        <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br>
194
                        [% END %]
194
                        [% END %]
Lines 214-220 Link Here
214
[% ELSE %]
214
[% ELSE %]
215
    <p>
215
    <p>
216
        Invoice is closed, so you can't receive orders anymore.
216
        Invoice is closed, so you can't receive orders anymore.
217
        <a href="/cgi-bin/koha/acqui/invoice.pl?op=reopen&invoiceid=[% invoiceid | html %]&referer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | html %]">Reopen it</a>.
217
        <a href="/cgi-bin/koha/acqui/invoice.pl?op=reopen&invoiceid=[% invoiceid | uri %]&referer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | uri %]">Reopen it</a>.
218
    </p>
218
    </p>
219
[% END %]
219
[% END %]
220
220
Lines 277-310 Link Here
277
    <tbody class="filterclass">
277
    <tbody class="filterclass">
278
        [% FOREACH order IN loop_received %]
278
        [% FOREACH order IN loop_received %]
279
            <tr>
279
            <tr>
280
                <td>[% order.basketname | html %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% order.basketno | html %]">[% order.basketno | html %]</a>)</td>
280
                <td>[% order.basketname | html %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% order.basketno | uri %]">[% order.basketno | html %]</a>)</td>
281
                <td>
281
                <td>
282
                  [% IF order.basketgroupid %]
282
                  [% IF order.basketgroupid %]
283
                    [% order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% order.booksellerid | html %]">[% order.basketgroupid | html %]</a>)
283
                    [% order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% order.booksellerid | uri %]">[% order.basketgroupid | html %]</a>)
284
                  [% ELSE %]
284
                  [% ELSE %]
285
                    No basket group
285
                    No basket group
286
                  [% END %]
286
                  [% END %]
287
                </td>
287
                </td>
288
                <td>
288
                <td>
289
                  <a href="neworderempty.pl?ordernumber=[% order.ordernumber | html %]&amp;booksellerid=[% booksellerid | html %]">[% order.ordernumber | html %]</a>
289
                  <a href="neworderempty.pl?ordernumber=[% order.ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]">[% order.ordernumber | html %]</a>
290
                  [% IF (order.parent_ordernumber && (order.parent_ordernumber != order.ordernumber)) %]
290
                  [% IF (order.parent_ordernumber && (order.parent_ordernumber != order.ordernumber)) %]
291
                    (<a href="neworderempty.pl?ordernumber=[% order.parent_ordernumber | html %]&amp;booksellerid=[% booksellerid | html %]" title="Original order line">[% order.parent_ordernumber | html %]</a>)
291
                    (<a href="neworderempty.pl?ordernumber=[% order.parent_ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]" title="Original order line">[% order.parent_ordernumber | html %]</a>)
292
                  [% END %]
292
                  [% END %]
293
                </td>
293
                </td>
294
                <td>
294
                <td>
295
                  [% IF order.total_holds > 0 %]
295
                  [% IF order.total_holds > 0 %]
296
                    [% IF order.item_holds > 0 %]
296
                    [% IF order.item_holds > 0 %]
297
                      <span class="error"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% order.biblionumber | html %]">[% order.item_holds | html %]</a></span>
297
                      <span class="error"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% order.biblionumber | uri %]">[% order.item_holds | html %]</a></span>
298
                    [% ELSE %]
298
                    [% ELSE %]
299
                      0
299
                      0
300
                    [% END %]
300
                    [% END %]
301
                    /
301
                    /
302
                    <span class="error"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% order.biblionumber | html %]">[% order.total_holds | html %]</a></span>
302
                    <span class="error"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% order.biblionumber | uri %]">[% order.total_holds | html %]</a></span>
303
                  [% ELSE %]
303
                  [% ELSE %]
304
                    0
304
                    0
305
                  [% END %]
305
                  [% END %]
306
                </td>
306
                </td>
307
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | html %]">[% order.title | html %]</a>
307
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">[% order.title | html %]</a>
308
                [% IF ( order.author ) %] / [% order.author | html %][% END %]
308
                [% IF ( order.author ) %] / [% order.author | html %][% END %]
309
                [% IF ( order.isbn ) %] - [% order.isbn | html %][% END %]
309
                [% IF ( order.isbn ) %] - [% order.isbn | html %][% END %]
310
                [% IF ( order.publishercode ) %]
310
                [% IF ( order.publishercode ) %]
Lines 316-328 Link Here
316
                [% IF ( order.suggestionid ) %]
316
                [% IF ( order.suggestionid ) %]
317
                    <br/>
317
                    <br/>
318
                    Suggested by: [% order.surnamesuggestedby | html %][% IF ( order.firstnamesuggestedby ) %], [% order.firstnamesuggestedby | html %] [% END %]
318
                    Suggested by: [% order.surnamesuggestedby | html %][% IF ( order.firstnamesuggestedby ) %], [% order.firstnamesuggestedby | html %] [% END %]
319
                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% order.suggestionid | html %]&amp;op=show">suggestion #[% order.suggestionid | html %]</a>)
319
                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% order.suggestionid | uri %]&amp;op=show">suggestion #[% order.suggestionid | html %]</a>)
320
                [% END %]
320
                [% END %]
321
                </td>
321
                </td>
322
                <td>
322
                <td>
323
                  <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% order.ordernumber | html %]" class="previewData">Order</a><br>
323
                  <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% order.ordernumber | uri %]" class="previewData">Order</a><br>
324
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber | html %]" class="previewData">MARC</a><br>
324
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber | uri %]" class="previewData">MARC</a><br>
325
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% order.biblionumber | html %]" class="previewData">Card</a>
325
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% order.biblionumber | uri %]" class="previewData">Card</a>
326
                </td>
326
                </td>
327
                <td>[% order.replacementprice | $Price %]</td>
327
                <td>[% order.replacementprice | $Price %]</td>
328
                <td>[% order.quantityreceived | html %]</td>
328
                <td>[% order.quantityreceived | html %]</td>
Lines 351-357 Link Here
351
                          Can't cancel receipt
351
                          Can't cancel receipt
352
                      </span>
352
                      </span>
353
                    [% ELSE %]
353
                    [% ELSE %]
354
                        <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]&op=cancelreceipt&ordernumber=[% order.ordernumber | html %]">Cancel receipt</a>
354
                        <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]&op=cancelreceipt&ordernumber=[% order.ordernumber | uri %]">Cancel receipt</a>
355
                    [% END %]
355
                    [% END %]
356
                </td>
356
                </td>
357
            </tr>
357
            </tr>
Lines 381-387 Link Here
381
</div>
381
</div>
382
382
383
[% IF (invoiceclosedate) %]
383
[% IF (invoiceclosedate) %]
384
    <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid | html %]">View invoice</a>
384
    <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid | uri %]">View invoice</a>
385
[% ELSE %]
385
[% ELSE %]
386
    <form action="/cgi-bin/koha/acqui/invoice.pl" method="get">
386
    <form action="/cgi-bin/koha/acqui/invoice.pl" method="get">
387
        <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" />
387
        <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" />
Lines 430-436 Link Here
430
      <input type="hidden" value="search" name="op" />
430
      <input type="hidden" value="search" name="op" />
431
      <input type="hidden" value="[% invoiceid | html %]" name="invoiceid" />
431
      <input type="hidden" value="[% invoiceid | html %]" name="invoiceid" />
432
      <input type="submit" value="Filter" />
432
      <input type="submit" value="Filter" />
433
      <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]">Clear</a>
433
      <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]">Clear</a>
434
    </fieldset>
434
    </fieldset>
435
  </fieldset>
435
  </fieldset>
436
</form>
436
</form>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-7 / +7 lines)
Lines 28-34 Link Here
28
        <p>An error has occurred. Invoice cannot be created.</p>
28
        <p>An error has occurred. Invoice cannot be created.</p>
29
    </div>
29
    </div>
30
[% END %]
30
[% END %]
31
<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% name | html %]</a></h1>
31
<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1>
32
32
33
    [% IF duplicate_invoices %]
33
    [% IF duplicate_invoices %]
34
    <div id="parcels_duplicate_invoice" class="dialog alert">
34
    <div id="parcels_duplicate_invoice" class="dialog alert">
Lines 40-46 Link Here
40
                    <tr>
40
                    <tr>
41
                        <td>[% invoice.invoicenumber | html %]</td>
41
                        <td>[% invoice.invoicenumber | html %]</td>
42
                        <td>[% invoice.shipmentdate | $KohaDates %]</td>
42
                        <td>[% invoice.shipmentdate | $KohaDates %]</td>
43
                        <td><a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoice.invoiceid | html %]">Receive</a></td>
43
                        <td><a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoice.invoiceid | uri %]">Receive</a></td>
44
                    </tr>
44
                    </tr>
45
                [% END %]
45
                [% END %]
46
            </tbody>
46
            </tbody>
Lines 86-92 Link Here
86
            </td>
86
            </td>
87
            <td>
87
            <td>
88
                [% IF ( searchresult.code ) %]
88
                [% IF ( searchresult.code ) %]
89
                    <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% searchresult.invoiceid | html %]">[% searchresult.code | html %]</a>
89
                    <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% searchresult.invoiceid | uri %]">[% searchresult.code | html %]</a>
90
                [% ELSE %]
90
                [% ELSE %]
91
                    <abbr title="not available">n/a</abbr>
91
                    <abbr title="not available">n/a</abbr>
92
                [% END %]
92
                [% END %]
Lines 108-124 Link Here
108
<div id="resultnumber">
108
<div id="resultnumber">
109
<!-- Row of numbers corresponding to search result pages -->
109
<!-- Row of numbers corresponding to search result pages -->
110
[% IF ( displayprev ) %]
110
[% IF ( displayprev ) %]
111
    <a href="parcels.pl?booksellerid=[% booksellerid | html %]&amp;startfrom=[% prevstartfrom | html %][% IF ( datefrom ) %]&amp;datefrom=[% datefrom | html %][% END %][% IF ( dateto ) %]&amp;dateto=[% dateto | html %][% END %][% IF ( code ) %]&amp;filter=[% code | html %][% END %][% IF ( orderby ) %]&amp;orderby=[% orderby | html %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage | html %][% END %]&amp;type=intra">&lt;&lt; Previous</a>
111
    <a href="parcels.pl?booksellerid=[% booksellerid | uri %]&amp;startfrom=[% prevstartfrom | uri %][% IF ( datefrom ) %]&amp;datefrom=[% datefrom | uri %][% END %][% IF ( dateto ) %]&amp;dateto=[% dateto | uri %][% END %][% IF ( code ) %]&amp;filter=[% code | uri %][% END %][% IF ( orderby ) %]&amp;orderby=[% orderby | uri %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage | uri %][% END %]&amp;type=intra">&lt;&lt; Previous</a>
112
[% END %]
112
[% END %]
113
[% FOREACH number IN numbers %]
113
[% FOREACH number IN numbers %]
114
    [% IF ( number.highlight ) %]
114
    [% IF ( number.highlight ) %]
115
    <span class="current">[% number.number | html %]</span>
115
    <span class="current">[% number.number | html %]</span>
116
    [% ELSE %]
116
    [% ELSE %]
117
    <a href="parcels.pl?booksellerid=[% booksellerid | html %]&amp;startfrom=[% number.startfrom | html %][% IF ( number.datefrom ) %]&amp;datefrom=[% number.datefrom | html %][% END %][% IF ( number.dateto ) %]&amp;dateto=[% number.dateto | html %][% END %][% IF ( number.code ) %]&amp;filter=[% number.code | html %][% END %][% IF ( number.orderby ) %]&amp;orderby=[% number.orderby | html %][% END %][% IF ( number.resultsperpage ) %]&amp;resultsperpage=[% number.resultsperpage | html %][% END %]&amp;type=intra">[% number.number | html %]</a>
117
    <a href="parcels.pl?booksellerid=[% booksellerid | uri %]&amp;startfrom=[% number.startfrom | uri %][% IF ( number.datefrom ) %]&amp;datefrom=[% number.datefrom | uri %][% END %][% IF ( number.dateto ) %]&amp;dateto=[% number.dateto | uri %][% END %][% IF ( number.code ) %]&amp;filter=[% number.code | uri %][% END %][% IF ( number.orderby ) %]&amp;orderby=[% number.orderby | uri %][% END %][% IF ( number.resultsperpage ) %]&amp;resultsperpage=[% number.resultsperpage | uri %][% END %]&amp;type=intra">[% number.number | html %]</a>
118
    [% END %]
118
    [% END %]
119
[% END %]
119
[% END %]
120
[% IF ( displaynext ) %]
120
[% IF ( displaynext ) %]
121
    <a href="parcels.pl?booksellerid=[% booksellerid | html %]&amp;startfrom=[% nextstartfrom | html %][% IF ( datefrom ) %]&amp;datefrom=[% datefrom | html %][% END %][% IF ( dateto ) %]&amp;dateto=[% dateto | html %][% END %][% IF ( code ) %]&amp;filter=[% code | html %][% END %][% IF ( orderby ) %]&amp;orderby=[% orderby | html %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage | html %][% END %]&amp;type=intra">Next &gt;&gt;</a>
121
    <a href="parcels.pl?booksellerid=[% booksellerid | uri %]&amp;startfrom=[% nextstartfrom | uri %][% IF ( datefrom ) %]&amp;datefrom=[% datefrom | uri %][% END %][% IF ( dateto ) %]&amp;dateto=[% dateto | uri %][% END %][% IF ( code ) %]&amp;filter=[% code | uri %][% END %][% IF ( orderby ) %]&amp;orderby=[% orderby | uri %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage | uri %][% END %]&amp;type=intra">Next &gt;&gt;</a>
122
[% END %]
122
[% END %]
123
</div>
123
</div>
124
</div>
124
</div>
Lines 202-208 Link Here
202
                <option value="100">100</option>
202
                <option value="100">100</option>
203
                </select></li>
203
                </select></li>
204
        </ol>
204
        </ol>
205
	<fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | html %]">Clear</a></fieldset>
205
	<fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | uri %]">Clear</a></fieldset>
206
	</fieldset>
206
	</fieldset>
207
</form>
207
</form>
208
</aside>
208
</aside>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-3 / +3 lines)
Lines 42-48 Link Here
42
    [% FOREACH order IN spent %]
42
    [% FOREACH order IN spent %]
43
        <tr>
43
        <tr>
44
            <td class="cell">
44
            <td class="cell">
45
                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | html %]">
45
                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">
46
                    [% order.title | html %]
46
                    [% order.title | html %]
47
                </a>
47
                </a>
48
            </td>
48
            </td>
Lines 50-59 Link Here
50
                [% order.ordernumber | html %]
50
                [% order.ordernumber | html %]
51
            </td>
51
            </td>
52
            <td class="cell">
52
            <td class="cell">
53
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.vendorname | html %]</a>
53
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
54
            </td>
54
            </td>
55
            <td class="cell">
55
            <td class="cell">
56
                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | html %]">[% order.invoicenumber | html %]</a>
56
                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a>
57
            </td>
57
            </td>
58
            <td class="cell">
58
            <td class="cell">
59
                [% ItemTypes.GetDescription( order.itype ) | html %]
59
                [% ItemTypes.GetDescription( order.itype ) | html %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-3 / +3 lines)
Lines 65-71 Link Here
65
    <p><span class="label">Alternative phone: </span>[% contact.altphone | html %]</p>
65
    <p><span class="label">Alternative phone: </span>[% contact.altphone | html %]</p>
66
    <p><span class="label">Fax: </span>[% contact.fax | html %]</p>
66
    <p><span class="label">Fax: </span>[% contact.fax | html %]</p>
67
    [% IF ( contact.email ) %]
67
    [% IF ( contact.email ) %]
68
        <p><span class="label">Email: </span><a href="mailto:[% contact.email | html %]">[% contact.email | html %]</a></p>
68
        <p><span class="label">Email: </span><a href="mailto:[% contact.email | uri %]">[% contact.email | html %]</a></p>
69
    [% END %]
69
    [% END %]
70
    [% IF ( contact.notes ) %]
70
    [% IF ( contact.notes ) %]
71
        <p><span class="label">Notes: </span>[% contact.notes | html %]</p>
71
        <p><span class="label">Notes: </span>[% contact.notes | html %]</p>
Lines 264-270 Link Here
264
                <p><span class="label">Phone: </span>[% phone | html %]</p>
264
                <p><span class="label">Phone: </span>[% phone | html %]</p>
265
                <p><span class="label">Fax: </span>[% fax | html %]</p>
265
                <p><span class="label">Fax: </span>[% fax | html %]</p>
266
                [% IF ( url ) %]
266
                [% IF ( url ) %]
267
                    <p><span class="label">Website: </span><a href="[% url | html %]">[% url | html %]</a></p>
267
                    <p><span class="label">Website: </span><a href="[% url | uri %]">[% url | html %]</a></p>
268
                [% END %]
268
                [% END %]
269
                [% IF ( accountnumber ) %]
269
                [% IF ( accountnumber ) %]
270
                    <p><span class="label">Account number: </span>[% accountnumber | html %]</p>
270
                    <p><span class="label">Account number: </span>[% accountnumber | html %]</p>
Lines 334-340 Link Here
334
                    [% FOREACH contract IN contracts %]
334
                    [% FOREACH contract IN contracts %]
335
                        <tr>
335
                        <tr>
336
                        <td>
336
                        <td>
337
                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber | html %]&amp;booksellerid=[% contract.booksellerid | html %]">[% contract.contractname | html %]</a>
337
                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber | uri %]&amp;booksellerid=[% contract.booksellerid | uri %]">[% contract.contractname | html %]</a>
338
                        </td>
338
                        </td>
339
                        <td>[% contract.contractdescription | html %]</td>
339
                        <td>[% contract.contractdescription | html %]</td>
340
                        <td><span title="[% contract.contractstartdate | html %]">[% contract.contractstartdate | $KohaDates %]</span></td>
340
                        <td><span title="[% contract.contractstartdate | html %]">[% contract.contractstartdate | $KohaDates %]</span></td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt (-2 / +2 lines)
Lines 73-81 Link Here
73
                <tbody>
73
                <tbody>
74
                    [% FOREACH ordersloo IN ordersloop %]
74
                    [% FOREACH ordersloo IN ordersloop %]
75
                      <tr>
75
                      <tr>
76
                        <td><a href="neworderempty.pl?ordernumber=[% ordersloo.ordernumber | html %]">[% ordersloo.ordernumber | html %]</a></td>
76
                        <td><a href="neworderempty.pl?ordernumber=[% ordersloo.ordernumber | uri %]">[% ordersloo.ordernumber | html %]</a></td>
77
                        <td>
77
                        <td>
78
                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber | html %]">[% ordersloo.title | html %]</a>
78
                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber | uri %]">[% ordersloo.title | html %]</a>
79
                            [% IF ( ordersloo.author ) %] by [% ordersloo.author | html %][% END %]
79
                            [% IF ( ordersloo.author ) %] by [% ordersloo.author | html %][% END %]
80
                            [% IF ( ordersloo.isbn ) %] &ndash; [% ordersloo.isbn | html %][% END %]
80
                            [% IF ( ordersloo.isbn ) %] &ndash; [% ordersloo.isbn | html %][% END %]
81
                            [% IF ( ordersloo.publishercode ) %]
81
                            [% IF ( ordersloo.publishercode ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-4 / +4 lines)
Lines 25-31 Link Here
25
            <META HTTP-EQUIV=Refresh CONTENT="[% metacontent | html %]">
25
            <META HTTP-EQUIV=Refresh CONTENT="[% metacontent | html %]">
26
        [% ELSE %]
26
        [% ELSE %]
27
        [% IF ( booksellername ) %]
27
        [% IF ( booksellername ) %]
28
            <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a></h1>
28
            <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
29
            <h2>Contact information</h2>
29
            <h2>Contact information</h2>
30
            <p><strong>Address: </strong>
30
            <p><strong>Address: </strong>
31
                [% booksellerpostal | html %]
31
                [% booksellerpostal | html %]
Lines 33-39 Link Here
33
                [% bookselleraddress2 | html %]
33
                [% bookselleraddress2 | html %]
34
                [% bookselleraddress3 | html %]
34
                [% bookselleraddress3 | html %]
35
                [% bookselleraddress4 | html %]
35
                [% bookselleraddress4 | html %]
36
                <a href="[% booksellerurl | html %]">[% booksellerurl | html %]</a>
36
                <a href="[% booksellerurl | uri %]">[% booksellerurl | html %]</a>
37
            </p>
37
            </p>
38
            <p><strong>Phone: </strong>
38
            <p><strong>Phone: </strong>
39
                [% booksellerphone | html %] / Fax:
39
                [% booksellerphone | html %] / Fax:
Lines 92-98 Link Here
92
            [% uncertainpriceorder.basketname | html %]
92
            [% uncertainpriceorder.basketname | html %]
93
        </td>
93
        </td>
94
	    <td>
94
	    <td>
95
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% uncertainpriceorder.biblionumber | html %]">[% uncertainpriceorder.title | html %]</a>
95
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% uncertainpriceorder.biblionumber | uri %]">[% uncertainpriceorder.title | html %]</a>
96
            [% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author | html %][% END %]
96
            [% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author | html %][% END %]
97
            [% IF ( uncertainpriceorder.publishercode ) %]
97
            [% IF ( uncertainpriceorder.publishercode ) %]
98
                <br /><em>Publisher:</em> [% uncertainpriceorder.publishercode | html %]
98
                <br /><em>Publisher:</em> [% uncertainpriceorder.publishercode | html %]
Lines 102-108 Link Here
102
            [% END %]
102
            [% END %]
103
            [% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn | html %][% END %]
103
            [% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn | html %][% END %]
104
            <br />
104
            <br />
105
            <a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber | html %]&amp;booksellerid=[% booksellerid | html %]&amp;basketno=[% uncertainpriceorder.basketno | html %]">
105
            <a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% uncertainpriceorder.basketno | uri %]">
106
                Edit
106
                Edit
107
            </a>
107
            </a>
108
        </td>
108
        </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-3 / +3 lines)
Lines 116-122 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
116
        [% IF ( breeding_loo.breedingid ) %]
116
        [% IF ( breeding_loo.breedingid ) %]
117
117
118
        <tr>
118
        <tr>
119
            <td>[% breeding_loo.server | html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri  %]&amp;breedingid=[% breeding_loo.breedingid | html %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Place order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
119
            <td>[% breeding_loo.server | html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri  %]&amp;breedingid=[% breeding_loo.breedingid | html %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
120
            <td>[% breeding_loo.title | html %]</td>
120
            <td>[% breeding_loo.title | html %]</td>
121
            <td>[% breeding_loo.author | html %]</td>
121
            <td>[% breeding_loo.author | html %]</td>
122
            <td>[% breeding_loo.isbn | html %]</td>
122
            <td>[% breeding_loo.isbn | html %]</td>
Lines 133-140 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
133
               </dl>
133
               </dl>
134
            </td>
134
            </td>
135
            [% END %]
135
            [% END %]
136
            <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | html %]" title="MARC" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" title="Card" class="previewData">Card</a></td>
136
            <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" title="Card" class="previewData">Card</a></td>
137
            <td><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | html %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Place order</a></td>
137
            <td><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Order</a></td>
138
138
139
        </tr>
139
        </tr>
140
        [% END %]
140
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt (-11 / +11 lines)
Lines 10-16 Link Here
10
        </a>
10
        </a>
11
        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetmenu_[% block_budget.budget_period_id | html %]">
11
        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetmenu_[% block_budget.budget_period_id | html %]">
12
              <li>
12
              <li>
13
                  <a href="[% script_name | html %]?op=add_form&amp;budget_period_id=[% block_budget.budget_period_id | html %]"><i class="fa fa-pencil"></i> Edit</a>
13
                  <a href="[% script_name | uri %]?op=add_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-pencil"></i> Edit</a>
14
              </li>
14
              </li>
15
              [% IF block_budget.count %]
15
              [% IF block_budget.count %]
16
                  <li class="disabled">
16
                  <li class="disabled">
Lines 18-34 Link Here
18
                  </li>
18
                  </li>
19
              [% ELSE %]
19
              [% ELSE %]
20
                  <li>
20
                  <li>
21
                      <a href="[% script_name | html %]?op=delete_confirm&amp;budget_period_id=[% block_budget.budget_period_id | html %]"><i class="fa fa-trash"></i> Delete</a>
21
                      <a href="[% script_name | uri %]?op=delete_confirm&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-trash"></i> Delete</a>
22
                  </li>
22
                  </li>
23
              [% END %]
23
              [% END %]
24
              <li>
24
              <li>
25
                  <a href="[% script_name | html %]?op=duplicate_form&amp;budget_period_id=[% block_budget.budget_period_id | html %]"><i class="fa fa-copy"></i> Duplicate</a>
25
                  <a href="[% script_name | uri %]?op=duplicate_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-copy"></i> Duplicate</a>
26
              </li>
26
              </li>
27
              <li>
27
              <li>
28
                  <a href="[% script_name | html %]?op=close_form&amp;budget_period_id=[% block_budget.budget_period_id | html %]"><i class="fa fa-times-circle"></i> Close</a>
28
                  <a href="[% script_name | uri %]?op=close_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-times-circle"></i> Close</a>
29
              </li>
29
              </li>
30
              <li>
30
              <li>
31
                  <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% block_budget.budget_period_id | html %]"><i class="fa fa-plus"></i> Add fund</a>
31
                  <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-plus"></i> Add fund</a>
32
              </li>
32
              </li>
33
        </ul>
33
        </ul>
34
    </div>
34
    </div>
Lines 103-113 Link Here
103
    [% END %]
103
    [% END %]
104
    [% IF close_form %]
104
    [% IF close_form %]
105
        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo;
105
        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo;
106
        <span>Close budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]">[% budget_period_description | html %]</a></span>
106
        <span>Close budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">[% budget_period_description | html %]</a></span>
107
    [% END %]
107
    [% END %]
108
    [% IF closed %]
108
    [% IF closed %]
109
        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo;
109
        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo;
110
        <span>Budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]">[% budget_period_description | html %]</a> closed</span>
110
        <span>Budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">[% budget_period_description | html %]</a> closed</span>
111
    [% END %]
111
    [% END %]
112
    [% IF ( else ) %]
112
    [% IF ( else ) %]
113
        <span>Budgets administration</span>
113
        <span>Budgets administration</span>
Lines 254-260 Link Here
254
        <!-- ###################################### -->
254
        <!-- ###################################### -->
255
        <input type="submit" value="Save" />
255
        <input type="submit" value="Save" />
256
        [% IF ( budget_period_id ) %]
256
        [% IF ( budget_period_id ) %]
257
            <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]" class="cancel">Cancel</a>
257
            <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]" class="cancel">Cancel</a>
258
        [% ELSE %]
258
        [% ELSE %]
259
            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a>
259
            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a>
260
        [% END %]
260
        [% END %]
Lines 309-315 Link Here
309
    <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>
309
    <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>
310
  [% ELSE %]
310
  [% ELSE %]
311
    <h3>The unreceived orders from the following funds will be moved</h3>
311
    <h3>The unreceived orders from the following funds will be moved</h3>
312
      Fund list of budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]">[% budget_period_description | html %]</a>:
312
      Fund list of budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">[% budget_period_description | html %]</a>:
313
    <table id="budgeth">
313
    <table id="budgeth">
314
      <thead>
314
      <thead>
315
        <tr>
315
        <tr>
Lines 437-443 Link Here
437
          <tbody>
437
          <tbody>
438
              [% FOREACH period_active IN period_active_loop %]
438
              [% FOREACH period_active IN period_active_loop %]
439
                <tr>
439
                <tr>
440
                <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_active.budget_period_id | html %]" title="View funds for [% period_active.budget_period_description | html %]">[% period_active.budget_period_description | html %]</a></td>
440
                <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_active.budget_period_id | uri %]" title="View funds for [% period_active.budget_period_description | html %]">[% period_active.budget_period_description | html %]</a></td>
441
                <td><span title="[% period_active.budget_period_startdate | html %]">[% period_active.budget_period_startdate | $KohaDates %]</span></td>
441
                <td><span title="[% period_active.budget_period_startdate | html %]">[% period_active.budget_period_startdate | $KohaDates %]</span></td>
442
                <td><span title="[% period_active.budget_period_enddate | html %]">[% period_active.budget_period_enddate | $KohaDates %]</span></td>
442
                <td><span title="[% period_active.budget_period_enddate | html %]">[% period_active.budget_period_enddate | $KohaDates %]</span></td>
443
                <td>
443
                <td>
Lines 473-479 Link Here
473
          <tbody>
473
          <tbody>
474
              [% FOREACH period_loo IN period_inactive_loop %]
474
              [% FOREACH period_loo IN period_inactive_loop %]
475
                  <tr>
475
                  <tr>
476
                  <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id | html %]" title="View funds for [% period_loo.budget_period_description | html %]">[% period_loo.budget_period_description | html %]</a></td>
476
                  <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id | uri %]" title="View funds for [% period_loo.budget_period_description | html %]">[% period_loo.budget_period_description | html %]</a></td>
477
                  <td><span title="[% period_loo.budget_period_startdate | html %]">[% period_loo.budget_period_startdate | $KohaDates %]</span></td>
477
                  <td><span title="[% period_loo.budget_period_startdate | html %]">[% period_loo.budget_period_startdate | $KohaDates %]</span></td>
478
                  <td><span title="[% period_loo.budget_period_enddate | html %]">[% period_loo.budget_period_enddate | $KohaDates %]</span></td>
478
                  <td><span title="[% period_loo.budget_period_enddate | html %]">[% period_loo.budget_period_enddate | $KohaDates %]</span></td>
479
                  <td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span>&nbsp;[% ELSE %][% END %] </td>
479
                  <td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span>&nbsp;[% ELSE %][% END %] </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (-6 / +6 lines)
Lines 18-24 Link Here
18
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
18
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
19
    <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo; [% IF op == 'list' %][% IF budget_period_id %]Funds for '[% budget_period_description | html %]'[% ELSE %]All funds[% END %][% END %]
19
    <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo; [% IF op == 'list' %][% IF budget_period_id %]Funds for '[% budget_period_description | html %]'[% ELSE %]All funds[% END %][% END %]
20
    [% IF op == 'add_form' %]
20
    [% IF op == 'add_form' %]
21
      <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]">Funds</a> &rsaquo; [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name | html %]'[% END %][% ELSE %]Add fund[% END %]
21
      <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">Funds</a> &rsaquo; [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name | html %]'[% END %][% ELSE %]Add fund[% END %]
22
    [% END %]
22
    [% END %]
23
    [% IF op == 'delete_confirm' %]
23
    [% IF op == 'delete_confirm' %]
24
      <a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a> &rsaquo; Delete fund?
24
      <a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a> &rsaquo; Delete fund?
Lines 176-188 Link Here
176
                   Actions <b class="caret"></b>
176
                   Actions <b class="caret"></b>
177
                </a>
177
                </a>
178
                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetactions[% budget.budget_id | html %]_[% budget.budget_period_id | html %]">
178
                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetactions[% budget.budget_id | html %]_[% budget.budget_period_id | html %]">
179
                    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_id=[% budget.budget_id | html %]&amp;budget_period_id=[% budget.budget_period_id | html %]"><i class="fa fa-pencil"></i> Edit</a></li>
179
                    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_id=[% budget.budget_id | uri %]&amp;budget_period_id=[% budget.budget_period_id | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
180
                    [% IF budget.budget_has_children %]
180
                    [% IF budget.budget_has_children %]
181
                        <li class="disabled"><a href="#" class="deletefund-disabled" data-toggle="tooltip" data-placement="left" title="This fund has children"><i class="fa fa-trash"></i> Delete</a></li>
181
                        <li class="disabled"><a href="#" class="deletefund-disabled" data-toggle="tooltip" data-placement="left" title="This fund has children"><i class="fa fa-trash"></i> Delete</a></li>
182
                    [% ELSE %]
182
                    [% ELSE %]
183
                        <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=delete_confirm&amp;budget_id=[% budget.budget_id | html %]&amp;budget_period_id=[% budget.budget_period_id | html %]"><i class="fa fa-trash"></i> Delete</a></li>
183
                        <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=delete_confirm&amp;budget_id=[% budget.budget_id | uri %]&amp;budget_period_id=[% budget.budget_period_id | uri %]"><i class="fa fa-trash"></i> Delete</a></li>
184
                    [% END %]
184
                    [% END %]
185
                    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_parent_id=[% budget.budget_id | html %]&amp;budget_period_id=[% budget.budget_period_id | html %]"><i class="fa fa-plus"></i> Add child fund</a></li>
185
                    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_parent_id=[% budget.budget_id | uri %]&amp;budget_period_id=[% budget.budget_period_id | uri %]"><i class="fa fa-plus"></i> Add child fund</a></li>
186
                </ul>
186
                </ul>
187
            </div>
187
            </div>
188
        </td>
188
        </td>
Lines 251-257 Link Here
251
        <span class="label">Owner: </span>
251
        <span class="label">Owner: </span>
252
        [% IF  budget_owner %]
252
        [% IF  budget_owner %]
253
            <span  id="budget_owner_name">
253
            <span  id="budget_owner_name">
254
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner.borrowernumber | html %]">
254
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner.borrowernumber | uri %]">
255
                    [% budget_owner.firstname | html %] [% budget_owner.surname | html %]
255
                    [% budget_owner.firstname | html %] [% budget_owner.surname | html %]
256
                </a> |
256
                </a> |
257
            </span>
257
            </span>
Lines 280-286 Link Here
280
        <ul style="float:left;" id="budget_users">
280
        <ul style="float:left;" id="budget_users">
281
            [% FOREACH user IN budget_users %]
281
            [% FOREACH user IN budget_users %]
282
                <li id="user_[% user.borrowernumber | html %]">
282
                <li id="user_[% user.borrowernumber | html %]">
283
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% user.borrowernumber | html %]">
283
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% user.borrowernumber | uri %]">
284
                        [% user.firstname | html %] [% user.surname | html %]
284
                        [% user.firstname | html %] [% user.surname | html %]
285
                    </a>
285
                    </a>
286
                    &bull; <a href="#" class="del_user" data-borrowernumber="[% user.borrowernumber | html %]"><i class="fa fa-trash"></i> Remove</a>
286
                    &bull; <a href="#" class="del_user" data-borrowernumber="[% user.borrowernumber | html %]"><i class="fa fa-trash"></i> Remove</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt (-9 / +9 lines)
Lines 24-48 Link Here
24
    &rsaquo;
24
    &rsaquo;
25
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
25
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
26
    &rsaquo;
26
    &rsaquo;
27
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a>
27
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
28
    &rsaquo;
28
    &rsaquo;
29
    [% IF ( add_form ) %]
29
    [% IF ( add_form ) %]
30
        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]">Contracts</a>
30
        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
31
        &rsaquo;
31
        &rsaquo;
32
        [% IF ( contractnumber ) %]Modify contract '[% contractname | html %]'
32
        [% IF ( contractnumber ) %]Modify contract '[% contractname | html %]'
33
        [% ELSE %]New contract
33
        [% ELSE %]New contract
34
        [% END %]
34
        [% END %]
35
    [% END %]
35
    [% END %]
36
    [% IF ( add_validate ) %]
36
    [% IF ( add_validate ) %]
37
        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]">Contracts</a>
37
        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
38
        &rsaquo; Data recorded
38
        &rsaquo; Data recorded
39
    [% END %]
39
    [% END %]
40
    [% IF ( delete_confirm ) %]
40
    [% IF ( delete_confirm ) %]
41
        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]">Contracts</a>
41
        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
42
        &rsaquo; Confirm deletion of contract [% contractnumber | html %]
42
        &rsaquo; Confirm deletion of contract [% contractnumber | html %]
43
    [% END %]
43
    [% END %]
44
    [% IF ( delete_confirmed ) %]
44
    [% IF ( delete_confirmed ) %]
45
        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]">Contracts</a> &rsaquo; Contract deleted
45
        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a> &rsaquo; Contract deleted
46
    [% END %]
46
    [% END %]
47
    [% IF ( else ) %]Contracts[% END %]
47
    [% IF ( else ) %]Contracts[% END %]
48
</div>
48
</div>
Lines 151-164 Link Here
151
                    [% FOREACH loo IN loop %]
151
                    [% FOREACH loo IN loop %]
152
                        <tr>
152
                        <tr>
153
                        <td>
153
                        <td>
154
                            <a href="[% loo.script_name | html %]?op=add_form&amp;booksellerid=[% loo.booksellerid | html %]&amp;contractnumber=[% loo.contractnumber | html %]">[% loo.contractname | html %]</a>
154
                            <a href="[% loo.script_name | uri %]?op=add_form&amp;booksellerid=[% loo.booksellerid | uri %]&amp;contractnumber=[% loo.contractnumber | uri %]">[% loo.contractname | html %]</a>
155
                        </td>
155
                        </td>
156
                        <td>[% loo.contractdescription | html %]</td>
156
                        <td>[% loo.contractdescription | html %]</td>
157
                        <td>[% loo.contractstartdate | html %]</td>
157
                        <td>[% loo.contractstartdate | html %]</td>
158
                        <td>[% loo.contractenddate | html %]</td>
158
                        <td>[% loo.contractenddate | html %]</td>
159
                        <td class="actions">
159
                        <td class="actions">
160
                            <a href="[% loo.script_name | html %]?op=add_form&amp;contractnumber=[% loo.contractnumber | html %]&amp;booksellerid=[% loo.booksellerid | html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
160
                            <a href="[% loo.script_name | uri %]?op=add_form&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
161
                            <a href="[% loo.script_name | html %]?op=delete_confirm&amp;contractnumber=[% loo.contractnumber | html %]&amp;booksellerid=[% loo.booksellerid | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
161
                            <a href="[% loo.script_name | uri %]?op=delete_confirm&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
162
                        </td>
162
                        </td>
163
                        </tr>
163
                        </tr>
164
                    [% END %]
164
                    [% END %]
Lines 167-173 Link Here
167
                    <div class="dialog message">
167
                    <div class="dialog message">
168
                        There are no contracts with this vendor.
168
                        There are no contracts with this vendor.
169
                        [% IF active %]
169
                        [% IF active %]
170
                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid | html %]">Add a contract</a>.
170
                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid | uri %]">Add a contract</a>.
171
                        [% END %]
171
                        [% END %]
172
                    </div>
172
                    </div>
173
                [% END %]
173
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt (-3 / +3 lines)
Lines 16-23 Link Here
16
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
16
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
17
    <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
17
    <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
18
    <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo; 
18
    <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo; 
19
    <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]">Funds</a> &rsaquo;
19
    <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">Funds</a> &rsaquo;
20
    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | html %]">Planning</a> &rsaquo;
20
    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]">Planning</a> &rsaquo;
21
</div>
21
</div>
22
22
23
<div class="main container-fluid">
23
<div class="main container-fluid">
Lines 75-81 Link Here
75
        [% ELSE %]
75
        [% ELSE %]
76
            <td>
76
            <td>
77
        [% END %]
77
        [% END %]
78
        <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_id=[% budget_line.budget_id | html %]&amp;budget_period_id=[% budget_period_id | html %]">[% budget_line.budget_name | html %]</a></td>
78
        <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_id=[% budget_line.budget_id | uri %]&amp;budget_period_id=[% budget_period_id | uri %]">[% budget_line.budget_name | html %]</a></td>
79
        <td><span id="[% budget_line.budget_amount | html %]">[% budget_line.budget_amount | $Price %]&nbsp;</span>
79
        <td><span id="[% budget_line.budget_amount | html %]">[% budget_line.budget_amount | $Price %]&nbsp;</span>
80
80
81
81
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt (-4 / +4 lines)
Lines 15-21 Link Here
15
  [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a> &rsaquo;
15
  [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a> &rsaquo;
16
  [% END %]
16
  [% END %]
17
  [% IF ( else ) %]Authority MARC subfield structure for [% tagfield | html %]
17
  [% IF ( else ) %]Authority MARC subfield structure for [% tagfield | html %]
18
  [% ELSE %]<a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;tagsubfield=[% tagsubfield | html %]&amp;authtypecode=[% authtypecode |uri %]">Authority MARC subfield structure for [% tagfield | html %]</a> &rsaquo;
18
  [% ELSE %]<a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;tagsubfield=[% tagsubfield | uri %]&amp;authtypecode=[% authtypecode |uri %]">Authority MARC subfield structure for [% tagfield | html %]</a> &rsaquo;
19
  [% END %]
19
  [% END %]
20
  [% IF ( delete_confirm ) %]Confirm deletion of subfield [% tagsubfield | html %]?[% END %]
20
  [% IF ( delete_confirm ) %]Confirm deletion of subfield [% tagsubfield | html %]?[% END %]
21
  [% IF ( delete_confirmed ) %]Data deleted[% END %]
21
  [% IF ( delete_confirmed ) %]Data deleted[% END %]
Lines 45-53 Link Here
45
            <ul>
45
            <ul>
46
                [% FOREACH loo IN loop %]
46
                [% FOREACH loo IN loop %]
47
                    [% IF ( loo.new_subfield ) %]
47
                    [% IF ( loo.new_subfield ) %]
48
                        <li><a href="#sub[% loo.tagsubfield | html %]field" title="[% loo.liblibrarian | html_entity %]">New</a></li>
48
                        <li><a href="#sub[% loo.tagsubfield | uri %]field" title="[% loo.liblibrarian | html_entity %]">New</a></li>
49
                    [% ELSE %]
49
                    [% ELSE %]
50
                        <li><a href="#sub[% loo.tagsubfield | html %]field" title="[% loo.liblibrarian | html_entity %]">
50
                        <li><a href="#sub[% loo.tagsubfield | uri %]field" title="[% loo.liblibrarian | html_entity %]">
51
                            [% loo.tagsubfield | html %]
51
                            [% loo.tagsubfield | html %]
52
                    </a></li>
52
                    </a></li>
53
                    [% END %]
53
                    [% END %]
Lines 301-307 Link Here
301
                [% IF ( loo.value_builder ) %] | <strong>Plugin:</strong>[% loo.value_builder | html %],[% END %]
301
                [% IF ( loo.value_builder ) %] | <strong>Plugin:</strong>[% loo.value_builder | html %],[% END %]
302
            [% END %]
302
            [% END %]
303
        </td>
303
        </td>
304
        <td><a href="[% loo.delete | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a></td>
304
        <td><a href="[% loo.delete | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a></td>
305
    </tr>
305
    </tr>
306
    [% END %]
306
    [% END %]
307
</table>
307
</table>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt (-9 / +9 lines)
Lines 21-48 Link Here
21
    [% IF ( add_form ) %]
21
    [% IF ( add_form ) %]
22
        [% IF ( use_heading_flags_p ) %]
22
        [% IF ( use_heading_flags_p ) %]
23
            [% IF ( heading_modify_tag_p ) %]
23
            [% IF ( heading_modify_tag_p ) %]
24
                [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | html %]">[% authtypecode | html %] Framework</a>
24
                [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] Framework</a>
25
                [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
25
                [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
26
                [% END %] &rsaquo; Modify tag
26
                [% END %] &rsaquo; Modify tag
27
            [% END %]
27
            [% END %]
28
            [% IF ( heading_add_tag_p ) %]
28
            [% IF ( heading_add_tag_p ) %]
29
                [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | html %]">[% authtypecode | html %] framework</a>
29
                [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
30
                [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
30
                [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
31
                [% END %] &rsaquo; New tag
31
                [% END %] &rsaquo; New tag
32
            [% END %]
32
            [% END %]
33
        [% ELSE %]
33
        [% ELSE %]
34
            [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | html %]">[% authtypecode | html %] Framework</a>
34
            [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] Framework</a>
35
            [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
35
            [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
36
            [% END %] &rsaquo; [% action | html %]
36
            [% END %] &rsaquo; [% action | html %]
37
        [% END %]
37
        [% END %]
38
    [% ELSE %]
38
    [% ELSE %]
39
        [% IF ( delete_confirm ) %]
39
        [% IF ( delete_confirm ) %]
40
            [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | html %]">[% authtypecode | html %] framework</a>
40
            [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
41
            [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
41
            [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
42
            [% END %] &rsaquo; Confirm deletion
42
            [% END %] &rsaquo; Confirm deletion
43
        [% ELSE %]
43
        [% ELSE %]
44
            [% IF ( delete_confirmed ) %]
44
            [% IF ( delete_confirmed ) %]
45
                [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | html %]">[% authtypecode | html %] framework</a>
45
                [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
46
                [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
46
                [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
47
                [% END %] &rsaquo; Data deleted
47
                [% END %] &rsaquo; Data deleted
48
            [% ELSE %]
48
            [% ELSE %]
Lines 114-120 Link Here
114
        </fieldset>
114
        </fieldset>
115
        <fieldset class="action">
115
        <fieldset class="action">
116
            <input type="submit" value="Submit" />
116
            <input type="submit" value="Submit" />
117
            <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | html %]" class="cancel">Cancel</a>
117
            <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]" class="cancel">Cancel</a>
118
        </fieldset>
118
        </fieldset>
119
    </form>
119
    </form>
120
[% END %]
120
[% END %]
Lines 213-221 Link Here
213
                    <a class="btn btn-default btn-xs dropdown-toggle" id="authtagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#">
213
                    <a class="btn btn-default btn-xs dropdown-toggle" id="authtagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#">
214
                        Actions <b class="caret"></b></a>
214
                        Actions <b class="caret"></b></a>
215
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authtagactions[% loo.tagfield | html %]">
215
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authtagactions[% loo.tagfield | html %]">
216
                        <li><a href="[% loo.subfield_link | html %]"><i class="fa fa-eye"></i> Subfields</a></li>
216
                        <li><a href="[% loo.subfield_link | uri %]"><i class="fa fa-eye"></i> Subfields</a></li>
217
                        <li><a href="[% loo.edit | html %]"><i class="fa fa-pencil"></i> Edit</a></li>
217
                        <li><a href="[% loo.edit | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
218
                        <li><a href="[% loo.delete | html %]"><i class="fa fa-trash"></i> Delete</a></li>
218
                        <li><a href="[% loo.delete | uri %]"><i class="fa fa-trash"></i> Delete</a></li>
219
                    </ul>
219
                    </ul>
220
                </div>
220
                </div>
221
            </td>
221
            </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt (-2 / +2 lines)
Lines 91-97 Link Here
91
			<ul>
91
			<ul>
92
                  <li><a href="#none">None</a></li>
92
                  <li><a href="#none">None</a></li>
93
				  [% FOREACH imageset IN imagesets %]
93
				  [% FOREACH imageset IN imagesets %]
94
                        [% IF ( imageset.imagesetactive ) %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#[% imageset.imagesetname | html %]">[% imageset.imagesetname | html %]</a></li>
94
                        [% IF ( imageset.imagesetactive ) %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#[% imageset.imagesetname | uri %]">[% imageset.imagesetname | html %]</a></li>
95
				  [% END %]
95
				  [% END %]
96
			</ul>
96
			</ul>
97
  <div id="none"><ul>
97
  <div id="none"><ul>
Lines 258-264 Link Here
258
            No limitation
258
            No limitation
259
        [% END %]
259
        [% END %]
260
    </td>
260
    </td>
261
    <td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;id=[% loo.id | html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
261
    <td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;id=[% loo.id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
262
    <a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/authorised_values.pl?op=delete&amp;searchfield=[% searchfield | url %]&amp;id=[% loo.id | html %]"><i class="fa fa-trash"></i> Delete</a></td>
262
    <a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/authorised_values.pl?op=delete&amp;searchfield=[% searchfield | url %]&amp;id=[% loo.id | html %]"><i class="fa fa-trash"></i> Delete</a></td>
263
</tr>
263
</tr>
264
[% END %]
264
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt (-3 / +3 lines)
Lines 155-163 Link Here
155
                    <a class="btn btn-default btn-xs dropdown-toggle" id="authtypeactions[% authority_type.authtypecode | html %]" role="button" data-toggle="dropdown" href="#">
155
                    <a class="btn btn-default btn-xs dropdown-toggle" id="authtypeactions[% authority_type.authtypecode | html %]" role="button" data-toggle="dropdown" href="#">
156
                      Actions <b class="caret"></b></a>
156
                      Actions <b class="caret"></b></a>
157
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authtypeactions[% authority_type.authtypecode | html %]">
157
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authtypeactions[% authority_type.authtypecode | html %]">
158
                      <li><a href="auth_tag_structure.pl?authtypecode=[% authority_type.authtypecode | html %]" class="button parameters"><i class="fa fa-eye"></i> MARC structure</a></li>
158
                      <li><a href="auth_tag_structure.pl?authtypecode=[% authority_type.authtypecode | uri %]" class="button parameters"><i class="fa fa-eye"></i> MARC structure</a></li>
159
                      <li><a href="/cgi-bin/koha/admin/authtypes.pl?op=add_form&amp;authtypecode=[% authority_type.authtypecode | html %]"><i class="fa fa-pencil"></i> Edit</a></li>
159
                      <li><a href="/cgi-bin/koha/admin/authtypes.pl?op=add_form&amp;authtypecode=[% authority_type.authtypecode | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
160
                      [% IF authority_type.authtypecode %]<li><a href="/cgi-bin/koha/admin/authtypes.pl?op=delete_confirm&amp;authtypecode=[% authority_type.authtypecode | html %]"><i class="fa fa-trash"></i> Delete</a></li>[% END %]
160
                      [% IF authority_type.authtypecode %]<li><a href="/cgi-bin/koha/admin/authtypes.pl?op=delete_confirm&amp;authtypecode=[% authority_type.authtypecode | uri %]"><i class="fa fa-trash"></i> Delete</a></li>[% END %]
161
                    </ul>
161
                    </ul>
162
                  </div>
162
                  </div>
163
                </td>
163
                </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt (-3 / +3 lines)
Lines 209-217 Link Here
209
                  Actions <b class="caret"></b>
209
                  Actions <b class="caret"></b>
210
                </a>
210
                </a>
211
                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode | html %]">
211
                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode | html %]">
212
                  <li><a href="marctagstructure.pl?frameworkcode=[% loo.frameworkcode | html %]"><i class="fa fa-eye"></i> MARC structure</a></li>
212
                  <li><a href="marctagstructure.pl?frameworkcode=[% loo.frameworkcode | uri %]"><i class="fa fa-eye"></i> MARC structure</a></li>
213
                  <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form&amp;frameworkcode=[% loo.frameworkcode | html %]"><i class="fa fa-pencil"></i> Edit</a></li>
213
                  <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form&amp;frameworkcode=[% loo.frameworkcode | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
214
                  <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=delete_confirm&amp;frameworkcode=[% loo.frameworkcode | html %]"><i class="fa fa-trash"></i> Delete</a></li>
214
                  <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=delete_confirm&amp;frameworkcode=[% loo.frameworkcode | uri %]"><i class="fa fa-trash"></i> Delete</a></li>
215
                  <!-- Trigger modal -->
215
                  <!-- Trigger modal -->
216
                  <li><a href="#" data-toggle="modal" data-target="#exportModal_[% loo.frameworkcode | html %][% loop.count | html %]" title="Export framework structure (fields, subfields) to a spreadsheet file (.csv, .xml, .ods)"><i class="fa fa-upload"></i> Export</a></li>
216
                  <li><a href="#" data-toggle="modal" data-target="#exportModal_[% loo.frameworkcode | html %][% loop.count | html %]" title="Export framework structure (fields, subfields) to a spreadsheet file (.csv, .xml, .ods)"><i class="fa fa-upload"></i> Export</a></li>
217
                  <!-- Trigger modal -->
217
                  <!-- Trigger modal -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt (-1 / +1 lines)
Lines 34-40 Link Here
34
34
35
  <div id="transferlimit_tabs" class="toptabs">
35
  <div id="transferlimit_tabs" class="toptabs">
36
	<ul class="ui-tabs-nav">
36
	<ul class="ui-tabs-nav">
37
      [% FOREACH codes_loo IN codes_loop %]<li><a href="#[% codes_loo.code | html %]set">[% codes_loo.code | html %]</a></li>[% END %]
37
      [% FOREACH codes_loo IN codes_loop %]<li><a href="#[% codes_loo.code | uri %]set">[% codes_loo.code | html %]</a></li>[% END %]
38
	</ul>
38
	</ul>
39
39
40
		<form method="post" action="branch_transfer_limits.pl">
40
		<form method="post" action="branch_transfer_limits.pl">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt (-2 / +2 lines)
Lines 220-228 Link Here
220
                            [% IF library.branchfax %]
220
                            [% IF library.branchfax %]
221
                                <br />Fax: [% library.branchfax | html %][% END %]
221
                                <br />Fax: [% library.branchfax | html %][% END %]
222
                            [% IF library.branchemail %]
222
                            [% IF library.branchemail %]
223
                                <br /><a href="mailto:[% library.branchemail | html %]">[% library.branchemail | html %]</a>[% END %]
223
                                <br /><a href="mailto:[% library.branchemail | uri %]">[% library.branchemail | html %]</a>[% END %]
224
                            [% IF library.branchurl %]
224
                            [% IF library.branchurl %]
225
                                <br /><a href="[% library.branchurl | html %]">[% library.branchurl | html %]</a>[% END %]
225
                                <br /><a href="[% library.branchurl | uri %]">[% library.branchurl | html %]</a>[% END %]
226
                            [% IF library.opac_info %]
226
                            [% IF library.opac_info %]
227
                                <br />OPAC Info: <div>[% library.opac_info | $raw %]</div>[% END %]
227
                                <br />OPAC Info: <div>[% library.opac_info | $raw %]</div>[% END %]
228
                            [% IF library.branchnotes %]
228
                            [% IF library.branchnotes %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt (-1 / +1 lines)
Lines 264-270 Link Here
264
    [% FOREACH account IN ediaccounts %]
264
    [% FOREACH account IN ediaccounts %]
265
    <tr>
265
    <tr>
266
      <td>[% account.id | html %]</td>
266
      <td>[% account.id | html %]</td>
267
      <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% account.vendor_id | html %]">[% account.vendor.name | html %]</a></td>
267
      <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% account.vendor_id | uri %]">[% account.vendor.name | html %]</a></td>
268
      <td>[% account.description | html %]</td>
268
      <td>[% account.description | html %]</td>
269
      <td>[% account.transport | html %]</td>
269
      <td>[% account.transport | html %]</td>
270
      <td>[% account.host | html %]</td>
270
      <td>[% account.host | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt (-5 / +5 lines)
Lines 119-125 Item types administration Link Here
119
                    <label for="description" class="required">Description: </label>
119
                    <label for="description" class="required">Description: </label>
120
                    <input type="text" id="description" name="description" size="48" value="[% itemtype.description | html %]" required="required" /> <span class="required">Required</span>
120
                    <input type="text" id="description" name="description" size="48" value="[% itemtype.description | html %]" required="required" /> <span class="required">Required</span>
121
                    [% IF can_be_translated %]
121
                    [% IF can_be_translated %]
122
                        <a href="/cgi-bin/koha/admin/localization.pl?entity=itemtypes&code=[% itemtype.itemtype | html %]" title="Translate item type [% itemtype.itemtype | html %]" rel="gb_page_center[600,500]"><i class="fa fa-pencil"></i> Translate into other languages</a>
122
                        <a href="/cgi-bin/koha/admin/localization.pl?entity=itemtypes&code=[% itemtype.itemtype | uri %]" title="Translate item type [% itemtype.itemtype | html %]" rel="gb_page_center[600,500]"><i class="fa fa-pencil"></i> Translate into other languages</a>
123
                    [% END %]
123
                    [% END %]
124
                </li>
124
                </li>
125
                <li>
125
                <li>
Lines 157-163 Item types administration Link Here
157
                            [% ELSE %]
157
                            [% ELSE %]
158
                                <li>
158
                                <li>
159
                            [% END %]
159
                            [% END %]
160
                            <a href="#[% imageset.imagesetname | html %]">[% imageset.imagesetname | html %]</a>
160
                            <a href="#[% imageset.imagesetname | uri %]">[% imageset.imagesetname | html %]</a>
161
                            </li>
161
                            </li>
162
                        [% END %]
162
                        [% END %]
163
                        [% IF itemtype.image_location('intranet').match('^http') %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#remote">Remote image</a></li>
163
                        [% IF itemtype.image_location('intranet').match('^http') %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#remote">Remote image</a></li>
Lines 345-351 Item types administration Link Here
345
                    </td>
345
                    </td>
346
                [% END %]
346
                [% END %]
347
            <td>
347
            <td>
348
              <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&amp;itemtype=[% itemtype.itemtype | html %]">
348
              <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&amp;itemtype=[% itemtype.itemtype | uri %]">
349
                [% itemtype.itemtype | html %]
349
                [% itemtype.itemtype | html %]
350
              </a>
350
              </a>
351
            </td>
351
            </td>
Lines 376-383 Item types administration Link Here
376
            <td>[% itemtype.processfee | $Price %]</td>
376
            <td>[% itemtype.processfee | $Price %]</td>
377
            <td>[% itemtype.checkinmsg | html_line_break | $raw %]</td>
377
            <td>[% itemtype.checkinmsg | html_line_break | $raw %]</td>
378
            <td class="actions">
378
            <td class="actions">
379
              <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&amp;itemtype=[% itemtype.itemtype | html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
379
              <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&amp;itemtype=[% itemtype.itemtype | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
380
              <a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&amp;itemtype=[% itemtype.itemtype | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
380
              <a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&amp;itemtype=[% itemtype.itemtype | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
381
            </td>
381
            </td>
382
          </tr>
382
          </tr>
383
          [% END %]
383
          [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt (-13 / +13 lines)
Lines 15-28 Link Here
15
  <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a> &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode | html %]&amp;searchfield=[% tagfield | uri %]">[% IF ( frameworkcode ) %][% frameworkcode | html %][% ELSE %]Default[% END %] framework structure</a> &rsaquo;
15
  <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a> &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode | html %]&amp;searchfield=[% tagfield | uri %]">[% IF ( frameworkcode ) %][% frameworkcode | html %][% ELSE %]Default[% END %] framework structure</a> &rsaquo;
16
  [% IF ( add_form ) %]
16
  [% IF ( add_form ) %]
17
  [% IF ( use_heading_flags_p ) %]
17
  [% IF ( use_heading_flags_p ) %]
18
  [% IF ( heading_edit_subfields_p ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode | html %]">Tag [% tagfield | html %] subfield structure</a> &rsaquo; Edit subfields constraints
18
  [% IF ( heading_edit_subfields_p ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode | uri %]">Tag [% tagfield | html %] subfield structure</a> &rsaquo; Edit subfields constraints
19
  [% END %]
19
  [% END %]
20
  [% ELSE %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode | html %]">Tag [% tagfield | html %] Subfield structure</a> &rsaquo; [% action | html %]
20
  [% ELSE %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode | uri %]">Tag [% tagfield | html %] Subfield structure</a> &rsaquo; [% action | html %]
21
  [% END %]
21
  [% END %]
22
  [% END %]
22
  [% END %]
23
[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode | html %]">Tag [% tagfield | html %] Subfield structure</a> &rsaquo; Confirm deletion of subfield [% tagsubfield | html %]
23
[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode | uri %]">Tag [% tagfield | html %] Subfield structure</a> &rsaquo; Confirm deletion of subfield [% tagsubfield | html %]
24
[% END %]
24
[% END %]
25
[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode | html %]">Tag [% tagfield | html %] subfield structure</a> &rsaquo; Subfield deleted
25
[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode | uri %]">Tag [% tagfield | html %] subfield structure</a> &rsaquo; Subfield deleted
26
[% END %]
26
[% END %]
27
[% IF ( else ) %]Tag [% tagfield | html %] Subfield structure[% END %]
27
[% IF ( else ) %]Tag [% tagfield | html %] Subfield structure[% END %]
28
</div>
28
</div>
Lines 48-56 Link Here
48
   <ul>
48
   <ul>
49
        [% FOREACH loo IN loop %]
49
        [% FOREACH loo IN loop %]
50
            [% IF ( loo.new_subfield ) %]
50
            [% IF ( loo.new_subfield ) %]
51
                <li><a href="#sub[% loo.urisubfieldcode | html %]field" title="[% loo.liblibrarian | html_entity %]">New</a></li>
51
                <li><a href="#sub[% loo.urisubfieldcode | uri %]field" title="[% loo.liblibrarian | html_entity %]">New</a></li>
52
            [% ELSE %]
52
            [% ELSE %]
53
                <li><a href="#sub[% loo.urisubfieldcode | html %]field" title="[% loo.liblibrarian | html_entity %]">
53
                <li><a href="#sub[% loo.urisubfieldcode | uri %]field" title="[% loo.liblibrarian | html_entity %]">
54
                    [% loo.subfieldcode | html %]
54
                    [% loo.subfieldcode | html %]
55
               </a></li>
55
               </a></li>
56
            [% END %]
56
            [% END %]
Lines 60-66 Link Here
60
    [% FOREACH loo IN loop %] 
60
    [% FOREACH loo IN loop %] 
61
        <div class="constraints" id="sub[% loo.urisubfieldcode | html %]field">
61
        <div class="constraints" id="sub[% loo.urisubfieldcode | html %]field">
62
62
63
               <h3><a href="#basic[% loo.urisubfieldcode | html %]">Basic constraints</a></h3>
63
               <h3><a href="#basic[% loo.urisubfieldcode | uri %]">Basic constraints</a></h3>
64
                    <div id="basic[% loo.urisubfieldcode | html %]">
64
                    <div id="basic[% loo.urisubfieldcode | html %]">
65
                    <fieldset class="rows">
65
                    <fieldset class="rows">
66
                	<ol>
66
                	<ol>
Lines 114-120 Link Here
114
                    </div>
114
                    </div>
115
115
116
116
117
            <h3><a href="#advanced[% loo.urisubfieldcode | html %]">Advanced constraints</a></h3>
117
            <h3><a href="#advanced[% loo.urisubfieldcode | uri %]">Advanced constraints</a></h3>
118
            <div id="advanced[% loo.urisubfieldcode | html %]">
118
            <div id="advanced[% loo.urisubfieldcode | html %]">
119
            <fieldset class="rows">
119
            <fieldset class="rows">
120
                <ol><li><label for="defaultvalue[% loo.row | html %]">Default value:</label>
120
                <ol><li><label for="defaultvalue[% loo.row | html %]">Default value:</label>
Lines 161-167 Link Here
161
			</ol>
161
			</ol>
162
            </fieldset>
162
            </fieldset>
163
            </div>
163
            </div>
164
            <h3><a href="#oth[% loo.urisubfieldcode | html %]">Other options (choose one)</a></h3>
164
            <h3><a href="#oth[% loo.urisubfieldcode | uri %]">Other options (choose one)</a></h3>
165
            <div id="oth[% loo.urisubfieldcode | html %]">
165
            <div id="oth[% loo.urisubfieldcode | html %]">
166
            <fieldset class="rows">
166
            <fieldset class="rows">
167
                    	<ol>
167
                    	<ol>
Lines 209-215 Link Here
209
        [% END %]
209
        [% END %]
210
		</div><!-- /content -->
210
		</div><!-- /content -->
211
    <fieldset class="action">
211
    <fieldset class="action">
212
        <input type="submit" value="Save changes" /> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield  | uri %]&amp;frameworkcode=[% frameworkcode | html %]" class="cancel">Cancel</a>
212
        <input type="submit" value="Save changes" /> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield  | uri %]&amp;frameworkcode=[% frameworkcode | uri %]" class="cancel">Cancel</a>
213
    </fieldset>
213
    </fieldset>
214
    </form>
214
    </form>
215
[% END %]
215
[% END %]
Lines 265-271 Link Here
265
</tr>
265
</tr>
266
[% FOREACH loo IN loop %]
266
[% FOREACH loo IN loop %]
267
<tr>
267
<tr>
268
    <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&amp;tagfield=[% loo.tagfield | html %]&amp;frameworkcode=[% frameworkcode | html %]#sub[% loo.tagsubfield | html %]field">[% loo.tagsubfield | html %]</a></td>
268
    <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&amp;tagfield=[% loo.tagfield | uri %]&amp;frameworkcode=[% frameworkcode | uri %]#sub[% loo.tagsubfield | uri %]field">[% loo.tagsubfield | html %]</a></td>
269
    <td>
269
    <td>
270
        [% IF ( loo.subfield_ignored ) %]
270
        [% IF ( loo.subfield_ignored ) %]
271
            <i>[% loo.liblibrarian | html_entity %]</i>
271
            <i>[% loo.liblibrarian | html_entity %]</i>
Lines 291-298 Link Here
291
        [% END %]
291
        [% END %]
292
    </td>
292
    </td>
293
    <td class="actions">
293
    <td class="actions">
294
        <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&amp;tagfield=[% loo.tagfield | html %]&amp;frameworkcode=[% frameworkcode | html %]#sub[% loo.tagsubfield | html %]field" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
294
        <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&amp;tagfield=[% loo.tagfield | uri %]&amp;frameworkcode=[% frameworkcode | uri %]#sub[% loo.tagsubfield | uri %]field" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
295
        <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=delete_confirm&amp;tagfield=[% loo.tagfield | html %]&amp;tagsubfield=[% loo.tagsubfield | html %]&amp;frameworkcode=[% frameworkcode | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
295
        <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=delete_confirm&amp;tagfield=[% loo.tagfield | uri %]&amp;tagsubfield=[% loo.tagsubfield | uri %]&amp;frameworkcode=[% frameworkcode | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
296
    </td>
296
    </td>
297
</tr>
297
</tr>
298
[% END %]
298
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt (-10 / +10 lines)
Lines 21-35 Link Here
21
&rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
21
&rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
22
&rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
22
&rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
23
[% IF ( add_form ) %]
23
[% IF ( add_form ) %]
24
&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | html %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END%]</a>
24
&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END%]</a>
25
&rsaquo; [% action | html %] [% searchfield | html %]
25
&rsaquo; [% action | html %] [% searchfield | html %]
26
[% ELSIF ( else ) %]
26
[% ELSIF ( else ) %]
27
&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | html %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END %]</a>
27
&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END %]</a>
28
[% ELSIF ( delete_confirm ) %]
28
[% ELSIF ( delete_confirm ) %]
29
&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | html %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END %]</a>
29
&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END %]</a>
30
&rsaquo; Confirm deletion of tag '[% searchfield | html %]'
30
&rsaquo; Confirm deletion of tag '[% searchfield | html %]'
31
[% ELSIF ( delete_confirmed ) %]
31
[% ELSIF ( delete_confirmed ) %]
32
&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | html %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END %]</a>
32
&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END %]</a>
33
&rsaquo; Data deleted
33
&rsaquo; Data deleted
34
[% END %]
34
[% END %]
35
</div>
35
</div>
Lines 207-215 Link Here
207
                    <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#">
207
                    <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#">
208
                        Actions <b class="caret"></b></a>
208
                        Actions <b class="caret"></b></a>
209
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield | html %]">
209
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield | html %]">
210
                        <li><a href="[% loo.subfield_link | html %]"><i class="fa fa-eye"></i> Subfields</a></li>
210
                        <li><a href="[% loo.subfield_link | uri %]"><i class="fa fa-eye"></i> Subfields</a></li>
211
                        <li><a href="[% loo.edit | html %]"><i class="fa fa-pencil"></i> Edit</a></li>
211
                        <li><a href="[% loo.edit | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
212
                        <li><a href="[% loo.delete | html %]"><i class="fa fa-trash"></i> Delete</a></li>
212
                        <li><a href="[% loo.delete | uri %]"><i class="fa fa-trash"></i> Delete</a></li>
213
                    </ul>
213
                    </ul>
214
                </div>
214
                </div>
215
            </td>
215
            </td>
Lines 230-238 Link Here
230
                <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#">
230
                <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#">
231
                    Actions <b class="caret"></b></a>
231
                    Actions <b class="caret"></b></a>
232
                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield | html %]">
232
                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield | html %]">
233
                    <li><a href="[% loo.subfield_link | html %]"><i class="fa fa-eye"></i> Subfields</a></li>
233
                    <li><a href="[% loo.subfield_link | uri %]"><i class="fa fa-eye"></i> Subfields</a></li>
234
                    <li><a href="[% loo.edit | html %]"><i class="fa fa-pencil"></i> Edit</a></li>
234
                    <li><a href="[% loo.edit | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
235
                    <li><a href="[% loo.delete | html %]"><i class="fa fa-trash"></i> Delete</a></li>
235
                    <li><a href="[% loo.delete | uri %]"><i class="fa fa-trash"></i> Delete</a></li>
236
                </ul>
236
                </ul>
237
            </div>
237
            </div>
238
        </td>
238
        </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt (-2 / +2 lines)
Lines 92-100 Link Here
92
                                <a class="btn btn-default btn-xs dropdown-toggle" id="oaisetsactions[% set.id | html %]" role="button" data-toggle="dropdown" href="#">
92
                                <a class="btn btn-default btn-xs dropdown-toggle" id="oaisetsactions[% set.id | html %]" role="button" data-toggle="dropdown" href="#">
93
                                  Actions <b class="caret"></b></a>
93
                                  Actions <b class="caret"></b></a>
94
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="oaisetsactions[% set.id | html %]">
94
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="oaisetsactions[% set.id | html %]">
95
                                  <li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&amp;id=[% set.id | html %]"><i class="fa fa-fw fa-pencil"></i> Edit</a></li>
95
                                  <li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&amp;id=[% set.id | uri %]"><i class="fa fa-fw fa-pencil"></i> Edit</a></li>
96
                                  <li><a class="delete_oai_set" href="/cgi-bin/koha/admin/oai_sets.pl?op=del&amp;id=[% set.id | html %]"><i class="fa fa-fw fa-trash"></i> Delete</a></li>
96
                                  <li><a class="delete_oai_set" href="/cgi-bin/koha/admin/oai_sets.pl?op=del&amp;id=[% set.id | html %]"><i class="fa fa-fw fa-trash"></i> Delete</a></li>
97
                                  <li><a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id | html %]"><i class="fa fa-fw fa-info"></i> Define mappings</a></li>
97
                                  <li><a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id | uri %]"><i class="fa fa-fw fa-info"></i> Define mappings</a></li>
98
                                </ul>
98
                                </ul>
99
                              </div>
99
                              </div>
100
                            </td>
100
                            </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt (-1 / +1 lines)
Lines 255-261 Link Here
255
    <tbody>[% FOREACH loo IN loop %]
255
    <tbody>[% FOREACH loo IN loop %]
256
        <tr>
256
        <tr>
257
257
258
        <td><strong><a href="[% loo.edit | html %]">[% loo.variable | html %]</a></strong></td><td> [% loo.explanation | html %]</td>
258
        <td><strong><a href="[% loo.edit | uri %]">[% loo.variable | html %]</a></strong></td><td> [% loo.explanation | html %]</td>
259
        [% IF ( loo.oneline ) %]
259
        [% IF ( loo.oneline ) %]
260
        <td class="single-line">
260
        <td class="single-line">
261
        [% ELSE %]
261
        [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt (-1 / +1 lines)
Lines 206-212 Link Here
206
                            <label for="MyPublicLink">See your public page: </label>
206
                            <label for="MyPublicLink">See your public page: </label>
207
                            [% IF Koha.Preference('UsageStatsPublicID') %]
207
                            [% IF Koha.Preference('UsageStatsPublicID') %]
208
                                [% SET my_url = 'https://hea.koha-community.org/libraries/' _  Koha.Preference('UsageStatsPublicID') %]
208
                                [% SET my_url = 'https://hea.koha-community.org/libraries/' _  Koha.Preference('UsageStatsPublicID') %]
209
                                <a href="[% my_url | html %]">[% my_url | html %]</a>
209
                                <a href="[% my_url | uri %]">[% my_url | html %]</a>
210
                            [% ELSE %]
210
                            [% ELSE %]
211
                                You do not have anything public yet.
211
                                You do not have anything public yet.
212
                            [% END %]
212
                            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt (-4 / +4 lines)
Lines 167-173 Link Here
167
        <tbody>
167
        <tbody>
168
        [% FOREACH loo IN loop %]
168
        [% FOREACH loo IN loop %]
169
            <tr>
169
            <tr>
170
            <td><a href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&amp;id=[% loo.id | html %]">[% loo.servername | html %]</a></td><td>[% loo.host | html %]:[% loo.port | html %]</td><td>[% loo.db | html %]</td><td>[% loo.userid | html %]</td><td>[% IF loo.password %]########[% END %]</td><td>[% IF ( loo.checked ) %]Yes[% ELSE %]No[% END %]</td><td>[% loo.rank | html %]</td>
170
            <td><a href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&amp;id=[% loo.id | uri %]">[% loo.servername | html %]</a></td><td>[% loo.host | html %]:[% loo.port | html %]</td><td>[% loo.db | html %]</td><td>[% loo.userid | html %]</td><td>[% IF loo.password %]########[% END %]</td><td>[% IF ( loo.checked ) %]Yes[% ELSE %]No[% END %]</td><td>[% loo.rank | html %]</td>
171
            <td>[% loo.syntax | html %]</td><td>[% loo.encoding | html %]</td><td>[% loo.timeout | html %]</td>
171
            <td>[% loo.syntax | html %]</td><td>[% loo.encoding | html %]</td><td>[% loo.timeout | html %]</td>
172
            <td>[% IF ( loo.recordtype == 'biblio' )  %]
172
            <td>[% IF ( loo.recordtype == 'biblio' )  %]
173
                <span>Bibliographic</span>
173
                <span>Bibliographic</span>
Lines 181-189 Link Here
181
                        Actions <b class="caret"></b>
181
                        Actions <b class="caret"></b>
182
                    </a>
182
                    </a>
183
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]">
183
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]">
184
                        <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&amp;id=[% loo.id | html %]"><i class="fa fa-pencil"></i> Edit</a></li>
184
                        <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&amp;id=[% loo.id | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
185
                        <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=add&amp;id=[% loo.id | html %]"><i class="fa fa-copy"></i> Copy</a></li>
185
                        <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=add&amp;id=[% loo.id | uri %]"><i class="fa fa-copy"></i> Copy</a></li>
186
                        <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=delete_confirmed&amp;id=[% loo.id | html %]" class="delete" data-servername="[% loo.servername | html %]"><i class="fa fa-trash"></i> Delete</a></li>
186
                        <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=delete_confirmed&amp;id=[% loo.id | uri %]" class="delete" data-servername="[% loo.servername | html %]"><i class="fa fa-trash"></i> Delete</a></li>
187
                    </ul>
187
                    </ul>
188
                </div>
188
                </div>
189
            </td>
189
            </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt (-3 / +3 lines)
Lines 43-49 Link Here
43
[% IF too_many_login_attempts %]
43
[% IF too_many_login_attempts %]
44
    <div id="login_error"><strong>Error: </strong>This account has been locked!</div>
44
    <div id="login_error"><strong>Error: </strong>This account has been locked!</div>
45
    [% IF Koha.Preference('OpacResetPassword') && Koha.Preference('OpacBaseURL') %]
45
    [% IF Koha.Preference('OpacResetPassword') && Koha.Preference('OpacBaseURL') %]
46
        <a href="[% Koha.Preference('OpacBaseURL') | html %]/cgi-bin/koha/opac-password-recovery.pl">You must reset your password</a>.
46
        <a href="[% Koha.Preference('OpacBaseURL') | uri %]/cgi-bin/koha/opac-password-recovery.pl">You must reset your password</a>.
47
    [% END %]
47
    [% END %]
48
[% ELSIF invalid_username_or_password %]
48
[% ELSIF invalid_username_or_password %]
49
<div id="login_error"><strong>Error: </strong>Invalid username or password</div>
49
<div id="login_error"><strong>Error: </strong>Invalid username or password</div>
Lines 95-108 Link Here
95
[% END %]
95
[% END %]
96
96
97
[% IF ( casServerUrl ) %]
97
[% IF ( casServerUrl ) %]
98
    <p><a href="[% casServerUrl | html %]">If you have a CAS account, please click here to login</a>.<p>
98
    <p><a href="[% casServerUrl | uri %]">If you have a CAS account, please click here to login</a>.<p>
99
[% END %]
99
[% END %]
100
100
101
[% IF ( casServersLoop ) %]
101
[% IF ( casServersLoop ) %]
102
    <p>If you have a CAS account, please choose against which one you would like to authenticate:</p>
102
    <p>If you have a CAS account, please choose against which one you would like to authenticate:</p>
103
<ul>
103
<ul>
104
    [% FOREACH casServer IN casServersLoop %]
104
    [% FOREACH casServer IN casServersLoop %]
105
        <li><a href="[% casServer.value | html %]">[% casServer.name | html %]</a></li>
105
        <li><a href="[% casServer.value | uri %]">[% casServer.name | html %]</a></li>
106
    [% END %]
106
    [% END %]
107
[% END %]
107
[% END %]
108
[% END %]
108
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt (-2 / +2 lines)
Lines 190-196 function confirmnotdup(redirect){ Link Here
190
[% IF ( duplicateauthid ) %]
190
[% IF ( duplicateauthid ) %]
191
        <div class="dialog alert">
191
        <div class="dialog alert">
192
                <h3>Duplicate record suspected</h3>
192
                <h3>Duplicate record suspected</h3>
193
                <p>Is this a duplicate of <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% duplicateauthid | html %]" class="popup" onclick="openWindow('/cgi-bin/koha/authorities/detail.pl?authid=[% duplicateauthid | html %]&amp;popup=1', 'DuplicateAuthority','800','600'); return false;" class="button">[% duplicateauthvalue | html %]</a> ?</p>
193
                <p>Is this a duplicate of <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% duplicateauthid | uri %]" class="popup" onclick="openWindow('/cgi-bin/koha/authorities/detail.pl?authid=[% duplicateauthid | html %]&amp;popup=1', 'DuplicateAuthority','800','600'); return false;" class="button">[% duplicateauthvalue | html %]</a> ?</p>
194
194
195
                <form action="authorities.pl" method="get">
195
                <form action="authorities.pl" method="get">
196
                    <input type="hidden" name="authid" value="[% duplicateauthid | html %]" />
196
                    <input type="hidden" name="authid" value="[% duplicateauthid | html %]" />
Lines 228-234 function confirmnotdup(redirect){ Link Here
228
<div id="authoritytabs" class="toptabs numbered">
228
<div id="authoritytabs" class="toptabs numbered">
229
    <ul>
229
    <ul>
230
        [% FOREACH BIG_LOO IN BIG_LOOP %]
230
        [% FOREACH BIG_LOO IN BIG_LOOP %]
231
        <li><a href="#tab[% BIG_LOO.number | html %]XX">[% BIG_LOO.number | html %]</a></li>
231
        <li><a href="#tab[% BIG_LOO.number | uri %]XX">[% BIG_LOO.number | html %]</a></li>
232
        [% END %]
232
        [% END %]
233
    </ul>
233
    </ul>
234
234
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt (-4 / +4 lines)
Lines 44-50 Link Here
44
44
45
<div id="action">
45
<div id="action">
46
    [% IF count %]
46
    [% IF count %]
47
        Used in <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an=[% authid | html %]">[% count | html %] record(s)</a>
47
        Used in <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an=[% authid | uri %]">[% count | html %] record(s)</a>
48
    [% ELSE %]
48
    [% ELSE %]
49
        This authority is not used in any records.
49
        This authority is not used in any records.
50
    [% END %]
50
    [% END %]
Lines 54-60 Link Here
54
    <ul>
54
    <ul>
55
        [% FOREACH BIG_LOO IN BIG_LOOP %]
55
        [% FOREACH BIG_LOO IN BIG_LOOP %]
56
            <li>
56
            <li>
57
                <a href="#tab[% BIG_LOO.number | html %]XX">[% BIG_LOO.number | html %]</a>
57
                <a href="#tab[% BIG_LOO.number | uri %]XX">[% BIG_LOO.number | html %]</a>
58
            </li>
58
            </li>
59
        [% END %]
59
        [% END %]
60
    </ul>
60
    </ul>
Lines 81-92 Link Here
81
                <span title="[% subfiel.long_desc | html %]" class="desc">[% subfiel.short_desc | html %]</span></label>
81
                <span title="[% subfiel.long_desc | html %]" class="desc">[% subfiel.short_desc | html %]</span></label>
82
                [% subfiel.marc_value | html %]
82
                [% subfiel.marc_value | html %]
83
                [% IF ( subfiel.link ) %]
83
                [% IF ( subfiel.link ) %]
84
                    <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=[% subfiel.link | html %]&amp;operator==&amp;type=intranet&amp;value=[% subfiel.marc_value |url %]">
84
                    <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=[% subfiel.link | uri %]&amp;operator==&amp;type=intranet&amp;value=[% subfiel.marc_value |url %]">
85
                        <img src="[% interface | html %]/[% theme | html %]/images/filefind.png" height="15" title="Search on [% subfiel.marc_value | html %]">
85
                        <img src="[% interface | html %]/[% theme | html %]/images/filefind.png" height="15" title="Search on [% subfiel.marc_value | html %]">
86
                    </a>
86
                    </a>
87
                [% END %]
87
                [% END %]
88
                [% IF ( subfiel.authority ) %]
88
                [% IF ( subfiel.authority ) %]
89
                    <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% subfiel.authority | html %]" class="button">Auth</a>
89
                    <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% subfiel.authority | uri %]" class="button">Auth</a>
90
                [% END %]
90
                [% END %]
91
            </p>
91
            </p>
92
        [% END %]
92
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt (-3 / +3 lines)
Lines 46-52 div#result { margin-top: 1em; } Link Here
46
[% ELSIF ( result ) %]
46
[% ELSIF ( result ) %]
47
47
48
        <script type="text/javascript">window.location.href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | html %]"</script>
48
        <script type="text/javascript">window.location.href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | html %]"</script>
49
        <p>The merging was successful. <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | html %]">Click here to see the merged record.</a></p>
49
        <p>The merging was successful. <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | uri %]">Click here to see the merged record.</a></p>
50
50
51
[% ELSIF ( choosereference ) %]
51
[% ELSIF ( choosereference ) %]
52
52
Lines 55-62 div#result { margin-top: 1em; } Link Here
55
    <fieldset class="rows">
55
    <fieldset class="rows">
56
    <legend>Merge reference</legend>
56
    <legend>Merge reference</legend>
57
    <ol>
57
    <ol>
58
    <li class="radio"><input type="radio" value="[% recordid1 | html %]" checked="checked" id="mergereference1" name="mergereference" onclick="changeFramework('[% frameworkcode1 | html %]')" /><label for="mergereference1">[% title1 | html %] [% FOREACH subtitl1 IN subtitle1 %] [% subtitl1.subfield | html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | html %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid1 | html %][% IF frameworklabel1 %] &mdash; [% frameworklabel1 | html %][% END %]</a>)</label></li>
58
    <li class="radio"><input type="radio" value="[% recordid1 | uri %]" checked="checked" id="mergereference1" name="mergereference" onclick="changeFramework('[% frameworkcode1 | html %]')" /><label for="mergereference1">[% title1 | html %] [% FOREACH subtitl1 IN subtitle1 %] [% subtitl1.subfield | html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | uri %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid1 | html %][% IF frameworklabel1 %] &mdash; [% frameworklabel1 | html %][% END %]</a>)</label></li>
59
    <li class="radio"><input type="radio" value="[% recordid2 | html %]" id="mergereference2" name="mergereference" onclick="changeFramework('[% frameworkcode2 | html %]')" /><label for="mergereference2">[% title2 | html %] [% FOREACH subtitl2 IN subtitle2 %] [% subtitl2.subfield | html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid2 | html %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid2 | html %][% IF frameworklabel2 %] &mdash; [% frameworklabel2 | html %][% END %]</a>)</label></li>
59
    <li class="radio"><input type="radio" value="[% recordid2 | uri %]" id="mergereference2" name="mergereference" onclick="changeFramework('[% frameworkcode2 | html %]')" /><label for="mergereference2">[% title2 | html %] [% FOREACH subtitl2 IN subtitle2 %] [% subtitl2.subfield | html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid2 | uri %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid2 | html %][% IF frameworklabel2 %] &mdash; [% frameworklabel2 | html %][% END %]</a>)</label></li>
60
60
61
    [% IF frameworkselect %]
61
    [% IF frameworkselect %]
62
          <li><label for="frameworkcode">Using framework:</label>
62
          <li><label for="frameworkcode">Using framework:</label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt (-7 / +7 lines)
Lines 14-20 Link Here
14
    	[% INCLUDE 'auth-finder-search.inc' %]
14
    	[% INCLUDE 'auth-finder-search.inc' %]
15
        [% IF ( total ) %]<div class="resultnumber">
15
        [% IF ( total ) %]<div class="resultnumber">
16
            [% IF ( displayprev ) %]
16
            [% IF ( displayprev ) %]
17
                    <a href="auth_finder.pl?startfrom=[% startfromprev | html %]&amp;authtypecode=[% authtypecode | html %][% FOREACH searchdat IN searchdata %]&amp;[% searchdat.term | html %]=[% searchdat.val | html %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% index | html %]&amp;tagid=[% tagid | html %]&amp;orderby=[% orderby | html %]">
17
                    <a href="auth_finder.pl?startfrom=[% startfromprev | uri %]&amp;authtypecode=[% authtypecode | uri %][% FOREACH searchdat IN searchdata %]&amp;[% searchdat.term | uri %]=[% searchdat.val | uri %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% index | uri %]&amp;tagid=[% tagid | uri %]&amp;orderby=[% orderby | uri %]">
18
                        &lt;&lt;
18
                        &lt;&lt;
19
                    </a>
19
                    </a>
20
                [% END %]
20
                [% END %]
Lines 22-33 Link Here
22
                    [% IF ( number.highlight ) %]
22
                    [% IF ( number.highlight ) %]
23
                        [% number.number | html %]
23
                        [% number.number | html %]
24
                    [% ELSE %]
24
                    [% ELSE %]
25
                        <a href="auth_finder.pl?startfrom=[% number.startfrom | html %]&amp;authtypecode=[% authtypecode | html %][% FOREACH searchdat IN number.searchdata %]&amp;[% searchdat.term | html %]=[% searchdat.val | html %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% index | html %]&amp;tagid=[% tagid | html %]&amp;orderby=[% orderby | html %]">
25
                        <a href="auth_finder.pl?startfrom=[% number.startfrom | uri %]&amp;authtypecode=[% authtypecode | uri %][% FOREACH searchdat IN number.searchdata %]&amp;[% searchdat.term | uri %]=[% searchdat.val | uri %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% index | uri %]&amp;tagid=[% tagid | uri %]&amp;orderby=[% orderby | uri %]">
26
                            [% number.number | html %]</a>
26
                            [% number.number | html %]</a>
27
                    [% END %]
27
                    [% END %]
28
                [% END %]
28
                [% END %]
29
                [% IF ( displaynext ) %]
29
                [% IF ( displaynext ) %]
30
                    <a href="auth_finder.pl?startfrom=[% startfromnext | html %]&amp;authtypecode=[% authtypecode | html %][% FOREACH searchdat IN searchdata %]&amp;[% searchdat.term | html %]=[% searchdat.val | html %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% index | html %]&amp;tagid=[% tagid | html %]&amp;orderby=[% orderby | html %]">
30
                    <a href="auth_finder.pl?startfrom=[% startfromnext | uri %]&amp;authtypecode=[% authtypecode | uri %][% FOREACH searchdat IN searchdata %]&amp;[% searchdat.term | uri %]=[% searchdat.val | uri %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% index | uri %]&amp;tagid=[% tagid | uri %]&amp;orderby=[% orderby | uri %]">
31
                        &gt;&gt;</a>
31
                        &gt;&gt;</a>
32
                [% END %]
32
                [% END %]
33
            <div>
33
            <div>
Lines 53-59 Link Here
53
                        <td>
53
                        <td>
54
                            [% IF resul.summary && resul.summary.authorized && resul.summary.authorized.size > 1 %]
54
                            [% IF resul.summary && resul.summary.authorized && resul.summary.authorized.size > 1 %]
55
                                [% FOREACH authorized IN resul.summary.authorized %]
55
                                [% FOREACH authorized IN resul.summary.authorized %]
56
                                    <a href="javascript:doauth('[% resul.authid | html %]', '[% index | html %]', '[% loop.count | html %]')" title="[% authorized.heading | html %]">[% loop.count | html %]</a>
56
                                    <a href="javascript:doauth('[% resul.authid | uri %]', '[% index | uri %]', '[% loop.count | uri %]')" title="[% authorized.heading | html %]">[% loop.count | html %]</a>
57
                                [% END %]
57
                                [% END %]
58
                          [% ELSE %]
58
                          [% ELSE %]
59
                                <a class="btn btn-xs btn-default" href="javascript:doauth('[% resul.authid | html %]', '[% index | html %]', '')"><i class="fa fa-plus"></i> Choose</a>
59
                                <a class="btn btn-xs btn-default" href="javascript:doauth('[% resul.authid | html %]', '[% index | html %]', '')"><i class="fa fa-plus"></i> Choose</a>
Lines 67-73 Link Here
67
        </div>
67
        </div>
68
        <div class="resultnumber">
68
        <div class="resultnumber">
69
            [% IF ( displayprev ) %]
69
            [% IF ( displayprev ) %]
70
                    <a href="auth_finder.pl?startfrom=[% startfromprev | html %]&amp;authtypecode=[% authtypecode | html %][% FOREACH searchdat IN searchdata %]&amp;[% searchdat.term | html %]=[% searchdat.val | html %][% END %]&amp;op=do_search&amp;type=intranetamp;&amp;index=[% index | html %]&amp;tagid=[% tagid | html %]&amp;orderby=[% orderby | html %]">
70
                    <a href="auth_finder.pl?startfrom=[% startfromprev | uri %]&amp;authtypecode=[% authtypecode | uri %][% FOREACH searchdat IN searchdata %]&amp;[% searchdat.term | uri %]=[% searchdat.val | uri %][% END %]&amp;op=do_search&amp;type=intranetamp;&amp;index=[% index | uri %]&amp;tagid=[% tagid | uri %]&amp;orderby=[% orderby | uri %]">
71
                        &lt;&lt;
71
                        &lt;&lt;
72
                    </a>
72
                    </a>
73
                [% END %]
73
                [% END %]
Lines 75-86 Link Here
75
                    [% IF ( number.highlight ) %]
75
                    [% IF ( number.highlight ) %]
76
                        [% number.number | html %]
76
                        [% number.number | html %]
77
                    [% ELSE %]
77
                    [% ELSE %]
78
                        <a href="auth_finder.pl?startfrom=[% number.startfrom | html %]&amp;authtypecode=[% authtypecode | html %][% FOREACH searchdat IN number.searchdata %]&amp;[% searchdat.term | html %]=[% searchdat.val | html %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% index | html %]&amp;tagid=[% tagid | html %]&amp;orderby=[% orderby | html %]">
78
                        <a href="auth_finder.pl?startfrom=[% number.startfrom | uri %]&amp;authtypecode=[% authtypecode | uri %][% FOREACH searchdat IN number.searchdata %]&amp;[% searchdat.term | uri %]=[% searchdat.val | uri %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% index | uri %]&amp;tagid=[% tagid | uri %]&amp;orderby=[% orderby | uri %]">
79
                            [% number.number | html %]</a>
79
                            [% number.number | html %]</a>
80
                    [% END %]
80
                    [% END %]
81
                [% END %]
81
                [% END %]
82
                [% IF ( displaynext ) %]
82
                [% IF ( displaynext ) %]
83
                    <a href="auth_finder.pl?startfrom=[% startfromnext | html %]&amp;authtypecode=[% authtypecode | html %][% FOREACH searchdat IN searchdata %]&amp;[% searchdat.term | html %]=[% searchdat.val | html %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% index | html %]&amp;tagid=[% tagid | html %]&amp;orderby=[% orderby | html %]">
83
                    <a href="auth_finder.pl?startfrom=[% startfromnext | uri %]&amp;authtypecode=[% authtypecode | uri %][% FOREACH searchdat IN searchdata %]&amp;[% searchdat.term | uri %]=[% searchdat.val | uri %][% END %]&amp;op=do_search&amp;type=intranet&amp;index=[% index | uri %]&amp;tagid=[% tagid | uri %]&amp;orderby=[% orderby | uri %]">
84
                        &gt;&gt;</a>
84
                        &gt;&gt;</a>
85
                [% END %]
85
                [% END %]
86
        </div>[% END %]
86
        </div>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt (-3 / +3 lines)
Lines 41-51 Link Here
41
    [% FOREACH resul IN result %]
41
    [% FOREACH resul IN result %]
42
    <tr data-authid="[% resul.authid | html %]">
42
    <tr data-authid="[% resul.authid | html %]">
43
      <td>[% PROCESS authresult summary=resul.summary %]</td>
43
      <td>[% PROCESS authresult summary=resul.summary %]</td>
44
      <td><a href="detail.pl?authid=[% resul.authid | html %]">Details</a></td>
44
      <td><a href="detail.pl?authid=[% resul.authid | uri %]">Details</a></td>
45
    [% UNLESS ( resul.isEDITORS ) %]
45
    [% UNLESS ( resul.isEDITORS ) %]
46
      <td>
46
      <td>
47
      [% IF resul.used > 0 %]
47
      [% IF resul.used > 0 %]
48
          <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&amp;op=do_search&amp;idx=an,phr&amp;q=[% resul.authid | html %]" class="button">[% resul.used | html %] record(s)</a>
48
          <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&amp;op=do_search&amp;idx=an,phr&amp;q=[% resul.authid | uri %]" class="button">[% resul.used | html %] record(s)</a>
49
      [% ELSE %]
49
      [% ELSE %]
50
          0 records
50
          0 records
51
      [% END %]
51
      [% END %]
Lines 57-63 Link Here
57
        <a class="btn btn-default btn-xs dropdown-toggle" id="authactions[% resul.authid | html %]" role="button" data-toggle="dropdown" href="#">
57
        <a class="btn btn-default btn-xs dropdown-toggle" id="authactions[% resul.authid | html %]" role="button" data-toggle="dropdown" href="#">
58
        Actions <b class="caret"></b></a>
58
        Actions <b class="caret"></b></a>
59
        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authactions[% resul.authid | html %]">
59
        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authactions[% resul.authid | html %]">
60
          <li><a href="/cgi-bin/koha/authorities/authorities.pl?authid=[% resul.authid | html %]"><i class="fa fa-pencil"></i> Edit</a></li>
60
          <li><a href="/cgi-bin/koha/authorities/authorities.pl?authid=[% resul.authid | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
61
          <li><a class="merge_auth" href="#merge"><i class="fa fa-compress"></i> Merge</a></li>
61
          <li><a class="merge_auth" href="#merge"><i class="fa fa-compress"></i> Merge</a></li>
62
          [% UNLESS ( resul.used ) %]
62
          [% UNLESS ( resul.used ) %]
63
            <li><a onclick='return confirm_deletion("[% resul.authid | html %]")'><i class="fa fa-trash"></i> Delete</a></li>
63
            <li><a onclick='return confirm_deletion("[% resul.authid | html %]")'><i class="fa fa-trash"></i> Delete</a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt (-7 / +7 lines)
Lines 50-60 Link Here
50
                        <div class="btn-group">
50
                        <div class="btn-group">
51
                            <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#" id="downloadcart"><i class="fa fa-download"></i> Download <span class="caret"></span> </a>
51
                            <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#" id="downloadcart"><i class="fa fa-download"></i> Download <span class="caret"></span> </a>
52
                            <ul class="dropdown-menu">
52
                            <ul class="dropdown-menu">
53
                                <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=iso2709&amp;bib_list=[% bib_list | html %]">MARC</a></li>
53
                                <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=iso2709&amp;bib_list=[% bib_list | uri %]">iso2709</a></li>
54
                                <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=ris&amp;bib_list=[% bib_list | html %]">RIS</a></li>
54
                                <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=ris&amp;bib_list=[% bib_list | uri %]">RIS</a></li>
55
                                <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=bibtex&amp;bib_list=[% bib_list | html %]">BibTex</a></li>
55
                                <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=bibtex&amp;bib_list=[% bib_list | uri %]">BibTex</a></li>
56
                            [% FOREACH csv_profile IN csv_profiles %]
56
                            [% FOREACH csv_profile IN csv_profiles %]
57
                                <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=[% csv_profile.export_format_id | html %]&amp;bib_list=[% bib_list | html %]">CSV - [% csv_profile.profile | html %]</a></li>
57
                                <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=[% csv_profile.export_format_id | uri %]&amp;bib_list=[% bib_list | uri %]">CSV - [% csv_profile.profile | html %]</a></li>
58
                            [% END %]
58
                            [% END %]
59
                            </ul>
59
                            </ul>
60
                        </div>
60
                        </div>
Lines 156-162 Link Here
156
                                                [% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %]
156
                                                [% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %]
157
                                                    <p>
157
                                                    <p>
158
                                                    [% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
158
                                                    [% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
159
                                                        - <a href="[% MARCNOTE.marcnote | html %]">[% MARCNOTE.marcnote | html %]</a>
159
                                                        - <a href="[% MARCNOTE.marcnote | uri %]">[% MARCNOTE.marcnote | html %]</a>
160
                                                    [% ELSE %]
160
                                                    [% ELSE %]
161
                                                        - [% MARCNOTE.marcnote | html %]
161
                                                        - [% MARCNOTE.marcnote | html %]
162
                                                    [% END %]
162
                                                    [% END %]
Lines 207-213 Link Here
207
                                            <td>
207
                                            <td>
208
                                               [% FOREACH MARCurl IN BIBLIO_RESULT.MARCURLS %]
208
                                               [% FOREACH MARCurl IN BIBLIO_RESULT.MARCURLS %]
209
                                                    [% IF MARCurl.part %]<p>[% MARCurl.part | html %]</p>[% END %]
209
                                                    [% IF MARCurl.part %]<p>[% MARCurl.part | html %]</p>[% END %]
210
                                                    <a href="[% MARCurl.MARCURL | html %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a>
210
                                                    <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a>
211
                                                    [% IF MARCurl.notes %]
211
                                                    [% IF MARCurl.notes %]
212
                                                        [% FOREACH note IN MARCurl.notes %]
212
                                                        [% FOREACH note IN MARCurl.notes %]
213
                                                            <p>[% note.note | html %]</p>
213
                                                            <p>[% note.note | html %]</p>
Lines 262-268 Link Here
262
                                            <input type="checkbox" class="select_record" value="[% BIBLIO_RESULT.biblionumber | html %]" name="bib[% BIBLIO_RESULT.biblionumber | html %]" id="bib[% BIBLIO_RESULT.biblionumber | html %]" />
262
                                            <input type="checkbox" class="select_record" value="[% BIBLIO_RESULT.biblionumber | html %]" name="bib[% BIBLIO_RESULT.biblionumber | html %]" id="bib[% BIBLIO_RESULT.biblionumber | html %]" />
263
                                        </td>
263
                                        </td>
264
                                        <td>
264
                                        <td>
265
                                            <a href="[% BIBLIO_RESULT.dest | html %]?biblionumber=[% BIBLIO_RESULT.biblionumber | html %]" class="open_title">
265
                                            <a href="[% BIBLIO_RESULT.dest | uri %]?biblionumber=[% BIBLIO_RESULT.biblionumber | uri %]" class="open_title">
266
                                                [% BIBLIO_RESULT.title |html %]
266
                                                [% BIBLIO_RESULT.title |html %]
267
                                                [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %]
267
                                                [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %]
268
                                                    [% subtitl.subfield | html %]
268
                                                    [% subtitl.subfield | html %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt (-3 / +3 lines)
Lines 75-88 Link Here
75
                    <span class="subfield-label">&nbsp;
75
                    <span class="subfield-label">&nbsp;
76
                    [% UNLESS ( subfiel.hide_marc ) %]<span class="subfield-code">[% subfiel.marc_subfield | html %]</span>[% END %]
76
                    [% UNLESS ( subfiel.hide_marc ) %]<span class="subfield-code">[% subfiel.marc_subfield | html %]</span>[% END %]
77
                    <span class="desc" title="[% subfiel.long_desc | html %]">[% subfiel.short_desc | html %]</span></span>
77
                    <span class="desc" title="[% subfiel.long_desc | html %]">[% subfiel.short_desc | html %]</span></span>
78
                    [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value | html %]">[% subfiel.marc_value | html %]</a>[% ELSE %][% subfiel.marc_value | html %][% END %]
78
                    [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value | uri %]">[% subfiel.marc_value | html %]</a>[% ELSE %][% subfiel.marc_value | html %][% END %]
79
                    [% IF ( subfiel.link ) %]
79
                    [% IF ( subfiel.link ) %]
80
                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=[% subfiel.link | html %],phr&amp;type=intranet&amp;q=[% subfiel.marc_value |url %]">
80
                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=[% subfiel.link | uri %],phr&amp;type=intranet&amp;q=[% subfiel.marc_value |url %]">
81
                            <img src="[% interface | html %]/[% theme | html %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value | html %]" alt="Search on [% subfiel.marc_value | html %]" />
81
                            <img src="[% interface | html %]/[% theme | html %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value | html %]" alt="Search on [% subfiel.marc_value | html %]" />
82
                        </a>
82
                        </a>
83
                    [% END %]
83
                    [% END %]
84
                    [% IF ( subfiel.authority ) %]
84
                    [% IF ( subfiel.authority ) %]
85
                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% subfiel.authority | html %]" class="button">Auth</a>
85
                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% subfiel.authority | uri %]" class="button">Auth</a>
86
                    [% END %]
86
                    [% END %]
87
                </p>
87
                </p>
88
            [% END %]
88
            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt (-2 / +2 lines)
Lines 38-44 Link Here
38
        </div>
38
        </div>
39
        [% END %]
39
        [% END %]
40
        <div class="btn-group">
40
        <div class="btn-group">
41
            <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | html %]" class="btn btn-sm btn-link"><i class="fa fa-trash"></i> Clear fields</a>
41
            <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="btn btn-sm btn-link"><i class="fa fa-trash"></i> Clear fields</a>
42
        </div>
42
        </div>
43
    </fieldset>
43
    </fieldset>
44
</div>
44
</div>
Lines 103-109 Link Here
103
      <ul>
103
      <ul>
104
      [% FOREACH advsearchloo IN advancedsearchesloop %]
104
      [% FOREACH advsearchloo IN advancedsearchesloop %]
105
        <li id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]">
105
        <li id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]">
106
           <a href="#advsearch-[% advsearchloo.advanced_search_type | html %]">
106
           <a href="#advsearch-[% advsearchloo.advanced_search_type | uri %]">
107
           [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item type
107
           [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item type
108
           [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]Collection
108
           [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]Collection
109
           [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving location
109
           [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving location
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-24 / +24 lines)
Lines 91-97 Link Here
91
        [% IF shelves.count %]
91
        [% IF shelves.count %]
92
            <span class="results_summary"><span class="label">Lists that include this title: </span>
92
            <span class="results_summary"><span class="label">Lists that include this title: </span>
93
            [% FOREACH s IN shelves %]
93
            [% FOREACH s IN shelves %]
94
                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | html %]">[% s.shelfname | html %]</a>
94
                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a>
95
                [% IF ( loop.last ) %][% ELSE %]|[% END %]
95
                [% IF ( loop.last ) %][% ELSE %]|[% END %]
96
            [% END %]
96
            [% END %]
97
            </span>
97
            </span>
Lines 108-121 Link Here
108
                    [% END %]
108
                    [% END %]
109
                    </span>
109
                    </span>
110
        [% END %]
110
        [% END %]
111
        <span id="catalogue_detail_marc_preview" class="results_summary"><span class="label">MARC Preview:</span> <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblionumber | html %]&amp;viewas=html" title="MARC" class="previewMARC">Show</a></span>
111
        <span id="catalogue_detail_marc_preview" class="results_summary"><span class="label">MARC Preview:</span> <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblionumber | uri %]&amp;viewas=html" title="MARC" class="previewMARC">Show</a></span>
112
112
113
        [% IF ( holdcount ) %]
113
        [% IF ( holdcount ) %]
114
            <span class="results_summary">
114
            <span class="results_summary">
115
                <span class="label">Holds:</span>
115
                <span class="label">Holds:</span>
116
                <span class="number_box">
116
                <span class="number_box">
117
                    [% IF CAN_user_reserveforothers_place_holds %]
117
                    [% IF CAN_user_reserveforothers_place_holds %]
118
                        <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | html %]">[% holdcount | html %]</a>
118
                        <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]">[% holdcount | html %]</a>
119
                    [% ELSE %]
119
                    [% ELSE %]
120
                        <span>[% holdcount | html %]</span>
120
                        <span>[% holdcount | html %]</span>
121
                    [% END %]
121
                    [% END %]
Lines 127-133 Link Here
127
            <span class="results_summary">
127
            <span class="results_summary">
128
                <span class="label">Article requests:</span>
128
                <span class="label">Article requests:</span>
129
                <span class="number_box">
129
                <span class="number_box">
130
                    <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber | html %]">[% article_requests_count | html %]</a>
130
                    <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber | uri %]">[% article_requests_count | html %]</a>
131
                </span>
131
                </span>
132
            </span>
132
            </span>
133
        [% END %]
133
        [% END %]
Lines 139-145 Link Here
139
        [% END %]
139
        [% END %]
140
        [% IF ( AmazonCoverImages ) %]
140
        [% IF ( AmazonCoverImages ) %]
141
            <div id="amazon-bookcoverimg">
141
            <div id="amazon-bookcoverimg">
142
            <a href="http://www.amazon[% AmazonTld | html %]/gp/reader/[% normalized_isbn | html %][% AmazonAssocTag | html %]#reader-link">
142
            <a href="http://www.amazon[% AmazonTld | uri %]/gp/reader/[% normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link">
143
                <img src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn | html %].01.MZZZZZZZ.jpg" alt="" />
143
                <img src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn | html %].01.MZZZZZZZ.jpg" alt="" />
144
        </a></div>
144
        </a></div>
145
        [% END %]
145
        [% END %]
Lines 188-194 Link Here
188
		<li>[% IF ( MARCurl.part ) %][% MARCurl.part | html %]
188
		<li>[% IF ( MARCurl.part ) %][% MARCurl.part | html %]
189
			<br />[% END %] 
189
			<br />[% END %] 
190
		<!-- here you might do a tmpl_if name="toc" and use greybox or equivalent for table of contents -->
190
		<!-- here you might do a tmpl_if name="toc" and use greybox or equivalent for table of contents -->
191
		<a href="[% MARCurl.MARCURL | html %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a>
191
		<a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a>
192
			[% IF ( MARCurl.notes ) %]<ul>[% FOREACH note IN MARCurl.notes %]<li>[% note.note | html %]</li>[% END %]</ul>[% END %]</li>
192
			[% IF ( MARCurl.notes ) %]<ul>[% FOREACH note IN MARCurl.notes %]<li>[% note.note | html %]</li>[% END %]</ul>[% END %]</li>
193
            [% END %]</ul>
193
            [% END %]</ul>
194
</li>
194
</li>
Lines 196-207 Link Here
196
196
197
    [% IF ( OPACBaseURL ) %]
197
    [% IF ( OPACBaseURL ) %]
198
        <li><strong>OPAC view:</strong>
198
        <li><strong>OPAC view:</strong>
199
        <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]" target="_blank">Open in new window</a>
199
        <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]" target="_blank">Open in new window</a>
200
        </li>
200
        </li>
201
    [% END %]
201
    [% END %]
202
        <li id="catalogue_detail_marc_preview">
202
        <li id="catalogue_detail_marc_preview">
203
            <strong>MARC Preview:</strong>
203
            <strong>MARC Preview:</strong>
204
            <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblionumber | html %]" title="MARC" rel="gb_page_center[600,500]">Show</a>
204
            <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblionumber | uri %]" title="MARC" rel="gb_page_center[600,500]">Show</a>
205
        </li>
205
        </li>
206
        </ul>
206
        </ul>
207
        </div>
207
        </div>
Lines 213-219 Link Here
213
        [% END %]
213
        [% END %]
214
        [% IF ( AmazonCoverImages ) %]
214
        [% IF ( AmazonCoverImages ) %]
215
            <div id="amazon-bookcoverimg">
215
            <div id="amazon-bookcoverimg">
216
            <a href="http://www.amazon[% AmazonTld | html %]/gp/reader/[% normalized_isbn | html %][% AmazonAssocTag | html %]#reader-link">
216
            <a href="http://www.amazon[% AmazonTld | uri %]/gp/reader/[% normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link">
217
            <img src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn | html %].01.MZZZZZZZ.jpg" alt="" />
217
            <img src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn | html %].01.MZZZZZZZ.jpg" alt="" />
218
            </a>
218
            </a>
219
        </div>
219
        </div>
Lines 260-266 Link Here
260
        [% IF ( urlS ) %]
260
        [% IF ( urlS ) %]
261
            <li><strong>URL:</strong>
261
            <li><strong>URL:</strong>
262
                [% FOREACH url IN urlS %]
262
                [% FOREACH url IN urlS %]
263
                    <a href="[% url.url | html %]">[% url.url | html %]</a>
263
                    <a href="[% url.url | uri %]">[% url.url | html %]</a>
264
                [% END %]
264
                [% END %]
265
            </li>
265
            </li>
266
        [% END %]
266
        [% END %]
Lines 269-275 Link Here
269
            <li><strong>Lists that include this title: </strong>
269
            <li><strong>Lists that include this title: </strong>
270
            <ul>
270
            <ul>
271
            [% FOREACH s IN shelves %]
271
            [% FOREACH s IN shelves %]
272
                <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | html %]">[% s.shelfname | html %]</a></li>
272
                <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a></li>
273
            [% END %]
273
            [% END %]
274
            </ul>
274
            </ul>
275
            </li>
275
            </li>
Lines 288-294 Link Here
288
                    [% END %]
288
                    [% END %]
289
                    </ul></li>
289
                    </ul></li>
290
        [% END %]
290
        [% END %]
291
            [% IF ( holdcount ) %]<li><strong>Holds:</strong> <span class="number_box"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | html %]">[% holdcount | html %]</a></span></li>[% ELSE %][% END %]
291
            [% IF ( holdcount ) %]<li><strong>Holds:</strong> <span class="number_box"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]">[% holdcount | html %]</a></span></li>[% ELSE %][% END %]
292
        </ul>
292
        </ul>
293
		[% END %]
293
		[% END %]
294
294
Lines 478-484 Link Here
478
                    </td>
478
                    </td>
479
                    <td class="datelastseen"><span title="[% item.datelastseen | html %]">[% item.datelastseen | $KohaDates %]</span></td>
479
                    <td class="datelastseen"><span title="[% item.datelastseen | html %]">[% item.datelastseen | $KohaDates %]</span></td>
480
                    <td class="dateaccessioned"><span title="[% item.dateaccessioned | html %]">[% item.dateaccessioned | $KohaDates %]</span></td>
480
                    <td class="dateaccessioned"><span title="[% item.dateaccessioned | html %]">[% item.dateaccessioned | $KohaDates %]</span></td>
481
                    <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=[% item.type | html %]&amp;itemnumber=[% item.itemnumber | html %]&amp;biblionumber=[% item.biblionumber | html %]&amp;bi=[% item.biblioitemnumber | html %]#item[% item.itemnumber | html %]">[% item.barcode | html %]</a></td>
481
                    <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=[% item.type | uri %]&amp;itemnumber=[% item.itemnumber | uri %]&amp;biblionumber=[% item.biblionumber | uri %]&amp;bi=[% item.biblioitemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a></td>
482
                    [% IF ( volinfo ) %]
482
                    [% IF ( volinfo ) %]
483
                        <td class="enumchron">
483
                        <td class="enumchron">
484
                            [% IF ( itemdata_enumchron ) %]
484
                            [% IF ( itemdata_enumchron ) %]
Lines 500-506 Link Here
500
                        </td>
500
                        </td>
501
                    [% END %]
501
                    [% END %]
502
                    [% IF ( itemdata_uri ) %]
502
                    [% IF ( itemdata_uri ) %]
503
                        <td class="uri"><a href="[% item.uri | html %]">[% item.uri | html %]</a></td>
503
                        <td class="uri"><a href="[% item.uri | uri %]">[% item.uri | html %]</a></td>
504
                    [% END %]
504
                    [% END %]
505
                    [% IF ( itemdata_copynumber ) %]
505
                    [% IF ( itemdata_copynumber ) %]
506
                        <td class="copynumber">[% item.copynumber | html %]</td>
506
                        <td class="copynumber">[% item.copynumber | html %]</td>
Lines 518-537 Link Here
518
                        <td class="nonpublicnote">[% item.itemnotes_nonpublic | html %]</td>
518
                        <td class="nonpublicnote">[% item.itemnotes_nonpublic | html %]</td>
519
                    [% END %]
519
                    [% END %]
520
                    [% IF ( SpineLabelShowPrintOnBibDetails ) %]
520
                    [% IF ( SpineLabelShowPrintOnBibDetails ) %]
521
                        <td><a href="/cgi-bin/koha/labels/spinelabel-print.pl?barcode=[% item.barcode | html %]" >Print label</a></td>
521
                        <td><a href="/cgi-bin/koha/labels/spinelabel-print.pl?barcode=[% item.barcode | uri %]" >Print label</a></td>
522
                    [% END %]
522
                    [% END %]
523
                    [% IF ( hostrecords ) %]
523
                    [% IF ( hostrecords ) %]
524
                        <td>[% IF ( item.hostbiblionumber) %]<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.hostbiblionumber | html %]" >[% item.hosttitle | html %]</a>[% END %]</td>
524
                        <td>[% IF ( item.hostbiblionumber) %]<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.hostbiblionumber | uri %]" >[% item.hosttitle | html %]</a>[% END %]</td>
525
                    [% END %]
525
                    [% END %]
526
                    [% IF ( analyze ) %]
526
                    [% IF ( analyze ) %]
527
                        <td>
527
                        <td>
528
                            [% IF ( item.countanalytics ) %]
528
                            [% IF ( item.countanalytics ) %]
529
                                <a href="/cgi-bin/koha/catalogue/search.pl?idx=hi&amp;q=[% item.itemnumber | html %]">[% item.countanalytics | html %] analytics</a>
529
                                <a href="/cgi-bin/koha/catalogue/search.pl?idx=hi&amp;q=[% item.itemnumber | uri %]">[% item.countanalytics | html %] analytics</a>
530
                            [% END %]
530
                            [% END %]
531
                        </td>
531
                        </td>
532
                    [% END %]
532
                    [% END %]
533
                    [% IF ( analyze ) %]
533
                    [% IF ( analyze ) %]
534
                        <td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?hostbiblionumber=[% item.biblionumber | html %]&amp;hostitemnumber=[% item.itemnumber | html %]">Create analytics</a></td>
534
                        <td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?hostbiblionumber=[% item.biblionumber | uri %]&amp;hostitemnumber=[% item.itemnumber | uri %]">Create analytics</a></td>
535
                    [% END %]
535
                    [% END %]
536
536
537
                [% IF ShowCourseReserves %]
537
                [% IF ShowCourseReserves %]
Lines 540-546 Link Here
540
                            [% FOREACH r IN item.course_reserves %]
540
                            [% FOREACH r IN item.course_reserves %]
541
                                [% IF r.course.enabled == 'yes' %]
541
                                [% IF r.course.enabled == 'yes' %]
542
                                    <p>
542
                                    <p>
543
                                      <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% r.course.course_id | html %]">
543
                                      <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% r.course.course_id | uri %]">
544
                                         [% r.course.course_name | html %]
544
                                         [% r.course.course_name | html %]
545
                                         <!--[% IF r.course.course_number %] [% r.course.course_number | html %] [% END %]-->
545
                                         <!--[% IF r.course.course_number %] [% r.course.course_number | html %] [% END %]-->
546
                                         [% IF r.course.section %] [% r.course.section | html %] [% END %]
546
                                         [% IF r.course.section %] [% r.course.section | html %] [% END %]
Lines 579-585 Link Here
579
        [% PROCESS items_table tab="holdings" items=itemloop %]
579
        [% PROCESS items_table tab="holdings" items=itemloop %]
580
        [% END %]
580
        [% END %]
581
                [% IF ( hiddencount ) %]
581
                [% IF ( hiddencount ) %]
582
                   <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]&amp;showallitems=1">Show all items ([% hiddencount | html %] hidden)</a>
582
                   <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&amp;showallitems=1">Show all items ([% hiddencount | html %] hidden)</a>
583
                [% END %] 		
583
                [% END %] 		
584
		[% IF ( debug_display ) %]
584
		[% IF ( debug_display ) %]
585
		<br /><br />
585
		<br /><br />
Lines 626-632 Link Here
626
    [% FOREACH MARCNOTE IN MARCNOTES %]
626
    [% FOREACH MARCNOTE IN MARCNOTES %]
627
        <p>
627
        <p>
628
        [% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
628
        [% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
629
            <a href="[% MARCNOTE.marcnote | html %]">[% MARCNOTE.marcnote | html %]</a>
629
            <a href="[% MARCNOTE.marcnote | uri %]">[% MARCNOTE.marcnote | html %]</a>
630
        [% ELSE %]
630
        [% ELSE %]
631
            [% MARCNOTE.marcnote FILTER html_line_break | html %]
631
            [% MARCNOTE.marcnote FILTER html_line_break | html %]
632
        [% END %]
632
        [% END %]
Lines 691-697 Link Here
691
            [% END %]
691
            [% END %]
692
            </table>
692
            </table>
693
            [% END %]
693
            [% END %]
694
            <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | html %]">Subscription details</a>
694
            <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]">Subscription details</a>
695
    [% END %]
695
    [% END %]
696
</div>
696
</div>
697
</div>
697
</div>
Lines 787-795 Link Here
787
[% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %]
787
[% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %]
788
<div id="editions"><h4>Editions</h4>
788
<div id="editions"><h4>Editions</h4>
789
<table>
789
<table>
790
[% FOREACH XISBN IN XISBNS %]<tr>[% IF ( AmazonCoverImages ) %]<td><a href="http://www.amazon.com/gp/reader/[% XISBN.normalized_isbn | html %][% AmazonAssocTag | html %]#reader-link"><img src="https://images-na.ssl-images-amazon.com/images/P/[% XISBN.normalized_isbn | html %].01._AA75_PU_PU-5_.jpg" /></a></td>[% END %]
790
[% FOREACH XISBN IN XISBNS %]<tr>[% IF ( AmazonCoverImages ) %]<td><a href="http://www.amazon.com/gp/reader/[% XISBN.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link"><img src="https://images-na.ssl-images-amazon.com/images/P/[% XISBN.normalized_isbn | html %].01._AA75_PU_PU-5_.jpg" /></a></td>[% END %]
791
[% UNLESS ( item_level_itypes ) %]<td>[% IF ( noItemTypeImages ) %][% XISBN.description | html %][% ELSE %]<img src="[% XISBN.imageurl | html %]" alt="[% XISBN.description | html %]" title="[% XISBN.description | html %]">[% END %]</td>[% END %]
791
[% UNLESS ( item_level_itypes ) %]<td>[% IF ( noItemTypeImages ) %][% XISBN.description | html %][% ELSE %]<img src="[% XISBN.imageurl | html %]" alt="[% XISBN.description | html %]" title="[% XISBN.description | html %]">[% END %]</td>[% END %]
792
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber | html %]">[% XISBN.title | html %]</a> by [% XISBN.author | html %] &copy;[% XISBN.copyrightdate | html %]
792
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber | uri %]">[% XISBN.title | html %]</a> by [% XISBN.author | html %] &copy;[% XISBN.copyrightdate | html %]
793
  [% IF ( XISBN.publishercode ) %]
793
  [% IF ( XISBN.publishercode ) %]
794
[% XISBN.publishercode | html %] [% IF ( XISBN.place ) %]([% XISBN.place | html %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear | html %][% END %] [% IF ( XISBN.editionstatement ) %][% XISBN.editionstatement | html %][% END %] [% IF ( XISBN.editionresponsibility ) %][% XISBN.editionresponsibility | html %][% END %]
794
[% XISBN.publishercode | html %] [% IF ( XISBN.place ) %]([% XISBN.place | html %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear | html %][% END %] [% IF ( XISBN.editionstatement ) %][% XISBN.editionstatement | html %][% END %] [% IF ( XISBN.editionresponsibility ) %][% XISBN.editionresponsibility | html %][% END %]
795
    [% END %]
795
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt (-1 / +1 lines)
Lines 56-62 Link Here
56
                [% END %]
56
                [% END %]
57
                <td>
57
                <td>
58
                    [% IF checkout.item.barcode %] [%# FIXME This test is not mandatory I think %]
58
                    [% IF checkout.item.barcode %] [%# FIXME This test is not mandatory I think %]
59
                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout.item.biblionumber | html %]&amp;itemnumber=[% checkout.item.itemnumber | html %]">[% checkout.item.barcode | html %]</a>
59
                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout.item.biblionumber | uri %]&amp;itemnumber=[% checkout.item.itemnumber | uri %]">[% checkout.item.barcode | html %]</a>
60
                    [% ELSE %]
60
                    [% ELSE %]
61
                        &nbsp;
61
                        &nbsp;
62
                    [% END %]</td>
62
                    [% END %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (-10 / +10 lines)
Lines 39-57 Link Here
39
        <li><span class="label">Physical details:</span> [% pages | html %] [% illus | html %] [% size | html %]&nbsp;</li>
39
        <li><span class="label">Physical details:</span> [% pages | html %] [% illus | html %] [% size | html %]&nbsp;</li>
40
        [% IF ( bnotes ) %]<li><span class="label">Notes:</span> [% bnotes | html %]</li>[% END %]
40
        [% IF ( bnotes ) %]<li><span class="label">Notes:</span> [% bnotes | html %]</li>[% END %]
41
        <li><span class="label">No. of items:</span> [% count | html %]&nbsp;[% IF ( hiddencount ) %]total ([% showncount | html %] shown / [% hiddencount | html %] hidden) 
41
        <li><span class="label">No. of items:</span> [% count | html %]&nbsp;[% IF ( hiddencount ) %]total ([% showncount | html %] shown / [% hiddencount | html %] hidden) 
42
<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | html %]&amp;showallitems=1">Show all items</a>[% END %]</li>
42
<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&amp;showallitems=1">Show all items</a>[% END %]</li>
43
    </ol>
43
    </ol>
44
44
45
    <br clear="all" />
45
    <br clear="all" />
46
    [% IF ( ONLY_ONE ) %]
46
    [% IF ( ONLY_ONE ) %]
47
        <div class="dialog message">You are only viewing one item.  <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | html %]&amp;bi=[% biblioitemnumber | html %]#item[% itemnumber | html %]">View All</a></div>
47
        <div class="dialog message">You are only viewing one item.  <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&amp;bi=[% biblioitemnumber | uri %]#item[% itemnumber | uri %]">View All</a></div>
48
    [% END %]
48
    [% END %]
49
    [% FOREACH ITEM_DAT IN ITEM_DATA %]
49
    [% FOREACH ITEM_DAT IN ITEM_DATA %]
50
    <div class="yui-g">
50
    <div class="yui-g">
51
        <h3 id="item[% ITEM_DAT.itemnumber | html %]">Barcode [% ITEM_DAT.barcode | html %]  [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]</h3>
51
        <h3 id="item[% ITEM_DAT.itemnumber | html %]">Barcode [% ITEM_DAT.barcode | html %]  [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]</h3>
52
        <div class="listgroup"><h4>Item information [% IF ( CAN_user_editcatalogue_edit_catalogue ) %][% UNLESS ( ITEM_DAT.nomod ) %]
52
        <div class="listgroup"><h4>Item information [% IF ( CAN_user_editcatalogue_edit_catalogue ) %][% UNLESS ( ITEM_DAT.nomod ) %]
53
         [% IF ( CAN_user_editcatalogue_edit_items ) %]
53
         [% IF ( CAN_user_editcatalogue_edit_items ) %]
54
         <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=[% ITEM_DAT.biblionumber | html %]&amp;itemnumber=[% ITEM_DAT.itemnumber | html %]">[Edit Item]</a>
54
         <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=[% ITEM_DAT.biblionumber | uri %]&amp;itemnumber=[% ITEM_DAT.itemnumber | uri %]">[Edit Item]</a>
55
         [% END %]
55
         [% END %]
56
         [% END %][% END %]</h4>
56
         [% END %][% END %]</h4>
57
            <ol class="bibliodetails">
57
            <ol class="bibliodetails">
Lines 196-202 Link Here
196
            [% IF ITEM_DAT.basketno %]
196
            [% IF ITEM_DAT.basketno %]
197
                <li><span class="label">Order date:</span>
197
                <li><span class="label">Order date:</span>
198
                    [% IF ( CAN_user_acquisition_order_manage ) %]
198
                    [% IF ( CAN_user_acquisition_order_manage ) %]
199
                        <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ITEM_DAT.basketno | html %]">[% ITEM_DAT.orderdate | $KohaDates %]</a>
199
                        <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ITEM_DAT.basketno | uri %]">[% ITEM_DAT.orderdate | $KohaDates %]</a>
200
                    [% ELSE %]
200
                    [% ELSE %]
201
                        [% ITEM_DAT.orderdate | $KohaDates %]
201
                        [% ITEM_DAT.orderdate | $KohaDates %]
202
                    [% END %]
202
                    [% END %]
Lines 209-215 Link Here
209
            [% IF ITEM_DAT.dateaccessioned %]
209
            [% IF ITEM_DAT.dateaccessioned %]
210
                <li><span class="label">Accession date:</span>
210
                <li><span class="label">Accession date:</span>
211
                    [% IF ( CAN_user_acquisition_order_receive && ITEM_DAT.invoiceid ) %]
211
                    [% IF ( CAN_user_acquisition_order_receive && ITEM_DAT.invoiceid ) %]
212
                        <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% ITEM_DAT.invoiceid | html %]">[% ITEM_DAT.dateaccessioned | $KohaDates %]</a>
212
                        <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% ITEM_DAT.invoiceid | uri %]">[% ITEM_DAT.dateaccessioned | $KohaDates %]</a>
213
                    [% ELSE %]
213
                    [% ELSE %]
214
                        [% ITEM_DAT.dateaccessioned | $KohaDates %]
214
                        [% ITEM_DAT.dateaccessioned | $KohaDates %]
215
                    [% END %]
215
                    [% END %]
Lines 221-236 Link Here
221
                </li>
221
                </li>
222
            [% END %]
222
            [% END %]
223
223
224
                <li><span class="label">Total checkouts:</span>[% IF ( ITEM_DAT.issues ) %][% ITEM_DAT.issues | html %][% ELSE %]0[% END %]  (<a href="/cgi-bin/koha/circ/bookcount.pl?&amp;biblionumber=[% ITEM_DAT.biblionumber | html %]&amp;itm=[% ITEM_DAT.itemnumber | html %]">View item's checkout history</a>)</li>
224
                <li><span class="label">Total checkouts:</span>[% IF ( ITEM_DAT.issues ) %][% ITEM_DAT.issues | html %][% ELSE %]0[% END %]  (<a href="/cgi-bin/koha/circ/bookcount.pl?&amp;biblionumber=[% ITEM_DAT.biblionumber | uri %]&amp;itm=[% ITEM_DAT.itemnumber | uri %]">View item's checkout history</a>)</li>
225
225
226
                <li><span class="label">Last seen:</span>[% IF ( ITEM_DAT.datelastseen ) %][% ITEM_DAT.datelastseen | $KohaDates %] [%END %]&nbsp;</li>
226
                <li><span class="label">Last seen:</span>[% IF ( ITEM_DAT.datelastseen ) %][% ITEM_DAT.datelastseen | $KohaDates %] [%END %]&nbsp;</li>
227
                <li><span class="label">Last borrowed:</span>[% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %]&nbsp;</li>
227
                <li><span class="label">Last borrowed:</span>[% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %]&nbsp;</li>
228
                [% IF Koha.Preference('StoreLastBorrower') && ITEM_DAT.object.last_returned_by %]
228
                [% IF Koha.Preference('StoreLastBorrower') && ITEM_DAT.object.last_returned_by %]
229
                    <li><span class="label">Last returned by:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.object.last_returned_by.borrowernumber | html %]">[% ITEM_DAT.object.last_returned_by.cardnumber | html %]</a>&nbsp;</li>
229
                    <li><span class="label">Last returned by:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.object.last_returned_by.borrowernumber | uri %]">[% ITEM_DAT.object.last_returned_by.cardnumber | html %]</a>&nbsp;</li>
230
                [% END %]
230
                [% END %]
231
                [% IF ( ITEM_DAT.card0 ) %]<li><span class="label">Last borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower0 | html %]">[% ITEM_DAT.card0 | html %]</a>&nbsp;</li>[% END %]
231
                [% IF ( ITEM_DAT.card0 ) %]<li><span class="label">Last borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower0 | uri %]">[% ITEM_DAT.card0 | html %]</a>&nbsp;</li>[% END %]
232
                [% IF ( ITEM_DAT.card1 ) %]<li><span class="label">Previous borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower1 | html %]">[% ITEM_DAT.card1 | html %]</a>&nbsp;</li>[% END %]
232
                [% IF ( ITEM_DAT.card1 ) %]<li><span class="label">Previous borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower1 | uri %]">[% ITEM_DAT.card1 | html %]</a>&nbsp;</li>[% END %]
233
                [% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower2 | html %]">[% ITEM_DAT.card2 | html %]</a>&nbsp;</li>[% END %]
233
                [% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower2 | uri %]">[% ITEM_DAT.card2 | html %]</a>&nbsp;</li>[% END %]
234
                [% IF ( ITEM_DAT.paidfor ) %]<li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor | html %]&nbsp;</li>[% END %]
234
                [% IF ( ITEM_DAT.paidfor ) %]<li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor | html %]&nbsp;</li>[% END %]
235
235
236
                [% IF ( ITEM_DAT.enumchron ) %]<li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron | html %]&nbsp;</li>[% END %]
236
                [% IF ( ITEM_DAT.enumchron ) %]<li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron | html %]&nbsp;</li>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-7 / +7 lines)
Lines 44-50 Link Here
44
            <ul style="list-style: none;">
44
            <ul style="list-style: none;">
45
            [% FOREACH SPELL_SUGGES IN SPELL_SUGGEST %]
45
            [% FOREACH SPELL_SUGGES IN SPELL_SUGGEST %]
46
            <li>
46
            <li>
47
                <a href="/cgi-bin/koha/catalogue/search.pl?q=[% SPELL_SUGGES.spsuggestion | html %]">[% SPELL_SUGGES.spsuggestion | html %]</a>
47
                <a href="/cgi-bin/koha/catalogue/search.pl?q=[% SPELL_SUGGES.spsuggestion | uri %]">[% SPELL_SUGGES.spsuggestion | html %]</a>
48
            </li>
48
            </li>
49
            [% END %]
49
            [% END %]
50
            </ul>
50
            </ul>
Lines 326-332 Link Here
326
                [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
326
                [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
327
                    <tr>
327
                    <tr>
328
                        <td>
328
                        <td>
329
                            <a href="/cgi-bin/koha/catalogue/search.pl?idx=[% scan_index_to_use | html %]&amp;q=[% SEARCH_RESULT.scan_use |url %]&quot;[% SEARCH_RESULT.title | html %]&quot;">[% SEARCH_RESULT.title | html %]</a>
329
                            <a href="/cgi-bin/koha/catalogue/search.pl?idx=[% scan_index_to_use | uri %]&amp;q=[% SEARCH_RESULT.scan_use |url %]&quot;[% SEARCH_RESULT.title | uri %]&quot;">[% SEARCH_RESULT.title | html %]</a>
330
                        </td>
330
                        </td>
331
                        <td>
331
                        <td>
332
                            [% SEARCH_RESULT.author | html %]
332
                            [% SEARCH_RESULT.author | html %]
Lines 443-449 Link Here
443
                            [% ELSE %]
443
                            [% ELSE %]
444
                                [% IF CAN_user_reserveforothers_place_holds %]
444
                                [% IF CAN_user_reserveforothers_place_holds %]
445
                                    <a id="reserve_[% SEARCH_RESULT.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]">Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %])</a>
445
                                    <a id="reserve_[% SEARCH_RESULT.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]">Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %])</a>
446
                                    [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]&amp;findborrower=[% holdfor_cardnumber | html %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></span>[% END %]
446
                                    [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]&amp;findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></span>[% END %]
447
                                [% ELSE %]
447
                                [% ELSE %]
448
                                    Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %])
448
                                    Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %])
449
                                [% END %]
449
                                [% END %]
Lines 462-476 Link Here
462
                          [% END %]
462
                          [% END %]
463
463
464
                          [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
464
                          [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
465
                          | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]">Edit record</a>
465
                          | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit record</a>
466
                          [% END %]
466
                          [% END %]
467
                          [% IF ( CAN_user_editcatalogue_edit_items ) %]
467
                          [% IF ( CAN_user_editcatalogue_edit_items ) %]
468
                          | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]">Edit items</a>
468
                          | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit items</a>
469
                          [% END %]
469
                          [% END %]
470
470
471
                          [% IF ( OPACBaseURL ) %]
471
                          [% IF ( OPACBaseURL ) %]
472
                              <span class="view-in-opac">
472
                              <span class="view-in-opac">
473
                                | <a href="[% Koha.Preference('OPACBaseURL') | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]" target="_blank">OPAC view</a>
473
                                | <a href="[% Koha.Preference('OPACBaseURL') | uri %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]" target="_blank">OPAC view</a>
474
                              </span>
474
                              </span>
475
                          [% END %]
475
                          [% END %]
476
476
Lines 594-600 Link Here
594
    [% IF ( outer_sup_results_loo.inner_sup_results_loop ) %]
594
    [% IF ( outer_sup_results_loo.inner_sup_results_loop ) %]
595
        [% outer_sup_results_loo.servername | html %]
595
        [% outer_sup_results_loo.servername | html %]
596
        [% FOREACH inner_sup_results_loo IN outer_sup_results_loo.inner_sup_results_loop %]
596
        [% FOREACH inner_sup_results_loo IN outer_sup_results_loo.inner_sup_results_loop %]
597
        <div><a href="/cgi-bin/koha/catalogue/search.pl?[% inner_sup_results_loo.query_cgi | html %][% inner_sup_results_loo.limit_cgi | html %][% inner_sup_results_loo.sort_by | html %][% inner_sup_results_loo.link | html %]">[% inner_sup_results_loo.title | html %]</a></div>
597
        <div><a href="/cgi-bin/koha/catalogue/search.pl?[% inner_sup_results_loo.query_cgi | uri %][% inner_sup_results_loo.limit_cgi | uri %][% inner_sup_results_loo.sort_by | uri %][% inner_sup_results_loo.link | uri %]">[% inner_sup_results_loo.title | html %]</a></div>
598
        [% END %]
598
        [% END %]
599
    [% END %]
599
    [% END %]
600
<!-- </div> -->
600
<!-- </div> -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt (-4 / +4 lines)
Lines 57-63 Link Here
57
                  <tr>
57
                  <tr>
58
                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
58
                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
59
                    <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
59
                    <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
60
                    <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td>
60
                    <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
61
                    <td>[% s.total | html %]</td>
61
                    <td>[% s.total | html %]</td>
62
                  </tr>
62
                  </tr>
63
                [% END %]
63
                [% END %]
Lines 94-100 Link Here
94
                  <tr>
94
                  <tr>
95
                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
95
                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
96
                    <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
96
                    <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
97
                    <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td>
97
                    <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
98
                    <td>[% s.total | html %]</td>
98
                    <td>[% s.total | html %]</td>
99
                  </tr>
99
                  </tr>
100
                [% END %]
100
                [% END %]
Lines 137-143 Link Here
137
                  <tr>
137
                  <tr>
138
                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
138
                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
139
                    <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
139
                    <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
140
                    <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td>
140
                    <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
141
                    <td>[% s.total | html %]</td>
141
                    <td>[% s.total | html %]</td>
142
                  </tr>
142
                  </tr>
143
                [% END %]
143
                [% END %]
Lines 174-180 Link Here
174
                  <tr>
174
                  <tr>
175
                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
175
                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
176
                    <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
176
                    <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
177
                    <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td>
177
                    <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
178
                    <td>[% s.total | html %]</td>
178
                    <td>[% s.total | html %]</td>
179
                  </tr>
179
                  </tr>
180
                [% END %]
180
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (-1 / +1 lines)
Lines 570-576 function Changefwk() { Link Here
570
<div id="addbibliotabs" class="toptabs numbered">
570
<div id="addbibliotabs" class="toptabs numbered">
571
    <ul>
571
    <ul>
572
        [% FOREACH BIG_LOO IN BIG_LOOP %]
572
        [% FOREACH BIG_LOO IN BIG_LOOP %]
573
        <li><a href="#tab[% BIG_LOO.number | html %]XX">[% BIG_LOO.number | html %]</a></li>
573
        <li><a href="#tab[% BIG_LOO.number | uri %]XX">[% BIG_LOO.number | html %]</a></li>
574
        [% END %]
574
        [% END %]
575
    </ul>
575
    </ul>
576
576
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt (-9 / +9 lines)
Lines 27-33 Link Here
27
            <ul class="dropdown-menu">
27
            <ul class="dropdown-menu">
28
                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=">Default framework</a></li>
28
                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=">Default framework</a></li>
29
                [% FOREACH framework IN frameworks %]
29
                [% FOREACH framework IN frameworks %]
30
                    <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=[% framework.frameworkcode | html %]">[% framework.frameworktext | html %]</a></li>
30
                    <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% framework.frameworktext | html %]</a></li>
31
                [% END %]
31
                [% END %]
32
            </ul>
32
            </ul>
33
        </div>
33
        </div>
Lines 76-82 Link Here
76
            <td><input type="checkbox" class="selection" id="bib[% resultsloo.biblionumber | html %]" name="biblionumber" value="[% resultsloo.biblionumber | html %]" /></td>
76
            <td><input type="checkbox" class="selection" id="bib[% resultsloo.biblionumber | html %]" name="biblionumber" value="[% resultsloo.biblionumber | html %]" /></td>
77
            <td>
77
            <td>
78
                <p>
78
                <p>
79
                    <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% resultsloo.biblionumber | html %]">[% resultsloo.title | html %]</a>
79
                    <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% resultsloo.biblionumber | uri %]">[% resultsloo.title | html %]</a>
80
                [% FOREACH subtitl IN resultsloo.subtitle %][% subtitl.subfield | html %][% END %]</p>
80
                [% FOREACH subtitl IN resultsloo.subtitle %][% subtitl.subfield | html %][% END %]</p>
81
                [% IF ( resultsloo.summary ) %]
81
                [% IF ( resultsloo.summary ) %]
82
                    <p>[% resultsloo.summary | html %]</p>
82
                    <p>[% resultsloo.summary | html %]</p>
Lines 131-140 Link Here
131
                      Actions <b class="caret"></b>
131
                      Actions <b class="caret"></b>
132
                    </a>
132
                    </a>
133
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% resultsloo.biblionumber | html %]">
133
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% resultsloo.biblionumber | html %]">
134
                      <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% resultsloo.biblionumber | html %]" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li>
134
                      <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% resultsloo.biblionumber | uri %]" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li>
135
                      <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% resultsloo.biblionumber | html %]" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li>
135
                      <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% resultsloo.biblionumber | uri %]" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li>
136
                      [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% resultsloo.biblionumber | html %]"><i class="fa fa-pencil"></i> Edit biblio</a></li>[% END %]
136
                      [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% resultsloo.biblionumber | uri %]"><i class="fa fa-pencil"></i> Edit biblio</a></li>[% END %]
137
                      [% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% resultsloo.biblionumber | html %]"><i class="fa fa-plus"></i> Add/Edit items</a></li>[% END %]
137
                      [% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% resultsloo.biblionumber | uri %]"><i class="fa fa-plus"></i> Add/Edit items</a></li>[% END %]
138
                    </ul>
138
                    </ul>
139
                  </div>
139
                  </div>
140
                </td>
140
                </td>
Lines 178-187 Link Here
178
                      Actions <b class="caret"></b>
178
                      Actions <b class="caret"></b>
179
                    </a>
179
                    </a>
180
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reservoirsearchactions[% breeding_loo.id | html %]">
180
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reservoirsearchactions[% breeding_loo.id | html %]">
181
                      <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.id | html %]" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li>
181
                      <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.id | uri %]" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li>
182
                      <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.id | html %]" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li>
182
                      <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.id | uri %]" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li>
183
                      [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
183
                      [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
184
                        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id | html %]"><i class="fa fa-plus"></i> Add biblio</a></li>
184
                        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id | uri %]"><i class="fa fa-plus"></i> Add biblio</a></li>
185
                      [% END %]
185
                      [% END %]
186
                    </ul>
186
                    </ul>
187
                  </div>
187
                  </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt (-10 / +10 lines)
Lines 36-44 $(document).ready(function(){ Link Here
36
                    var rowid = $(this).parent().attr("id");
36
                    var rowid = $(this).parent().attr("id");
37
                    num_rowid = rowid.replace("row","");
37
                    num_rowid = rowid.replace("row","");
38
                    $(".linktools").remove();
38
                    $(".linktools").remove();
39
                    var edit_link = $('<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&frameworkcode=[% frameworkcode | html %]&biblionumber=[% biblionumber | html %]&itemnumber='+num_rowid+'&searchid=[% searchid | html %]#edititem"></a>');
39
                    var edit_link = $('<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&frameworkcode=[% frameworkcode | uri %]&biblionumber=[% biblionumber | uri %]&itemnumber='+num_rowid+'&searchid=[% searchid | uri %]#edititem"></a>');
40
                    $(edit_link).text(_("Edit item"));
40
                    $(edit_link).text(_("Edit item"));
41
                    var delete_link = $('<a href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&frameworkcode=[% frameworkcode | html %]&biblionumber=[% biblionumber | html %]&itemnumber='+num_rowid+'&searchid=[% searchid | html %]"></a>');
41
                    var delete_link = $('<a href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&frameworkcode=[% frameworkcode | uri %]&biblionumber=[% biblionumber | uri %]&itemnumber='+num_rowid+'&searchid=[% searchid | uri %]"></a>');
42
                    $(delete_link).text(_("Delete item"));
42
                    $(delete_link).text(_("Delete item"));
43
                    $(delete_link).on('click', function(e) {
43
                    $(delete_link).on('click', function(e) {
44
                        return confirm_deletion();
44
                        return confirm_deletion();
Lines 151-158 function confirm_deletion() { Link Here
151
<div id="breadcrumbs">
151
<div id="breadcrumbs">
152
          <a href="/cgi-bin/koha/mainpage.pl">Home</a>
152
          <a href="/cgi-bin/koha/mainpage.pl">Home</a>
153
 &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
153
 &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
154
 &rsaquo; Edit <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]">[% title | html %] [% IF ( author ) %] by [% author | html %][% END %] (Record #[% biblionumber | html %])</a>
154
 &rsaquo; Edit <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | uri %]">[% title | html %] [% IF ( author ) %] by [% author | html %][% END %] (Record #[% biblionumber | html %])</a>
155
 &rsaquo; <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber | html %]">Items</a>
155
 &rsaquo; <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber | uri %]">Items</a>
156
</div>
156
</div>
157
157
158
<div id="doc3" class="yui-t7">
158
<div id="doc3" class="yui-t7">
Lines 167-173 function confirm_deletion() { Link Here
167
[% IF ( book_on_loan ) %]<div class="dialog alert"><strong>Cannot delete</strong>: item is checked out.</div>[% END %]
167
[% IF ( book_on_loan ) %]<div class="dialog alert"><strong>Cannot delete</strong>: item is checked out.</div>[% END %]
168
[% IF ( book_reserved ) %]<div class="dialogalert"><strong>Cannot delete</strong>: item has a waiting hold.</div>[% END %]
168
[% IF ( book_reserved ) %]<div class="dialogalert"><strong>Cannot delete</strong>: item has a waiting hold.</div>[% END %]
169
[% IF ( not_same_branch ) %]<div class="dialog alert"><strong>Cannot delete</strong>: The items do not belong to your library.</div>[% END %]
169
[% IF ( not_same_branch ) %]<div class="dialog alert"><strong>Cannot delete</strong>: The items do not belong to your library.</div>[% END %]
170
[% IF ( linked_analytics ) %]<div class="dialog alert"><strong>Cannot delete</strong>: item has linked <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]&amp;analyze=1">analytics.</a>.</div>[% END %]
170
[% IF ( linked_analytics ) %]<div class="dialog alert"><strong>Cannot delete</strong>: item has linked <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&amp;analyze=1">analytics.</a>.</div>[% END %]
171
171
172
<div id="cataloguing_additem_itemlist">
172
<div id="cataloguing_additem_itemlist">
173
    [% IF ( item_loop ) %]
173
    [% IF ( item_loop ) %]
Lines 213-223 function confirm_deletion() { Link Here
213
                          <ul class="dropdown-menu" role="menu" aria-labelledby="itemactions[% item_loo.itemnumber | html %]">
213
                          <ul class="dropdown-menu" role="menu" aria-labelledby="itemactions[% item_loo.itemnumber | html %]">
214
214
215
                        [% IF ( item_loo.hostitemflag ) %]
215
                        [% IF ( item_loo.hostitemflag ) %]
216
                              <li><a href="additem.pl?op=edititem&amp;biblionumber=[% item_loo.hostbiblionumber | html %]&amp;itemnumber=[% item_loo.itemnumber | html %]#edititem">Edit in host</a> &nbsp; <a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delinkitem&amp;biblionumber=[% biblionumber | html %]&amp;hostitemnumber=[% item_loo.itemnumber | html %]&amp;searchid=[% searchid | html %]">Delink</a></li>
216
                              <li><a href="additem.pl?op=edititem&amp;biblionumber=[% item_loo.hostbiblionumber | uri %]&amp;itemnumber=[% item_loo.itemnumber | uri %]#edititem">Edit in host</a> &nbsp; <a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delinkitem&amp;biblionumber=[% biblionumber | html %]&amp;hostitemnumber=[% item_loo.itemnumber | html %]&amp;searchid=[% searchid | html %]">Delink</a></li>
217
                        [% ELSE %]
217
                        [% ELSE %]
218
                              <li><a href="additem.pl?op=edititem&amp;biblionumber=[% biblionumber | html %]&amp;itemnumber=[% item_loo.itemnumber | html %]&amp;searchid=[% searchid | html %]#edititem">Edit</a></li>
218
                              <li><a href="additem.pl?op=edititem&amp;biblionumber=[% biblionumber | uri %]&amp;itemnumber=[% item_loo.itemnumber | uri %]&amp;searchid=[% searchid | uri %]#edititem">Edit</a></li>
219
                              <li><a href="additem.pl?op=dupeitem&amp;biblionumber=[% biblionumber | html %]&amp;itemnumber=[% item_loo.itemnumber | html %]&amp;searchid=[% searchid | html %]#additema">Duplicate</a></li>
219
                              <li><a href="additem.pl?op=dupeitem&amp;biblionumber=[% biblionumber | uri %]&amp;itemnumber=[% item_loo.itemnumber | uri %]&amp;searchid=[% searchid | uri %]#additema">Duplicate</a></li>
220
                              <li class="print_label"><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=add&amp;number_type=itemnumber&amp;number_list=[% item_loo.itemnumber | html %]" target="_blank" >Print Label</a></li>
220
                              <li class="print_label"><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=add&amp;number_type=itemnumber&amp;number_list=[% item_loo.itemnumber | uri %]" target="_blank" >Print Label</a></li>
221
                          [% IF ( item_loo.countanalytics ) %]
221
                          [% IF ( item_loo.countanalytics ) %]
222
                              <li><a href="/cgi-bin/koha/catalogue/search.pl?idx=hi&amp;q=% item_loo.itemnumber %]">View analytics</a></li>
222
                              <li><a href="/cgi-bin/koha/catalogue/search.pl?idx=hi&amp;q=% item_loo.itemnumber %]">View analytics</a></li>
223
                          [% ELSE %]
223
                          [% ELSE %]
Lines 362-368 function confirm_deletion() { Link Here
362
    <input type="hidden" name="field_value" value="[% itemnumber | html %]" />
362
    <input type="hidden" name="field_value" value="[% itemnumber | html %]" />
363
    <input type="submit" value="Save changes" onclick="return Check(this.form)">
363
    <input type="submit" value="Save changes" onclick="return Check(this.form)">
364
    <input type="button" id="addnewitem" value="Add a new item">
364
    <input type="button" id="addnewitem" value="Add a new item">
365
    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]">Cancel</a>
365
    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Cancel</a>
366
    [% END %]</fieldset>
366
    [% END %]</fieldset>
367
    
367
    
368
    [%# Fields for fast cataloging %]
368
    [%# Fields for fast cataloging %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt (-2 / +2 lines)
Lines 41-47 div#result { margin-top: 1em; } Link Here
41
       [% END %]
41
       [% END %]
42
42
43
    [% ELSE %]
43
    [% ELSE %]
44
        <p>The merge was successful. <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% ref_biblionumber | html %]">Click here to see the merged record.</a></p>
44
        <p>The merge was successful. <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% ref_biblionumber | uri %]">Click here to see the merged record.</a></p>
45
        <h3>Report</h3>
45
        <h3>Report</h3>
46
        <table>
46
        <table>
47
            <thead>
47
            <thead>
Lines 105-111 div#result { margin-top: 1em; } Link Here
105
                    [% FOREACH subtitle IN record.subtitles %]
105
                    [% FOREACH subtitle IN record.subtitles %]
106
                        [% subtitle.subfield | html %]
106
                        [% subtitle.subfield | html %]
107
                    [% END %]
107
                    [% END %]
108
                    ([% record.biblionumber | html %]) <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% record.biblionumber | html %]" class="previewData">View MARC</a>
108
                    ([% record.biblionumber | uri %]) <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% record.biblionumber | uri %]" class="previewData">View MARC</a>
109
                </label>
109
                </label>
110
            </li>
110
            </li>
111
        [% END %]
111
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt (-1 / +1 lines)
Lines 34-40 Link Here
34
    <tr>
34
    <tr>
35
    <td style="background:[% cn_loo.background | html %];">[% cn_loo.itemcallnumber | html %]</td>
35
    <td style="background:[% cn_loo.background | html %];">[% cn_loo.itemcallnumber | html %]</td>
36
    <td style="background:[% cn_loo.background | html %];">
36
    <td style="background:[% cn_loo.background | html %];">
37
        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cn_loo.biblionumber | html %]">
37
        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cn_loo.biblionumber | uri %]">
38
            [% cn_loo.title | html %] [% cn_loo.subtitle | html %] [% cn_loo.subtitle2 | html %]
38
            [% cn_loo.title | html %] [% cn_loo.subtitle | html %] [% cn_loo.subtitle2 | html %]
39
            [% IF ( cn_loo.author ) %]
39
            [% IF ( cn_loo.author ) %]
40
                <span>by</span> [% cn_loo.author | html %]
40
                <span>by</span> [% cn_loo.author | html %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt (-2 / +2 lines)
Lines 22-28 Link Here
22
<div id="macles" class="toptabs numbered">
22
<div id="macles" class="toptabs numbered">
23
    [% IF ( BIGLOOP ) %]<ul>
23
    [% IF ( BIGLOOP ) %]<ul>
24
    [% FOREACH BIGLOO IN BIGLOOP %]
24
    [% FOREACH BIGLOO IN BIGLOOP %]
25
        <li><a href="#tab[% BIGLOO.number | html %]XX">[% BIGLOO.number | html %]</a></li>
25
        <li><a href="#tab[% BIGLOO.number | uri %]XX">[% BIGLOO.number | html %]</a></li>
26
    [% END %]
26
    [% END %]
27
    </ul>[% END %]
27
    </ul>[% END %]
28
    <!-- RESET PAGINATION -->
28
    <!-- RESET PAGINATION -->
Lines 68-74 Link Here
68
            [% FOREACH List IN BIGLOO.Lists %]
68
            [% FOREACH List IN BIGLOO.Lists %]
69
                <h3>[% List.lib | html %]</h3>
69
                <h3>[% List.lib | html %]</h3>
70
                [% FOREACH liblis IN List.liblist %]
70
                [% FOREACH liblis IN List.liblist %]
71
                <a href="#[% liblis.listvalue | html %]" onclick="check_multiple([% liblis.listvalue | html %])"> [% liblis.listlib | html %]</a><br />
71
                <a href="#[% liblis.listvalue | uri %]" onclick="check_multiple([% liblis.listvalue | html %])"> [% liblis.listlib | html %]</a><br />
72
                [% END %]
72
                [% END %]
73
            [% END %]
73
            [% END %]
74
            [% END %]
74
            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt (-2 / +2 lines)
Lines 84-92 Link Here
84
84
85
                                 <td>
85
                                 <td>
86
                      [% IF ( resul.biblionumber ) %]
86
                      [% IF ( resul.biblionumber ) %]
87
                                             <a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=marc21_linking_section.pl&amp;index=[% index | html %]&amp;biblionumber=[% resul.biblionumber | html %]&amp;type=intranet&amp;op=fillinput')">Choose</a>
87
                                             <a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=marc21_linking_section.pl&amp;index=[% index | uri %]&amp;biblionumber=[% resul.biblionumber | uri %]&amp;type=intranet&amp;op=fillinput')">Choose</a>
88
                      [% ELSE %]
88
                      [% ELSE %]
89
                                             <a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=marc21_linking_section.pl&amp;index=[% index | html %]&amp;type=intranet&amp;op=fillinput')">Clear field</a>
89
                                             <a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=marc21_linking_section.pl&amp;index=[% index | uri %]&amp;type=intranet&amp;op=fillinput')">Clear field</a>
90
                      [% END %]
90
                      [% END %]
91
                                   </td>
91
                                   </td>
92
                          </tr>
92
                          </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt (-1 / +1 lines)
Lines 94-100 Link Here
94
                      Actions <b class="caret"></b>
94
                      Actions <b class="caret"></b>
95
                    </a>
95
                    </a>
96
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]">
96
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]">
97
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | html %]" class="previewMARC"><i class="fa fa-eye"></i> MARC preview</a></li>
97
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" class="previewMARC"><i class="fa fa-eye"></i> MARC preview</a></li>
98
                        <li><a href="#" class="import_record" data-breedingid="[% breeding_loo.breedingid | html %]" data-heading_code="[% breeding_loo.heading_code | html %]" data-authid="[% breeding_loo.authid | html %]"><i class="fa fa-download"></i> Import</a></li>
98
                        <li><a href="#" class="import_record" data-breedingid="[% breeding_loo.breedingid | html %]" data-heading_code="[% breeding_loo.heading_code | html %]" data-authid="[% breeding_loo.authid | html %]"><i class="fa fa-download"></i> Import</a></li>
99
                    </ul>
99
                    </ul>
100
                </div>
100
                </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt (-2 / +2 lines)
Lines 137-144 Link Here
137
                      Actions <b class="caret"></b>
137
                      Actions <b class="caret"></b>
138
                    </a>
138
                    </a>
139
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]">
139
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]">
140
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | html %]" title="MARC" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li>
140
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li>
141
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" title="Card" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li>
141
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | uri %]" title="Card" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li>
142
                        <li><a href="#" class="import_record" data-breedingid="[% breeding_loo.breedingid | html %]" data-biblionumber="[% breeding_loo.biblionumber | html %]" data-frameworkcode="[% frameworkcode | uri %]"><i class="fa fa-download"></i> Import</a></li>
142
                        <li><a href="#" class="import_record" data-breedingid="[% breeding_loo.breedingid | html %]" data-biblionumber="[% breeding_loo.biblionumber | html %]" data-frameworkcode="[% frameworkcode | uri %]"><i class="fa fa-download"></i> Import</a></li>
143
                    </ul>
143
                    </ul>
144
                </div>
144
                </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt (-4 / +4 lines)
Lines 128-134 Link Here
128
                                        <td><input type="checkbox" reqid="[% ar.id | html %]"/></td>
128
                                        <td><input type="checkbox" reqid="[% ar.id | html %]"/></td>
129
                                        <td class="ar-title">
129
                                        <td class="ar-title">
130
                                            <p>
130
                                            <p>
131
                                                <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% ar.biblionumber | html %]">
131
                                                <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% ar.biblionumber | uri %]">
132
                                                    <strong>[% ar.biblio.title | html %]</strong>
132
                                                    <strong>[% ar.biblio.title | html %]</strong>
133
                                                    [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %]
133
                                                    [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %]
134
                                                </a>
134
                                                </a>
Lines 182-188 Link Here
182
                                        <td class="ar-barcode">[% ar.item.barcode | html %]</td>
182
                                        <td class="ar-barcode">[% ar.item.barcode | html %]</td>
183
                                        <td class="ar-patron">
183
                                        <td class="ar-patron">
184
                                            <p>
184
                                            <p>
185
                                                <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | html %]">
185
                                                <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | uri %]">
186
                                                    [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %])
186
                                                    [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %])
187
                                                </a>
187
                                                </a>
188
                                            </p>
188
                                            </p>
Lines 236-242 Link Here
236
                                        <td><input type="checkbox" reqid="[% ar.id | html %]"/></td>
236
                                        <td><input type="checkbox" reqid="[% ar.id | html %]"/></td>
237
                                        <td class="ar-title">
237
                                        <td class="ar-title">
238
                                            <p>
238
                                            <p>
239
                                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ar.biblionumber | html %]">
239
                                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ar.biblionumber | uri %]">
240
                                                    <strong>[% ar.biblio.title | html %]</strong>
240
                                                    <strong>[% ar.biblio.title | html %]</strong>
241
                                                    [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %]
241
                                                    [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %]
242
                                                </a>
242
                                                </a>
Lines 290-296 Link Here
290
                                        <td class="ar-barcode">[% ar.item.barcode | html %]</td>
290
                                        <td class="ar-barcode">[% ar.item.barcode | html %]</td>
291
                                        <td class="ar-patron">
291
                                        <td class="ar-patron">
292
                                            <p>
292
                                            <p>
293
                                                <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | html %]">
293
                                                <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | uri %]">
294
                                                    [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %])
294
                                                    [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %])
295
                                                </a>
295
                                                </a>
296
                                            </p>
296
                                            </p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt (-6 / +6 lines)
Lines 49-58 Link Here
49
                            <br />Barcode : [% overduesloo.barcode | html %]
49
                            <br />Barcode : [% overduesloo.barcode | html %]
50
                    </td>
50
                    </td>
51
                    <td>
51
                    <td>
52
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overduesloo.borrowernumber | html %]">[% overduesloo.borrowersurname | html %], [% overduesloo.borrowerfirstname | html %]</a>
52
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overduesloo.borrowernumber | uri %]">[% overduesloo.borrowersurname | html %], [% overduesloo.borrowerfirstname | html %]</a>
53
                        <br />[% overduesloo.cardnumber | html %]
53
                        <br />[% overduesloo.cardnumber | html %]
54
                        <br />[% overduesloo.borrowerphone | html %]<br />
54
                        <br />[% overduesloo.borrowerphone | html %]<br />
55
                    [% IF ( overduesloo.borroweremail ) %]<a href="mailto:[% overduesloo.borroweremail | html %]?subject=Overdue: [% overduesloo.title | html %]">
55
                    [% IF ( overduesloo.borroweremail ) %]<a href="mailto:[% overduesloo.borroweremail | uri %]?subject=Overdue: [% overduesloo.title | uri %]">
56
                    [% overduesloo.borroweremail | html %]</a>[% END %]
56
                    [% overduesloo.borroweremail | html %]</a>[% END %]
57
                    </td>
57
                    </td>
58
                    <td>[% Branches.GetName( overduesloo.homebranch ) | html %] [% overduesloo.itemcallnumber | html %]
58
                    <td>[% Branches.GetName( overduesloo.homebranch ) | html %] [% overduesloo.itemcallnumber | html %]
Lines 83-105 Link Here
83
                        </td>
83
                        </td>
84
                        <td>
84
                        <td>
85
                            <p>
85
                            <p>
86
                                <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% todayoverduesloo.biblionumber | html %]">[% todayoverduesloo.title | html %]</a>
86
                                <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% todayoverduesloo.biblionumber | uri %]">[% todayoverduesloo.title | html %]</a>
87
                                &nbsp; (<b>[% todayoverduesloo.description | html %]</b>)
87
                                &nbsp; (<b>[% todayoverduesloo.description | html %]</b>)
88
                                <br />Barcode : [% todayoverduesloo.barcode | html %]
88
                                <br />Barcode : [% todayoverduesloo.barcode | html %]
89
                            </p>
89
                            </p>
90
                        </td>
90
                        </td>
91
                        <td>
91
                        <td>
92
                            <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% todayoverduesloo.borrowernumber | html %]">[% todayoverduesloo.borrowersurname | html %] &nbsp; [% todayoverduesloo.borrowerfirstname | html %]</a>
92
                            <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% todayoverduesloo.borrowernumber | uri %]">[% todayoverduesloo.borrowersurname | html %] &nbsp; [% todayoverduesloo.borrowerfirstname | html %]</a>
93
                            <br />[% todayoverduesloo.cardnumber | html %]<br />
93
                            <br />[% todayoverduesloo.cardnumber | html %]<br />
94
                            <br />[% todayoverduesloo.borrowerphone | html %]<br />
94
                            <br />[% todayoverduesloo.borrowerphone | html %]<br />
95
                        [% IF ( todayoverduesloo.borroweremail ) %]<a href="mailto:[% todayoverduesloo.borroweremail | html %]?subject=Overdue: [% todayoverduesloo.title | html %]">
95
                        [% IF ( todayoverduesloo.borroweremail ) %]<a href="mailto:[% todayoverduesloo.borroweremail | uri %]?subject=Overdue: [% todayoverduesloo.title | uri %]">
96
                        [% todayoverduesloo.borroweremail | html %]</a>[% END %]
96
                        [% todayoverduesloo.borroweremail | html %]</a>[% END %]
97
                            </p>
97
                            </p>
98
                        </td>
98
                        </td>
99
                        <td><p>[% Branches.GetName( todayoverduesloo.homebranch ) | html %] [% todayoverduesloo.itemcallnumber | html %]</p>
99
                        <td><p>[% Branches.GetName( todayoverduesloo.homebranch ) | html %] [% todayoverduesloo.itemcallnumber | html %]</p>
100
                        </td>
100
                        </td>
101
                        <td>
101
                        <td>
102
                        <a href="branchoverdues.pl?action=remove&amp;borrowernumber=[% todayoverduesloo.borrowernumber | html %]&amp;itemnumber=[% todayoverduesloo.itemnumber | html %]&amp;method=phone&amp;location=[% todayoverduesloo.location | html %]">Cancel notification</a>
102
                        <a href="branchoverdues.pl?action=remove&amp;borrowernumber=[% todayoverduesloo.borrowernumber | uri %]&amp;itemnumber=[% todayoverduesloo.itemnumber | uri %]&amp;method=phone&amp;location=[% todayoverduesloo.location | uri %]">Cancel notification</a>
103
                        </td>
103
                        </td>
104
                    </tr>
104
                    </tr>
105
                [% END %]
105
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt (-5 / +5 lines)
Lines 21-30 Link Here
21
    <table>
21
    <table>
22
        <caption>
22
        <caption>
23
            [% IF ( reserved ) %]
23
            [% IF ( reserved ) %]
24
                Reserve found for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">[% borrowernumber | html %]</a>).
24
                Reserve found for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
25
            [% END %]
25
            [% END %]
26
            [% IF ( waiting ) %]
26
            [% IF ( waiting ) %]
27
                Item is marked waiting at [% branchname | html %] for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">[% borrowernumber | html %]</a>).
27
                Item is marked waiting at [% branchname | html %] for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
28
            [% END %]
28
            [% END %]
29
        </caption>
29
        </caption>
30
        <tr>
30
        <tr>
Lines 130-136 Link Here
130
                                  <li>Item is already at destination library.</li>
130
                                  <li>Item is already at destination library.</li>
131
                              [% END %]
131
                              [% END %]
132
                              [% IF ( errmsgloo.errwasreturned ) %]
132
                              [% IF ( errmsgloo.errwasreturned ) %]
133
                                  <li>Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% errmsgloo.patron.borrowernumber | html %]">
133
                                  <li>Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% errmsgloo.patron.borrowernumber | uri %]">
134
                                  [% errmsgloo.patron.firstname | html %] [% errmsgloo.patron.surname | html %]
134
                                  [% errmsgloo.patron.firstname | html %] [% errmsgloo.patron.surname | html %]
135
                                  ([% errmsgloo.patron.cardnumber | html %])</a> and has been returned.</li>
135
                                  ([% errmsgloo.patron.cardnumber | html %])</a> and has been returned.</li>
136
                              [% END %]
136
                              [% END %]
Lines 181-189 Link Here
181
            </tr>
181
            </tr>
182
            [% FOREACH trsfitemloo IN trsfitemloop %]
182
            [% FOREACH trsfitemloo IN trsfitemloop %]
183
                <tr>
183
                <tr>
184
                    <td class="tf-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% trsfitemloo.biblionumber | html %]">[% trsfitemloo.title | html %]</a></td>
184
                    <td class="tf-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% trsfitemloo.biblionumber | uri %]">[% trsfitemloo.title | html %]</a></td>
185
                    <td class="tf-author">[% trsfitemloo.author | html %]</td>
185
                    <td class="tf-author">[% trsfitemloo.author | html %]</td>
186
                    <td class="tf-barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% trsfitemloo.biblionumber | html %]&amp;itemnumber=[% trsfitemloo.itemnumber | html %]#item[% trsfitemloo.itemnumber | html %]">[% trsfitemloo.barcode | html %]</a></td>
186
                    <td class="tf-barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% trsfitemloo.biblionumber | uri %]&amp;itemnumber=[% trsfitemloo.itemnumber | uri %]#item[% trsfitemloo.itemnumber | uri %]">[% trsfitemloo.barcode | html %]</a></td>
187
                    <td class="tf-location">[% trsfitemloo.location | html %]</td>
187
                    <td class="tf-location">[% trsfitemloo.location | html %]</td>
188
                    <td class="tf-itemcallnumber">[% trsfitemloo.itemcallnumber | html %]</td>
188
                    <td class="tf-itemcallnumber">[% trsfitemloo.itemcallnumber | html %]</td>
189
                    <td class="tf-itemtype">[% ItemTypes.GetDescription( trsfitemloo.itemtype ) | html %]</td>
189
                    <td class="tf-itemtype">[% ItemTypes.GetDescription( trsfitemloo.itemtype ) | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt (-1 / +1 lines)
Lines 72-78 Link Here
72
                            [% FOREACH note IN notes %]
72
                            [% FOREACH note IN notes %]
73
                                <tr>
73
                                <tr>
74
                                    <td><input type="checkbox" name="issue_ids" value="[% note.issue_id | html %]"></td>
74
                                    <td><input type="checkbox" name="issue_ids" value="[% note.issue_id | html %]"></td>
75
                                    <td>[% note.item.biblio.title | html %] - [% note.item.biblio.author | html %] (<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% note.item.biblionumber | html %]">[% note.item.barcode | html %]</a>)</td>
75
                                    <td>[% note.item.biblio.title | html %] - [% note.item.biblio.author | html %] (<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% note.item.biblionumber | uri %]">[% note.item.barcode | html %]</a>)</td>
76
                                    <td>[% note.note | html %]</td>
76
                                    <td>[% note.note | html %]</td>
77
                                    <td><span title="[% note.notedate | html %]">[% note.notedate | $KohaDates %]</span></td>
77
                                    <td><span title="[% note.notedate | html %]">[% note.notedate | $KohaDates %]</span></td>
78
                                    <td>[% INCLUDE 'patron-title.inc' patron => note.patron hide_patron_infos_if_needed=1 %]</td>
78
                                    <td>[% INCLUDE 'patron-title.inc' patron => note.patron hide_patron_infos_if_needed=1 %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (-1 / +1 lines)
Lines 135-141 Link Here
135
                    </div>
135
                    </div>
136
                    <div class="col-sm-5 col-md-3">
136
                    <div class="col-sm-5 col-md-3">
137
                    <p><a href="https://github.com/bywatersolutions/koha-offline-circulation/releases"><i class="fa fa-window-maximize"></i> Get desktop application</a></p>
137
                    <p><a href="https://github.com/bywatersolutions/koha-offline-circulation/releases"><i class="fa fa-window-maximize"></i> Get desktop application</a></p>
138
                    <p><a href="https://addons.mozilla.org/[% lang | html %]/firefox/addon/koct/"><i class="fa fa-firefox"></i> Get Firefox add-on</a></p>
138
                    <p><a href="https://addons.mozilla.org/[% lang | uri %]/firefox/addon/koct/"><i class="fa fa-firefox"></i> Get Firefox add-on</a></p>
139
                    </div>
139
                    </div>
140
            </div>
140
            </div>
141
        </div>
141
        </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-8 / +8 lines)
Lines 115-129 Link Here
115
[% END %]
115
[% END %]
116
116
117
[% IF ( RESERVE_WAITING ) %]
117
[% IF ( RESERVE_WAITING ) %]
118
    <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | html %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% reswaitingdate | $KohaDates %]</li>
118
    <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% reswaitingdate | $KohaDates %]</li>
119
[% END %]
119
[% END %]
120
120
121
[% IF ( RESERVED ) %]
121
[% IF ( RESERVED ) %]
122
    <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | html %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% resreservedate | $KohaDates %]</li>
122
    <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% resreservedate | $KohaDates %]</li>
123
[% END %]
123
[% END %]
124
124
125
[% IF ( ISSUED_TO_ANOTHER ) %]
125
[% IF ( ISSUED_TO_ANOTHER ) %]
126
    <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) is checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% issued_borrowernumber | html %]">[% issued_firstname | html %] [% issued_surname | html %]</a> ([% issued_cardnumber | html %]).
126
    <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) is checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% issued_borrowernumber | uri %]">[% issued_firstname | html %] [% issued_surname | html %]</a> ([% issued_cardnumber | html %]).
127
      [% IF CAN_user_circulate_force_checkout %]
127
      [% IF CAN_user_circulate_force_checkout %]
128
        Check in and check out?
128
        Check in and check out?
129
      [% END %]
129
      [% END %]
Lines 656-662 No patron matched <span class="ex">[% message | html %]</span> Link Here
656
656
657
			[% IF ( warndeparture ) %]
657
			[% IF ( warndeparture ) %]
658
			<li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
658
			<li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
659
            Patron's card expires on [% expiry | $KohaDates %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | html %]&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 %]&amp;categorycode=[% categorycode | html %]">Edit Details</a>
659
            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 %]&amp;categorycode=[% categorycode | html %]">Edit Details</a>
660
660
661
			</li>
661
			</li>
662
			[% END %]
662
			[% END %]
Lines 669-675 No patron matched <span class="ex">[% message | html %]</span> Link Here
669
669
670
			[% IF ( expired ) %]
670
			[% IF ( expired ) %]
671
			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
671
			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
672
            [% IF ( expiry ) %]Patron's card expired on [% expiry | $KohaDates %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | html %]&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 %]&amp;categorycode=[% categorycode | html %]">Edit Details</a>
672
            [% IF ( expiry ) %]Patron's card expired on [% expiry | $KohaDates %][% END %] <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 %]&amp;categorycode=[% categorycode | html %]">Edit Details</a>
673
673
674
			</li>
674
			</li>
675
			[% END %]
675
			[% END %]
Lines 703-709 No patron matched <span class="ex">[% message | html %]</span> Link Here
703
                   <a class="btn btn-default btn-sm" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a>
703
                   <a class="btn btn-default btn-sm" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a>
704
                    [% IF (noissues && patron && CAN_user_circulate_force_checkout) %]
704
                    [% IF (noissues && patron && CAN_user_circulate_force_checkout) %]
705
                        <span class="override_debarment">
705
                        <span class="override_debarment">
706
                            <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&amp;borrowernumber=[% patron.borrowernumber | html %]" class="btn btn-default btn-sm">Override restriction temporarily</a>
706
                            <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&amp;borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-sm">Override restriction temporarily</a>
707
                        </span>
707
                        </span>
708
                    [% END %]
708
                    [% END %]
709
               </li>
709
               </li>
Lines 741-747 No patron matched <span class="ex">[% message | html %]</span> Link Here
741
                    [% FOREACH w IN WaitingHolds %]
741
                    [% FOREACH w IN WaitingHolds %]
742
                        <ul>
742
                        <ul>
743
                            <li>
743
                            <li>
744
                                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | html %]">[% w.biblio.title | html %]</a>
744
                                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | uri %]">[% w.biblio.title | html %]</a>
745
                                ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
745
                                ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
746
                                [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
746
                                [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
747
                                [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
747
                                [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
Lines 780-786 No patron matched <span class="ex">[% message | html %]</span> Link Here
780
                        [% message.message_date | $KohaDates %]
780
                        [% message.message_date | $KohaDates %]
781
                        [% Branches.GetName( message.branchcode ) | html %]
781
                        [% Branches.GetName( message.branchcode ) | html %]
782
                        [% IF message.manager_id %]
782
                        [% IF message.manager_id %]
783
                            ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.manager_id | html %]">[% message.get_column('manager_firstname') | html %] [% message.get_column('manager_surname') | html %]</a> )
783
                            ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.manager_id | uri %]">[% message.get_column('manager_firstname') | html %] [% message.get_column('manager_surname') | html %]</a> )
784
                        [% END %]
784
                        [% END %]
785
                        <i>"[% message.message | html %]"</i>
785
                        <i>"[% message.message | html %]"</i>
786
                    </span>
786
                    </span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt (-1 / +1 lines)
Lines 116-122 Link Here
116
            [% END %]
116
            [% END %]
117
            <td>[% checkout_info.barcode | html %]</td>
117
            <td>[% checkout_info.barcode | html %]</td>
118
            <td>
118
            <td>
119
              <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout_info.biblio.biblionumber | html %]&amp;type=intra"><strong>[% checkout_info.biblio.title | html %][% FOREACH subtitle IN checkout_info.biblio.subtitles %] [% subtitle.subfield | html %][% END %]</strong></a>[% IF checkout_info.biblio.author %], by [% checkout_info.biblio.author | html %][% END %][% IF ( checkout_info.item.itemnotes ) %]- <span class="circ-hlt">[% checkout_info.item.itemnotes | html %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout_info.biblio.biblionumber | html %]&amp;itemnumber=[% checkout_info.item.itemnumber | html %]#item[% checkout_info.item.itemnumber | html %]">[% checkout_info.item.barcode | html %]</a>
119
              <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout_info.biblio.biblionumber | uri %]&amp;type=intra"><strong>[% checkout_info.biblio.title | html %][% FOREACH subtitle IN checkout_info.biblio.subtitles %] [% subtitle.subfield | html %][% END %]</strong></a>[% IF checkout_info.biblio.author %], by [% checkout_info.biblio.author | html %][% END %][% IF ( checkout_info.item.itemnotes ) %]- <span class="circ-hlt">[% checkout_info.item.itemnotes | html %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout_info.biblio.biblionumber | html %]&amp;itemnumber=[% checkout_info.item.itemnumber | html %]#item[% checkout_info.item.itemnumber | html %]">[% checkout_info.item.barcode | html %]</a>
120
            </td>
120
            </td>
121
            <td>
121
            <td>
122
              [% IF checkout_info.NEEDSCONFIRMATION %]
122
              [% IF checkout_info.NEEDSCONFIRMATION %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt (-3 / +3 lines)
Lines 38-51 Link Here
38
                    [% IF item.is_overdue %]</span>[% END %]
38
                    [% IF item.is_overdue %]</span>[% END %]
39
                  </td>
39
                  </td>
40
                  <td>
40
                  <td>
41
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber | html %]">[% item.firstname | html %] [% item.surname | html %]</a>
41
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber | uri %]">[% item.firstname | html %] [% item.surname | html %]</a>
42
                  </td>
42
                  </td>
43
                  <td>
43
                  <td>
44
                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber | html %]"><strong>[% item.title | html %]</strong></a>[% IF ( item.author ) %], by [% item.author | html %][% END %][% IF ( item.itemnotes ) %]- <span class="circ-hlt">[% item.itemnotes | html %]</span>[% END %]
44
                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber | uri %]"><strong>[% item.title | html %]</strong></a>[% IF ( item.author ) %], by [% item.author | html %][% END %][% IF ( item.itemnotes ) %]- <span class="circ-hlt">[% item.itemnotes | html %]</span>[% END %]
45
                  </td>
45
                  </td>
46
                  <td>[% item.itemcallnumber | html %]</td>
46
                  <td>[% item.itemcallnumber | html %]</td>
47
                  <td>
47
                  <td>
48
                    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% item.biblionumber | html %]&amp;itemnumber=[% item.itemnumber | html %]#item[% item.itemnumber | html %]">[% item.barcode | html %]</a>
48
                    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% item.biblionumber | uri %]&amp;itemnumber=[% item.itemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a>
49
                  </td>
49
                  </td>
50
                  <td>[% Branches.GetName(item.branchcode) | html %]</td>
50
                  <td>[% Branches.GetName(item.branchcode) | html %]</td>
51
                  <td>[% AuthorisedValues.GetByCode( 'LOC', item.location ) | html %]</td>
51
                  <td>[% AuthorisedValues.GetByCode( 'LOC', item.location ) | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt (-3 / +3 lines)
Lines 36-42 Link Here
36
36
37
  <p>
37
  <p>
38
    [% IF ( isfiltered ) %]
38
    [% IF ( isfiltered ) %]
39
      <a href="overdue.pl?op=csv&amp;[% csv_param_string | html %]">Download file of displayed overdues</a>
39
      <a href="overdue.pl?op=csv&amp;[% csv_param_string | uri %]">Download file of displayed overdues</a>
40
    [% ELSE %]
40
    [% ELSE %]
41
      <a href="overdue.pl?op=csv">Download file of all overdues</a>
41
      <a href="overdue.pl?op=csv">Download file of all overdues</a>
42
    [% END %]
42
    [% END %]
Lines 65-76 Link Here
65
          <td>
65
          <td>
66
            [% INCLUDE 'patron-title.inc' patron=overdueloo.patron hide_patron_infos_if_needed=1 link_to="circulation_reserves" %]
66
            [% INCLUDE 'patron-title.inc' patron=overdueloo.patron hide_patron_infos_if_needed=1 link_to="circulation_reserves" %]
67
            [% IF logged_in_user.can_see_patron_infos( overdueloo.patron ) %]
67
            [% IF logged_in_user.can_see_patron_infos( overdueloo.patron ) %]
68
                [% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email | html %]?subject=[% INCLUDE subject %] [% overdueloo.title | html %]">email</a>][% END %]
68
                [% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email | uri %]?subject=[% INCLUDE subject %] [% overdueloo.title | uri %]">email</a>][% END %]
69
                [% IF ( overdueloo.phone ) %]([% overdueloo.phone | html %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile | html %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro | html %])[% END %]</td>
69
                [% IF ( overdueloo.phone ) %]([% overdueloo.phone | html %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile | html %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro | html %])[% END %]</td>
70
            [% END %]
70
            [% END %]
71
          <td>[% Branches.GetName( overdueloo.patron.branchcode ) | html %]</td>
71
          <td>[% Branches.GetName( overdueloo.patron.branchcode ) | html %]</td>
72
          <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overdueloo.biblionumber %][% overdueloo.title | html %]  [% overdueloo.subtitle | html %]</a> [% IF ( overdueloo.author ) %], by [% overdueloo.author | html %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron | html %][% END %]</td>
72
          <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overdueloo.biblionumber %][% overdueloo.title | html %]  [% overdueloo.subtitle | html %]</a> [% IF ( overdueloo.author ) %], by [% overdueloo.author | html %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron | html %][% END %]</td>
73
          <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% overdueloo.biblionumber | html %]&amp;itemnumber=[% overdueloo.itemnum | html %]#item[% overdueloo.itemnum | html %]">[% overdueloo.barcode | html %]</a></td>
73
          <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% overdueloo.biblionumber | uri %]&amp;itemnumber=[% overdueloo.itemnum | uri %]#item[% overdueloo.itemnum | uri %]">[% overdueloo.barcode | html %]</a></td>
74
          <td>[% overdueloo.itemcallnumber | html %]</td>
74
          <td>[% overdueloo.itemcallnumber | html %]</td>
75
          <td>[% overdueloo.replacementprice | $Price %]</td>
75
          <td>[% overdueloo.replacementprice | $Price %]</td>
76
          <td>[% overdueloo.itemnotes_nonpublic | html %]</td>
76
          <td>[% overdueloo.itemnotes_nonpublic | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-1 / +1 lines)
Lines 74-80 Link Here
74
            <td><p><b>[% reserveloo.pullcount | html %]</b></p></td>
74
            <td><p><b>[% reserveloo.pullcount | html %]</b></p></td>
75
            <td>[% reserveloo.count | html %]</td>
75
            <td>[% reserveloo.count | html %]</td>
76
            <td>[% reserveloo.rcount | html %]</td>
76
            <td>[% reserveloo.rcount | html %]</td>
77
            <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber | html %]">[% reserveloo.firstname | html %] [% reserveloo.surname | html %]</a></td>
77
            <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber | uri %]">[% reserveloo.firstname | html %] [% reserveloo.surname | html %]</a></td>
78
            <td>
78
            <td>
79
            <p>
79
            <p>
80
                [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
80
                [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (-6 / +6 lines)
Lines 28-38 Link Here
28
28
29
                            [% ELSIF error == "no_checkout" %]
29
                            [% ELSIF error == "no_checkout" %]
30
30
31
                                <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblio.biblionumber | html %]">[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %]</a> ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | html %]&amp;biblionumber=[% item.biblio.biblionumber | html %]&amp;bi=[% item.biblioitemnumber.biblioitemnumber | html %]#item[% item.itemnumber | html %]">[% item.barcode | html %]</a> ) is not checked out to a patron.</p>
31
                                <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblio.biblionumber | uri %]">[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %]</a> ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | html %]&amp;biblionumber=[% item.biblio.biblionumber | html %]&amp;bi=[% item.biblioitemnumber.biblioitemnumber | html %]#item[% item.itemnumber | html %]">[% item.barcode | html %]</a> ) is not checked out to a patron.</p>
32
32
33
                            [% ELSIF error == "too_many" %]
33
                            [% ELSIF error == "too_many" %]
34
34
35
                                <p>[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] ( [% item.barcode | html %] ) has been renewed the maximum number of times by [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | html %]"> [% borrower.cardnumber | html %] </a> )</p>
35
                                <p>[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] ( [% item.barcode | html %] ) has been renewed the maximum number of times by [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> )</p>
36
36
37
                                [% IF Koha.Preference('AllowRenewalLimitOverride') %]
37
                                [% IF Koha.Preference('AllowRenewalLimitOverride') %]
38
                                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
38
                                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
Lines 115-121 Link Here
115
115
116
                            [% ELSIF error == "patron_restricted" %]
116
                            [% ELSIF error == "patron_restricted" %]
117
117
118
                                <p>[% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | html %]"> [% borrower.cardnumber | html %] </a> ) is currently restricted.</p>
118
                                <p>[% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> ) is currently restricted.</p>
119
119
120
                            [% ELSE %]
120
                            [% ELSE %]
121
121
Lines 133-142 Link Here
133
                    <div class="dialog message">
133
                    <div class="dialog message">
134
                        <h3>Item renewed:</h3>
134
                        <h3>Item renewed:</h3>
135
                        <p>
135
                        <p>
136
                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblio.biblionumber | html %]">[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %]</a>
136
                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblio.biblionumber | uri %]">[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %]</a>
137
                            ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | html %]&amp;biblionumber=[% item.biblio.biblionumber | html %]&amp;bi=[% item.biblioitemnumber.biblioitemnumber | html %]#item[% item.itemnumber | html %]">[% item.barcode | html %]</a> )
137
                            ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | uri %]&amp;biblionumber=[% item.biblio.biblionumber | uri %]&amp;bi=[% item.biblioitemnumber.biblioitemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a> )
138
                            renewed for
138
                            renewed for
139
                            [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | html %]"> [% borrower.cardnumber | html %] </a> )
139
                            [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> )
140
                            now due on [% date_due | $KohaDates %]
140
                            now due on [% date_due | $KohaDates %]
141
                        </p>
141
                        </p>
142
                    </div>
142
                    </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt (-4 / +4 lines)
Lines 22-28 Link Here
22
        <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>
22
        <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>
23
        [% UNLESS blocking_error %]
23
        [% UNLESS blocking_error %]
24
        &rsaquo;
24
        &rsaquo;
25
        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]">[% biblio.title | html %]</a>
25
        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">[% biblio.title | html %]</a>
26
        &rsaquo;
26
        &rsaquo;
27
        Request article
27
        Request article
28
        [% END %]
28
        [% END %]
Lines 34-40 Link Here
34
            <div id="yui-main">
34
            <div id="yui-main">
35
                <div class="yui-b">
35
                <div class="yui-b">
36
36
37
                    <h1>Request article from <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.id | html %]">[% biblio.title | html %]</a></h1>
37
                    <h1>Request article from <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.id | uri %]">[% biblio.title | html %]</a></h1>
38
                    [% IF no_patrons_found %]
38
                    [% IF no_patrons_found %]
39
                        <div class="dialog alert">
39
                        <div class="dialog alert">
40
                            <h3>Patron not found</h3>
40
                            <h3>Patron not found</h3>
Lines 243-249 Link Here
243
                                [% FOREACH ar IN biblio.article_requests_current %]
243
                                [% FOREACH ar IN biblio.article_requests_current %]
244
                                    <tr>
244
                                    <tr>
245
                                        <td>[% ar.created_on | $KohaDates %]</td>
245
                                        <td>[% ar.created_on | $KohaDates %]</td>
246
                                        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% ar.borrowernumber | html %]">[% ar.borrower.firstname | html %] [% ar.borrower.surname | html %]</a></td>
246
                                        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% ar.borrowernumber | uri %]">[% ar.borrower.firstname | html %] [% ar.borrower.surname | html %]</a></td>
247
                                        <td>[% ar.title | html %]</td>
247
                                        <td>[% ar.title | html %]</td>
248
                                        <td>[% ar.author | html %]</td>
248
                                        <td>[% ar.author | html %]</td>
249
                                        <td>[% ar.volume | html %]</td>
249
                                        <td>[% ar.volume | html %]</td>
Lines 254-260 Link Here
254
                                        <td>[% ar.patron_notes | html %]</td>
254
                                        <td>[% ar.patron_notes | html %]</td>
255
                                        <td>
255
                                        <td>
256
                                            [% IF ar.item %]
256
                                            [% IF ar.item %]
257
                                                <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% ar.itemnumber | html %]&biblionumber=[% ar.biblionumber | html %]">[% ar.item.barcode | html %]</a>
257
                                                <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% ar.itemnumber | uri %]&biblionumber=[% ar.biblionumber | uri %]">[% ar.item.barcode | html %]</a>
258
                                            [% END %]
258
                                            [% END %]
259
                                        </td>
259
                                        </td>
260
                                        <td>
260
                                        <td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt (-1 / +1 lines)
Lines 92-98 Link Here
92
                      [% END %]
92
                      [% END %]
93
                  </ul>
93
                  </ul>
94
            </td>
94
            </td>
95
            <td>[% IF ( reserveloo.thisratio_atleast1 ) %]<p>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc | html %] --><a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber | html %]&amp;booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;rr_quantity_to_order=[% reserveloo.ratiocalc | html %]">[% END %]<b>[% reserveloo.ratiocalc | html %] to order</b>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]</a>[% END %]
95
            <td>[% IF ( reserveloo.thisratio_atleast1 ) %]<p>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc | uri %] --><a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;rr_quantity_to_order=[% reserveloo.ratiocalc | uri %]">[% END %]<b>[% reserveloo.ratiocalc | html %] to order</b>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]</a>[% END %]
96
            [% IF ( reserveloo.pendingorders ) %]<br><b>[% reserveloo.pendingorders | html %] pending</b>[% END %]</p>[% END %]</td>
96
            [% IF ( reserveloo.pendingorders ) %]<br><b>[% reserveloo.pendingorders | html %] pending</b>[% END %]</p>[% END %]</td>
97
        </tr>
97
        </tr>
98
      [% END %]
98
      [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-21 / +21 lines)
Lines 118-124 Link Here
118
[% IF ( collectionItemNeedsTransferred ) %]
118
[% IF ( collectionItemNeedsTransferred ) %]
119
 <div id="rotating-collection" class="dialog message">
119
 <div id="rotating-collection" class="dialog message">
120
        <h3>Please transfer item to: [% Branches.GetName( collectionBranch ) | html %]</h3>
120
        <h3>Please transfer item to: [% Branches.GetName( collectionBranch ) | html %]</h3>
121
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p>
121
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
122
            <p>This item is part of a rotating collection.</p>
122
            <p>This item is part of a rotating collection.</p>
123
            <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;branchcode=[% collectionBranch | html %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button></p>
123
            <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;branchcode=[% collectionBranch | html %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button></p>
124
</div>
124
</div>
Lines 129-135 Link Here
129
    <div class="dialog message">
129
    <div class="dialog message">
130
        <h1>Patron note</h1>
130
        <h1>Patron note</h1>
131
        <p>[% issue.notedate | $KohaDates %]</p>
131
        <p>[% issue.notedate | $KohaDates %]</p>
132
        <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber | html %]"> [% title | html %]</a> [% author | html %]</p>
132
        <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber | uri %]"> [% title | html %]</a> [% author | html %]</p>
133
        <p>[% issue.note | html %]</p>
133
        <p>[% issue.note | html %]</p>
134
    </div>
134
    </div>
135
[% END %]
135
[% END %]
Lines 138-144 Link Here
138
[% IF ( fines ) %]
138
[% IF ( fines ) %]
139
    <div class="dialog alert">
139
    <div class="dialog alert">
140
        <h3>Patron has outstanding fines of [% fines | html %].</h3>
140
        <h3>Patron has outstanding fines of [% fines | html %].</h3>
141
        <p><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% fineborrowernumber | html %]">Make payment</a>.</p>
141
        <p><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% fineborrowernumber | uri %]">Make payment</a>.</p>
142
    </div>
142
    </div>
143
[% END %]
143
[% END %]
144
144
Lines 146-152 Link Here
146
[% IF ( waiting_holds ) %]
146
[% IF ( waiting_holds ) %]
147
    <div id="awaiting-pickup" class="dialog message">
147
    <div id="awaiting-pickup" class="dialog message">
148
        <h3>[% holdsfirstname | html %] [% holdssurname | html %] has [% waiting_holds | html %] hold(s) waiting for pickup.</h3>
148
        <h3>[% holdsfirstname | html %] [% holdssurname | html %] has [% waiting_holds | html %] hold(s) waiting for pickup.</h3>
149
        <p><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% holdsborrowernumber | html %]">Check out to this patron</a>.</p>
149
        <p><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% holdsborrowernumber | uri %]">Check out to this patron</a>.</p>
150
    </div>
150
    </div>
151
[% END %]
151
[% END %]
152
152
Lines 154-160 Link Here
154
[% IF return_date_was_overriden && Borrowers.IsDebarred( borrower ) %]
154
[% IF return_date_was_overriden && Borrowers.IsDebarred( borrower ) %]
155
    <div id="restricted_backdated" class="dialog message">
155
    <div id="restricted_backdated" class="dialog message">
156
        <h3>
156
        <h3>
157
            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">
157
            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">
158
                [% patron.firstname | html %] [% patron.surname | html %]
158
                [% patron.firstname | html %] [% patron.surname | html %]
159
            </a>
159
            </a>
160
            is restricted. Please verify this patron should still be restricted.
160
            is restricted. Please verify this patron should still be restricted.
Lines 164-170 Link Here
164
164
165
[% IF ( wrongbranch ) %]
165
[% IF ( wrongbranch ) %]
166
    <div class="dialog alert"><h3>Cannot check in</h3>
166
    <div class="dialog alert"><h3>Cannot check in</h3>
167
        <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p>
167
        <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
168
        </p><strong>NOT CHECKED IN</strong></p>
168
        </p><strong>NOT CHECKED IN</strong></p>
169
        <p>This item must be checked in at following library: <strong>[% Branches.GetName( rightbranch ) | html %]</strong></p>
169
        <p>This item must be checked in at following library: <strong>[% Branches.GetName( rightbranch ) | html %]</strong></p>
170
    </div>
170
    </div>
Lines 175-186 Link Here
175
    <div id="return2" class="dialog message">
175
    <div id="return2" class="dialog message">
176
        <!-- WrongTransfer -->
176
        <!-- WrongTransfer -->
177
        <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %]</h3>
177
        <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %]</h3>
178
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p>
178
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
179
        <button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% TransferWaitingAt | html %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
179
        <button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% TransferWaitingAt | html %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
180
        <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber | html %]&amp;canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>
180
        <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber | html %]&amp;canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>
181
[% IF ( patron.cardnumber ) %]<h5>Hold for:</h5>
181
[% IF ( patron.cardnumber ) %]<h5>Hold for:</h5>
182
        <ul>
182
        <ul>
183
            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">
183
            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">
184
            [% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %]) <span class="patron-category"> - [% patron.category.description | html %]</span> </li>
184
            [% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %]) <span class="patron-category"> - [% patron.category.description | html %]</span> </li>
185
            [% INCLUDE display_holdpatron_address %]
185
            [% INCLUDE display_holdpatron_address %]
186
            [% IF ( patron.phone ) %]<li>[% patron.phone | html %]</li>[% END %]
186
            [% IF ( patron.phone ) %]<li>[% patron.phone | html %]</li>[% END %]
Lines 212-218 Link Here
212
                    <h3>
212
                    <h3>
213
                        Hold found (item is already waiting):
213
                        Hold found (item is already waiting):
214
                        <br/>
214
                        <br/>
215
                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">
215
                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">
216
                            [% itembarcode | html %]: [% title | html %]
216
                            [% itembarcode | html %]: [% title | html %]
217
                        </a>
217
                        </a>
218
                    </h3>
218
                    </h3>
Lines 226-232 Link Here
226
                    <h4>Hold for:</h4>
226
                    <h4>Hold for:</h4>
227
                    <ul>
227
                    <ul>
228
                    <li>
228
                    <li>
229
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %])
229
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %])
230
                        <span class="patron-category"> - [% patron.category.description | html %]</span>
230
                        <span class="patron-category"> - [% patron.category.description | html %]</span>
231
                    </li>
231
                    </li>
232
                    [% INCLUDE display_holdpatron_address %]
232
                    [% INCLUDE display_holdpatron_address %]
Lines 298-307 Link Here
298
		<!-- diffbranch -->
298
		<!-- diffbranch -->
299
        <div id="transfer-needed" class="dialog message audio-alert-action">
299
        <div id="transfer-needed" class="dialog message audio-alert-action">
300
            <h3>Hold needing transfer found</h3>
300
            <h3>Hold needing transfer found</h3>
301
                <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p>
301
                <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
302
                <h4>Hold for: </h4>
302
                <h4>Hold for: </h4>
303
                    <ul>
303
                    <ul>
304
                        <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %]) <span class="patron-category"> - [% patron.category.description | html %]</span> </li>
304
                        <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %]) <span class="patron-category"> - [% patron.category.description | html %]</span> </li>
305
                        [% INCLUDE display_holdpatron_address %]
305
                        [% INCLUDE display_holdpatron_address %]
306
                        [% IF ( patron.phone ) %]<li>[% patron.phone | html %]</li>[% END %]
306
                        [% IF ( patron.phone ) %]<li>[% patron.phone | html %]</li>[% END %]
307
                        [% IF ( patron.email ) %]<li>[% IF ( transfertodo ) %][% patron.email | html %][% ELSE %]<a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a>[% END %]</li>[% END %]
307
                        [% IF ( patron.email ) %]<li>[% IF ( transfertodo ) %][% patron.email | html %][% ELSE %]<a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a>[% END %]</li>[% END %]
Lines 341-347 Link Here
341
    <!-- transfer: item with no reservation, must be returned according to home library circulation rules -->
341
    <!-- transfer: item with no reservation, must be returned according to home library circulation rules -->
342
        <div id="return1" class="dialog message audio-alert-action">
342
        <div id="return1" class="dialog message audio-alert-action">
343
            <h3>Please return item to: [% Branches.GetName( returnbranch ) | html %]</h3>
343
            <h3>Please return item to: [% Branches.GetName( returnbranch ) | html %]</h3>
344
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p>
344
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
345
            <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;branchcode=[% returnbranch | html %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button></p>
345
            <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;branchcode=[% returnbranch | html %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button></p>
346
        </div>
346
        </div>
347
    [% END %]
347
    [% END %]
Lines 376-382 Link Here
376
	<!-- diffbranch -->
376
	<!-- diffbranch -->
377
        <h3 class="audio-alert-action">Item consigned:</h3>
377
        <h3 class="audio-alert-action">Item consigned:</h3>
378
        <table>
378
        <table>
379
        <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% title | html %]</a></caption>
379
        <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a></caption>
380
        <tr>
380
        <tr>
381
            <th>Hold for:</th>
381
            <th>Hold for:</th>
382
            <td>[% INCLUDE 'patron-title.inc' patron=patron %]</td>
382
            <td>[% INCLUDE 'patron-title.inc' patron=patron %]</td>
Lines 410-416 Link Here
410
                    <h3>
410
                    <h3>
411
                        Hold found:
411
                        Hold found:
412
                        <br/>
412
                        <br/>
413
                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">
413
                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">
414
                            [% itembarcode | html %]: [% title | html %]
414
                            [% itembarcode | html %]: [% title | html %]
415
                        </a>
415
                        </a>
416
                </div>
416
                </div>
Lines 512-518 Link Here
512
    <div class="dialog alert audio-alert-warning">
512
    <div class="dialog alert audio-alert-warning">
513
        <h3>Check in message</h3>
513
        <h3>Check in message</h3>
514
        [% IF itembiblionumber %]
514
        [% IF itembiblionumber %]
515
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p>
515
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
516
        [% END %]
516
        [% END %]
517
        [% FOREACH errmsgloo IN errmsgloop %]
517
        [% FOREACH errmsgloo IN errmsgloop %]
518
            [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
518
            [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
Lines 568-574 Link Here
568
               <p class="problem">Item is withdrawn.</p>
568
               <p class="problem">Item is withdrawn.</p>
569
            [% END %]
569
            [% END %]
570
            [% IF ( errmsgloo.debarred ) %]
570
            [% IF ( errmsgloo.debarred ) %]
571
                <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber | html %]">[% errmsgloo.debarname | html %]([% errmsgloo.debarcardnumber | html %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %].</p>
571
                <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber | uri %]">[% errmsgloo.debarname | html %]([% errmsgloo.debarcardnumber | html %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %].</p>
572
            [% END %]
572
            [% END %]
573
            [% IF ( errmsgloo.prevdebarred ) %]
573
            [% IF ( errmsgloo.prevdebarred ) %]
574
                <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p>
574
                <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p>
Lines 695-701 Link Here
695
                [% ELSE %]Not checked out
695
                [% ELSE %]Not checked out
696
                [% END %]
696
                [% END %]
697
            </td>
697
            </td>
698
            <td class="ci-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% riloo.itembiblionumber | html %]">
698
            <td class="ci-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% riloo.itembiblionumber | uri %]">
699
                    [% riloo.itemtitle | html %]
699
                    [% riloo.itemtitle | html %]
700
                </a>
700
                </a>
701
                [% IF ( riloo.enumchron ) %]
701
                [% IF ( riloo.enumchron ) %]
Lines 704-710 Link Here
704
                [% END %]
704
                [% END %]
705
            </td>
705
            </td>
706
            <td class="ci-author">[% riloo.itemauthor | html %]</td>
706
            <td class="ci-author">[% riloo.itemauthor | html %]</td>
707
            <td class="ci-barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber | html %]&amp;itemnumber=[% riloo.itemnumber | html %]#item[% riloo.itemnumber | html %]">[% riloo.barcode | html %]</a></td>
707
            <td class="ci-barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber | uri %]&amp;itemnumber=[% riloo.itemnumber | uri %]#item[% riloo.itemnumber | uri %]">[% riloo.barcode | html %]</a></td>
708
            <td class="ci-homelibrary">[% Branches.GetName( riloo.homebranch ) | html %]</td>
708
            <td class="ci-homelibrary">[% Branches.GetName( riloo.homebranch ) | html %]</td>
709
            <td class="ci-holdinglibrary">[% Branches.GetName( riloo.holdingbranch ) | html %]</td>
709
            <td class="ci-holdinglibrary">[% Branches.GetName( riloo.holdingbranch ) | html %]</td>
710
            <td class="ci-shelvinglocation">[% riloo.location | html %]</td>
710
            <td class="ci-shelvinglocation">[% riloo.location | html %]</td>
Lines 712-725 Link Here
712
            <td class="ci-dateaccessioned">[% riloo.dateaccessioned | $KohaDates %]</td>
712
            <td class="ci-dateaccessioned">[% riloo.dateaccessioned | $KohaDates %]</td>
713
            <td class="ci-type">[% ItemTypes.GetDescription( riloo.itemtype ) | html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %]</td>
713
            <td class="ci-type">[% ItemTypes.GetDescription( riloo.itemtype ) | html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %]</td>
714
            <td class="ci-patron">[% IF ( riloo.duedate ) %]
714
            <td class="ci-patron">[% IF ( riloo.duedate ) %]
715
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riloo.patron.borrowernumber | html %]">
715
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riloo.patron.borrowernumber | uri %]">
716
                    [% riloo.patron.surname | html %], [% riloo.patron.firstname | html %] ([% riloo.patron.category.description | html %])
716
                    [% riloo.patron.surname | html %], [% riloo.patron.firstname | html %] ([% riloo.patron.category.description | html %])
717
                </a>
717
                </a>
718
                [% IF riloo.borissuescount %]
718
                [% IF riloo.borissuescount %]
719
                    <span class="results_summary nowrap">
719
                    <span class="results_summary nowrap">
720
                        <span class="label">Checkouts:</span>
720
                        <span class="label">Checkouts:</span>
721
                        <span class="number_box">
721
                        <span class="number_box">
722
                            <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% riloo.patron.borrowernumber | html %]">[% riloo.borissuescount | html %]</a>
722
                            <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% riloo.patron.borrowernumber | uri %]">[% riloo.borissuescount | html %]</a>
723
                        </span>
723
                        </span>
724
                    </span>
724
                    </span>
725
                [% END %]
725
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt (-3 / +3 lines)
Lines 53-66 Link Here
53
                            <br />Barcode: [% reser.barcode | html %]
53
                            <br />Barcode: [% reser.barcode | html %]
54
                    </td>
54
                    </td>
55
                    <td>[% IF ( reser.patron ) %]
55
                    <td>[% IF ( reser.patron ) %]
56
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reser.patron.borrowernumber | html %]">
56
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reser.patron.borrowernumber | uri %]">
57
                            [% reser.patron.surname | html %][%IF ( reser.patron.firstname ) %], [% reser.patron.firstname | html %][% END %]
57
                            [% reser.patron.surname | html %][%IF ( reser.patron.firstname ) %], [% reser.patron.firstname | html %][% END %]
58
                        </a>
58
                        </a>
59
                        [% IF ( reser.patron.phone ) %]<br />[% reser.patron.phone | html %][% END %]
59
                        [% IF ( reser.patron.phone ) %]<br />[% reser.patron.phone | html %][% END %]
60
                            [% IF ( reser.patron.first_valid_email_address ) %]
60
                            [% IF ( reser.patron.first_valid_email_address ) %]
61
                                <br />
61
                                <br />
62
                                [% BLOCK subject %]Hold:[% END %]
62
                                [% BLOCK subject %]Hold:[% END %]
63
                                <a href="mailto:[% reser.patron.first_valid_email_address | html %]?subject=[% INCLUDE subject %] [% reser.title | html %]">
63
                                <a href="mailto:[% reser.patron.first_valid_email_address | uri %]?subject=[% INCLUDE subject %] [% reser.title | uri %]">
64
                                    [% reser.patron.first_valid_email_address | html %]
64
                                    [% reser.patron.first_valid_email_address | html %]
65
                                </a>
65
                                </a>
66
                            [% END %]
66
                            [% END %]
Lines 70-76 Link Here
70
                    </td>
70
                    </td>
71
                    <td>[% IF reser.homebranch %][% Branches.GetName( reser.homebranch ) | html %][% END %]</td>
71
                    <td>[% IF reser.homebranch %][% Branches.GetName( reser.homebranch ) | html %][% END %]</td>
72
                    <td>[% reser.itemcallnumber | html %]</td>
72
                    <td>[% reser.itemcallnumber | html %]</td>
73
                    <td class="actions"><a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% reser.itemnumber | html %]&amp;canceltransfer=1&amp;dest=ttr" class="btn btn-default btn-xs"><i class="fa fa-times"></i> Cancel transfer</a></td>
73
                    <td class="actions"><a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% reser.itemnumber | uri %]&amp;canceltransfer=1&amp;dest=ttr" class="btn btn-default btn-xs"><i class="fa fa-times"></i> Cancel transfer</a></td>
74
                </tr>
74
                </tr>
75
            [% END %]</tbody>
75
            [% END %]</tbody>
76
            </table>
76
            </table>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-1 / +1 lines)
Lines 119-125 Link Here
119
     <tbody>[% FOREACH itemsloo IN itemsloop %]
119
     <tbody>[% FOREACH itemsloo IN itemsloop %]
120
        <tr>
120
        <tr>
121
            <td class="hq-title">
121
            <td class="hq-title">
122
                <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itemsloo.biblionumber | html %]"><strong>[% itemsloo.title | html %]</strong> [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %]</a></p>
122
                <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itemsloo.biblionumber | uri %]"><strong>[% itemsloo.title | html %]</strong> [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %]</a></p>
123
                <p>
123
                <p>
124
                    <div class="hq-biblionumber content_hidden">[% itemsloo.biblionumber | html %]</div>
124
                    <div class="hq-biblionumber content_hidden">[% itemsloo.biblionumber | html %]</div>
125
                    <div class="hq-author">[% itemsloo.author | html %]</div>
125
                    <div class="hq-author">[% itemsloo.author | html %]</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-5 / +5 lines)
Lines 28-34 Link Here
28
28
29
        <h2>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]
29
        <h2>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]
30
            [% IF ( all_branches_link ) %]
30
            [% IF ( all_branches_link ) %]
31
            <span style="margin-left:20px"><a href="[% all_branches_link | html %]">
31
            <span style="margin-left:20px"><a href="[% all_branches_link | uri %]">
32
            View all libraries</a></span>
32
            View all libraries</a></span>
33
            [% END %]
33
            [% END %]
34
        </h2>
34
        </h2>
Lines 92-100 Link Here
92
                            [% UNLESS ( item_level_itypes ) %][% IF ( reserveloo.itemtype ) %]&nbsp; (<b>[% reserveloo.itemtype | html %]</b>)[% END %][% END %]
92
                            [% UNLESS ( item_level_itypes ) %][% IF ( reserveloo.itemtype ) %]&nbsp; (<b>[% reserveloo.itemtype | html %]</b>)[% END %][% END %]
93
                            <br />Barcode: [% reserveloo.barcode | html %]
93
                            <br />Barcode: [% reserveloo.barcode | html %]
94
                    </td>
94
                    </td>
95
                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.patron.borrowernumber | html %]">[% reserveloo.patron.surname | html %], [% reserveloo.patron.firstname | html %]</a>
95
                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.patron.borrowernumber | uri %]">[% reserveloo.patron.surname | html %], [% reserveloo.patron.firstname | html %]</a>
96
                        [% IF ( reserveloo.patron.phone ) %]<br />[% reserveloo.patron.phone | html %][% END %]
96
                        [% IF ( reserveloo.patron.phone ) %]<br />[% reserveloo.patron.phone | html %][% END %]
97
                        [% IF ( reserveloo.patron.first_valid_email_address ) %]<br /><a href="mailto:[% reserveloo.patron.first_valid_email_address | html %]?subject=Hold waiting: [% reserveloo.title | html %]">
97
                        [% IF ( reserveloo.patron.first_valid_email_address ) %]<br /><a href="mailto:[% reserveloo.patron.first_valid_email_address | uri %]?subject=Hold waiting: [% reserveloo.title | uri %]">
98
                        [% reserveloo.patron.first_valid_email_address | html %]</a>[% END %]
98
                        [% reserveloo.patron.first_valid_email_address | html %]</a>[% END %]
99
                    </td>
99
                    </td>
100
                    <td>[% Branches.GetName( reserveloo.homebranch ) | html %]</td>
100
                    <td>[% Branches.GetName( reserveloo.homebranch ) | html %]</td>
Lines 163-170 Link Here
163
                            [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]&nbsp; (<b>[% overloo.itemtype | html %]</b>)[% END %][% END %]
163
                            [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]&nbsp; (<b>[% overloo.itemtype | html %]</b>)[% END %][% END %]
164
                        <br />Barcode: [% overloo.barcode | html %]
164
                        <br />Barcode: [% overloo.barcode | html %]
165
                    </td>
165
                    </td>
166
                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overloo.patron.borrowernumber | html %]">[% overloo.patron.surname | html %], [% overloo.patron.firstname | html %]</a><br />[% overloo.patron.phone | html %]<br />
166
                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overloo.patron.borrowernumber | uri %]">[% overloo.patron.surname | html %], [% overloo.patron.firstname | html %]</a><br />[% overloo.patron.phone | html %]<br />
167
                        [% IF ( overloo.patron.first_valid_email_address ) %]<a href="mailto:[% overloo.patron.first_valid_email_address | html %]?subject=Reservation: [% overloo.title |url %]">
167
                        [% IF ( overloo.patron.first_valid_email_address ) %]<a href="mailto:[% overloo.patron.first_valid_email_address | uri %]?subject=Reservation: [% overloo.title |url %]">
168
        [% overloo.patron.first_valid_email_address | html %]</a>[% END %]
168
        [% overloo.patron.first_valid_email_address | html %]</a>[% END %]
169
                    </td>
169
                    </td>
170
                    <td>[% Branches.GetName( overloo.homebranch ) | html %]</td>
170
                    <td>[% Branches.GetName( overloo.homebranch ) | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt (-1 / +1 lines)
Lines 35-41 Link Here
35
                            [% SET p = e.patron %]
35
                            [% SET p = e.patron %]
36
                            <tr>
36
                            <tr>
37
                                <td>
37
                                <td>
38
                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% p.id | html %]">[% p.surname | html %], [% p.firstname | html %]</a>
38
                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% p.id | uri %]">[% p.surname | html %], [% p.firstname | html %]</a>
39
                                </td>
39
                                </td>
40
                                <td>
40
                                <td>
41
                                    [% p.cardnumber | html %]
41
                                    [% p.cardnumber | html %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt (-4 / +4 lines)
Lines 113-119 Link Here
113
                            [% END %]
113
                            [% END %]
114
                            <ul class="dropdown-menu">
114
                            <ul class="dropdown-menu">
115
                                [% FOREACH t IN club_templates %]
115
                                [% FOREACH t IN club_templates %]
116
                                    <li><a href="/cgi-bin/koha/clubs/clubs-add-modify.pl?club_template_id=[% t.id | html %]">[% t.name | html %]</a></li>
116
                                    <li><a href="/cgi-bin/koha/clubs/clubs-add-modify.pl?club_template_id=[% t.id | uri %]">[% t.name | html %]</a></li>
117
                                [% END %]
117
                                [% END %]
118
                            </ul>
118
                            </ul>
119
                        </div>
119
                        </div>
Lines 178-197 Link Here
178
                                            <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="clubactions[% c.id | html %]">
178
                                            <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="clubactions[% c.id | html %]">
179
                                                [% IF ( c.club_enrollments.count ) %]
179
                                                [% IF ( c.club_enrollments.count ) %]
180
                                                    <li>
180
                                                    <li>
181
                                                        <a href="club-enrollments.pl?id=[% c.id | html %]">
181
                                                        <a href="club-enrollments.pl?id=[% c.id | uri %]">
182
                                                            <i class="fa fa-list-ul"></i> Enrollments
182
                                                            <i class="fa fa-list-ul"></i> Enrollments
183
                                                        </a>
183
                                                        </a>
184
                                                    </li>
184
                                                    </li>
185
                                                [% ELSE %]
185
                                                [% ELSE %]
186
                                                    <li class="disabled">
186
                                                    <li class="disabled">
187
                                                        <a href="club-enrollments.pl?id=[% c.id | html %]">
187
                                                        <a href="club-enrollments.pl?id=[% c.id | uri %]">
188
                                                            <i class="fa fa-list-ul"></i> Enrollments
188
                                                            <i class="fa fa-list-ul"></i> Enrollments
189
                                                        </a>
189
                                                        </a>
190
                                                    </li>
190
                                                    </li>
191
                                                [% END %]
191
                                                [% END %]
192
                                                [% IF CAN_user_clubs_edit_clubs %]
192
                                                [% IF CAN_user_clubs_edit_clubs %]
193
                                                    <li>
193
                                                    <li>
194
                                                        <a href="clubs-add-modify.pl?id=[% c.id | html %]">
194
                                                        <a href="clubs-add-modify.pl?id=[% c.id | uri %]">
195
                                                            <i class="fa fa-pencil"></i> Edit
195
                                                            <i class="fa fa-pencil"></i> Edit
196
                                                        </a>
196
                                                        </a>
197
                                                    </li>
197
                                                    </li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt (-1 / +1 lines)
Lines 38-44 Link Here
38
            <fieldset class="action">
38
            <fieldset class="action">
39
                <input type="submit" value="Submit" class="submit" />
39
                <input type="submit" value="Submit" class="submit" />
40
40
41
                <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]" class="cancel">Cancel</a>
41
                <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | uri %]" class="cancel">Cancel</a>
42
            </fieldset>
42
            </fieldset>
43
        </form>
43
        </form>
44
    </div>
44
    </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt (-1 / +1 lines)
Lines 109-115 Link Here
109
            <fieldset class="action">
109
            <fieldset class="action">
110
                <input type="submit" id="submit" value="Save" class="submit focus" />
110
                <input type="submit" id="submit" value="Save" class="submit focus" />
111
111
112
                <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]" class="cancel">Cancel</a>
112
                <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | uri %]" class="cancel">Cancel</a>
113
            </fieldset>
113
            </fieldset>
114
        </form>
114
        </form>
115
    </div>
115
    </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt (-1 / +1 lines)
Lines 94-100 Link Here
94
                <fieldset class="action">
94
                <fieldset class="action">
95
                    <input type="submit" value="Submit" class="submit" />
95
                    <input type="submit" value="Submit" class="submit" />
96
96
97
                    <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]" class="cancel">Cancel</a>
97
                    <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | uri %]" class="cancel">Cancel</a>
98
                </fieldset>
98
                </fieldset>
99
            </form>
99
            </form>
100
        [% END %]
100
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt (-6 / +6 lines)
Lines 45-51 Link Here
45
                <li><span class="label">Department</span> [% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) | html %]</li>
45
                <li><span class="label">Department</span> [% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) | html %]</li>
46
                <li><span class="label">Course number</span> [% course.course_number | html %]</li>
46
                <li><span class="label">Course number</span> [% course.course_number | html %]</li>
47
                <li><span class="label">Section</span> [% course.section | html %]</li>
47
                <li><span class="label">Section</span> [% course.section | html %]</li>
48
                <li><span class="label">Instructors</span> [% FOREACH i IN course.instructors %]<div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber | html %]">[% i.firstname | html %] [% i.surname | html %]</a></div>[% END %]</li>
48
                <li><span class="label">Instructors</span> [% FOREACH i IN course.instructors %]<div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber | uri %]">[% i.firstname | html %] [% i.surname | html %]</a></div>[% END %]</li>
49
                <li><span class="label">Staff note</span> [% course.staff_note | html %]</li>
49
                <li><span class="label">Staff note</span> [% course.staff_note | html %]</li>
50
                <li><span class="label">Public note</span> [% course.public_note | html %]</li>
50
                <li><span class="label">Public note</span> [% course.public_note | html %]</li>
51
                <li><span class="label">Student count</span> [% course.students_count | html %]</li>
51
                <li><span class="label">Student count</span> [% course.students_count | html %]</li>
Lines 79-87 Link Here
79
                <tbody>
79
                <tbody>
80
                    [% FOREACH cr IN course_reserves %]
80
                    [% FOREACH cr IN course_reserves %]
81
                        <tr>
81
                        <tr>
82
                            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cr.biblio.biblionumber | html %]">[% cr.biblio.title | html %]</a></td>
82
                            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cr.biblio.biblionumber | uri %]">[% cr.biblio.title | html %]</a></td>
83
                            <td>[% cr.biblio.author | html %]</td>
83
                            <td>[% cr.biblio.author | html %]</td>
84
                            <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% cr.item.itemnumber | html %]&amp;biblionumber=[% cr.biblio.biblionumber | html %]&amp;bi=[% cr.biblioitem.biblioitemnumber | html %]">[% cr.item.barcode | html %]</a></td>
84
                            <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% cr.item.itemnumber | uri %]&amp;biblionumber=[% cr.biblio.biblionumber | uri %]&amp;bi=[% cr.biblioitem.biblioitemnumber | uri %]">[% cr.item.barcode | html %]</a></td>
85
                            <td>[% cr.item.itemcallnumber | html %]</td>
85
                            <td>[% cr.item.itemcallnumber | html %]</td>
86
                            [% IF item_level_itypes %]
86
                            [% IF item_level_itypes %]
87
                            <td>
87
                            <td>
Lines 156-164 Link Here
156
156
157
                            <td>
157
                            <td>
158
                                [% IF (cr.item.uri) %]
158
                                [% IF (cr.item.uri) %]
159
                                    <a href="[% cr.item.uri | html %]">Item URI</a>
159
                                    <a href="[% cr.item.uri | uri %]">Item URI</a>
160
                                [% ELSIF (cr.biblioitem.url) %]
160
                                [% ELSIF (cr.biblioitem.url) %]
161
                                    <a href="[% cr.biblioitem.url | html %]">Record URL</a>
161
                                    <a href="[% cr.biblioitem.url | uri %]">Record URL</a>
162
                                [% END %]
162
                                [% END %]
163
                            </td>
163
                            </td>
164
164
Lines 166-172 Link Here
166
                                [% FOREACH c IN cr.courses %]
166
                                [% FOREACH c IN cr.courses %]
167
                                    [% UNLESS cr.course_id == c.course_id %]
167
                                    [% UNLESS cr.course_id == c.course_id %]
168
                                        <p>
168
                                        <p>
169
                                            <a href="course-details.pl?course_id=[% c.course_id | html %]">
169
                                            <a href="course-details.pl?course_id=[% c.course_id | uri %]">
170
                                                [% c.course_name | html %]
170
                                                [% c.course_name | html %]
171
                                                [% IF c.section %] [% c.section | html %] [% END %]
171
                                                [% IF c.section %] [% c.section | html %] [% END %]
172
                                                [% IF c.term %] [% AuthorisedValues.GetByCode( 'TERM', c.term ) | html %] [% END %]
172
                                                [% IF c.term %] [% AuthorisedValues.GetByCode( 'TERM', c.term ) | html %] [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt (-2 / +2 lines)
Lines 70-83 Link Here
70
                        <tbody>
70
                        <tbody>
71
                            [% FOREACH c IN courses %]
71
                            [% FOREACH c IN courses %]
72
                                <tr>
72
                                <tr>
73
                                    <td><a href="course-details.pl?course_id=[% c.course_id | html %]">[% c.course_name | html %]</a></td>
73
                                    <td><a href="course-details.pl?course_id=[% c.course_id | uri %]">[% c.course_name | html %]</a></td>
74
                                    <td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department ) | html %]</td>
74
                                    <td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department ) | html %]</td>
75
                                    <td>[% c.course_number | html %]</td>
75
                                    <td>[% c.course_number | html %]</td>
76
                                    <td>[% c.section | html %]</td>
76
                                    <td>[% c.section | html %]</td>
77
                                    <td>[% AuthorisedValues.GetByCode( 'TERM' c.term ) | html %]</td>
77
                                    <td>[% AuthorisedValues.GetByCode( 'TERM' c.term ) | html %]</td>
78
                                    <td>
78
                                    <td>
79
                                        [% FOREACH i IN c.instructors %]
79
                                        [% FOREACH i IN c.instructors %]
80
                                            <div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber | html %]">[% i.firstname | html %] [% i.surname | html %]</a></div>
80
                                            <div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber | uri %]">[% i.firstname | html %] [% i.surname | html %]</a></div>
81
                                        [% END %]
81
                                        [% END %]
82
                                    </td>
82
                                    </td>
83
                                    <td>[% c.staff_note | html %]</td>
83
                                    <td>[% c.staff_note | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt (-1 / +1 lines)
Lines 118-124 Link Here
118
                    <input type="submit" value="Save" class="submit" />
118
                    <input type="submit" value="Save" class="submit" />
119
119
120
                    [% IF course_id %]
120
                    [% IF course_id %]
121
                        <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course_id | html %]" class="cancel">Cancel</a>
121
                        <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course_id | uri %]" class="cancel">Cancel</a>
122
                    [% ELSE %]
122
                    [% ELSE %]
123
                        <a href="/cgi-bin/koha/course_reserves/course-reserves.pl" class="cancel">Cancel</a>
123
                        <a href="/cgi-bin/koha/course_reserves/course-reserves.pl" class="cancel">Cancel</a>
124
                    [% END %]
124
                    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt (-1 / +1 lines)
Lines 26-32 Link Here
26
        <h3>What's next?</h3>
26
        <h3>What's next?</h3>
27
        <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
27
        <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
28
            <li>Use top menu bar to navigate to another part of Koha.</li>
28
            <li>Use top menu bar to navigate to another part of Koha.</li>
29
            <li>To report a broken link or any other issue, please contact the Koha Administrator. <a href="mailto:[% admin | html %]">Send email</a></li>
29
            <li>To report a broken link or any other issue, please contact the Koha Administrator. <a href="mailto:[% admin | uri %]">Send email</a></li>
30
    </ul>
30
    </ul>
31
</div>
31
</div>
32
32
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-4 / +4 lines)
Lines 393-399 Link Here
393
                            </fieldset>
393
                            </fieldset>
394
                            <fieldset class="action">
394
                            <fieldset class="action">
395
                                <input type="submit" class="btn btn-default" value="Send email"/>
395
                                <input type="submit" class="btn btn-default" value="Send email"/>
396
                                <span><a href="[% ill_url | html %]" title="Return to request details">Cancel</a></span>
396
                                <span><a href="[% ill_url | uri %]" title="Return to request details">Cancel</a></span>
397
                            </fieldset>
397
                            </fieldset>
398
                        </form>
398
                        </form>
399
                    [% ELSE %]
399
                    [% ELSE %]
Lines 401-407 Link Here
401
                            <legend>Interlibrary loan request details</legend>
401
                            <legend>Interlibrary loan request details</legend>
402
                            <p>No partners have been defined yet. Please create appropriate patron records (by default ILLLIBS category).</p>
402
                            <p>No partners have been defined yet. Please create appropriate patron records (by default ILLLIBS category).</p>
403
                            <p>Be sure to provide email addresses for these patrons.</p>
403
                            <p>Be sure to provide email addresses for these patrons.</p>
404
                            <p><span><a href="[% ill_url | html %]" title="Return to request details">Cancel</a></span></p>
404
                            <p><span><a href="[% ill_url | uri %]" title="Return to request details">Cancel</a></span></p>
405
                        </fieldset>
405
                        </fieldset>
406
                    [% END %]
406
                    [% END %]
407
                <!-- generic_confirm ends here -->
407
                <!-- generic_confirm ends here -->
Lines 518-524 Link Here
518
                                <div class="borrowernumber">
518
                                <div class="borrowernumber">
519
                                    <span class="label borrowernumber">Patron:</span>
519
                                    <span class="label borrowernumber">Patron:</span>
520
                                    [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
520
                                    [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
521
                                    <a href="[% borrowerlink | html %]" title="View borrower details">
521
                                    <a href="[% borrowerlink | uri %]" title="View borrower details">
522
                                    [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %]
522
                                    [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %]
523
                                    </a>
523
                                    </a>
524
                                </div>
524
                                </div>
Lines 526-532 Link Here
526
                                <div class="biblio_id">
526
                                <div class="biblio_id">
527
                                    <span class="label biblio_id">Bibliographic record ID:</span>
527
                                    <span class="label biblio_id">Bibliographic record ID:</span>
528
                                    [% IF request.biblio_id %]
528
                                    [% IF request.biblio_id %]
529
                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% request.biblio_id | html %]">[% request.biblio_id | html %]</a>
529
                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% request.biblio_id | uri %]">[% request.biblio_id | html %]</a>
530
                                    [% ELSE %]
530
                                    [% ELSE %]
531
                                        <span>N/A</span>
531
                                        <span>N/A</span>
532
                                    [% END %]
532
                                    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-1 / +1 lines)
Lines 25-31 Link Here
25
                                <div class="newsbody">[% koha_new.content | $raw %]</div>
25
                                <div class="newsbody">[% koha_new.content | $raw %]</div>
26
                                <p class="newsfooter"> Posted on [% koha_new.newdate | html %][% IF( ( newsdisp == 'staff' || newsdisp == 'both' ) && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title | html %] </span>[% koha_new.author_firstname | html %] [% koha_new.author_surname | html %]<br />[% END %]
26
                                <p class="newsfooter"> Posted on [% koha_new.newdate | html %][% IF( ( newsdisp == 'staff' || newsdisp == 'both' ) && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title | html %] </span>[% koha_new.author_firstname | html %] [% koha_new.author_surname | html %]<br />[% END %]
27
                                    [% IF ( CAN_user_tools ) %]
27
                                    [% IF ( CAN_user_tools ) %]
28
                                        <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew | html %]">Edit</a>
28
                                        <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew | uri %]">Edit</a>
29
                                         | <a class="news_delete" href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=[% koha_new.idnew | html %]">Delete</a>
29
                                         | <a class="news_delete" href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=[% koha_new.idnew | html %]">Delete</a>
30
                                         | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a>
30
                                         | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a>
31
                                    [% END %]
31
                                    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt (-3 / +3 lines)
Lines 52-58 Link Here
52
                                &nbsp;
52
                                &nbsp;
53
                                [% IF ( accountline.itemnumber ) %]
53
                                [% IF ( accountline.itemnumber ) %]
54
                                    [% SET biblio = accountline.item.biblio %]
54
                                    [% SET biblio = accountline.item.biblio %]
55
                                    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | html %]&amp;itemnumber=[% accountline.itemnumber | html %]">[% biblio.title | html %]</a>
55
                                    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | uri %]&amp;itemnumber=[% accountline.itemnumber | uri %]">[% biblio.title | html %]</a>
56
                                [% END %]
56
                                [% END %]
57
                            </td>
57
                            </td>
58
58
Lines 111-121 Link Here
111
                                        <td>[% offset_accountline.amountoutstanding | $Price %]</td>
111
                                        <td>[% offset_accountline.amountoutstanding | $Price %]</td>
112
                                        <td>[% INCLUDE 'accounttype.inc' account => offset_accountline %]</td>
112
                                        <td>[% INCLUDE 'accounttype.inc' account => offset_accountline %]</td>
113
                                        <td>[% offset_accountline.note | html %]</td>
113
                                        <td>[% offset_accountline.note | html %]</td>
114
                                        <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | html %]">[% offset_accountline.manager_id | html %]</a>[% END %]</td>
114
                                        <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | uri %]">[% offset_accountline.manager_id | html %]</a>[% END %]</td>
115
                                        <td>[% ao.created_on | $KohaDates with_hours => 1 | html %]</td>
115
                                        <td>[% ao.created_on | $KohaDates with_hours => 1 | html %]</td>
116
                                        <td>[% ao.amount | $Price %]</td>
116
                                        <td>[% ao.amount | $Price %]</td>
117
                                        <td>[% INCLUDE 'account_offset_type.inc' account_offset => ao %]</td>
117
                                        <td>[% INCLUDE 'account_offset_type.inc' account_offset => ao %]</td>
118
                                        <td><a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | html %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a></td>
118
                                        <td><a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a></td>
119
                                    </tr>
119
                                    </tr>
120
                                [% END %]
120
                                [% END %]
121
                            [% END %]
121
                            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-8 / +8 lines)
Lines 31-40 Link Here
31
<!-- The manual invoice and credit buttons -->
31
<!-- The manual invoice and credit buttons -->
32
<div class="statictabs">
32
<div class="statictabs">
33
<ul>
33
<ul>
34
    <li class="active"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Account</a></li>
34
    <li class="active"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account</a></li>
35
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]" >Pay fines</a></li>
35
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Pay fines</a></li>
36
    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual invoice</a></li>
36
    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a></li>
37
    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual credit</a></li>
37
    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a></li>
38
</ul>
38
</ul>
39
<div class="tabs-container">
39
<div class="tabs-container">
40
<!-- The table with the account items -->
40
<!-- The table with the account items -->
Lines 64-70 Link Here
64
        [% INCLUDE 'accounttype.inc' accountline => account %]
64
        [% INCLUDE 'accounttype.inc' accountline => account %]
65
        [%- IF account.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
65
        [%- IF account.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
66
        [%- IF account.description %], [% account.description | html %][% END %]
66
        [%- IF account.description %], [% account.description | html %][% END %]
67
        &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | html %]&amp;itemnumber=[% account.itemnumber | html %]">[% account.item.biblio.title | html %]</a>[% END %]</td>
67
        &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>[% END %]</td>
68
      <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td>
68
      <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td>
69
      <td>[% account.note | html_line_break %]</td>
69
      <td>[% account.note | html_line_break %]</td>
70
      [% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price %]</td>
70
      [% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price %]</td>
Lines 75-88 Link Here
75
        [% ELSE %]
75
        [% ELSE %]
76
          <a target="_blank" href="printinvoice.pl?action=print&amp;accountlines_id=[% account.accountlines_id | html %]&amp;borrowernumber=[% account.borrowernumber | html %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a>
76
          <a target="_blank" href="printinvoice.pl?action=print&amp;accountlines_id=[% account.accountlines_id | html %]&amp;borrowernumber=[% account.borrowernumber | html %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a>
77
        [% END %]
77
        [% END %]
78
        <a href="accountline-details.pl?accountlines_id=[% account.accountlines_id | html %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a>
78
        <a href="accountline-details.pl?accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a>
79
        [% IF ( reverse_col) %]
79
        [% IF ( reverse_col) %]
80
          [% IF ( account.payment || account.amount < 0 ) %]
80
          [% IF ( account.payment || account.amount < 0 ) %]
81
                [% IF account.payment %]
81
                [% IF account.payment %]
82
                    <a href="boraccount.pl?action=reverse&amp;accountlines_id=[% account.accountlines_id | html %]&amp;borrowernumber=[% account.borrowernumber | html %]" class="btn btn-default btn-xs"><i class="fa fa-undo"></i> Reverse</a>
82
                    <a href="boraccount.pl?action=reverse&amp;accountlines_id=[% account.accountlines_id | uri %]&amp;borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-undo"></i> Reverse</a>
83
                [% END %]
83
                [% END %]
84
                [% IF account.amount < 0 %]
84
                [% IF account.amount < 0 %]
85
                    <a href="boraccount.pl?action=void&amp;accountlines_id=[% account.accountlines_id | html %]&amp;borrowernumber=[% account.borrowernumber | html %]" class="btn btn-default btn-xs void"><i class="fa fa-ban"></i> Void</a>
85
                    <a href="boraccount.pl?action=void&amp;accountlines_id=[% account.accountlines_id | uri %]&amp;borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs void"><i class="fa fa-ban"></i> Void</a>
86
                [% END %]
86
                [% END %]
87
          [% ELSE %]
87
          [% ELSE %]
88
            &nbsp;
88
            &nbsp;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt (-1 / +1 lines)
Lines 33-39 Link Here
33
          <tbody>
33
          <tbody>
34
            [% FOREACH d IN pending_discharges %]
34
            [% FOREACH d IN pending_discharges %]
35
              <tr>
35
              <tr>
36
                <td><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% d.borrower.borrowernumber | html %]">[% d.borrower.surname | html %], [% d.borrower.firstname | html %]</a></td>
36
                <td><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% d.borrower.borrowernumber | uri %]">[% d.borrower.surname | html %], [% d.borrower.firstname | html %]</a></td>
37
                <td>[% d.borrower.branchcode.branchname | html %]</td>
37
                <td>[% d.borrower.branchcode.branchname | html %]</td>
38
                <td><span title="[% d.needed | html %]">[% d.needed | $KohaDates %]</span></td>
38
                <td><span title="[% d.needed | html %]">[% d.needed | $KohaDates %]</span></td>
39
                <td><a class="btn btn-xs btn-default" href="/cgi-bin/koha/members/discharges.pl?op=allow&borrowernumber=[% d.borrower.borrowernumber | html %]"><i class="fa fa-check"></i> Allow</a></td>
39
                <td><a class="btn btn-xs btn-default" href="/cgi-bin/koha/members/discharges.pl?op=allow&borrowernumber=[% d.borrower.borrowernumber | html %]"><i class="fa fa-check"></i> Allow</a></td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt (-1 / +1 lines)
Lines 45-51 Link Here
45
                    <tbody>
45
                    <tbody>
46
                        [% FOREACH f IN files %]
46
                        [% FOREACH f IN files %]
47
                            <tr>
47
                            <tr>
48
                                 <td><a href="?borrowernumber=[% patron.borrowernumber | html %]&amp;op=download&amp;file_id=[% f.file_id | html %]">[% f.file_name | html %]</a></td>
48
                                 <td><a href="?borrowernumber=[% patron.borrowernumber | uri %]&amp;op=download&amp;file_id=[% f.file_id | uri %]">[% f.file_name | html %]</a></td>
49
                                 <td>[% f.file_type | html %]</td>
49
                                 <td>[% f.file_type | html %]</td>
50
                                 <td>[% f.file_description | html %]</td>
50
                                 <td>[% f.file_description | html %]</td>
51
                                 <td>[% f.date_uploaded | $KohaDates %]</td>
51
                                 <td>[% f.date_uploaded | $KohaDates %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt (-1 / +1 lines)
Lines 54-60 Link Here
54
      </thead>
54
      </thead>
55
      <tbody>
55
      <tbody>
56
      [% FOREACH hold IN holds %]
56
      [% FOREACH hold IN holds %]
57
          <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblio.biblionumber | html %]">[% hold.biblio.title | html %]</a></td>
57
          <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblio.biblionumber | uri %]">[% hold.biblio.title | html %]</a></td>
58
          <td>[% hold.biblio.author | html %]</td>
58
          <td>[% hold.biblio.author | html %]</td>
59
          <td>[% hold.item.barcode | html %]</td>
59
          <td>[% hold.item.barcode | html %]</td>
60
          <td>[% Branches.GetName( hold.branchcode ) | html %]</td>
60
          <td>[% Branches.GetName( hold.branchcode ) | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt (-3 / +3 lines)
Lines 390-401 Link Here
390
                      <td>[% entry.id | html %]</td>
390
                      <td>[% entry.id | html %]</td>
391
                      <td>[% entry.appointment_date | $KohaDates %] ([% entry.day_segment | html %])</td>
391
                      <td>[% entry.appointment_date | $KohaDates %] ([% entry.day_segment | html %])</td>
392
                      <td>
392
                      <td>
393
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% entry.chooser.borrowernumber | html %]">
393
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% entry.chooser.borrowernumber | uri %]">
394
                          [% INCLUDE 'patron-title.inc' patron = entry.chooser invert_name = 0 %]
394
                          [% INCLUDE 'patron-title.inc' patron = entry.chooser invert_name = 0 %]
395
                        </a>
395
                        </a>
396
                      </td>
396
                      </td>
397
                      <td>
397
                      <td>
398
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% entry.deliverer.borrowernumber | html %]">
398
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% entry.deliverer.borrowernumber | uri %]">
399
                          [% INCLUDE 'patron-title.inc' patron = entry.deliverer invert_name = 0 %]
399
                          [% INCLUDE 'patron-title.inc' patron = entry.deliverer invert_name = 0 %]
400
                        </a>
400
                        </a>
401
                      </td>
401
                      </td>
Lines 408-414 Link Here
408
                </table>
408
                </table>
409
                [% END %]
409
                [% END %]
410
                <div class="action">
410
                <div class="action">
411
                  <a href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&borrowernumber=[% patron.borrowernumber | html %]"
411
                  <a href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&borrowernumber=[% patron.borrowernumber | uri %]"
412
                    class="btn btn-default btn-sm">
412
                    class="btn btn-default btn-sm">
413
                    <i class="fa fa-plus"></i> Add a new delivery
413
                    <i class="fa fa-plus"></i> Add a new delivery
414
                  </a>
414
                  </a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (-4 / +4 lines)
Lines 24-33 Link Here
24
<!-- The manual invoice and credit buttons -->
24
<!-- The manual invoice and credit buttons -->
25
<div class="statictabs">
25
<div class="statictabs">
26
<ul>
26
<ul>
27
    <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Account</a></li>
27
    <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account</a></li>
28
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]" >Pay fines</a></li>
28
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Pay fines</a></li>
29
    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual invoice</a></li>
29
    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a></li>
30
    <li class="active"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual credit</a></li>
30
    <li class="active"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a></li>
31
</ul>
31
</ul>
32
<div class="tabs-container">
32
<div class="tabs-container">
33
33
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-4 / +4 lines)
Lines 24-33 Link Here
24
<!-- The manual invoice and credit buttons -->
24
<!-- The manual invoice and credit buttons -->
25
<div class="statictabs">
25
<div class="statictabs">
26
<ul>
26
<ul>
27
    <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Account</a></li>
27
    <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account</a></li>
28
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]" >Pay fines</a></li>
28
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Pay fines</a></li>
29
    <li class="active"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual invoice</a></li>
29
    <li class="active"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a></li>
30
    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual credit</a></li>
30
    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a></li>
31
</ul>
31
</ul>
32
<div class="tabs-container">
32
<div class="tabs-container">
33
33
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-3 / +3 lines)
Lines 26-32 Link Here
26
<div id="breadcrumbs">
26
<div id="breadcrumbs">
27
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
27
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
28
    [% UNLESS blocking_error %]
28
    [% UNLESS blocking_error %]
29
    &rsaquo;[% IF (firstname || surname ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">[% IF (firstname) %][% firstname | html %] [% END %][% IF (surname) %][% surname | html %] [% END %]</a>  &rsaquo;[% END %]
29
    &rsaquo;[% IF (firstname || surname ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% IF (firstname) %][% firstname | html %] [% END %][% IF (surname) %][% surname | html %] [% END %]</a>  &rsaquo;[% END %]
30
<strong>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron ([%IF ( categoryname ) %][% categoryname | html %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</strong>
30
<strong>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron ([%IF ( categoryname ) %][% categoryname | html %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</strong>
31
    [% END %]
31
    [% END %]
32
</div>
32
</div>
Lines 326-332 Link Here
326
	        [% ELSE %]
326
	        [% ELSE %]
327
	        <li id="contact-details" style="display: none">
327
	        <li id="contact-details" style="display: none">
328
	        [% END %]
328
	        [% END %]
329
	            <span class="label">Organization #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid | html %]" target="blank">[% guarantorid | html %]</a>[% END %]
329
	            <span class="label">Organization #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid | uri %]" target="blank">[% guarantorid | html %]</a>[% END %]
330
	        </li>
330
	        </li>
331
	        <li>
331
	        <li>
332
	            <label for="contactname">Organization name: </label>
332
	            <label for="contactname">Organization name: </label>
Lines 347-353 Link Here
347
     <span class="label">Patron #:</span>
347
     <span class="label">Patron #:</span>
348
     [% IF guarantorid %]
348
     [% IF guarantorid %]
349
        [% IF logged_in_user.can_see_patron_infos( guarantor ) %]
349
        [% IF logged_in_user.can_see_patron_infos( guarantor ) %]
350
            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid | html %]" target="blank">[% guarantorid | html %]</a>
350
            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid | uri %]" target="blank">[% guarantorid | html %]</a>
351
        [% ELSE %]
351
        [% ELSE %]
352
            [% guarantorid | html %]
352
            [% guarantorid | html %]
353
        [% END %]
353
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt (-1 / +1 lines)
Lines 99-105 Link Here
99
                    <div id="pending_updates">
99
                    <div id="pending_updates">
100
                            [% FOREACH pm IN PendingModifications %]
100
                            [% FOREACH pm IN PendingModifications %]
101
                                [% SET borrowernumber = pm.borrowernumber %]
101
                                [% SET borrowernumber = pm.borrowernumber %]
102
                                <h3><a href="#panel_modify_[% pm.borrowernumber | html %]">[% borrowers.$borrowernumber.surname | html %][% IF ( borrowers.$borrowernumber.firstname ) %], [% borrowers.$borrowernumber.firstname | html %][% END %] - [% Categories.GetName( borrowers.$borrowernumber.categorycode ) | html %] ([% Branches.GetName( borrowers.$borrowernumber.branchcode ) | html %]) ([% borrowers.$borrowernumber.cardnumber | html %]) - Requested on [% pm.timestamp | $KohaDates with_hours = 1 | html %]</a></h3>
102
                                <h3><a href="#panel_modify_[% pm.borrowernumber | uri %]">[% borrowers.$borrowernumber.surname | html %][% IF ( borrowers.$borrowernumber.firstname ) %], [% borrowers.$borrowernumber.firstname | html %][% END %] - [% Categories.GetName( borrowers.$borrowernumber.categorycode ) | html %] ([% Branches.GetName( borrowers.$borrowernumber.branchcode ) | html %]) ([% borrowers.$borrowernumber.cardnumber | html %]) - Requested on [% pm.timestamp | $KohaDates with_hours = 1 | html %]</a></h3>
103
                                <div id="panel_modify_[% pm.borrowernumber | html %]">
103
                                <div id="panel_modify_[% pm.borrowernumber | html %]">
104
                                    <div style="background-color:#E6F0F2;padding:.5em;margin:.3em 0;">
104
                                    <div style="background-color:#E6F0F2;padding:.5em;margin:.3em 0;">
105
                                        <input type="radio" id="approve_modify_[% pm.borrowernumber | html %]" name="modify_[% pm.borrowernumber | html %]" value="approve" />
105
                                        <input type="radio" id="approve_modify_[% pm.borrowernumber | html %]" name="modify_[% pm.borrowernumber | html %]" value="approve" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt (-1 / +1 lines)
Lines 105-111 Link Here
105
                    <div class="dialog alert">No valid patrons to merge were found.</div>
105
                    <div class="dialog alert">No valid patrons to merge were found.</div>
106
                [% ELSE %]
106
                [% ELSE %]
107
                    <p>
107
                    <p>
108
                        Patron records merged into <a href="moremember.pl?borrowernumber=[% keeper.id | html %]">[% INCLUDE 'patron-title.inc' patron = keeper %]</a>
108
                        Patron records merged into <a href="moremember.pl?borrowernumber=[% keeper.id | uri %]">[% INCLUDE 'patron-title.inc' patron = keeper %]</a>
109
                    </p>
109
                    </p>
110
110
111
                    [% FOREACH pair IN results.merged.pairs %]
111
                    [% FOREACH pair IN results.merged.pairs %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-4 / +4 lines)
Lines 35-42 Link Here
35
            [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span>[% phonepro | html %]</li>[% END %]
35
            [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span>[% phonepro | html %]</li>[% END %]
36
            [% IF ( mobile ) %]<li><span class="label">Other phone: </span>[% mobile | html %]</li>[% END %]
36
            [% IF ( mobile ) %]<li><span class="label">Other phone: </span>[% mobile | html %]</li>[% END %]
37
            [% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax | html %]</li>[% END %]
37
            [% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax | html %]</li>[% END %]
38
            [% IF ( email ) %]<li class="email"><span class="label">Primary email:</span><a href="mailto:[% email | html %]">[% email | html %]</a></li>[% END %]
38
            [% IF ( email ) %]<li class="email"><span class="label">Primary email:</span><a href="mailto:[% email | uri %]">[% email | html %]</a></li>[% END %]
39
            [% IF ( emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a href="mailto:[% emailpro | html %]">[% emailpro | html %]</a></li>[% END %]
39
            [% IF ( emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a href="mailto:[% emailpro | uri %]">[% emailpro | html %]</a></li>[% END %]
40
            [% UNLESS ( I ) %]
40
            [% UNLESS ( I ) %]
41
                [% IF ( inititals ) %]<li><span class="label">Initials: </span>[% initials | html %]</li>[% END %]
41
                [% IF ( inititals ) %]<li><span class="label">Initials: </span>[% initials | html %]</li>[% END %]
42
                [% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth | $KohaDates %]</li>[% END %]
42
                [% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth | $KohaDates %]</li>[% END %]
Lines 44-54 Link Here
44
            [% END %]
44
            [% END %]
45
    [% IF ( isguarantee ) %]
45
    [% IF ( isguarantee ) %]
46
        [% IF ( guaranteeloop ) %]
46
        [% IF ( guaranteeloop ) %]
47
            <li><span class="label">Guarantees:</span><ul>[% FOREACH guaranteeloo IN guaranteeloop %]<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guaranteeloo.borrowernumber | html %]">[% guaranteeloo.name | html %]  </a></li>[% END %]</ul></li>
47
            <li><span class="label">Guarantees:</span><ul>[% FOREACH guaranteeloo IN guaranteeloop %]<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guaranteeloo.borrowernumber | uri %]">[% guaranteeloo.name | html %]  </a></li>[% END %]</ul></li>
48
        [% END %]
48
        [% END %]
49
    [% ELSE %]
49
    [% ELSE %]
50
        [% IF ( guarantor.borrowernumber ) %]
50
        [% IF ( guarantor.borrowernumber ) %]
51
            <li><span class="label">Guarantor:</span><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber | html %]">[% guarantor.surname | html %], [% guarantor.firstname | html %]</a></li>
51
            <li><span class="label">Guarantor:</span><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber | uri %]">[% guarantor.surname | html %], [% guarantor.firstname | html %]</a></li>
52
        [% END %]
52
        [% END %]
53
    [% END %]
53
    [% END %]
54
	</ol>
54
	</ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt (-3 / +3 lines)
Lines 10-16 Link Here
10
10
11
<body id="pat_moremember-print" class="pat">
11
<body id="pat_moremember-print" class="pat">
12
    <div id="main">
12
    <div id="main">
13
        <h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% patron.cardnumber | html %]">Account summary: [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a></h3>
13
        <h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% patron.cardnumber | uri %]">Account summary: [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a></h3>
14
14
15
        <ul>
15
        <ul>
16
            [% IF Koha.Preference( 'AddressFormat' ) %]
16
            [% IF Koha.Preference( 'AddressFormat' ) %]
Lines 48-54 Link Here
48
                    [% IF ( issue.overdue ) %]<tr class="overdue">[% ELSE %]<tr>[% END %]
48
                    [% IF ( issue.overdue ) %]<tr class="overdue">[% ELSE %]<tr>[% END %]
49
                        <td>
49
                        <td>
50
                            [% issue.title | html %]
50
                            [% issue.title | html %]
51
                            <a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issue.itemnumber | html %]&amp;biblionumber=[% issue.biblionumber | html %]&amp;bi=[% issue.biblioitemnumber | html %]"></a>
51
                            <a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issue.itemnumber | uri %]&amp;biblionumber=[% issue.biblionumber | uri %]&amp;bi=[% issue.biblioitemnumber | uri %]"></a>
52
                        </td>
52
                        </td>
53
                        <td>[% issue.author | html %]</td>
53
                        <td>[% issue.author | html %]</td>
54
                        <td>[% issue.itemcallnumber | html %]</td>
54
                        <td>[% issue.itemcallnumber | html %]</td>
Lines 118-124 Link Here
118
                      [% END %]
118
                      [% END %]
119
                      &nbsp;
119
                      &nbsp;
120
                      [% IF ( account.itemnumber AND account.accounttype != 'F' AND account.accounttype != 'FU' ) %]
120
                      [% IF ( account.itemnumber AND account.accounttype != 'F' AND account.accounttype != 'FU' ) %]
121
                          <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | html %]&amp;itemnumber=[% account.itemnumber | html %]">[% account.item.biblio.title | html %]</a>
121
                          <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>
122
                      [% END %]
122
                      [% END %]
123
                  </td>
123
                  </td>
124
                  <td>
124
                  <td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt (-4 / +4 lines)
Lines 17-23 Link Here
17
<h3>[% LibraryName | html %]</h3>
17
<h3>[% LibraryName | html %]</h3>
18
[% IF ( branchname ) %][% branchname | html %]<br />[% END %]
18
[% IF ( branchname ) %][% branchname | html %]<br />[% END %]
19
Checked out to [% firstname | html %] [% surname | html %] <br />
19
Checked out to [% firstname | html %] [% surname | html %] <br />
20
(<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber | html %]">[% cardnumber | html %]</a>)<br />
20
(<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber | uri %]">[% cardnumber | html %]</a>)<br />
21
21
22
[% todaysdate | html %]<br />
22
[% todaysdate | html %]<br />
23
23
Lines 26-32 Checked out to [% firstname | html %] [% surname | html %] <br /> Link Here
26
[% FOREACH issueloo IN issueloop %]
26
[% FOREACH issueloo IN issueloop %]
27
[% IF ( issueloo.red ) %][% ELSE %]
27
[% IF ( issueloo.red ) %][% ELSE %]
28
[% IF ( issueloo.today ) %]
28
[% IF ( issueloo.today ) %]
29
<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber | html %]&amp;biblionumber=[% issueloo.biblionumber | html %]&amp;bi=[% issueloo.biblioitemnumber | html %]">[% issueloo.title | html %]</a><br />
29
<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber | uri %]&amp;biblionumber=[% issueloo.biblionumber | uri %]&amp;bi=[% issueloo.biblioitemnumber | uri %]">[% issueloo.title | html %]</a><br />
30
Barcode: [% issueloo.barcode | html %]<br />
30
Barcode: [% issueloo.barcode | html %]<br />
31
Date due: [% issueloo.date_due | html %]<br /></p>
31
Date due: [% issueloo.date_due | html %]<br /></p>
32
    [% END %]
32
    [% END %]
Lines 37-43 Date due: [% issueloo.date_due | html %]<br /></p> Link Here
37
<h4>Checked out</h4>
37
<h4>Checked out</h4>
38
[% FOREACH issueloo IN issueloop %]
38
[% FOREACH issueloo IN issueloop %]
39
[% IF ( issueloo.red ) %][% ELSE %]
39
[% IF ( issueloo.red ) %][% ELSE %]
40
<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber | html %]&amp;biblionumber=[% issueloo.biblionumber | html %]&amp;bi=[% issueloo.biblioitemnumber | html %]">[% issueloo.title | html %]</a><br />
40
<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber | uri %]&amp;biblionumber=[% issueloo.biblionumber | uri %]&amp;bi=[% issueloo.biblioitemnumber | uri %]">[% issueloo.title | html %]</a><br />
41
Barcode: [% issueloo.barcode | html %]<br />
41
Barcode: [% issueloo.barcode | html %]<br />
42
Date due: [% issueloo.date_due | html %]<br /></p>
42
Date due: [% issueloo.date_due | html %]<br /></p>
43
    [% END %]
43
    [% END %]
Lines 51-57 Date due: [% issueloo.date_due | html %]<br /></p> Link Here
51
<h4>Overdues</h4>
51
<h4>Overdues</h4>
52
    [% FOREACH issueloo IN issueloop %]
52
    [% FOREACH issueloo IN issueloop %]
53
    [% IF ( issueloo.red ) %]
53
    [% IF ( issueloo.red ) %]
54
<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber | html %]&amp;biblionumber=[% issueloo.biblionumber | html %]&amp;bi=[% issueloo.biblioitemnumber | html %]">[% issueloo.title | html %]</a><br />
54
<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber | uri %]&amp;biblionumber=[% issueloo.biblionumber | uri %]&amp;bi=[% issueloo.biblioitemnumber | uri %]">[% issueloo.title | html %]</a><br />
55
Barcode: [% issueloo.barcode | html %]<br />
55
Barcode: [% issueloo.barcode | html %]<br />
56
Date due: [% issueloo.date_due | html %]</p>
56
Date due: [% issueloo.date_due | html %]</p>
57
[% END %]
57
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-9 / +9 lines)
Lines 92-98 Link Here
92
                                                [% patron_message.message_date | $KohaDates %]
92
                                                [% patron_message.message_date | $KohaDates %]
93
                                                [% Branches.GetName( patron_message.branchcode ) | html %]
93
                                                [% Branches.GetName( patron_message.branchcode ) | html %]
94
                                                [% IF patron_message.manager_id %]
94
                                                [% IF patron_message.manager_id %]
95
                                                    ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron_message.manager_id | html %]">[% patron_message.get_column('manager_firstname') | html %] [% patron_message.get_column('manager_surname') | html %]</a> )
95
                                                    ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron_message.manager_id | uri %]">[% patron_message.get_column('manager_firstname') | html %] [% patron_message.get_column('manager_surname') | html %]</a> )
96
                                                [% END %]
96
                                                [% END %]
97
                                                <i>"[% patron_message.message | html %]"</i>
97
                                                <i>"[% patron_message.message | html %]"</i>
98
                                            </span>
98
                                            </span>
Lines 173-191 Link Here
173
                                        [% IF ( patron.phone ) %]
173
                                        [% IF ( patron.phone ) %]
174
                                            <li>
174
                                            <li>
175
                                                <span class="label">Primary phone: </span>
175
                                                <span class="label">Primary phone: </span>
176
                                                <a href="tel:[% patron.phone | html %]">[% patron.phone | html %]</a>
176
                                                <a href="tel:[% patron.phone | uri %]">[% patron.phone | html %]</a>
177
                                            </li>
177
                                            </li>
178
                                        [% END %]
178
                                        [% END %]
179
                                        [% IF ( patron.phonepro ) %]
179
                                        [% IF ( patron.phonepro ) %]
180
                                            <li>
180
                                            <li>
181
                                                <span class="label">Secondary phone: </span>
181
                                                <span class="label">Secondary phone: </span>
182
                                                <a href="tel:[% patron.phonepro | html %]">[% patron.phonepro | html %]</a>
182
                                                <a href="tel:[% patron.phonepro | uri %]">[% patron.phonepro | html %]</a>
183
                                            </li>
183
                                            </li>
184
                                        [% END %]
184
                                        [% END %]
185
                                        [% IF ( patron.mobile ) %]
185
                                        [% IF ( patron.mobile ) %]
186
                                            <li>
186
                                            <li>
187
                                                <span class="label">Other phone: </span>
187
                                                <span class="label">Other phone: </span>
188
                                                <a href="tel:[% patron.mobile | html %]">[% patron.mobile | html %]</a>
188
                                                <a href="tel:[% patron.mobile | uri %]">[% patron.mobile | html %]</a>
189
                                            </li>
189
                                            </li>
190
                                        [% END %]
190
                                        [% END %]
191
                                        [% IF ( patron.fax ) %]
191
                                        [% IF ( patron.fax ) %]
Lines 232-238 Link Here
232
                                                <ul>
232
                                                <ul>
233
                                                    [% FOREACH guarantee IN guarantees %]
233
                                                    [% FOREACH guarantee IN guarantees %]
234
                                                        [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
234
                                                        [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
235
                                                            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | html %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></li>
235
                                                            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | uri %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></li>
236
                                                        [% ELSE %]
236
                                                        [% ELSE %]
237
                                                            <li>[% guarantee.firstname | html %] [% guarantee.surname | html %]</li>
237
                                                            <li>[% guarantee.firstname | html %] [% guarantee.surname | html %]</li>
238
                                                        [% END %]
238
                                                        [% END %]
Lines 243-249 Link Here
243
                                            <li>
243
                                            <li>
244
                                                <span class="label">Guarantor:</span>
244
                                                <span class="label">Guarantor:</span>
245
                                                [% IF guarantor.borrowernumber AND logged_in_user.can_see_patron_infos( guarantor ) %]
245
                                                [% IF guarantor.borrowernumber AND logged_in_user.can_see_patron_infos( guarantor ) %]
246
                                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber | html %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a>
246
                                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber | uri %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a>
247
                                                [% ELSE %]
247
                                                [% ELSE %]
248
                                                    [% guarantor.firstname | html %] [% guarantor.surname | html %]
248
                                                    [% guarantor.firstname | html %] [% guarantor.surname | html %]
249
                                                [% END %]
249
                                                [% END %]
Lines 382-388 Link Here
382
                                            <ol>
382
                                            <ol>
383
                                                <li>
383
                                                <li>
384
                                                    <span class="label">SMS number:</span>
384
                                                    <span class="label">SMS number:</span>
385
                                                    <a href="sms:[% patron.smsalertnumber | html %]">[% patron.smsalertnumber | html %]</a>
385
                                                    <a href="sms:[% patron.smsalertnumber | uri %]">[% patron.smsalertnumber | html %]</a>
386
                                                </li>
386
                                                </li>
387
                                            </ol>
387
                                            </ol>
388
                                        </div>
388
                                        </div>
Lines 476-482 Link Here
476
                                            [% IF ( patron.password ) %]
476
                                            [% IF ( patron.password ) %]
477
                                                *******
477
                                                *******
478
                                            [% ELSE %]
478
                                            [% ELSE %]
479
                                                <span class="problem"><a href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | html %]">Undefined</a></span>
479
                                                <span class="problem"><a href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | uri %]">Undefined</a></span>
480
                                            [% END %]
480
                                            [% END %]
481
                                        </li>
481
                                        </li>
482
482
Lines 537-543 Link Here
537
                                            [% IF ( patron.B_phone ) %]
537
                                            [% IF ( patron.B_phone ) %]
538
                                                <li>
538
                                                <li>
539
                                                    <span class="label">Phone: </span>
539
                                                    <span class="label">Phone: </span>
540
                                                    <a href="tel:[% patron.B_phone | html %]">[% patron.B_phone |html  %]</a>
540
                                                    <a href="tel:[% patron.B_phone | uri %]">[% patron.B_phone |html  %]</a>
541
                                                </li>
541
                                                </li>
542
                                            [% END %]
542
                                            [% END %]
543
543
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-4 / +4 lines)
Lines 26-35 Link Here
26
<!-- The manual invoice and credit buttons -->
26
<!-- The manual invoice and credit buttons -->
27
<div class="statictabs">
27
<div class="statictabs">
28
<ul>
28
<ul>
29
    <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Account</a></li>
29
    <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account</a></li>
30
    <li class="active"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]" >Pay fines</a></li>
30
    <li class="active"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Pay fines</a></li>
31
    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual invoice</a></li>
31
    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a></li>
32
    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual credit</a></li>
32
    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a></li>
33
</ul>
33
</ul>
34
<div class="tabs-container">
34
<div class="tabs-container">
35
35
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-5 / +5 lines)
Lines 16-22 Link Here
16
<div id="breadcrumbs">
16
<div id="breadcrumbs">
17
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
17
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
18
    <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> &rsaquo;
18
    <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> &rsaquo;
19
    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]">Pay fines for [% patron.firstname | html %] [% patron.surname | html %]</a> &rsaquo;
19
    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">Pay fines for [% patron.firstname | html %] [% patron.surname | html %]</a> &rsaquo;
20
    [% IF    ( pay_individual )      %]Pay an individual fine
20
    [% IF    ( pay_individual )      %]Pay an individual fine
21
    [% ELSIF ( writeoff_individual ) %]Write off an individual fine
21
    [% ELSIF ( writeoff_individual ) %]Write off an individual fine
22
    [% ELSE %]
22
    [% ELSE %]
Lines 41-56 Link Here
41
<div class="statictabs">
41
<div class="statictabs">
42
<ul>
42
<ul>
43
    <li>
43
    <li>
44
    <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Account</a>
44
    <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account</a>
45
    </li>
45
    </li>
46
    <li class="active">
46
    <li class="active">
47
    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]" >Pay fines</a>
47
    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Pay fines</a>
48
    </li>
48
    </li>
49
    <li>
49
    <li>
50
    <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual invoice</a>
50
    <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a>
51
    </li>
51
    </li>
52
    <li>
52
    <li>
53
    <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual credit</a>
53
    <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a>
54
    </li>
54
    </li>
55
</ul>
55
</ul>
56
<div class="tabs-container">
56
<div class="tabs-container">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt (-1 / +1 lines)
Lines 50-56 Link Here
50
                                    <p>
50
                                    <p>
51
                                        <strong>
51
                                        <strong>
52
                                            [% IF ( CAN_user_catalogue ) %]
52
                                            [% IF ( CAN_user_catalogue ) %]
53
                                                <a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% s.suggestionid | html %]&amp;op=show">[% s.title | html %]</a>
53
                                                <a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% s.suggestionid | uri %]&amp;op=show">[% s.title | html %]</a>
54
                                            [% ELSE %]
54
                                            [% ELSE %]
55
                                                [% s.title | html %]
55
                                                [% s.title | html %]
56
                                            [% END %]
56
                                            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt (-1 / +1 lines)
Lines 72-78 Link Here
72
          <td>
72
          <td>
73
            <span title="[% issue.issuestimestamp | html %]">[% issue.issuestimestamp | $KohaDates with_hours => 1 | html %]</span>
73
            <span title="[% issue.issuestimestamp | html %]">[% issue.issuestimestamp | $KohaDates with_hours => 1 | html %]</span>
74
          </td>
74
          </td>
75
          <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issue.biblionumber | html %]">[% issue.title | html %]</a></td>
75
          <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issue.biblionumber | uri %]">[% issue.title | html %]</a></td>
76
76
77
          <td>[% issue.author | html %]</td>
77
          <td>[% issue.author | html %]</td>
78
78
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt (-2 / +2 lines)
Lines 53-59 Link Here
53
        [% FOREACH routinglist IN routinglists %]
53
        [% FOREACH routinglist IN routinglists %]
54
            <tr>
54
            <tr>
55
                <td>
55
                <td>
56
                    <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% routinglist.subscription.subscriptionid | html %]">
56
                    <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% routinglist.subscription.subscriptionid | uri %]">
57
                        [% routinglist.subscription.biblio.title | html %]
57
                        [% routinglist.subscription.biblio.title | html %]
58
                    </a>
58
                    </a>
59
                </td>
59
                </td>
Lines 61-67 Link Here
61
                    [% routinglist.ranking | html %]
61
                    [% routinglist.ranking | html %]
62
                </td>
62
                </td>
63
                <td>
63
                <td>
64
                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% routinglist.subscription.subscriptionid | html %]">
64
                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% routinglist.subscription.subscriptionid | uri %]">
65
                        Edit routing list
65
                        Edit routing list
66
                    </a>
66
                    </a>
67
                    <input type="hidden" name="biblionumber" value="[% routinglist.subscription.biblionumber | html %]" />
67
                    <input type="hidden" name="biblionumber" value="[% routinglist.subscription.biblionumber | html %]" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt (-2 / +2 lines)
Lines 53-59 Link Here
53
                            </td>
53
                            </td>
54
			                <td>
54
			                <td>
55
                                [% IF ( operation.biblionumber ) %]
55
                                [% IF ( operation.biblionumber ) %]
56
			                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% operation.biblionumber | html %]" title="[% operation.bibliotitle | html %]">[% operation.barcode | html %]</a>
56
			                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% operation.biblionumber | uri %]" title="[% operation.bibliotitle | html %]">[% operation.barcode | html %]</a>
57
			                    [% ELSE %]
57
			                    [% ELSE %]
58
			                        <span class="error">[% operation.barcode | html %]</span>
58
			                        <span class="error">[% operation.barcode | html %]</span>
59
			                    [% END %]
59
			                    [% END %]
Lines 61-67 Link Here
61
			                <td>
61
			                <td>
62
			                [% IF ( operation.actionissue || operation.actionpayment) %]
62
			                [% IF ( operation.actionissue || operation.actionpayment) %]
63
		                        [% IF ( operation.borrowernumber ) %]
63
		                        [% IF ( operation.borrowernumber ) %]
64
		                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% operation.borrowernumber | html %]" title="[% operation.borrower | html %]">[% operation.cardnumber | html %]</a>
64
		                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% operation.borrowernumber | uri %]" title="[% operation.borrower | html %]">[% operation.cardnumber | html %]</a>
65
		                        [% ELSE %]
65
		                        [% ELSE %]
66
		                            <span class="error">[% operation.cardnumber | html %]</span>
66
		                            <span class="error">[% operation.cardnumber | html %]</span>
67
		                        [% END %]
67
		                        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt (-4 / +4 lines)
Lines 26-35 Link Here
26
	</div>
26
	</div>
27
	[% END %]
27
	[% END %]
28
	[% IF ( message.ERROR_no_borrower_from_item ) %]<p>Warning: Unable to determine patron from item barcode ([% message.badbarcode | html %]). Cannot check in.</p>[% END %]
28
	[% IF ( message.ERROR_no_borrower_from_item ) %]<p>Warning: Unable to determine patron from item barcode ([% message.badbarcode | html %]). Cannot check in.</p>[% END %]
29
    [% IF ( message.issue ) %]<p>Checked out <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | html %]">[% message.title | html %]</a> ([% message.barcode | html %]) to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
29
    [% IF ( message.issue ) %]<p>Checked out <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.title | html %]</a> ([% message.barcode | html %]) to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
30
    [% IF ( message.renew ) %]<p>Renewed <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | html %]">[% message.title | html %]</a>  ([% message.barcode | html %]) for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
30
    [% IF ( message.renew ) %]<p>Renewed <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.title | html %]</a>  ([% message.barcode | html %]) for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
31
    [% IF ( message.return ) %]<p>Checked in <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | html %]">[% message.title | html %]</a> ([% message.barcode | html %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
31
    [% IF ( message.return ) %]<p>Checked in <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.title | html %]</a> ([% message.barcode | html %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
32
	[% IF ( message.payment ) %]<p>Accepted payment ([% message.amount | html %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
32
	[% IF ( message.payment ) %]<p>Accepted payment ([% message.amount | html %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | uri %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
33
  [% END %]
33
  [% END %]
34
[% ELSE %]
34
[% ELSE %]
35
   <h2>Upload offline circulation data</h2>
35
   <h2>Upload offline circulation data</h2>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt (-1 / +1 lines)
Lines 138-144 Link Here
138
                                <input type="hidden" id="borrowernumber_[% p.patron_list_patron_id | html %]" value="[% p.borrowernumber.id | html %]" />
138
                                <input type="hidden" id="borrowernumber_[% p.patron_list_patron_id | html %]" value="[% p.borrowernumber.id | html %]" />
139
                            </td>
139
                            </td>
140
                            <td>
140
                            <td>
141
                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% p.borrowernumber.borrowernumber | html %]">
141
                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% p.borrowernumber.borrowernumber | uri %]">
142
                                    [% p.borrowernumber.cardnumber | html %]
142
                                    [% p.borrowernumber.cardnumber | html %]
143
                                </a>
143
                                </a>
144
                            </td>
144
                            </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt (-5 / +5 lines)
Lines 42-48 Link Here
42
                [% FOREACH l IN lists %]
42
                [% FOREACH l IN lists %]
43
                    [% SET shared_by_other = l.owner.id != logged_in_user.id %]
43
                    [% SET shared_by_other = l.owner.id != logged_in_user.id %]
44
                    <tr>
44
                    <tr>
45
                        <td><a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | html %]">[% l.name | html %]</a></td>
45
                        <td><a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | uri %]">[% l.name | html %]</a></td>
46
                        <td>[% l.patron_list_patrons_rs.count || 0 | html %]</td>
46
                        <td>[% l.patron_list_patrons_rs.count || 0 | html %]</td>
47
                        <td>
47
                        <td>
48
                            [% IF l.shared %]
48
                            [% IF l.shared %]
Lines 59-67 Link Here
59
                                   Actions <b class="caret"></b>
59
                                   Actions <b class="caret"></b>
60
                                </a>
60
                                </a>
61
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id | html %]">
61
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id | html %]">
62
                                    <li><a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | html %]"><i class="fa fa-user"></i> Add patrons</a></li>
62
                                    <li><a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | uri %]"><i class="fa fa-user"></i> Add patrons</a></li>
63
                                    [% UNLESS shared_by_other %]
63
                                    [% UNLESS shared_by_other %]
64
                                        <li><a href="/cgi-bin/koha/patron_lists/add-modify.pl?patron_list_id=[% l.patron_list_id | html %]"><i class="fa fa-pencil"></i> Edit list</a></li>
64
                                        <li><a href="/cgi-bin/koha/patron_lists/add-modify.pl?patron_list_id=[% l.patron_list_id | uri %]"><i class="fa fa-pencil"></i> Edit list</a></li>
65
                                        <li><a class="delete_patron" href="/cgi-bin/koha/patron_lists/delete.pl?patron_list_id=[% l.patron_list_id | html %]" data-list-name="[% l.name | html %]"><i class="fa fa-trash"></i> Delete list</a></li>
65
                                        <li><a class="delete_patron" href="/cgi-bin/koha/patron_lists/delete.pl?patron_list_id=[% l.patron_list_id | html %]" data-list-name="[% l.name | html %]"><i class="fa fa-trash"></i> Delete list</a></li>
66
                                    [% END %]
66
                                    [% END %]
67
                                    [% IF ( l.patron_list_patrons_rs.count ) %]
67
                                    [% IF ( l.patron_list_patrons_rs.count ) %]
Lines 71-84 Link Here
71
                                        </li>
71
                                        </li>
72
                                        [% IF CAN_user_tools_edit_patrons %]
72
                                        [% IF CAN_user_tools_edit_patrons %]
73
                                            <li>
73
                                            <li>
74
                                                <a href="/cgi-bin/koha/tools/modborrowers.pl?patron_list_id=[% l.patron_list_id | html %]&op=show">
74
                                                <a href="/cgi-bin/koha/tools/modborrowers.pl?patron_list_id=[% l.patron_list_id | uri %]&op=show">
75
                                                    <i class="fa fa-pencil"></i> Batch edit patrons
75
                                                    <i class="fa fa-pencil"></i> Batch edit patrons
76
                                                </a>
76
                                                </a>
77
                                            </li>
77
                                            </li>
78
                                        [% END %]
78
                                        [% END %]
79
                                        [% IF CAN_user_tools_delete_anonymize_patrons %]
79
                                        [% IF CAN_user_tools_delete_anonymize_patrons %]
80
                                            <li>
80
                                            <li>
81
                                                <a href="/cgi-bin/koha/tools/cleanborrowers.pl?step=2&patron_list_id=[% l.patron_list_id | html %]&checkbox=borrower">
81
                                                <a href="/cgi-bin/koha/tools/cleanborrowers.pl?step=2&patron_list_id=[% l.patron_list_id | uri %]&checkbox=borrower">
82
                                                    <i class="fa fa-trash"></i> Batch delete patrons
82
                                                    <i class="fa fa-trash"></i> Batch delete patrons
83
                                                </a>
83
                                                </a>
84
                                            </li>
84
                                            </li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt (-3 / +3 lines)
Lines 99-117 Link Here
99
                                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="pluginactions[% plugin.class | html %]">
99
                                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="pluginactions[% plugin.class | html %]">
100
                                                    [% IF ( CAN_user_plugins_report ) %]
100
                                                    [% IF ( CAN_user_plugins_report ) %]
101
                                                        [% IF plugin.can('report') %]
101
                                                        [% IF plugin.can('report') %]
102
                                                            <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | html %]&method=report"><i class="fa fa-table"></i> Run report</a></li>
102
                                                            <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=report"><i class="fa fa-table"></i> Run report</a></li>
103
                                                        [% END %]
103
                                                        [% END %]
104
                                                    [% END %]
104
                                                    [% END %]
105
105
106
                                                    [% IF ( CAN_user_plugins_tool ) %]
106
                                                    [% IF ( CAN_user_plugins_tool ) %]
107
                                                        [% IF plugin.can('tool') %]
107
                                                        [% IF plugin.can('tool') %]
108
                                                            <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | html %]&method=tool"><i class="fa fa-wrench"></i> Run tool</a></li>
108
                                                            <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=tool"><i class="fa fa-wrench"></i> Run tool</a></li>
109
                                                        [% END %]
109
                                                        [% END %]
110
                                                    [% END %]
110
                                                    [% END %]
111
111
112
                                                    [% IF ( CAN_user_plugins_configure ) %]
112
                                                    [% IF ( CAN_user_plugins_configure ) %]
113
                                                        [% IF plugin.can('configure') %]
113
                                                        [% IF plugin.can('configure') %]
114
                                                            <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | html %]&method=configure"><i class="fa fa-cog"></i> Configure</a></li>
114
                                                            <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=configure"><i class="fa fa-cog"></i> Configure</a></li>
115
                                                        [% END %]
115
                                                        [% END %]
116
                                                    [% END %]
116
                                                    [% END %]
117
                                                    [% IF ( CAN_user_plugins_manage ) %]
117
                                                    [% IF ( CAN_user_plugins_manage ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt (-1 / +1 lines)
Lines 76-82 Link Here
76
					[% loopro.rowtitle | html %]</td>
76
					[% loopro.rowtitle | html %]</td>
77
					[% FOREACH loopcel IN loopro.loopcell %]
77
					[% FOREACH loopcel IN loopro.loopcell %]
78
						[% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
78
						[% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
79
							[% IF ( loopcel.reference ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopcel.reference | html %]">[% END %]
79
							[% IF ( loopcel.reference ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopcel.reference | uri %]">[% END %]
80
							[% IF ( loopcel.value ) %][% loopcel.value | html %][% END %]
80
							[% IF ( loopcel.value ) %][% loopcel.value | html %][% END %]
81
							[% IF ( loopcel.reference ) %]</a>[% END %]
81
							[% IF ( loopcel.reference ) %]</a>[% END %]
82
						</td>
82
						</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt (-2 / +2 lines)
Lines 191-197 Link Here
191
        [% FOREACH loopresul IN loopresult %]
191
        [% FOREACH loopresul IN loopresult %]
192
            <tr>
192
            <tr>
193
                <td>[% loopresul.mfirstname | html %] [% loopresul.msurname | html %]</td>
193
                <td>[% loopresul.mfirstname | html %] [% loopresul.msurname | html %]</td>
194
                <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopresul.borrowernumber | html %]">[% loopresul.cardnumber | html %]</a></td>
194
                <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopresul.borrowernumber | uri %]">[% loopresul.cardnumber | html %]</a></td>
195
                <td>[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %]</td>
195
                <td>[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %]</td>
196
                <td>[% loopresul.branchname | html %]</td>
196
                <td>[% loopresul.branchname | html %]</td>
197
                <td>[% loopresul.date | $KohaDates %]</td>
197
                <td>[% loopresul.date | $KohaDates %]</td>
Lines 228-234 Link Here
228
                </td>
228
                </td>
229
                <td>[% loopresul.note | html %]</td>
229
                <td>[% loopresul.note | html %]</td>
230
                <td style="text-align:right;">[% loopresul.amount | $Price %]</td>
230
                <td style="text-align:right;">[% loopresul.amount | $Price %]</td>
231
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber | html %]">[% loopresul.title | html %]</a></td>
231
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber | uri %]">[% loopresul.title | html %]</a></td>
232
                <td>[% loopresul.barcode | html %]</td>
232
                <td>[% loopresul.barcode | html %]</td>
233
                <td>[% ItemTypes.GetDescription(loopresul.itype) | html %]</td>
233
                <td>[% ItemTypes.GetDescription(loopresul.itype) | html %]</td>
234
            </tr>
234
            </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt (-2 / +2 lines)
Lines 39-45 Link Here
39
                <tr><th>Group</th><th>Call number range</th><th>Number of items displayed</th><th>Total items in group</th>
39
                <tr><th>Group</th><th>Call number range</th><th>Number of items displayed</th><th>Total items in group</th>
40
				</tr>
40
				</tr>
41
			[% FOREACH looptable IN mainloo.looptables %]
41
			[% FOREACH looptable IN mainloo.looptables %]
42
				<tr><td><a href="#table[% looptable.coltitle | html %]">[% looptable.coltitle | html %]</a></td>
42
				<tr><td><a href="#table[% looptable.coltitle | uri %]">[% looptable.coltitle | html %]</a></td>
43
					<td>[% IF ( looptable.looptable_count ) %]
43
					<td>[% IF ( looptable.looptable_count ) %]
44
						[% looptable.looptable_first | html %] to [% looptable.looptable_last | html %]
44
						[% looptable.looptable_first | html %] to [% looptable.looptable_last | html %]
45
						[% END %]
45
						[% END %]
Lines 71-77 Link Here
71
						<td>[% loop.count | html %]</td>
71
						<td>[% loop.count | html %]</td>
72
                        <td>[% IF ( loopro.itemcallnumber ) %][% loopro.itemcallnumber | html %][% ELSE %]No call number[% END %]</td>
72
                        <td>[% IF ( loopro.itemcallnumber ) %][% loopro.itemcallnumber | html %][% ELSE %]No call number[% END %]</td>
73
                        <td>[% IF ( loopro.barcode ) %][% loopro.barcode | html %][% ELSE %]No barcode[% END %]</td>
73
                        <td>[% IF ( loopro.barcode ) %][% loopro.barcode | html %][% ELSE %]No barcode[% END %]</td>
74
                        <td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.biblionumber | html %]">[% IF ( loopro.title ) %][% loopro.title | html %][% ELSE %]NO TITLE[% END %]</a> [% IF ( loopro.author ) %] by [% loopro.author | html %][% END %]</p>
74
                        <td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.biblionumber | uri %]">[% IF ( loopro.title ) %][% loopro.title | html %][% ELSE %]NO TITLE[% END %]</a> [% IF ( loopro.author ) %] by [% loopro.author | html %][% END %]</p>
75
                            [% IF ( loopro.branch ) %]at [% Branches.GetName( loopro.branch ) | html %][% END %]
75
                            [% IF ( loopro.branch ) %]at [% Branches.GetName( loopro.branch ) | html %][% END %]
76
						</td>
76
						</td>
77
					</tr>
77
					</tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-6 / +6 lines)
Lines 234-240 canned reports and writing custom SQL reports.</p> Link Here
234
                        </td>
234
                        </td>
235
                        <td class="report_json_url">
235
                        <td class="report_json_url">
236
                        [% IF (savedreport.public) %]
236
                        [% IF (savedreport.public) %]
237
                            <a href="[% OPACBaseURL | html %]/cgi-bin/koha/svc/report?id=[% savedreport.id | uri %]">[% OPACBaseURL | html %]/cgi-bin/koha/svc/report?id=[% savedreport.id | html %]</a>
237
                            <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/svc/report?id=[% savedreport.id | uri %]">[% OPACBaseURL | html %]/cgi-bin/koha/svc/report?id=[% savedreport.id | html %]</a>
238
                        [% ELSE %]
238
                        [% ELSE %]
239
                            <a href="/cgi-bin/koha/svc/report?id=[% savedreport.id | uri %]">[% Koha.Preference('staffClientBaseURL') | html %]/cgi-bin/koha/svc/report?id=[% savedreport.id | html %]</a>
239
                            <a href="/cgi-bin/koha/svc/report?id=[% savedreport.id | uri %]">[% Koha.Preference('staffClientBaseURL') | html %]/cgi-bin/koha/svc/report?id=[% savedreport.id | html %]</a>
240
                        [% END %]
240
                        [% END %]
Lines 242-255 canned reports and writing custom SQL reports.</p> Link Here
242
                        <td>[% savedreport.cache_expiry | html %]</td>
242
                        <td>[% savedreport.cache_expiry | html %]</td>
243
                        <td>
243
                        <td>
244
                            [% FOR result IN savedreport.results %]
244
                            [% FOR result IN savedreport.results %]
245
                                <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=retrieve%20results&amp;id=[% result.id | html %]">[% result.date_run | html %]</a>
245
                                <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=retrieve%20results&amp;id=[% result.id | uri %]">[% result.date_run | html %]</a>
246
                                <br/>
246
                                <br/>
247
                            [% END %]
247
                            [% END %]
248
                        </td>
248
                        </td>
249
                        <td>
249
                        <td>
250
                            [% IF savedreport.seems_obsolete %]
250
                            [% IF savedreport.seems_obsolete %]
251
                                This report seems obsolete, it uses biblioitems.marcxml field.
251
                                This report seems obsolete, it uses biblioitems.marcxml field.
252
                                <a href="/cgi-bin/koha/svc/convert_report?report_id=[% savedreport.id | html %]" data-report_id="[% savedreport.id | html %]" class="update_sql btn btn-default btn-xs" title="Update SQL"><i class="fa fa-eye"></i> Update SQL</a>
252
                                <a href="/cgi-bin/koha/svc/convert_report?report_id=[% savedreport.id | uri %]" data-report_id="[% savedreport.id | html %]" class="update_sql btn btn-default btn-xs" title="Update SQL"><i class="fa fa-eye"></i> Update SQL</a>
253
                            [% END %]
253
                            [% END %]
254
                        </td>
254
                        </td>
255
                        <td>
255
                        <td>
Lines 262-273 canned reports and writing custom SQL reports.</p> Link Here
262
                                       class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id | html %]" role="button" data-toggle="dropdown"
262
                                       class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id | html %]" role="button" data-toggle="dropdown"
263
                                       href="#"><b class="caret"></b></a>
263
                                       href="#"><b class="caret"></b></a>
264
                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]">
264
                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]">
265
                                        <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | html %]&amp;phase=Show%20SQL"><i class="fa fa-search"></i> Show</a></li>
265
                                        <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | uri %]&amp;phase=Show%20SQL"><i class="fa fa-search"></i> Show</a></li>
266
                                        [% IF ( CAN_user_reports_create_reports ) %]
266
                                        [% IF ( CAN_user_reports_create_reports ) %]
267
                                            <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | html %]&amp;phase=Edit%20SQL"><i class="fa fa-pencil"></i> Edit</a></li>
267
                                            <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | uri %]&amp;phase=Edit%20SQL"><i class="fa fa-pencil"></i> Edit</a></li>
268
                                            <li><a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% savedreport.savedsql |uri %]&amp;reportname=[% savedreport.report_name |uri %]&amp;notes=[% savedreport.notes |uri %]"><i class="fa fa-copy"></i> Duplicate</a></li>
268
                                            <li><a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% savedreport.savedsql |uri %]&amp;reportname=[% savedreport.report_name |uri %]&amp;notes=[% savedreport.notes |uri %]"><i class="fa fa-copy"></i> Duplicate</a></li>
269
                                        [% END %]
269
                                        [% END %]
270
                                        <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id | html %]"><i class="fa fa-clock-o"></i> Schedule</a></li>
270
                                        <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id | uri %]"><i class="fa fa-clock-o"></i> Schedule</a></li>
271
                                        [% IF ( CAN_user_reports_delete_reports ) %]
271
                                        [% IF ( CAN_user_reports_delete_reports ) %]
272
                                            <li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | html %]&amp;phase=Delete%20Saved"><i class="fa fa-trash"></i> Delete</a></li>
272
                                            <li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | html %]&amp;phase=Delete%20Saved"><i class="fa fa-trash"></i> Delete</a></li>
273
                                        [% END %]
273
                                        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt (-2 / +2 lines)
Lines 98-110 Link Here
98
                            </td>
98
                            </td>
99
                        [% END %]
99
                        [% END %]
100
                        <td>
100
                        <td>
101
                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber | html %]" title="[% item.itemnotes | html %]">[% item.biblio.title | html %]</a>
101
                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber | uri %]" title="[% item.itemnotes | html %]">[% item.biblio.title | html %]</a>
102
                        </td>
102
                        </td>
103
                        <td>[% item.biblio.author | html %]</td>
103
                        <td>[% item.biblio.author | html %]</td>
104
                        <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => item.itemlost ) | html %]
104
                        <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => item.itemlost ) | html %]
105
                        <td><span title="[% item.itemlost_on | html %]">[% item.itemlost_on | $KohaDates %]</span></td>
105
                        <td><span title="[% item.itemlost_on | html %]">[% item.itemlost_on | $KohaDates %]</span></td>
106
                        <td>
106
                        <td>
107
                            <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% item.biblionumber | html %]" title="[% item.itemnotes | html %]">[% item.barcode | html %]</a>
107
                            <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% item.biblionumber | uri %]" title="[% item.itemnotes | html %]">[% item.barcode | html %]</a>
108
                        </td>
108
                        </td>
109
                        <td>[% item.itemcallnumber | html %]</td>
109
                        <td>[% item.itemcallnumber | html %]</td>
110
                        <td><span title="[% item.datelastseen | html %]">[% item.datelastseen | $KohaDates %]</span></td>
110
                        <td><span title="[% item.datelastseen | html %]">[% item.datelastseen | $KohaDates %]</span></td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt (-2 / +2 lines)
Lines 59-68 Link Here
59
            [% ELSE %] <tr>
59
            [% ELSE %] <tr>
60
            [% END %]
60
            [% END %]
61
            <td>[% ordersloo.budget_name | html %]</td>
61
            <td>[% ordersloo.budget_name | html %]</td>
62
            <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ordersloo.basketno | html %]"> [% ordersloo.basketno | html %]</a></td>
62
            <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ordersloo.basketno | uri %]"> [% ordersloo.basketno | html %]</a></td>
63
            <td>[% ordersloo.basketname | html %]</td>
63
            <td>[% ordersloo.basketname | html %]</td>
64
            <td>[% ordersloo.authorisedbyname | html %]</td>
64
            <td>[% ordersloo.authorisedbyname | html %]</td>
65
            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber | html %]"> [% ordersloo.title | html %]</a></td>
65
            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber | uri %]"> [% ordersloo.title | html %]</a></td>
66
            <td>[% ordersloo.currency | html %]</td>
66
            <td>[% ordersloo.currency | html %]</td>
67
            <td>[% ordersloo.listprice | $Price %]</td>
67
            <td>[% ordersloo.listprice | $Price %]</td>
68
            <td>[% ordersloo.rrp | $Price %]</td>
68
            <td>[% ordersloo.rrp | $Price %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt (-1 / +1 lines)
Lines 52-58 Link Here
52
                        <td>[% loopro.rowtitle_display or "UNKNOWN VALUE" | html %]</td>
52
                        <td>[% loopro.rowtitle_display or "UNKNOWN VALUE" | html %]</td>
53
                    [% FOREACH loopcel IN loopro.loopcell %]
53
                    [% FOREACH loopcel IN loopro.loopcell %]
54
						<td align="center">
54
						<td align="center">
55
						[% IF ( loopcel.url_complement ) %]<a href="reserves_stats.pl?output=[% loopcel.output | html %]&amp;[% loopcel.url_complement | html %]">[% loopcel.value | html %]</a>[% ELSE %][% loopcel.value | html %][% END %]
55
						[% IF ( loopcel.url_complement ) %]<a href="reserves_stats.pl?output=[% loopcel.output | uri %]&amp;[% loopcel.url_complement | uri %]">[% loopcel.value | html %]</a>[% ELSE %][% loopcel.value | html %][% END %]
56
						</td>
56
						</td>
57
                    [% END %]
57
                    [% END %]
58
						<td align="center">[% loopro.totalrow | html %]</td>
58
						<td align="center">[% loopro.totalrow | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt (-2 / +2 lines)
Lines 41-48 Link Here
41
		<tbody>
41
		<tbody>
42
			<tr>
42
			<tr>
43
				[% FOREACH data IN datas %]
43
				[% FOREACH data IN datas %]
44
                    <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% data.aqbooksellerid | html %]">[% data.name | html %]</a></td>
44
                    <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% data.aqbooksellerid | uri %]">[% data.name | html %]</a></td>
45
                    <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% data.subscriptionid | html %]">[% data.title | html %]</a></td>
45
                    <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% data.subscriptionid | uri %]">[% data.title | html %]</a></td>
46
					<td>[% data.subscriptionid | html %]</td>
46
					<td>[% data.subscriptionid | html %]</td>
47
                    <td>[% Branches.GetName( data.branchcode ) | html %]</td>
47
                    <td>[% Branches.GetName( data.branchcode ) | html %]</td>
48
					<td>[% data.callnumber | html %]</td>
48
					<td>[% data.callnumber | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-17 / +17 lines)
Lines 96-124 Link Here
96
      <h3>Cannot place hold</h3>
96
      <h3>Cannot place hold</h3>
97
      <ul>
97
      <ul>
98
        [% IF ( exceeded_maxreserves ) %]
98
        [% IF ( exceeded_maxreserves ) %]
99
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% maxreserves | html %] total holds.</li>
99
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% maxreserves | html %] total holds.</li>
100
        [% ELSIF ( exceeded_holds_per_record ) %]
100
        [% ELSIF ( exceeded_holds_per_record ) %]
101
          <li><strong>Too many holds for this record: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li>
101
          <li><strong>Too many holds for this record: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li>
102
        [% ELSIF ( alreadypossession ) %]
102
        [% ELSIF ( alreadypossession ) %]
103
          <li> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %]</a> <strong>is already in possession</strong> of one item.</li>
103
          <li> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> <strong>is already in possession</strong> of one item.</li>
104
        [% ELSIF ( alreadyreserved ) %]
104
        [% ELSIF ( alreadyreserved ) %]
105
          <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %]</a> <strong>already has a hold</strong> on this item.</li>
105
          <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> <strong>already has a hold</strong> on this item.</li>
106
        [% ELSIF ( ageRestricted ) %]
106
        [% ELSIF ( ageRestricted ) %]
107
          <li><strong>Age restricted</strong></li>
107
          <li><strong>Age restricted</strong></li>
108
        [% ELSIF ( none_available ) %]
108
        [% ELSIF ( none_available ) %]
109
          <li> <strong>No items are available</strong> to be placed on hold.</li>
109
          <li> <strong>No items are available</strong> to be placed on hold.</li>
110
        [% ELSIF ( maxreserves ) %]
110
        [% ELSIF ( maxreserves ) %]
111
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] </a> has too many holds.</li>
111
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> has too many holds.</li>
112
        [% END %]
112
        [% END %]
113
      </ul>
113
      </ul>
114
    [% ELSE %]
114
    [% ELSE %]
115
        <h3>Cannot place hold on some items</h3>
115
        <h3>Cannot place hold on some items</h3>
116
        [% IF ( exceeded_maxreserves ) %]
116
        [% IF ( exceeded_maxreserves ) %]
117
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can place [% new_reserves_allowed | html %] of the requested [% new_reserves_count | html %] holds for a maximum of [% maxreserves | html %] total holds.</li>
117
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can place [% new_reserves_allowed | html %] of the requested [% new_reserves_count | html %] holds for a maximum of [% maxreserves | html %] total holds.</li>
118
        [% ELSIF ( exceeded_holds_per_record ) %]
118
        [% ELSIF ( exceeded_holds_per_record ) %]
119
            [% FOREACH biblioloo IN biblioloop %]
119
            [% FOREACH biblioloo IN biblioloop %]
120
                [% IF (biblioloo.tooManyHoldsForThisRecord) %]
120
                [% IF (biblioloo.tooManyHoldsForThisRecord) %]
121
                    <li><strong>Too many holds for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | html %]"> [% biblioloo.title | html %]</a>: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li>
121
                    <li><strong>Too many holds for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]"> [% biblioloo.title | html %]</a>: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li>
122
                [% END %]
122
                [% END %]
123
            [% END %]
123
            [% END %]
124
        [% END %]
124
        [% END %]
Lines 130-148 Link Here
130
[% IF ( expiry || diffbranch || patron.is_debarred || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %]
130
[% IF ( expiry || diffbranch || patron.is_debarred || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %]
131
<div class="dialog message"><ul>
131
<div class="dialog message"><ul>
132
    [% IF ( expiry ) %]
132
    [% IF ( expiry ) %]
133
    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Account has expired</strong></li>
133
    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Account has expired</strong></li>
134
    [% END %]
134
    [% END %]
135
135
136
    [% IF patron.is_debarred %]
136
    [% IF patron.is_debarred %]
137
    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]#reldebarments">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Patron has restrictions</strong></li>
137
    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]#reldebarments">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Patron has restrictions</strong></li>
138
    [% END %]
138
    [% END %]
139
139
140
    [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %]
140
    [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %]
141
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Patron has outstanding fines: [% amount_outstanding | format('%.2f') %]</strong></li>
141
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Patron has outstanding fines: [% amount_outstanding | format('%.2f') %]</strong></li>
142
    [% END %]
142
    [% END %]
143
143
144
    [% IF ( diffbranch ) %]
144
    [% IF ( diffbranch ) %]
145
    <li> <strong>Pickup library is different. </strong>Patron: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %]</a> Patron's home library: ([% Branches.GetName(patron.branchcode) | html %] / [% patron.branchcode | html %] )</li>
145
    <li> <strong>Pickup library is different. </strong>Patron: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> Patron's home library: ([% Branches.GetName(patron.branchcode) | html %] / [% patron.branchcode | html %] )</li>
146
    [% END %]
146
    [% END %]
147
147
148
</ul></div>
148
</ul></div>
Lines 180-186 Link Here
180
180
181
       <ol> <li><span class="label">Patron:</span>
181
       <ol> <li><span class="label">Patron:</span>
182
            [% IF ( patron.borrowernumber ) %]
182
            [% IF ( patron.borrowernumber ) %]
183
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a>
183
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a>
184
            [% ELSE %]
184
            [% ELSE %]
185
                Not defined yet
185
                Not defined yet
186
            [% END %]
186
            [% END %]
Lines 394-400 Link Here
394
                            Can't be cancelled when item is in transit
394
                            Can't be cancelled when item is in transit
395
                    [% ELSE %]
395
                    [% ELSE %]
396
                    [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
396
                    [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
397
                    [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedFor.borrowernumber | html %]">[% itemloo.ReservedFor.firstname | html %] [% itemloo.ReservedFor.surname | html %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %]
397
                    [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedFor.borrowernumber | uri %]">[% itemloo.ReservedFor.firstname | html %] [% itemloo.ReservedFor.surname | html %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %]
398
                    since
398
                    since
399
                    [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate | html %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber | html %]&amp;CancelBorrowerNumber=[% itemloo.ReservedFor.borrowernumber | html %]&amp;CancelItemnumber=[% itemloo.itemnumber | html %]"  onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);">Cancel hold</a>
399
                    [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate | html %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber | html %]&amp;CancelBorrowerNumber=[% itemloo.ReservedFor.borrowernumber | html %]&amp;CancelItemnumber=[% itemloo.itemnumber | html %]"  onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);">Cancel hold</a>
400
400
Lines 419-425 Link Here
419
        </table>
419
        </table>
420
    [% IF ( bibitemloo.hiddencount ) %]
420
    [% IF ( bibitemloo.hiddencount ) %]
421
        <form>
421
        <form>
422
        <p class="hiddencount"><a href="request.pl?biblionumber=[% bibitemloo.biblionumber | html %]&amp;borrowernumber=[% bibitemloo.borrowernumber | html %]&amp;showallitems=1">Show all items ([% bibitemloo.hiddencount | html %] hidden)</a></p>
422
        <p class="hiddencount"><a href="request.pl?biblionumber=[% bibitemloo.biblionumber | uri %]&amp;borrowernumber=[% bibitemloo.borrowernumber | uri %]&amp;showallitems=1">Show all items ([% bibitemloo.hiddencount | html %] hidden)</a></p>
423
        </form>
423
        </form>
424
    [% END %] <!-- hiddencount -->
424
    [% END %] <!-- hiddencount -->
425
    [% END %] <!-- bibitemloop -->
425
    [% END %] <!-- bibitemloop -->
Lines 443-449 Link Here
443
        [% END %]
443
        [% END %]
444
          <td>
444
          <td>
445
            <ul>
445
            <ul>
446
              <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | html %]">[% biblioloo.title | html %]</a></li>
446
              <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]">[% biblioloo.title | html %]</a></li>
447
              [% IF ( biblioloo.publicationyear ) %]
447
              [% IF ( biblioloo.publicationyear ) %]
448
                <li><span class="label">Publication year:</span> [% biblioloo.publicationyear | html %]</li>
448
                <li><span class="label">Publication year:</span> [% biblioloo.publicationyear | html %]</li>
449
              [% END %]
449
              [% END %]
Lines 470-476 Link Here
470
            [% END %]
470
            [% END %]
471
471
472
          [% IF ( biblioloo.alreadyres ) %]
472
          [% IF ( biblioloo.alreadyres ) %]
473
              <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %]</a> <strong>already has a hold</strong> on this item </li>
473
              <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> <strong>already has a hold</strong> on this item </li>
474
          [% END %]
474
          [% END %]
475
          [% IF ( biblioloo.none_avail ) %]
475
          [% IF ( biblioloo.none_avail ) %]
476
              <li> <strong>No items are available</strong> to be placed on hold</li>
476
              <li> <strong>No items are available</strong> to be placed on hold</li>
Lines 521-527 Link Here
521
                    [% IF ( biblioloo.reserveloop ) %]
521
                    [% IF ( biblioloo.reserveloop ) %]
522
                        [% IF ( multi_hold ) %]
522
                        [% IF ( multi_hold ) %]
523
                            <h3>
523
                            <h3>
524
                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | html %]">
524
                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">
525
                                    [% biblioloo.title | html %]
525
                                    [% biblioloo.title | html %]
526
                                </a>
526
                                </a>
527
                            </h3>
527
                            </h3>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt (-4 / +4 lines)
Lines 47-63 Link Here
47
    <tbody>[% FOREACH review IN reviews %]
47
    <tbody>[% FOREACH review IN reviews %]
48
    <tr>
48
    <tr>
49
        <td>
49
        <td>
50
            [% IF ( review.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% review.borrowernumber | html %]">[% review.patron.surname | html %], [% review.patron.firstname | html %]</a>[% ELSE %](deleted patron)[% END %]
50
            [% IF ( review.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% review.borrowernumber | uri %]">[% review.patron.surname | html %], [% review.patron.firstname | html %]</a>[% ELSE %](deleted patron)[% END %]
51
        </td>
51
        </td>
52
        <td>
52
        <td>
53
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% review.biblionumber | html %]">[% review.bibliotitle | html %]</a>
53
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% review.biblionumber | uri %]">[% review.bibliotitle | html %]</a>
54
        </td>
54
        </td>
55
        <td>
55
        <td>
56
            [% review.review | html %]
56
            [% review.review | html %]
57
        </td>
57
        </td>
58
        <td>
58
        <td>
59
            [% IF ( status ) %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=unapprove&amp;reviewid=[% review.reviewid | html %]" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Unapprove</a>[% ELSE %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&amp;reviewid=[% review.reviewid | html %]" class="btn btn-default btn-xs"><i class="fa fa-check"></i> Approve</a>[% END %]
59
            [% IF ( status ) %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=unapprove&amp;reviewid=[% review.reviewid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Unapprove</a>[% ELSE %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&amp;reviewid=[% review.reviewid | html %]" class="btn btn-default btn-xs"><i class="fa fa-check"></i> Approve</a>[% END %]
60
            <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=delete&amp;reviewid=[% review.reviewid | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a>
60
            <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=delete&amp;reviewid=[% review.reviewid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a>
61
        </td>
61
        </td>
62
    </tr>
62
    </tr>
63
    [% END %]</tbody>
63
    [% END %]</tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt (-1 / +1 lines)
Lines 106-112 Link Here
106
                        <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = collectionItemsLoo.biblionumber %][% collectionItemsLoo.title | html %]</a></td>
106
                        <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = collectionItemsLoo.biblionumber %][% collectionItemsLoo.title | html %]</a></td>
107
                        <td>[% collectionItemsLoo.itemcallnumber | html %]</td>
107
                        <td>[% collectionItemsLoo.itemcallnumber | html %]</td>
108
                        <td>[% collectionItemsLoo.barcode | html %]</td>
108
                        <td>[% collectionItemsLoo.barcode | html %]</td>
109
                        <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId | html %]&amp;barcode=[% collectionItemsLoo.barcode | html %]&amp;removeItem=1&amp;action=addItem">Remove</a></td>
109
                        <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId | uri %]&amp;barcode=[% collectionItemsLoo.barcode | uri %]&amp;removeItem=1&amp;action=addItem">Remove</a></td>
110
                      </tr>
110
                      </tr>
111
                    [% END %]
111
                    [% END %]
112
                  </table>
112
                  </table>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt (-1 / +1 lines)
Lines 19-25 Link Here
19
    [%- IF ( action == "new" ) %]
19
    [%- IF ( action == "new" ) %]
20
        Add a new collection
20
        Add a new collection
21
    [% ELSE %]
21
    [% ELSE %]
22
        <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% editColId | html %]">Collection <i>[% editColTitle | html %]</i></a> &rsaquo; Edit
22
        <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% editColId | uri %]">Collection <i>[% editColTitle | html %]</i></a> &rsaquo; Edit
23
    [% END -%]
23
    [% END -%]
24
</div>
24
</div>
25
25
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt (-4 / +4 lines)
Lines 36-42 Link Here
36
                            <tbody>
36
                            <tbody>
37
                            [% FOREACH collectionsLoo IN collectionsLoop %]
37
                            [% FOREACH collectionsLoo IN collectionsLoop %]
38
                                <tr>
38
                                <tr>
39
                                    <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | html %]">[% collectionsLoo.colTitle | html %]</a></td>
39
                                    <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | uri %]">[% collectionsLoo.colTitle | html %]</a></td>
40
                                    <td>[% collectionsLoo.colDesc | html %]</td>
40
                                    <td>[% collectionsLoo.colDesc | html %]</td>
41
                                    <td>[% Branches.GetName( collectionsLoo.colBranchcode ) | html %]</td>
41
                                    <td>[% Branches.GetName( collectionsLoo.colBranchcode ) | html %]</td>
42
                                    <td>
42
                                    <td>
Lines 44-52 Link Here
44
                                        <a class="btn btn-default btn-xs" dropdown-toggle" id="collectionsactions[% collectionsLoo.colId | html %]" role="button" data-toggle="dropdown" href="#">
44
                                        <a class="btn btn-default btn-xs" dropdown-toggle" id="collectionsactions[% collectionsLoo.colId | html %]" role="button" data-toggle="dropdown" href="#">
45
                                        Actions <b class="caret"></b></a>
45
                                        Actions <b class="caret"></b></a>
46
                                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="collectionsactions[% collectionsLoo.colId | html %]">
46
                                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="collectionsactions[% collectionsLoo.colId | html %]">
47
                                            <li><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | html %]"><i class="fa fa-plus"></i> Add or remove items</a></li>
47
                                            <li><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-plus"></i> Add or remove items</a></li>
48
                                            <li><a href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% collectionsLoo.colId | html %]"><i class="fa fa-exchange"></i> Transfer</a></li>
48
                                            <li><a href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-exchange"></i> Transfer</a></li>
49
                                            <li><a href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% collectionsLoo.colId | html %]"><i class="fa fa-pencil"></i> Edit</a></li>
49
                                            <li><a href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
50
                                            <li><a class="confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% collectionsLoo.colId | html %]"><i class="fa fa-trash"></i> Delete</a></li>
50
                                            <li><a class="confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% collectionsLoo.colId | html %]"><i class="fa fa-trash"></i> Delete</a></li>
51
                                        </ul>
51
                                        </ul>
52
                                    </div>
52
                                    </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt (-2 / +2 lines)
Lines 111-118 Link Here
111
                [% subscriptions_loo.expirationdate | $KohaDates %]
111
                [% subscriptions_loo.expirationdate | $KohaDates %]
112
            </td>
112
            </td>
113
            <td class="actions">
113
            <td class="actions">
114
                <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptions_loo.subscriptionid | html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
114
                <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptions_loo.subscriptionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
115
                <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscriptions_loo.subscriptionid | html %]" data-subscriptionid="[% subscriptions_loo.subscriptionid | html %]" class="btn btn-default btn-xs renew_subscription"><i class="fa fa-refresh"></i> Renew</a>
115
                <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscriptions_loo.subscriptionid | uri %]" data-subscriptionid="[% subscriptions_loo.subscriptionid | html %]" class="btn btn-default btn-xs renew_subscription"><i class="fa fa-refresh"></i> Renew</a>
116
            </td>
116
            </td>
117
        </tr>
117
        </tr>
118
    [% END %]
118
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt (-1 / +1 lines)
Lines 130-136 Link Here
130
                            <span class="branch-[% missingissue.branchcode | html %]">[% Branches.GetName( missingissue.branchcode ) | html %]</span>
130
                            <span class="branch-[% missingissue.branchcode | html %]">[% Branches.GetName( missingissue.branchcode ) | html %]</span>
131
                        </td>
131
                        </td>
132
                        <td>
132
                        <td>
133
                        <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% missingissue.subscriptionid | html %]">[% missingissue.title | html %]</a>
133
                        <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% missingissue.subscriptionid | uri %]">[% missingissue.title | html %]</a>
134
                        </td>
134
                        </td>
135
                        <td>[% missingissue.issn | html %]</td>
135
                        <td>[% missingissue.issn | html %]</td>
136
                        <td>[% missingissue.serialseq | html %]</td>
136
                        <td>[% missingissue.serialseq | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt (-1 / +1 lines)
Lines 74-80 Link Here
74
    <p style="margin-left:10em;">
74
    <p style="margin-left:10em;">
75
        <a href="#" id="add_recipients"><i class="fa fa-plus"></i> Add recipients</a>
75
        <a href="#" id="add_recipients"><i class="fa fa-plus"></i> Add recipients</a>
76
        [% IF memberloop %]
76
        [% IF memberloop %]
77
            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | html %]&amp;op=delete"><i class="fa fa-trash"></i> Delete all</a>
77
            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]&amp;op=delete"><i class="fa fa-trash"></i> Delete all</a>
78
        [% END %]
78
        [% END %]
79
    </p>
79
    </p>
80
</li>
80
</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt (-4 / +4 lines)
Lines 50-56 Link Here
50
</tr>
50
</tr>
51
[% FOREACH subscription IN subscriptions %]
51
[% FOREACH subscription IN subscriptions %]
52
    <tr>
52
    <tr>
53
        <td><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | html %]"># [% subscription.subscriptionid | html %]</a> </td>
53
        <td><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]"># [% subscription.subscriptionid | html %]</a> </td>
54
        <td>[% subscription.frequency.description | html %]</td>
54
        <td>[% subscription.frequency.description | html %]</td>
55
        <td>[% subscription.numberpattern.label | html %]</td>
55
        <td>[% subscription.numberpattern.label | html %]</td>
56
        <td>[% IF subscription.branchcode %][% Branches.GetName( subscription.branchcode ) | html %][% END %]</td>
56
        <td>[% IF subscription.branchcode %][% Branches.GetName( subscription.branchcode ) | html %][% END %]</td>
Lines 88-94 Link Here
88
[% END %]
88
[% END %]
89
[% IF ( subscr ) %]
89
[% IF ( subscr ) %]
90
[% IF ( subscriptioncount > 1 ) %]
90
[% IF ( subscriptioncount > 1 ) %]
91
<tr ><td colspan="8">  <a href="serials-collection.pl?biblionumber=[% biblionumber | html %]">See any subscription attached to this biblio</a></td>
91
<tr ><td colspan="8">  <a href="serials-collection.pl?biblionumber=[% biblionumber | uri %]">See any subscription attached to this biblio</a></td>
92
</tr>
92
</tr>
93
[% END %]
93
[% END %]
94
[% END %]
94
[% END %]
Lines 104-110 Link Here
104
            [% IF year.year == 'manage' %]
104
            [% IF year.year == 'manage' %]
105
                <li><a href="#subscription-year-manage">Manage</a></li>
105
                <li><a href="#subscription-year-manage">Manage</a></li>
106
            [% ELSE %]
106
            [% ELSE %]
107
                <li><a href="#subscription-year-[% year.year | html %]">[% year.year | html %]</a></li>
107
                <li><a href="#subscription-year-[% year.year | uri %]">[% year.year | html %]</a></li>
108
            [% END %]
108
            [% END %]
109
        [% END %]
109
        [% END %]
110
    [% END %]
110
    [% END %]
Lines 174-180 Link Here
174
                </td>
174
                </td>
175
            [% END %]
175
            [% END %]
176
[% IF ( subscriptions.size > 1 ) %]
176
[% IF ( subscriptions.size > 1 ) %]
177
                 <td><a href="serials-collection.pl?subscriptionid=[% serial.subscriptionid | html %]">[% serial.subscriptionid | html %]</a></td>
177
                 <td><a href="serials-collection.pl?subscriptionid=[% serial.subscriptionid | uri %]">[% serial.subscriptionid | html %]</a></td>
178
[% END %]
178
[% END %]
179
                <td>
179
                <td>
180
                    <span title="[% serial.publisheddate | html %]">
180
                    <span title="[% serial.publisheddate | html %]">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt (-3 / +3 lines)
Lines 441-455 $(document).ready(function() { Link Here
441
[% INCLUDE 'serials-menu.inc' %]
441
[% INCLUDE 'serials-menu.inc' %]
442
<ul>
442
<ul>
443
    [% FOREACH subscription IN subscriptions %]
443
    [% FOREACH subscription IN subscriptions %]
444
        <li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid | html %]" title="serial collection for [% subscription.bibliotitle | html %]">Serial collection #[% subscription.subscriptionid | html %]</a></li>
444
        <li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]" title="serial collection for [% subscription.bibliotitle | html %]">Serial collection #[% subscription.subscriptionid | html %]</a></li>
445
        <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | html %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid | html %]</a></li>
445
        <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid | html %]</a></li>
446
        [% IF ( subscription.abouttoexpire ) %]
446
        [% IF ( subscription.abouttoexpire ) %]
447
          [% UNLESS subscription.closed %]
447
          [% UNLESS subscription.closed %]
448
            <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid | html %])">Renew #[% subscription.subscriptionid | html %]</a></li>
448
            <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid | html %])">Renew #[% subscription.subscriptionid | html %]</a></li>
449
          [% END %]
449
          [% END %]
450
        [% END %]
450
        [% END %]
451
    [% END %]
451
    [% END %]
452
    <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view | html %].pl?biblionumber=[% biblionumber | html %]" title="go to [% bibliotitle | html %]">Show biblio</a></li></ul>
452
    <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view | uri %].pl?biblionumber=[% biblionumber | uri %]" title="go to [% bibliotitle | html %]">Show biblio</a></li></ul>
453
</div>
453
</div>
454
</div>
454
</div>
455
[% INCLUDE 'intranet-bottom.inc' %]
455
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt (-6 / +6 lines)
Lines 98-104 Link Here
98
            [% IF ( subscription.issn ) %][% subscription.issn | html %]
98
            [% IF ( subscription.issn ) %][% subscription.issn | html %]
99
            [% END %]
99
            [% END %]
100
            </td>
100
            </td>
101
            <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | html %]" class="button" title="subscription detail">[% subscription.title | html %]</a>
101
            <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]" class="button" title="subscription detail">[% subscription.title | html %]</a>
102
            </td>
102
            </td>
103
            <td>[% IF ( subscription.publicnotes ) %][% subscription.publicnotes | html %][% END %]
103
            <td>[% IF ( subscription.publicnotes ) %][% subscription.publicnotes | html %][% END %]
104
            [% IF ( subscription.internalnotes ) %]([% subscription.internalnotes | html %])[% END %]
104
            [% IF ( subscription.internalnotes ) %]([% subscription.internalnotes | html %])[% END %]
Lines 141-153 Link Here
141
                            [% IF ( routing && CAN_user_serials_routing ) %]
141
                            [% IF ( routing && CAN_user_serials_routing ) %]
142
                                [% UNLESS ( subscription.cannotedit ) %]
142
                                [% UNLESS ( subscription.cannotedit ) %]
143
                                    <li>
143
                                    <li>
144
                                        <a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid | html %]&amp;op=reopen&amp;routing=[% subscription.routing | html %]&amp;searched=1&amp;title_filter=[% title_filter | uri %]&amp;ISSN_filter=[% ISSN_filter | uri %]&amp;EAN_filter=[% EAN_filter | uri %]&amp;published_filter=[% publisher_filter | uri %]&amp;bookseller_filter=[% bookseller_filter | uri %]&amp;branch_filter=[% branch_filter | uri %]" id="reopensub"> <i class="fa fa-repeat"></i> Reopen</a>
144
                                        <a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid | uri %]&amp;op=reopen&amp;routing=[% subscription.routing | uri %]&amp;searched=1&amp;title_filter=[% title_filter | uri %]&amp;ISSN_filter=[% ISSN_filter | uri %]&amp;EAN_filter=[% EAN_filter | uri %]&amp;published_filter=[% publisher_filter | uri %]&amp;bookseller_filter=[% bookseller_filter | uri %]&amp;branch_filter=[% branch_filter | uri %]" id="reopensub"> <i class="fa fa-repeat"></i> Reopen</a>
145
                                    </li>
145
                                    </li>
146
                                [% END %]
146
                                [% END %]
147
                            [% END # IF ( routing && CAN_user_serials_routing ) %]
147
                            [% END # IF ( routing && CAN_user_serials_routing ) %]
148
148
149
                            <li>
149
                            <li>
150
                                <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid | html %]"><i class="fa fa-list-alt"></i> Issue history</a>
150
                                <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]"><i class="fa fa-list-alt"></i> Issue history</a>
151
                            </li>
151
                            </li>
152
152
153
                        </ul>
153
                        </ul>
Lines 170-187 Link Here
170
                                [% ELSE %]
170
                                [% ELSE %]
171
                                    [% IF ( subscription.routingedit ) %]
171
                                    [% IF ( subscription.routingedit ) %]
172
                                        <li>
172
                                        <li>
173
                                            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid | html %]"><i class="fa fa-pencil"></i> Edit routing list ([% subscription.routingedit | html %])</a>
173
                                            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid | uri %]"><i class="fa fa-pencil"></i> Edit routing list ([% subscription.routingedit | html %])</a>
174
                                        </li>
174
                                        </li>
175
                                    [% ELSE %]
175
                                    [% ELSE %]
176
                                        <li>
176
                                        <li>
177
                                            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid | html %]&amp;op=new"> <i class="fa fa-plus"></i> New routing list</a>
177
                                            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid | uri %]&amp;op=new"> <i class="fa fa-plus"></i> New routing list</a>
178
                                        </li>
178
                                        </li>
179
                                    [% END %]
179
                                    [% END %]
180
                                [% END %]
180
                                [% END %]
181
                            [% END # IF ( routing && CAN_user_serials_routing ) %]
181
                            [% END # IF ( routing && CAN_user_serials_routing ) %]
182
182
183
                            <li>
183
                            <li>
184
                                <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid | html %]"><i class="fa fa-list-alt"></i> Issue history</a>
184
                                <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]"><i class="fa fa-list-alt"></i> Issue history</a>
185
                            </li>
185
                            </li>
186
                        </ul>
186
                        </ul>
187
                        </div>
187
                        </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt (-2 / +2 lines)
Lines 47-54 Link Here
47
                                [% FOREACH subscription IN subscriptions %]
47
                                [% FOREACH subscription IN subscriptions %]
48
                                    <tr>
48
                                    <tr>
49
                                        <td>[% subscription.biblio.biblioitem.issn | html %]</td>
49
                                        <td>[% subscription.biblio.biblioitem.issn | html %]</td>
50
                                        <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | html %]">[% subscription.biblio.title | html %] (#[% subscription.subscriptionid | html %])</a></td>
50
                                        <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]">[% subscription.biblio.title | html %] (#[% subscription.subscriptionid | html %])</a></td>
51
                                        <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% subscription.vendor.id | html %]">[% subscription.vendor.name | html %]</a></td>
51
                                        <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% subscription.vendor.id | uri %]">[% subscription.vendor.name | html %]</a></td>
52
                                        <td>[% AuthorisedValues.GetByCode('LOC', subscription.location) | html %]</td>
52
                                        <td>[% AuthorisedValues.GetByCode('LOC', subscription.location) | html %]</td>
53
                                        <td>[% Branches.GetName(subscription.branchcode) | html %]</td>
53
                                        <td>[% Branches.GetName(subscription.branchcode) | html %]</td>
54
                                        <td>[% ItemTypes.GetDescription( subscription.itemtype ) | html %]</td>
54
                                        <td>[% ItemTypes.GetDescription( subscription.itemtype ) | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-5 / +5 lines)
Lines 74-81 Link Here
74
		<ol>
74
		<ol>
75
		<li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li>
75
		<li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li>
76
        <li><span class="label">Librarian identity:</span> [% librarian | html %]</li>
76
        <li><span class="label">Librarian identity:</span> [% librarian | html %]</li>
77
        <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid | html %]">[% aqbooksellername | html %]</a></li>
77
        <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li>
78
        <li><span class="label">Biblio:</span>  <a href="/cgi-bin/koha/catalogue/[% default_bib_view | html %].pl?biblionumber=[% bibnum | html %]">[% bibliotitle | html %]</a> <i>([% bibnum | html %])</i></li>
78
        <li><span class="label">Biblio:</span>  <a href="/cgi-bin/koha/catalogue/[% default_bib_view | uri %].pl?biblionumber=[% bibnum | uri %]">[% bibliotitle | html %]</a> <i>([% bibnum | html %])</i></li>
79
        [% IF ( OPACBaseURL ) %]
79
        [% IF ( OPACBaseURL ) %]
80
            <li>
80
            <li>
81
                <span class="label">OPAC view:</span>
81
                <span class="label">OPAC view:</span>
Lines 110-116 Link Here
110
        [% IF ( letter ) %]
110
        [% IF ( letter ) %]
111
            <li>
111
            <li>
112
                <span class="label">Patron notification:</span> [% letter | html %]
112
                <span class="label">Patron notification:</span> [% letter | html %]
113
                (<a href="/cgi-bin/koha/serials/viewalerts.pl?subscriptionid=[% subscriptionid | html %]">subscribers</a>)
113
                (<a href="/cgi-bin/koha/serials/viewalerts.pl?subscriptionid=[% subscriptionid | uri %]">subscribers</a>)
114
            </li>
114
            </li>
115
        [% END %]
115
        [% END %]
116
        [% IF ( hasRouting ) %]<li><span class="label">Routing:</span> yes</li>[% END %]
116
        [% IF ( hasRouting ) %]<li><span class="label">Routing:</span> yes</li>[% END %]
Lines 154-160 Link Here
154
            <li>
154
            <li>
155
              <span class="label">Manual history: </span>
155
              <span class="label">Manual history: </span>
156
                [% IF ( manualhistory ) %]
156
                [% IF ( manualhistory ) %]
157
                    Enabled <a href="/cgi-bin/koha/serials/subscription-history.pl?subscriptionid=[% subscriptionid | html %]">Edit history</a>
157
                    Enabled <a href="/cgi-bin/koha/serials/subscription-history.pl?subscriptionid=[% subscriptionid | uri %]">Edit history</a>
158
                [% ELSE %]
158
                [% ELSE %]
159
                    Disabled
159
                    Disabled
160
                [% END %]
160
                [% END %]
Lines 367-373 Link Here
367
                        <td>
367
                        <td>
368
                        [% IF order.invoice %]
368
                        [% IF order.invoice %]
369
                            [% IF CAN_user_acquisition %]
369
                            [% IF CAN_user_acquisition %]
370
                                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | html %]" title="Invoice detail page">
370
                                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]" title="Invoice detail page">
371
                                   [% order.invoice.invoicenumber | html %]</a>
371
                                   [% order.invoice.invoicenumber | html %]</a>
372
                            [% ELSE %]
372
                            [% ELSE %]
373
                                [% order.invoice.invoicenumber | html %]
373
                                [% order.invoice.invoicenumber | html %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt (-1 / +1 lines)
Lines 107-113 Link Here
107
                <ul id="blocking_subs" style="display:none">
107
                <ul id="blocking_subs" style="display:none">
108
                    [% FOREACH sub IN subscriptions %]
108
                    [% FOREACH sub IN subscriptions %]
109
                        <li style="list-style-type:none">
109
                        <li style="list-style-type:none">
110
                            <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | html %]">[% sub.title | html %]</a>
110
                            <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | uri %]">[% sub.title | html %]</a>
111
                        </li>
111
                        </li>
112
                    [% END %]
112
                    [% END %]
113
                </ul>
113
                </ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt (-1 / +1 lines)
Lines 243-249 Link Here
243
                <ul id="blocking_subs" style="display:none">
243
                <ul id="blocking_subs" style="display:none">
244
                    [% FOREACH sub IN subscriptions %]
244
                    [% FOREACH sub IN subscriptions %]
245
                        <li style="list-style-type:none">
245
                        <li style="list-style-type:none">
246
                            <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | html %]">[% sub.title | html %]</a>
246
                            <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | uri %]">[% sub.title | html %]</a>
247
                        </li>
247
                        </li>
248
                    [% END %]
248
                    [% END %]
249
                </ul>
249
                </ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt (-2 / +2 lines)
Lines 16-22 Link Here
16
<h1>Alert subscribers for <i>[% bibliotitle | html %]</i></h1>
16
<h1>Alert subscribers for <i>[% bibliotitle | html %]</i></h1>
17
17
18
<p>
18
<p>
19
    <span class="label">Subscription:</span> <a href="subscription-detail.pl?subscriptionid=[% subscriptionid | html %]">[% bibliotitle | html %] #[% subscriptionid | html %]</a>
19
    <span class="label">Subscription:</span> <a href="subscription-detail.pl?subscriptionid=[% subscriptionid | uri %]">[% bibliotitle | html %] #[% subscriptionid | html %]</a>
20
</p>
20
</p>
21
21
22
[% IF subscribers.count %]
22
[% IF subscribers.count %]
Lines 27-33 Link Here
27
        [% FOREACH subscriber IN subscribers %]
27
        [% FOREACH subscriber IN subscribers %]
28
        <tr>
28
        <tr>
29
            <td>
29
            <td>
30
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% subscriber.borrowernumber | html %]">[% INCLUDE 'patron-title.inc' patron=subscriber %]</a>
30
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% subscriber.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' patron=subscriber %]</a>
31
            </td>
31
            </td>
32
        </tr>
32
        </tr>
33
        [% END %]
33
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-11 / +11 lines)
Lines 162-168 Link Here
162
                <td>[% suggesteddate | $KohaDates %]</td>
162
                <td>[% suggesteddate | $KohaDates %]</td>
163
                <td>
163
                <td>
164
                    [% IF ( suggestedby_borrowernumber ) %]
164
                    [% IF ( suggestedby_borrowernumber ) %]
165
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | html %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a>
165
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | uri %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a>
166
                        [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %])
166
                        [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %])
167
                    [% END %]
167
                    [% END %]
168
                </td>
168
                </td>
Lines 172-178 Link Here
172
                <td>[% manageddate | $KohaDates %]</td>
172
                <td>[% manageddate | $KohaDates %]</td>
173
                <td>
173
                <td>
174
                        [% IF ( managedby_borrowernumber ) %]
174
                        [% IF ( managedby_borrowernumber ) %]
175
                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber | html %]">[% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a>
175
                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber | uri %]">[% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a>
176
                            [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %])
176
                            [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %])
177
                        [% END %]
177
                        [% END %]
178
                </td>
178
                </td>
Lines 182-188 Link Here
182
                <td>[% accepteddate | $KohaDates %]</td>
182
                <td>[% accepteddate | $KohaDates %]</td>
183
                <td>
183
                <td>
184
                    [% IF ( acceptedby_borrowernumber ) %]
184
                    [% IF ( acceptedby_borrowernumber ) %]
185
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber | html %]">[% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a>
185
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber | uri %]">[% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a>
186
                        [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %])
186
                        [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %])
187
                    [% END %]
187
                    [% END %]
188
                </td>
188
                </td>
Lines 347-364 Link Here
347
            <tr>
347
            <tr>
348
                <th><label for="suggesteddate">Created by:</label> </th>
348
                <th><label for="suggesteddate">Created by:</label> </th>
349
                <td><input type="text" id="suggesteddate" name="suggesteddate" class="datepicker" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/>[% INCLUDE 'date-format.inc' %]</td>
349
                <td><input type="text" id="suggesteddate" name="suggesteddate" class="datepicker" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/>[% INCLUDE 'date-format.inc' %]</td>
350
                <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby | html %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | html %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a>  [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %])[% END %]
350
                <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby | html %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | uri %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a>  [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %])[% END %]
351
                </td>
351
                </td>
352
            </tr>
352
            </tr>
353
            <tr>
353
            <tr>
354
                <th><label for="managedon">Managed by:</label> </th>
354
                <th><label for="managedon">Managed by:</label> </th>
355
                <td><input type="text" id="managedon" name="manageddate" class="datepicker" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td>
355
                <td><input type="text" id="managedon" name="manageddate" class="datepicker" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td>
356
                <td><input type="hidden" id="managedby" name="managedby" value="[% managedby | html %]"/>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber | html %]">[% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %])[% END %]</td>
356
                <td><input type="hidden" id="managedby" name="managedby" value="[% managedby | html %]"/>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber | uri %]">[% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %])[% END %]</td>
357
            </tr>
357
            </tr>
358
            <tr>
358
            <tr>
359
                <th><label for="accepteddate">Accepted on:</label> </th>
359
                <th><label for="accepteddate">Accepted on:</label> </th>
360
                <td><input type="text" id="accepteddate" name="accepteddate" class="datepicker" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td>
360
                <td><input type="text" id="accepteddate" name="accepteddate" class="datepicker" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td>
361
                <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby | html %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber | html %]">[% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %])[% END %]</td>
361
                <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby | html %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber | uri %]">[% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %])[% END %]</td>
362
            </tr>
362
            </tr>
363
            </tbody>
363
            </tbody>
364
        </table></li></ol>
364
        </table></li></ol>
Lines 434-440 Link Here
434
    <ul class="ui-tabs-nav">
434
    <ul class="ui-tabs-nav">
435
        [% FOREACH suggestion IN suggestions %]
435
        [% FOREACH suggestion IN suggestions %]
436
                <li>
436
                <li>
437
            <a href="#[% suggestion.suggestiontype | html %]">
437
            <a href="#[% suggestion.suggestiontype | uri %]">
438
            [% IF ( suggestion.suggestiontypelabel ) %]
438
            [% IF ( suggestion.suggestiontypelabel ) %]
439
                [% IF (suggestion.suggestiontypelabel == "Pending") %]Pending
439
                [% IF (suggestion.suggestiontypelabel == "Pending") %]Pending
440
                [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]Accepted
440
                [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]Accepted
Lines 483-489 Link Here
483
                    <input type="checkbox" name="edit_field" value="[% suggestions_loo.suggestionid | html %]" />
483
                    <input type="checkbox" name="edit_field" value="[% suggestions_loo.suggestionid | html %]" />
484
                </td>
484
                </td>
485
                <td>
485
                <td>
486
                    <a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid | html %]&amp;op=show" title="suggestion" >
486
                    <a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid | uri %]&amp;op=show" title="suggestion" >
487
                        [% suggestions_loo.title | html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author | html %][% END %]</a>
487
                        [% suggestions_loo.title | html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author | html %][% END %]</a>
488
                    <br />
488
                    <br />
489
                    [% IF ( suggestions_loo.copyrightdate ) %]&copy; [% suggestions_loo.copyrightdate | html %] [% END %]
489
                    [% IF ( suggestions_loo.copyrightdate ) %]&copy; [% suggestions_loo.copyrightdate | html %] [% END %]
Lines 491-501 Link Here
491
                        [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn | html %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode | html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear | html %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place | html %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle | html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) | html %] [% END %]<br />[% IF ( suggestions_loo.note ) %]<span class="note">[% suggestions_loo.note | html %]</span>[% END %]
491
                        [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn | html %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode | html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear | html %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place | html %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle | html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) | html %] [% END %]<br />[% IF ( suggestions_loo.note ) %]<span class="note">[% suggestions_loo.note | html %]</span>[% END %]
492
                </td>
492
                </td>
493
                <td>
493
                <td>
494
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby | html %]">[% suggestions_loo.surnamesuggestedby | html %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby | html %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby | html %])[% END %]</a>
494
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby | uri %]">[% suggestions_loo.surnamesuggestedby | html %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby | html %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby | html %])[% END %]</a>
495
                    [% IF ( suggestions_loo.suggesteddate ) %] - [% suggestions_loo.suggesteddate | $KohaDates %][% END %]
495
                    [% IF ( suggestions_loo.suggesteddate ) %] - [% suggestions_loo.suggesteddate | $KohaDates %][% END %]
496
                </td>
496
                </td>
497
                <td>
497
                <td>
498
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby | html %]">[% suggestions_loo.surnamemanagedby | html %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby | html %][% END %]</a>
498
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby | uri %]">[% suggestions_loo.surnamemanagedby | html %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby | html %][% END %]</a>
499
                    [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate | $KohaDates %][% END %]
499
                    [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate | $KohaDates %][% END %]
500
                </td>
500
                </td>
501
                <td>
501
                <td>
Lines 578-584 Link Here
578
578
579
            <span id="other_reason[% suggestion.suggestiontype | html %]">
579
            <span id="other_reason[% suggestion.suggestiontype | html %]">
580
                <input type="text" size="31" id="select-other_reason[% suggestion.suggestiontype | html %]" name="other_reason[% suggestion.suggestiontype | html %]" placeholder="please note your reason here..." />
580
                <input type="text" size="31" id="select-other_reason[% suggestion.suggestiontype | html %]" name="other_reason[% suggestion.suggestiontype | html %]" placeholder="please note your reason here..." />
581
                <a href="#back[% suggestion.suggestiontype | html %]">Cancel</a>
581
                <a href="#back[% suggestion.suggestiontype | uri %]">Cancel</a>
582
            </span>
582
            </span>
583
583
584
            <strong style="padding: 0 1em;">OR:</strong>
584
            <strong style="padding: 0 1em;">OR:</strong>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt (-1 / +1 lines)
Lines 41-47 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
41
            [% IF ( title.notes ) %]
41
            [% IF ( title.notes ) %]
42
            <p>[% title.notes | html %]</p>[% END %]
42
            <p>[% title.notes | html %]</p>[% END %]
43
            [% IF ( title.TagLoop ) %]<p style="font-size:90%"><strong>Tagged with:</strong> [% FOREACH TagLoo IN title.TagLoop %]
43
            [% IF ( title.TagLoop ) %]<p style="font-size:90%"><strong>Tagged with:</strong> [% FOREACH TagLoo IN title.TagLoop %]
44
            <a href="/cgi-bin/koha/tags/list.pl?tag=[% TagLoo.term | html %]">[% TagLoo.term | html %]</a> <span class="weight">([% TagLoo.weight_total | html %])</span>[% IF ( loop.last ) %][% ELSE %], [% END %]
44
            <a href="/cgi-bin/koha/tags/list.pl?tag=[% TagLoo.term | uri %]">[% TagLoo.term | html %]</a> <span class="weight">([% TagLoo.weight_total | html %])</span>[% IF ( loop.last ) %][% ELSE %], [% END %]
45
            [% END %]</p>
45
            [% END %]</p>
46
            [% END %]
46
            [% END %]
47
            </td>
47
            </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt (-1 / +1 lines)
Lines 119-125 tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } Link Here
119
                [% END %]
119
                [% END %]
120
                </span>
120
                </span>
121
            </td>
121
            </td>
122
            <td>[% IF ( tagloo.approved_by_name ) %]<a href="/cgi-bin/koha/tags/review.pl?approved_by=[% tagloo.approved_by | html %]&amp;approved=all">[% tagloo.approved_by_name | html %]</a>[% ELSE %]&nbsp;[% END %]
122
            <td>[% IF ( tagloo.approved_by_name ) %]<a href="/cgi-bin/koha/tags/review.pl?approved_by=[% tagloo.approved_by | uri %]&amp;approved=all">[% tagloo.approved_by_name | html %]</a>[% ELSE %]&nbsp;[% END %]
123
            </td>
123
            </td>
124
            [% ELSE %]
124
            [% ELSE %]
125
            <td class="actions"><span class="ajax_buttons" style="visibility:hidden">
125
            <td class="actions"><span class="ajax_buttons" style="visibility:hidden">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt (-5 / +5 lines)
Lines 105-111 Link Here
105
            </thead>
105
            </thead>
106
            <tbody>
106
            <tbody>
107
            [% FOREACH item_loo IN item_loop %] <tr> [% IF ( show ) %][% IF ( item_loo.nomod ) %] <td class="error">Cannot edit</td>[% ELSE %]<td><input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber | html %]" id="row[% item_loo.itemnumber | html %]" checked="checked" /></td>[% END %][% END %]
107
            [% FOREACH item_loo IN item_loop %] <tr> [% IF ( show ) %][% IF ( item_loo.nomod ) %] <td class="error">Cannot edit</td>[% ELSE %]<td><input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber | html %]" id="row[% item_loo.itemnumber | html %]" checked="checked" /></td>[% END %][% END %]
108
            <td><label for="row[% item_loo.itemnumber | html %]"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber | html %]">[% item_loo.title | html %]</a>[% IF ( item_loo.author ) %], by [% item_loo.author | html %][% END %]</label></td>
108
            <td><label for="row[% item_loo.itemnumber | html %]"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber | uri %]">[% item_loo.title | html %]</a>[% IF ( item_loo.author ) %], by [% item_loo.author | html %][% END %]</label></td>
109
            [% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field | html %]</td>
109
            [% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field | html %]</td>
110
                    [% END %] </tr>
110
                    [% END %] </tr>
111
            [% END %]
111
            [% END %]
Lines 118-124 Link Here
118
    <ul>
118
    <ul>
119
    [% FOREACH simple_items_displa IN simple_items_display %]
119
    [% FOREACH simple_items_displa IN simple_items_display %]
120
        <li>
120
        <li>
121
            <a href="[% simple_items_displa.itemnumber | html %]">[% simple_items_displa.barcode | html %]</a>
121
            <a href="[% simple_items_displa.itemnumber | uri %]">[% simple_items_displa.barcode | html %]</a>
122
        </li>
122
        </li>
123
    [% END %]
123
    [% END %]
124
    </ul>
124
    </ul>
Lines 162-170 Link Here
162
            <p>[% deleted_items | html %] item(s) deleted.</p>
162
            <p>[% deleted_items | html %] item(s) deleted.</p>
163
            [% IF delete_records %] <p>[% deleted_records | html %] record(s) deleted.</p> [% END %]
163
            [% IF delete_records %] <p>[% deleted_records | html %] record(s) deleted.</p> [% END %]
164
            [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%]
164
            [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%]
165
                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]">Return to the record</a>
165
                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a>
166
            [% ELSIF src %]
166
            [% ELSIF src %]
167
                <a href="[% src | html %]">Return to where you were</a>
167
                <a href="[% src | uri %]">Return to where you were</a>
168
            [% ELSE %]
168
            [% ELSE %]
169
                <a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Return to batch item deletion</a>
169
                <a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Return to batch item deletion</a>
170
            [% END %]
170
            [% END %]
Lines 185-191 Link Here
185
            [% FOREACH not_deleted_loo IN not_deleted_loop %]
185
            [% FOREACH not_deleted_loo IN not_deleted_loop %]
186
            <tr>
186
            <tr>
187
                <td>[% not_deleted_loo.itemnumber | html %]</td>
187
                <td>[% not_deleted_loo.itemnumber | html %]</td>
188
                <td>[% IF ( CAN_user_editcatalogue_edit_items ) %]<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=[% not_deleted_loo.biblionumber | html %]&amp;itemnumber=[% not_deleted_loo.itemnumber | html %]">[% not_deleted_loo.barcode | html %]</a>[% ELSE %][% not_deleted_loo.barcode | html %][% END %]</td>
188
                <td>[% IF ( CAN_user_editcatalogue_edit_items ) %]<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=[% not_deleted_loo.biblionumber | uri %]&amp;itemnumber=[% not_deleted_loo.itemnumber | uri %]">[% not_deleted_loo.barcode | html %]</a>[% ELSE %][% not_deleted_loo.barcode | html %][% END %]</td>
189
                <td>[% IF ( not_deleted_loo.book_on_loan ) %]Item is checked out[% ELSIF ( not_deleted_loo.book_reserved ) %]Item has a waiting hold[% END %]</td>
189
                <td>[% IF ( not_deleted_loo.book_on_loan ) %]Item is checked out[% ELSIF ( not_deleted_loo.book_reserved ) %]Item has a waiting hold[% END %]</td>
190
            </tr>
190
            </tr>
191
            [% END %]
191
            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt (-4 / +4 lines)
Lines 77-85 $(document).ready(function(){ Link Here
77
                [% END %]
77
                [% END %]
78
              <fieldset class="action">
78
              <fieldset class="action">
79
                  [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%]
79
                  [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%]
80
                      <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]">Return to the record</a>
80
                      <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a>
81
                  [% ELSIF src %]
81
                  [% ELSIF src %]
82
                      <a href="[% src | html %]">Return to where you were</a>
82
                      <a href="[% src | uri %]">Return to where you were</a>
83
                  [% ELSE %]
83
                  [% ELSE %]
84
                      <a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a>
84
                      <a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a>
85
                  [% END %]
85
                  [% END %]
Lines 175-181 $(document).ready(function(){ Link Here
175
                [% ELSE %]
175
                [% ELSE %]
176
                  <td>&nbsp;</td>
176
                  <td>&nbsp;</td>
177
                [% END %]
177
                [% END %]
178
                <td><label for="row[% item_loo.itemnumber | html %]"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber | html %]">[% item_loo.title | html %]</a>[% IF ( item_loo.author ) %], by [% item_loo.author | html %][% END %]</label></td>
178
                <td><label for="row[% item_loo.itemnumber | html %]"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber | uri %]">[% item_loo.title | html %]</a>[% IF ( item_loo.author ) %], by [% item_loo.author | html %][% END %]</label></td>
179
                [% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field | html %]</td>
179
                [% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field | html %]</td>
180
        [% END %] </tr>
180
        [% END %] </tr>
181
            [% END %]
181
            [% END %]
Lines 189-195 $(document).ready(function(){ Link Here
189
    <ul>
189
    <ul>
190
    [% FOREACH simple_items_displa IN simple_items_display %]
190
    [% FOREACH simple_items_displa IN simple_items_display %]
191
  <li>
191
  <li>
192
      [% IF ( CAN_user_editcatalogue_edit_items ) %]<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=[% simple_items_displa.biblionumber | html %]&amp;itemnumber=[% simple_items_displa.itemnumber | html %]">[% simple_items_displa.barcode | html %]</a>[% ELSE %][% simple_items_displa.barcode | html %][% END %]
192
      [% IF ( CAN_user_editcatalogue_edit_items ) %]<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=[% simple_items_displa.biblionumber | uri %]&amp;itemnumber=[% simple_items_displa.itemnumber | uri %]">[% simple_items_displa.barcode | html %]</a>[% ELSE %][% simple_items_displa.barcode | html %][% END %]
193
  </li>
193
  </li>
194
    [% END %]
194
    [% END %]
195
    </ul>
195
    </ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt (-5 / +5 lines)
Lines 112-120 Link Here
112
                  <td><input type="checkbox" name="record_id" id="record_id_[% biblio.biblionumber | html %]" value="[% biblio.biblionumber | html %]" data-items="[% biblio.itemnumbers.size | html %]" data-issues="[% biblio.issues_count | html %]" data-reserves="[% biblio.holds_count | html %]" /></td>
112
                  <td><input type="checkbox" name="record_id" id="record_id_[% biblio.biblionumber | html %]" value="[% biblio.biblionumber | html %]" data-items="[% biblio.itemnumbers.size | html %]" data-issues="[% biblio.issues_count | html %]" data-reserves="[% biblio.holds_count | html %]" /></td>
113
                  <td><label for="record_id_[% biblio.biblionumber | html %]">[% biblio.biblionumber | html %]</label></td>
113
                  <td><label for="record_id_[% biblio.biblionumber | html %]">[% biblio.biblionumber | html %]</label></td>
114
                  <td>[% INCLUDE 'biblio-default-view.inc' biblionumber=biblio.biblionumber %][% biblio.title | html %][% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle %] [% subtitle.subfield | html %][% END %][% END %]</a></td>
114
                  <td>[% INCLUDE 'biblio-default-view.inc' biblionumber=biblio.biblionumber %][% biblio.title | html %][% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle %] [% subtitle.subfield | html %][% END %][% END %]</a></td>
115
                  <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | html %]">[% biblio.itemnumbers.size | html %]</a></td>
115
                  <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.itemnumbers.size | html %]</a></td>
116
                  <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio.biblionumber | html %]">[% biblio.holds_count | html %]</a></td>
116
                  <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.holds_count | html %]</a></td>
117
                  <td><a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio.biblionumber | html %]">[% biblio.issues_count | html %]</a></td>
117
                  <td><a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.issues_count | html %]</a></td>
118
                </tr>
118
                </tr>
119
              [% END %]
119
              [% END %]
120
            </tbody>
120
            </tbody>
Lines 140-148 Link Here
140
              [% FOR authority IN records %]
140
              [% FOR authority IN records %]
141
                <tr>
141
                <tr>
142
                  <td><input type="checkbox" name="record_id" value="[% authority.authid | html %]" data-usage="[% authority.count_usage | html %]" /></td>
142
                  <td><input type="checkbox" name="record_id" value="[% authority.authid | html %]" data-usage="[% authority.count_usage | html %]" /></td>
143
                  <td><a href="/cgi-bin/koha/authorities/detail.pl?authid=[% authority.authid | html %]">[% authority.authid | html %]</a></td>
143
                  <td><a href="/cgi-bin/koha/authorities/detail.pl?authid=[% authority.authid | uri %]">[% authority.authid | html %]</a></td>
144
                  <td>[% PROCESS authresult summary=authority.summary %]</td>
144
                  <td>[% PROCESS authresult summary=authority.summary %]</td>
145
                  <td><a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&amp;op=do_search&amp;idx=an,phr&amp;q=[% authority.authid | html %]">[% authority.count_usage | html %] record(s)</a></td>
145
                  <td><a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&amp;op=do_search&amp;idx=an,phr&amp;q=[% authority.authid | uri %]">[% authority.count_usage | html %] record(s)</a></td>
146
                </tr>
146
                </tr>
147
              [% END %]
147
              [% END %]
148
            </tbody>
148
            </tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt (-8 / +8 lines)
Lines 42-54 Link Here
42
                [% ELSIF message.code == 'authority_not_exists' %]
42
                [% ELSIF message.code == 'authority_not_exists' %]
43
                    Authority record [% message.authid | html %] does not exist in the database.
43
                    Authority record [% message.authid | html %] does not exist in the database.
44
                [% ELSIF message.code == 'biblio_not_modified' %]
44
                [% ELSIF message.code == 'biblio_not_modified' %]
45
                    Bibliographic record <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | html %]">[% message.biblionumber | html %]</a> has not been modified. An error occurred on modifying it.
45
                    Bibliographic record <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.biblionumber | html %]</a> has not been modified. An error occurred on modifying it.
46
                [% ELSIF message.code == 'authority_not_modified' %]
46
                [% ELSIF message.code == 'authority_not_modified' %]
47
                    Authority record <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% message.authid | html %]">[% message.authid | html %]</a> has not been modified. An error occurred on modifying it.
47
                    Authority record <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% message.authid | uri %]">[% message.authid | html %]</a> has not been modified. An error occurred on modifying it.
48
                [% ELSIF message.code == 'biblio_modified' %]
48
                [% ELSIF message.code == 'biblio_modified' %]
49
                    Bibliographic record <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | html %]">[% message.biblionumber | html %]</a> has successfully been modified.
49
                    Bibliographic record <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.biblionumber | html %]</a> has successfully been modified.
50
                [% ELSIF message.code == 'authority_modified' %]
50
                [% ELSIF message.code == 'authority_modified' %]
51
                    Bibliographic record <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% message.authid | html %]">[% message.authid | html %]</a> has successfully been modified.
51
                    Bibliographic record <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% message.authid | uri %]">[% message.authid | html %]</a> has successfully been modified.
52
                [% END %]
52
                [% END %]
53
                [% IF message.error %]
53
                [% IF message.error %]
54
                    (The error was: [% message.error | html %]. See the Koha logfile for more information).
54
                    (The error was: [% message.error | html %]. See the Koha logfile for more information).
Lines 152-160 Link Here
152
                <tr>
152
                <tr>
153
                  <td><input type="checkbox" name="record_id" value="[% biblio.biblionumber | html %]" /></td>
153
                  <td><input type="checkbox" name="record_id" value="[% biblio.biblionumber | html %]" /></td>
154
                  <td>[% biblio.biblionumber | html %]</td>
154
                  <td>[% biblio.biblionumber | html %]</td>
155
                  <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | html %]">[% biblio.title | html %]</a></td>
155
                  <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.title | html %]</a></td>
156
                  <td class="actions">
156
                  <td class="actions">
157
                    <a href="/cgi-bin/koha/svc/records/preview?record_type=biblio&record_id=[% biblio.biblionumber | html %]&mmtid=[% mmtid | html %]" class="previewMARC btn btn-default btn-xs" data-record_type="biblio" data-record_id="[% biblio.biblionumber | html %]" data-mmtid="[% mmtid | html %]" title="Preview MARC"><i class="fa fa-eye"></i> Show MARC</a>
157
                    <a href="/cgi-bin/koha/svc/records/preview?record_type=biblio&record_id=[% biblio.biblionumber | uri %]&mmtid=[% mmtid | uri %]" class="previewMARC btn btn-default btn-xs" data-record_type="biblio" data-record_id="[% biblio.biblionumber | html %]" data-mmtid="[% mmtid | html %]" title="Preview MARC"><i class="fa fa-eye"></i> Show MARC</a>
158
                  </td>
158
                  </td>
159
                </tr>
159
                </tr>
160
              [% END %]
160
              [% END %]
Lines 179-187 Link Here
179
              [% FOR authority IN records %]
179
              [% FOR authority IN records %]
180
                <tr>
180
                <tr>
181
                  <td><input type="checkbox" name="record_id" value="[% authority.authid | html %]" data-usage="[% authority.count_usage | html %]" /></td>
181
                  <td><input type="checkbox" name="record_id" value="[% authority.authid | html %]" data-usage="[% authority.count_usage | html %]" /></td>
182
                  <td><a href="/cgi-bin/koha/authorities/detail.pl?authid=[% authority.authid | html %]">[% authority.authid | html %]</a></td>
182
                  <td><a href="/cgi-bin/koha/authorities/detail.pl?authid=[% authority.authid | uri %]">[% authority.authid | html %]</a></td>
183
                  <td>[% PROCESS authresult summary=authority.summary %]</td>
183
                  <td>[% PROCESS authresult summary=authority.summary %]</td>
184
                  <td class="actions"><a href="/cgi-bin/koha/svc/records/preview?record_type=authority&record_id=[% authority.authid | html %]&mmtid=[% mmtid | html %]" data-record_type="authority" data-record_id="[% authority.authid | html %]" data-mmtid="[% mmtid | html %]" class="previewMARC btn btn-default btn-xs"><i class='fa fa-eye'></i> Show MARC</a>
184
                  <td class="actions"><a href="/cgi-bin/koha/svc/records/preview?record_type=authority&record_id=[% authority.authid | uri %]&mmtid=[% mmtid | uri %]" data-record_type="authority" data-record_id="[% authority.authid | html %]" data-mmtid="[% mmtid | html %]" class="previewMARC btn btn-default btn-xs"><i class='fa fa-eye'></i> Show MARC</a>
185
                </tr>
185
                </tr>
186
              [% END %]
186
              [% END %]
187
            </tbody>
187
            </tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt (-2 / +2 lines)
Lines 268-275 Link Here
268
                    <td>[% PROCESS type_description type_code = csv_profile.type %]</td>
268
                    <td>[% PROCESS type_description type_code = csv_profile.type %]</td>
269
                    <td>[% PROCESS used_for_description used_for_code = csv_profile.used_for %]</td>
269
                    <td>[% PROCESS used_for_description used_for_code = csv_profile.used_for %]</td>
270
                    <td class="actions">
270
                    <td class="actions">
271
                        <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form&amp;export_format_id=[% csv_profile.export_format_id | html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
271
                        <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form&amp;export_format_id=[% csv_profile.export_format_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
272
                        <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=delete_confirm&amp;export_format_id=[% csv_profile.export_format_id | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
272
                        <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=delete_confirm&amp;export_format_id=[% csv_profile.export_format_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
273
                    </td>
273
                    </td>
274
                </tr>
274
                </tr>
275
                [% END %]
275
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt (-2 / +2 lines)
Lines 249-255 td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl Link Here
249
<tbody>
249
<tbody>
250
  [% FOREACH EXCEPTION_HOLIDAYS_LOO IN EXCEPTION_HOLIDAYS_LOOP %]
250
  [% FOREACH EXCEPTION_HOLIDAYS_LOO IN EXCEPTION_HOLIDAYS_LOOP %]
251
  <tr>
251
  <tr>
252
  <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch | html %]&amp;calendardate=[% EXCEPTION_HOLIDAYS_LOO.DATE | html %]"><span title="[% EXCEPTION_HOLIDAYS_LOO.DATE_SORT | html %]">[% EXCEPTION_HOLIDAYS_LOO.DATE | html %]</span></a></td>
252
  <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch | uri %]&amp;calendardate=[% EXCEPTION_HOLIDAYS_LOO.DATE | uri %]"><span title="[% EXCEPTION_HOLIDAYS_LOO.DATE_SORT | html %]">[% EXCEPTION_HOLIDAYS_LOO.DATE | html %]</span></a></td>
253
  <td>[% EXCEPTION_HOLIDAYS_LOO.TITLE | html %]</td>
253
  <td>[% EXCEPTION_HOLIDAYS_LOO.TITLE | html %]</td>
254
  <td>[% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION | html %]</td>
254
  <td>[% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION | html %]</td>
255
  </tr>
255
  </tr>
Lines 320-326 td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl Link Here
320
<tbody>
320
<tbody>
321
    [% FOREACH HOLIDAYS_LOO IN HOLIDAYS_LOOP %]
321
    [% FOREACH HOLIDAYS_LOO IN HOLIDAYS_LOOP %]
322
<tr>
322
<tr>
323
  <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch | html %]&amp;calendardate=[% HOLIDAYS_LOO.DATE | html %]"><span title="[% HOLIDAYS_LOO.DATE_SORT | html %]">[% HOLIDAYS_LOO.DATE | html %]</span></a></td>
323
  <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch | uri %]&amp;calendardate=[% HOLIDAYS_LOO.DATE | uri %]"><span title="[% HOLIDAYS_LOO.DATE_SORT | html %]">[% HOLIDAYS_LOO.DATE | html %]</span></a></td>
324
  <td>[% HOLIDAYS_LOO.TITLE | html %]</td>
324
  <td>[% HOLIDAYS_LOO.TITLE | html %]</td>
325
  <td>[% HOLIDAYS_LOO.DESCRIPTION.replace('\\\r\\\n', '<br />') | html %]</td>
325
  <td>[% HOLIDAYS_LOO.DESCRIPTION.replace('\\\r\\\n', '<br />') | html %]</td>
326
</tr>
326
</tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt (-1 / +1 lines)
Lines 193-199 Link Here
193
                <span class="shelvingloc">[% result.location | html %]</span>
193
                <span class="shelvingloc">[% result.location | html %]</span>
194
            </td>
194
            </td>
195
            <td>
195
            <td>
196
                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% result.biblionumber | html %]" class="openWin">[% result.title | html %]</a>
196
                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% result.biblionumber | uri %]" class="openWin">[% result.title | html %]</a>
197
                [% IF ( result.author ) %]
197
                [% IF ( result.author ) %]
198
                    by <span class="author">[% result.author | html %]</span>
198
                    by <span class="author">[% result.author | html %]</span>
199
                [% END %]
199
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt (-2 / +2 lines)
Lines 203-210 Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> Link Here
203
                                [% opac_new.content | $raw %]
203
                                [% opac_new.content | $raw %]
204
                            </td>
204
                            </td>
205
                            <td class="actions">
205
                            <td class="actions">
206
                                <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% opac_new.idnew | html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
206
                                <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% opac_new.idnew | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
207
                                <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=[% opac_new.idnew | html %]" class="delete_news btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
207
                                <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=[% opac_new.idnew | uri %]" class="delete_news btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
208
                            </td>
208
                            </td>
209
                        </tr>
209
                        </tr>
210
                    [% END %]</tbody>
210
                    [% END %]</tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt (-2 / +2 lines)
Lines 305-313 Link Here
305
                    [% FOR language IN languages %]
305
                    [% FOR language IN languages %]
306
                        [% FOR sublanguage IN language.sublanguages_loop %]
306
                        [% FOR sublanguage IN language.sublanguages_loop %]
307
                            [% IF language.plural %]
307
                            [% IF language.plural %]
308
                                <li><a href="#lang_[% sublanguage.rfc4646_subtag | html %]">[% sublanguage.native_description | html %] [% sublanguage.region_description | html %] ([% sublanguage.rfc4646_subtag | html %])</a></li>
308
                                <li><a href="#lang_[% sublanguage.rfc4646_subtag | uri %]">[% sublanguage.native_description | html %] [% sublanguage.region_description | html %] ([% sublanguage.rfc4646_subtag | html %])</a></li>
309
                            [% ELSE %]
309
                            [% ELSE %]
310
                                <li><a href="#lang_[% sublanguage.rfc4646_subtag | html %]">[% sublanguage.native_description | html %] ([% sublanguage.rfc4646_subtag | html %])</a></li>
310
                                <li><a href="#lang_[% sublanguage.rfc4646_subtag | uri %]">[% sublanguage.native_description | html %] ([% sublanguage.rfc4646_subtag | html %])</a></li>
311
                            [% END %]
311
                            [% END %]
312
                        [% END %]
312
                        [% END %]
313
                    [% END %]
313
                    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt (-5 / +5 lines)
Lines 21-27 Link Here
21
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> 
21
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> 
22
[% IF ( import_batch_id ) %]
22
[% IF ( import_batch_id ) %]
23
 &rsaquo;
23
 &rsaquo;
24
 <a href="[% script_name | html %]">Manage staged MARC records</a>
24
 <a href="[% script_name | uri %]">Manage staged MARC records</a>
25
 &rsaquo; Batch [% import_batch_id | html %]
25
 &rsaquo; Batch [% import_batch_id | html %]
26
[% ELSE %]
26
[% ELSE %]
27
 &rsaquo; Manage staged MARC records
27
 &rsaquo; Manage staged MARC records
Lines 267-273 Link Here
267
      [% IF ( page.current_page ) %]
267
      [% IF ( page.current_page ) %]
268
      <span class="current">[% page.page_number | html %]</span>
268
      <span class="current">[% page.page_number | html %]</span>
269
      [% ELSE %]
269
      [% ELSE %]
270
      <a href="[% page.script_name | html %]?offset=[% page.offset | html %]">[% page.page_number | html %]</a>
270
      <a href="[% page.script_name | uri %]?offset=[% page.offset | uri %]">[% page.page_number | html %]</a>
271
      [% END %]
271
      [% END %]
272
    [% END %]
272
    [% END %]
273
</div>
273
</div>
Lines 287-293 Link Here
287
  [% FOREACH batch_lis IN batch_list %]
287
  [% FOREACH batch_lis IN batch_list %]
288
    <tr>
288
    <tr>
289
    <td>[% batch_lis.import_batch_id | html %]</td>
289
    <td>[% batch_lis.import_batch_id | html %]</td>
290
    <td><a href="[% batch_lis.script_name | html %]?import_batch_id=[% batch_lis.import_batch_id | html %]">[% batch_lis.file_name | html %]</a></td>
290
    <td><a href="[% batch_lis.script_name | uri %]?import_batch_id=[% batch_lis.import_batch_id | uri %]">[% batch_lis.file_name | html %]</a></td>
291
    <td>[% batch_lis.comments | html %]</td>
291
    <td>[% batch_lis.comments | html %]</td>
292
    <td>[% IF ( batch_lis.record_type == 'auth' ) %]Authority[% ELSE %]Bibliographic[% END %]</td>
292
    <td>[% IF ( batch_lis.record_type == 'auth' ) %]Authority[% ELSE %]Bibliographic[% END %]</td>
293
    <td>
293
    <td>
Lines 309-315 Link Here
309
    </td>
309
    </td>
310
    <td>[% batch_lis.upload_timestamp | html %]</td>
310
    <td>[% batch_lis.upload_timestamp | html %]</td>
311
    <td>[% batch_lis.num_records | html %]</td>
311
    <td>[% batch_lis.num_records | html %]</td>
312
    <td>[% batch_lis.num_items | html %][% IF ( batch_lis.num_items ) %] <a href="[% batch_lis.script_name | html %]?import_batch_id=[% batch_lis.import_batch_id | html %]&amp;op=create_labels">(Create label batch)</a>[% END %]</td>
312
    <td>[% batch_lis.num_items | html %][% IF ( batch_lis.num_items ) %] <a href="[% batch_lis.script_name | uri %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;op=create_labels">(Create label batch)</a>[% END %]</td>
313
    <td class="actions">
313
    <td class="actions">
314
        [% IF ( batch_lis.can_clean ) %]
314
        [% IF ( batch_lis.can_clean ) %]
315
          <form method="post" action="[% batch_lis.script_name | html %]" name="clean_batch_[% batch_lis.import_batch_id | html %]" id="clean_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_clean" >
315
          <form method="post" action="[% batch_lis.script_name | html %]" name="clean_batch_[% batch_lis.import_batch_id | html %]" id="clean_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_clean" >
Lines 334-340 Link Here
334
      [% IF ( page.current_page ) %]
334
      [% IF ( page.current_page ) %]
335
      <span class="current">[% page.page_number | html %]</span>
335
      <span class="current">[% page.page_number | html %]</span>
336
      [% ELSE %]
336
      [% ELSE %]
337
      <a href="[% page.script_name | html %]?offset=[% page.offset | html %]">[% page.page_number | html %]</a>
337
      <a href="[% page.script_name | uri %]?offset=[% page.offset | uri %]">[% page.page_number | html %]</a>
338
      [% END %]
338
      [% END %]
339
    [% END %]
339
    [% END %]
340
</div>
340
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt (-1 / +1 lines)
Lines 159-165 Link Here
159
                                                    [% IF ( op == 'show' ) %]
159
                                                    [% IF ( op == 'show' ) %]
160
                                                        <td><input type="checkbox" name="borrowernumber" value="[% borrower.borrowernumber | html %]" checked="checked" /></td>
160
                                                        <td><input type="checkbox" name="borrowernumber" value="[% borrower.borrowernumber | html %]" checked="checked" /></td>
161
                                                    [% END %]
161
                                                    [% END %]
162
                                                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | html %]">[% borrower.cardnumber | html %]</a></td>
162
                                                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]">[% borrower.cardnumber | html %]</a></td>
163
                                                    <td>[% borrower.surname | html %]</td>
163
                                                    <td>[% borrower.surname | html %]</td>
164
                                                    <td>[% borrower.firstname | html %]</td>
164
                                                    <td>[% borrower.firstname | html %]</td>
165
                                                    <td>[% Branches.GetName( borrower.branchcode ) | html %]</td>
165
                                                    <td>[% Branches.GetName( borrower.branchcode ) | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt (-1 / +1 lines)
Lines 61-67 Link Here
61
  <div id="rulestabs" class="toptabs">
61
  <div id="rulestabs" class="toptabs">
62
    <ul class="ui-tabs-nav">
62
    <ul class="ui-tabs-nav">
63
      [% FOR tab IN tabs %]
63
      [% FOR tab IN tabs %]
64
          <li><a href="#[% tab.id | html %]" class="tab [% tab.id | html %]" data-number="[% tab.number | html %]"></a></li>
64
          <li><a href="#[% tab.id | uri %]" class="tab [% tab.id | html %]" data-number="[% tab.number | html %]"></a></li>
65
      [% END %]
65
      [% END %]
66
    </ul>
66
    </ul>
67
    [% FOR tab IN tabs %]
67
    [% FOR tab IN tabs %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt (-1 / +1 lines)
Lines 46-52 Link Here
46
        </div>
46
        </div>
47
    </div>
47
    </div>
48
48
49
<p><a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | html %]">Return to staged MARC batch [% batchid | html %]</a></p>
49
<p><a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | uri %]">Return to staged MARC batch [% batchid | html %]</a></p>
50
50
51
[% MACRO jsinclude BLOCK %]
51
[% MACRO jsinclude BLOCK %]
52
    [% Asset.js("js/tools-menu.js") | $raw %]
52
    [% Asset.js("js/tools-menu.js") | $raw %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt (-1 / +1 lines)
Lines 37-43 Link Here
37
    </div>
37
    </div>
38
    </li>
38
    </li>
39
    [% END %]
39
    [% END %]
40
    <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]">View final record</a></li>
40
    <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">View final record</a></li>
41
	<li><a href="/cgi-bin/koha/tools/tools-home.pl">Back</a></li>
41
	<li><a href="/cgi-bin/koha/tools/tools-home.pl">Back</a></li>
42
</ul>
42
</ul>
43
<hr />
43
<hr />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-7 / +7 lines)
Lines 210-216 Link Here
210
                                    <td>[% loopro.timestamp | html %]</td>
210
                                    <td>[% loopro.timestamp | html %]</td>
211
                                    <td>
211
                                    <td>
212
                                        [% IF loopro.librarian %]
212
                                        [% IF loopro.librarian %]
213
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.librarian.borrowernumber | html %]" title="display detail for this librarian."> [% IF ( loopro.librarian.firstname ) || ( loopro.librarian.surname ) %][% loopro.librarian.firstname | html %] [% loopro.librarian.surname | html %] ([% loopro.librarian.borrowernumber | html %]) [% ELSE %][% loopro.librarian.borrowernumber | html %][% END %]</a>
213
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.librarian.borrowernumber | uri %]" title="display detail for this librarian."> [% IF ( loopro.librarian.firstname ) || ( loopro.librarian.surname ) %][% loopro.librarian.firstname | html %] [% loopro.librarian.surname | html %] ([% loopro.librarian.borrowernumber | html %]) [% ELSE %][% loopro.librarian.borrowernumber | html %][% END %]</a>
214
                                        [% ELSE %]
214
                                        [% ELSE %]
215
                                            [% loopro.user | html %]
215
                                            [% loopro.user | html %]
216
                                        [% END %]
216
                                        [% END %]
Lines 220-244 Link Here
220
                                    <td>
220
                                    <td>
221
                                        [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %]
221
                                        [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %]
222
                                            [% IF loopro.patron %]
222
                                            [% IF loopro.patron %]
223
                                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object | html %]" title="Display member details."> [% IF ( loopro.object ) %][% IF ( loopro.patron.firstname ) || ( loopro.patron.surname ) %][% loopro.patron.firstname | html %] [% loopro.patron.surname | html %] ([% loopro.object | html %]) [% ELSE %]Member [% loopro.object | html %][% END %][% END %] </a>
223
                                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object | uri %]" title="Display member details."> [% IF ( loopro.object ) %][% IF ( loopro.patron.firstname ) || ( loopro.patron.surname ) %][% loopro.patron.firstname | html %] [% loopro.patron.surname | html %] ([% loopro.object | html %]) [% ELSE %]Member [% loopro.object | html %][% END %][% END %] </a>
224
                                            [% ELSE %]
224
                                            [% ELSE %]
225
                                                [% loopro.object | html %]
225
                                                [% loopro.object | html %]
226
                                            [% END %]
226
                                            [% END %]
227
                                        [% ELSE %]
227
                                        [% ELSE %]
228
                                                [% IF ( loopro.module == 'CATALOGUING' ) %]
228
                                                [% IF ( loopro.module == 'CATALOGUING' ) %]
229
                                                    [% IF ( loopro.info.substr(0, 4) == 'item' ) %]
229
                                                    [% IF ( loopro.info.substr(0, 4) == 'item' ) %]
230
                                                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.object | html %]&amp;biblionumber=[% loopro.biblionumber | html %]&amp;bi=[% loopro.biblioitemnumber | html %]#item[% loopro.object | html %]">Item [% loopro.object | html %]</a>
230
                                                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.object | uri %]&amp;biblionumber=[% loopro.biblionumber | uri %]&amp;bi=[% loopro.biblioitemnumber | uri %]#item[% loopro.object | uri %]">Item [% loopro.object | html %]</a>
231
                                                    [% ELSIF ( loopro.info.substr(0, 6) == 'biblio' ) %]
231
                                                    [% ELSIF ( loopro.info.substr(0, 6) == 'biblio' ) %]
232
                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.object | html %]" title="Display detail for this biblio">Biblio [% loopro.object | html %]</a>
232
                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.object | uri %]" title="Display detail for this biblio">Biblio [% loopro.object | html %]</a>
233
                                                    [% ELSE %]
233
                                                    [% ELSE %]
234
                                                        [% loopro.object | html %]
234
                                                        [% loopro.object | html %]
235
                                                    [% END %]
235
                                                    [% END %]
236
                                                [% ELSE %]
236
                                                [% ELSE %]
237
                                                    [% IF ( loopro.module == 'SERIAL' ) %]
237
                                                    [% IF ( loopro.module == 'SERIAL' ) %]
238
                                                        <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% loopro.object | html %]">Subscription [% loopro.object | html %] </a>
238
                                                        <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% loopro.object | uri %]">Subscription [% loopro.object | html %] </a>
239
                                                    [% ELSE %]
239
                                                    [% ELSE %]
240
                                                        [% IF ( loopro.module == 'AUTHORITIES' ) %]
240
                                                        [% IF ( loopro.module == 'AUTHORITIES' ) %]
241
                                                            <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% loopro.object | html %]" title="Display detail for this authority">Authority [% loopro.object | html %]</a>
241
                                                            <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% loopro.object | uri %]" title="Display detail for this authority">Authority [% loopro.object | html %]</a>
242
                                                        [% ELSE %]
242
                                                        [% ELSE %]
243
                                                            [% loopro.object | html %]
243
                                                            [% loopro.object | html %]
244
                                                        [% END %]
244
                                                        [% END %]
Lines 248-254 Link Here
248
                                    </td>
248
                                    </td>
249
                                    <td>
249
                                    <td>
250
                                        [% IF ( loopro.module == 'CIRCULATION' ) %]
250
                                        [% IF ( loopro.module == 'CIRCULATION' ) %]
251
                                            <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% loopro.info | html %]&amp;biblionumber=[% loopro.biblionumber | html %]&amp;bi=[% loopro.biblioitemnumber | html %]#item[% loopro.info | html %]" title="Display detail for this item">Item [% loopro.barcode | html %]</a>
251
                                            <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% loopro.info | uri %]&amp;biblionumber=[% loopro.biblionumber | uri %]&amp;bi=[% loopro.biblioitemnumber | uri %]#item[% loopro.info | uri %]" title="Display detail for this item">Item [% loopro.barcode | html %]</a>
252
                                        [% ELSE %]
252
                                        [% ELSE %]
253
                                            [% loopro.info | html %]
253
                                            [% loopro.info | html %]
254
                                        [% END %]
254
                                        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-12 / +12 lines)
Lines 45-57 Link Here
45
    [% END %]
45
    [% END %]
46
    [% IF shelf AND shelf.is_private %] &rsaquo;
46
    [% IF shelf AND shelf.is_private %] &rsaquo;
47
        [% IF op == 'view' OR op == 'edit_form' %]
47
        [% IF op == 'view' OR op == 'edit_form' %]
48
            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;category=[% PRIVATE | html %]">Your lists</a>
48
            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;category=[% PRIVATE | uri %]">Your lists</a>
49
        [% ELSE %]
49
        [% ELSE %]
50
            Your lists
50
            Your lists
51
        [% END %]
51
        [% END %]
52
    [% ELSIF shelf AND shelf.is_public %] &rsaquo;
52
    [% ELSIF shelf AND shelf.is_public %] &rsaquo;
53
        [% IF op == 'view' %]
53
        [% IF op == 'view' %]
54
            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;category=[% PUBLIC | html %]">Public lists</a>
54
            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;category=[% PUBLIC | uri %]">Public lists</a>
55
        [% ELSE %]
55
        [% ELSE %]
56
            Public lists
56
            Public lists
57
        [% END %]
57
        [% END %]
Lines 168-174 Link Here
168
168
169
                [% UNLESS ( item_level_itypes ) %]<th>Item type</th>[% END %]
169
                [% UNLESS ( item_level_itypes ) %]<th>Item type</th>[% END %]
170
                <th>
170
                <th>
171
                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | html %]&amp;sortfield=title&amp;direction=[% IF sortfield != 'title' %]asc[% ELSE %][% new_direction | html %][% END %]">Title</a>
171
                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;sortfield=title&amp;direction=[% IF sortfield != 'title' %]asc[% ELSE %][% new_direction | uri %][% END %]">Title</a>
172
                    [% IF sortfield == 'title' %]
172
                    [% IF sortfield == 'title' %]
173
                        <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" />
173
                        <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" />
174
                    [% ELSE %]
174
                    [% ELSE %]
Lines 176-182 Link Here
176
                    [% END %]
176
                    [% END %]
177
                </th>
177
                </th>
178
                <th>
178
                <th>
179
                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | html %]&amp;sortfield=author&amp;direction=[% IF sortfield != 'author' %]asc[% ELSE %][% new_direction | html %][% END %]">Author</a>
179
                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;sortfield=author&amp;direction=[% IF sortfield != 'author' %]asc[% ELSE %][% new_direction | uri %][% END %]">Author</a>
180
                   [% IF sortfield == 'author' %]
180
                   [% IF sortfield == 'author' %]
181
                        <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" />
181
                        <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" />
182
                   [% ELSE %]
182
                   [% ELSE %]
Lines 184-190 Link Here
184
                   [% END %]
184
                   [% END %]
185
                 </th>
185
                 </th>
186
                <th>
186
                <th>
187
                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | html %]&amp;sortfield=dateadded&amp;direction=[% IF sortfield != 'dateadded' %]asc[% ELSE %][% new_direction | html %][% END %]">Date added</a>
187
                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;sortfield=dateadded&amp;direction=[% IF sortfield != 'dateadded' %]asc[% ELSE %][% new_direction | uri %][% END %]">Date added</a>
188
                    [% IF sortfield == 'dateadded' %]
188
                    [% IF sortfield == 'dateadded' %]
189
                        <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" />
189
                        <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" />
190
                    [% ELSE %]
190
                    [% ELSE %]
Lines 192-198 Link Here
192
                    [% END %]
192
                    [% END %]
193
                </th>
193
                </th>
194
                <th>
194
                <th>
195
                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | html %]&amp;sortfield=itemcallnumber&amp;direction=[% IF sortfield != 'itemcallnumber' %]asc[% ELSE %][% new_direction | html %][% END %]">Call number</a>
195
                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;sortfield=itemcallnumber&amp;direction=[% IF sortfield != 'itemcallnumber' %]asc[% ELSE %][% new_direction | uri %][% END %]">Call number</a>
196
                   [% IF sortfield == 'itemcallnumber' %]
196
                   [% IF sortfield == 'itemcallnumber' %]
197
                        <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" />
197
                        <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" />
198
                   [% ELSE %]
198
                   [% ELSE %]
Lines 223-238 Link Here
223
                        [% ELSE %]
223
                        [% ELSE %]
224
                            [% IF ( itemsloo.ITEM_RESULTS.size ) %]
224
                            [% IF ( itemsloo.ITEM_RESULTS.size ) %]
225
                                <a id="reserve_[% itemsloo.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | html %]">Holds</a>
225
                                <a id="reserve_[% itemsloo.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | html %]">Holds</a>
226
                                [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | html %]&amp;findborrower=[% holdfor_cardnumber | html %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></span>[% END %]
226
                                [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | uri %]&amp;findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></span>[% END %]
227
                            [% ELSE %]
227
                            [% ELSE %]
228
                                <span class="noholdstext">No holds allowed</span>
228
                                <span class="noholdstext">No holds allowed</span>
229
                            [% END %]
229
                            [% END %]
230
                        [% END %]
230
                        [% END %]
231
                        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
231
                        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
232
                            | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% itemsloo.biblionumber | html %]">Edit record</a>
232
                            | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% itemsloo.biblionumber | uri %]">Edit record</a>
233
                        [% END %]
233
                        [% END %]
234
                        [% IF ( CAN_user_editcatalogue_edit_items ) %]
234
                        [% IF ( CAN_user_editcatalogue_edit_items ) %]
235
                            | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% itemsloo.biblionumber | html %]">Edit items</a>
235
                            | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% itemsloo.biblionumber | uri %]">Edit items</a>
236
                        [% END %]
236
                        [% END %]
237
                    </p>
237
                    </p>
238
            </td>
238
            </td>
Lines 321-332 Link Here
321
    <fieldset class="action">
321
    <fieldset class="action">
322
        <input type="submit" value="Save" class="submit" />
322
        <input type="submit" value="Save" class="submit" />
323
        [% IF referer == 'view' %]
323
        [% IF referer == 'view' %]
324
           <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | html %]" class="cancel">Cancel</a>
324
           <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel">Cancel</a>
325
       [% ELSE %]
325
       [% ELSE %]
326
            [% IF category == PUBLIC %]
326
            [% IF category == PUBLIC %]
327
                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;category=[% PUBLIC | html %]" class="cancel">Cancel</a>
327
                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;category=[% PUBLIC | uri %]" class="cancel">Cancel</a>
328
            [% ELSE %]
328
            [% ELSE %]
329
                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;category=[% PRIVATE | html %]" class="cancel">Cancel</a>
329
                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;category=[% PRIVATE | uri %]" class="cancel">Cancel</a>
330
            [% END %]
330
            [% END %]
331
        [% END %]
331
        [% END %]
332
    </fieldset>
332
    </fieldset>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc (-1 / +1 lines)
Lines 24-30 Link Here
24
            [% IF ( authid ) %]
24
            [% IF ( authid ) %]
25
            <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
25
            <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
26
            [% ELSE %]
26
            [% ELSE %]
27
            <a href="[% searchurl | url %][% heading | html %]">[% heading | html %]</a>
27
            <a href="[% searchurl | url %][% heading | uri %]">[% heading | html %]</a>
28
            [% END %]
28
            [% END %]
29
        [% ELSE %]
29
        [% ELSE %]
30
            [% heading | html %]
30
            [% heading | html %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc (-2 / +2 lines)
Lines 11-17 Link Here
11
                        [% IF ( sublanguages_loo.sublanguage_current ) %]
11
                        [% IF ( sublanguages_loo.sublanguage_current ) %]
12
                         <li role="presentation"> <a href="#" tabindex="-1" role="menuitem">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]&nbsp;<i class="fa fa-check"></i></a></li>
12
                         <li role="presentation"> <a href="#" tabindex="-1" role="menuitem">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]&nbsp;<i class="fa fa-check"></i></a></li>
13
                        [% ELSE %]
13
                        [% ELSE %]
14
                        <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | html %]"  tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a></li>
14
                        <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a></li>
15
                        [% END %]
15
                        [% END %]
16
                    [% END # / IF sublanguages_loo.enabled %]
16
                    [% END # / IF sublanguages_loo.enabled %]
17
                [% END # / FOREACH sublanguages_loo %]
17
                [% END # / FOREACH sublanguages_loo %]
Lines 20-26 Link Here
20
                    [% IF ( languages_loo.current ) %]
20
                    [% IF ( languages_loo.current ) %]
21
                    <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]&nbsp;<i class="fa fa-check"></i></a></li>
21
                    <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]&nbsp;<i class="fa fa-check"></i></a></li>
22
                    [% ELSE %]
22
                    [% ELSE %]
23
                    <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag | html %]"  tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li>
23
                    <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li>
24
                    [% END %]
24
                    [% END %]
25
                [% END # / IF languages_loo.current %]
25
                [% END # / IF languages_loo.current %]
26
            [% END # / IF ( languages_loo.plural ) %]
26
            [% END # / IF ( languages_loo.plural ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-3 / +3 lines)
Lines 38-44 Link Here
38
                                    <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=2" tabindex="-1" role="menuitem"><strong>Public lists</strong></a></li>
38
                                    <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=2" tabindex="-1" role="menuitem"><strong>Public lists</strong></a></li>
39
                                    [% SET number_of_public_shelves = 0 %]
39
                                    [% SET number_of_public_shelves = 0 %]
40
                                    [% FOREACH s IN some_public_shelves %]
40
                                    [% FOREACH s IN some_public_shelves %]
41
                                        <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | html %]&amp;sortfield=[% s.sortfield | html %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a></li>
41
                                        <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]&amp;sortfield=[% s.sortfield | uri %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a></li>
42
                                        [% SET number_of_public_shelves = number_of_public_shelves + 1 %]
42
                                        [% SET number_of_public_shelves = number_of_public_shelves + 1 %]
43
                                        [% IF number_of_public_shelves >= 10 %][% LAST | html %][% END %]
43
                                        [% IF number_of_public_shelves >= 10 %][% LAST | html %][% END %]
44
                                    [% END %]
44
                                    [% END %]
Lines 55-61 Link Here
55
                                        [% IF some_private_shelves.count %]
55
                                        [% IF some_private_shelves.count %]
56
                                            [% SET number_of_private_shelves = 0 %]
56
                                            [% SET number_of_private_shelves = 0 %]
57
                                            [% FOREACH s IN some_private_shelves %]
57
                                            [% FOREACH s IN some_private_shelves %]
58
                                                <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | html %]&amp;sortfield=[% s.sortfield | html %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a></li>
58
                                                <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]&amp;sortfield=[% s.sortfield | uri %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a></li>
59
                                                [% SET number_of_private_shelves = number_of_private_shelves + 1 %]
59
                                                [% SET number_of_private_shelves = number_of_private_shelves + 1 %]
60
                                                [% IF number_of_private_shelves >= 10 %][% LAST | html %][% END %]
60
                                                [% IF number_of_private_shelves >= 10 %][% LAST | html %][% END %]
61
                                            [% END %]
61
                                            [% END %]
Lines 307-313 Link Here
307
                        </div>
307
                        </div>
308
                    [% ELSE %]
308
                    [% ELSE %]
309
                        <h4>Shibboleth login</h4>
309
                        <h4>Shibboleth login</h4>
310
                        <p>If you have a Shibboleth account, please <a href="[% shibbolethLoginUrl | html %]">click here to login</a>.</p>
310
                        <p>If you have a Shibboleth account, please <a href="[% shibbolethLoginUrl | uri %]">click here to login</a>.</p>
311
                        <h4>Local Login</h4>
311
                        <h4>Local Login</h4>
312
                    [% END %]
312
                    [% END %]
313
                [% END %]
313
                [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc (-3 / +3 lines)
Lines 11-17 Link Here
11
            [% IF ( node.current_value ) %]
11
            [% IF ( node.current_value ) %]
12
                <span class="currentauth">[% node.value | html %]</span>
12
                <span class="currentauth">[% node.value | html %]</span>
13
            [% ELSE %]
13
            [% ELSE %]
14
                <a href="opac-authoritiesdetail.pl?authid=[% node.authid | html %]" title="Term">[% node.value | html %]</a>
14
                <a href="opac-authoritiesdetail.pl?authid=[% node.authid | uri %]" title="Term">[% node.value | html %]</a>
15
            [% END %]
15
            [% END %]
16
            [% IF ( node.children && node.children.size > 0 ) %]
16
            [% IF ( node.children && node.children.size > 0 ) %]
17
                [% PROCESS showtree tree = node.children %]
17
                [% PROCESS showtree tree = node.children %]
Lines 52-59 Link Here
52
[% END %]
52
[% END %]
53
53
54
[% BLOCK authheadingdisplay %]
54
[% BLOCK authheadingdisplay %]
55
    [% IF authid %]<a href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% authid | html %]">[% heading | html %]</a>
55
    [% IF authid %]<a href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% authid | uri %]">[% heading | html %]</a>
56
    [% ELSIF search %]<a href="/cgi-bin/koha/opac-authorities-home.pl?op=do_search&amp;type=opac&amp;operator=contains&amp;marclist=mainentry&amp;and_or=and&amp;orderby=HeadingAsc&amp;value=[% search | html %]">[% heading | html %]</a>
56
    [% ELSIF search %]<a href="/cgi-bin/koha/opac-authorities-home.pl?op=do_search&amp;type=opac&amp;operator=contains&amp;marclist=mainentry&amp;and_or=and&amp;orderby=HeadingAsc&amp;value=[% search | uri %]">[% heading | html %]</a>
57
    [% ELSE %][% heading | html %]
57
    [% ELSE %][% heading | html %]
58
    [% END %]
58
    [% END %]
59
[% END %]
59
[% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc (-2 / +2 lines)
Lines 52-58 Link Here
52
                                                            [% IF ( sublanguages_loo.sublanguage_current ) %]
52
                                                            [% IF ( sublanguages_loo.sublanguage_current ) %]
53
                                                                <li> <p>[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</p></li>
53
                                                                <li> <p>[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</p></li>
54
                                                            [% ELSE %]
54
                                                            [% ELSE %]
55
                                                                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | html %]"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</a></li>
55
                                                                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</a></li>
56
                                                            [% END %]
56
                                                            [% END %]
57
                                                        [% END # / IF sublanguages_loo.enabled %]
57
                                                        [% END # / IF sublanguages_loo.enabled %]
58
                                                    [% END # / FOREACH sublanguages_loo %]
58
                                                    [% END # / FOREACH sublanguages_loo %]
Lines 63-69 Link Here
63
                                            [% IF ( languages_loo.current ) %]
63
                                            [% IF ( languages_loo.current ) %]
64
                                                <li class="active"><p class="navbar-text">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</p></li>
64
                                                <li class="active"><p class="navbar-text">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</p></li>
65
                                            [% ELSE %]
65
                                            [% ELSE %]
66
                                                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag | html %]">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li>
66
                                                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li>
67
                                            [% END %]
67
                                            [% END %]
68
                                        [% END # / IF languages_loo.current %]
68
                                        [% END # / IF languages_loo.current %]
69
                                    [% END # / IF ( languages_loo.plural ) %]
69
                                    [% END # / IF ( languages_loo.plural ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc (-5 / +5 lines)
Lines 8-16 Link Here
8
                <ul>
8
                <ul>
9
                    <li>
9
                    <li>
10
                        [% IF ( available ) %]
10
                        [% IF ( available ) %]
11
                            <strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi_not_availablity | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">Show all items</a>
11
                            <strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi_not_availablity | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">Show all items</a>
12
                        [% ELSE %]
12
                        [% ELSE %]
13
                            <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi |url %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]&amp;limit=available">Limit to currently available items.</a>
13
                            <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi |url %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]&amp;limit=available">Limit to currently available items.</a>
14
                        [% END %]
14
                        [% END %]
15
                    </li>
15
                    </li>
16
                </ul>
16
                </ul>
Lines 43-52 Link Here
43
                                  [% IF facet.active %]
43
                                  [% IF facet.active %]
44
                                    [% SET local_url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
44
                                    [% SET local_url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
45
                                    <span class="facet-label">[% facet.facet_label_value | html %]</span>
45
                                    <span class="facet-label">[% facet.facet_label_value | html %]</span>
46
                                    [<a href="[% local_url | html %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
46
                                    [<a href="[% local_url | uri %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
47
                                  [% ELSE %]
47
                                  [% ELSE %]
48
                                    [% SET local_url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
48
                                    [% SET local_url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
49
                                    <span class="facet-label"><a href="[% local_url | html %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span>
49
                                    <span class="facet-label"><a href="[% local_url | uri %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span>
50
                                    [% IF ( displayFacetCount ) %]
50
                                    [% IF ( displayFacetCount ) %]
51
                                      <span class="facet-count"> ([% facet.facet_count | html %])</span>
51
                                      <span class="facet-count"> ([% facet.facet_count | html %])</span>
52
                                    [% END %]
52
                                    [% END %]
Lines 55-61 Link Here
55
                            [% END %]
55
                            [% END %]
56
                            [% IF ( facets_loo.expandable ) %]
56
                            [% IF ( facets_loo.expandable ) %]
57
                                <li class="showmore">
57
                                <li class="showmore">
58
                                    <a href="[% url | html %][% IF offset %]&amp;offset=[% offset |url %][% END %]&amp;expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a>
58
                                    <a href="[% url | uri %][% IF offset %]&amp;offset=[% offset |url %][% END %]&amp;expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a>
59
                                </li>
59
                                </li>
60
                            [% END %]
60
                            [% END %]
61
                        </ul>
61
                        </ul>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc (-5 / +5 lines)
Lines 3-21 Link Here
3
     [% IF hits_to_paginate < total %]<h6>[% hits_to_paginate | html %] of [% total | html %] results loaded, refine your search to view other records</h6>[% END %]
3
     [% IF hits_to_paginate < total %]<h6>[% hits_to_paginate | html %] of [% total | html %] results loaded, refine your search to view other records</h6>[% END %]
4
        <ul>
4
        <ul>
5
            [% IF ( previous_page_offset.defined ) %]
5
            [% IF ( previous_page_offset.defined ) %]
6
                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | html %][% END %]">First</a></li>
6
                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %]">First</a></li>
7
                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&amp;offset=[% previous_page_offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | html %][% END %]">&laquo; Previous</a></li>
7
                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %]&amp;offset=[% previous_page_offset | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %]">&laquo; Previous</a></li>
8
            [% END %]
8
            [% END %]
9
            [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
9
            [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
10
                [% IF ( PAGE_NUMBER.highlight ) %]
10
                [% IF ( PAGE_NUMBER.highlight ) %]
11
                    <li class="active"><a href="#">[% PAGE_NUMBER.pg | html %]</a></li>
11
                    <li class="active"><a href="#">[% PAGE_NUMBER.pg | html %]</a></li>
12
                [% ELSE %]
12
                [% ELSE %]
13
                    <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&amp;offset=[% PAGE_NUMBER.offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | html %][% END %]">[% PAGE_NUMBER.pg | html %]</a></li>
13
                    <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %]&amp;offset=[% PAGE_NUMBER.offset | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %]">[% PAGE_NUMBER.pg | html %]</a></li>
14
                [% END %]
14
                [% END %]
15
            [% END %]
15
            [% END %]
16
            [% IF ( next_page_offset ) %]
16
            [% IF ( next_page_offset ) %]
17
                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&amp;offset=[% next_page_offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | html %][% END %]">Next &raquo;</a></li>
17
                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %]&amp;offset=[% next_page_offset | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %]">Next &raquo;</a></li>
18
                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&amp;offset=[% last_page_offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | html %][% END %]">Last</a></li>
18
                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %]&amp;offset=[% last_page_offset | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %]">Last</a></li>
19
            [% END %]
19
            [% END %]
20
        </ul>
20
        </ul>
21
    </div>
21
    </div>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc (-4 / +4 lines)
Lines 13-26 Link Here
13
                    <td rowspan="2">
13
                    <td rowspan="2">
14
                      [% IF shelfbrowser_prev_item %]
14
                      [% IF shelfbrowser_prev_item %]
15
                        <div id="browser_previous">
15
                        <div id="browser_previous">
16
                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% shelfbrowser_prev_item.biblionumber | html %]&amp;shelfbrowse_itemnumber=[% shelfbrowser_prev_item.itemnumber | html %]#shelfbrowser" data-prev-itemnumber="[% shelfbrowser_prev_item.itemnumber | html %]">Previous</a>
16
                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% shelfbrowser_prev_item.biblionumber | uri %]&amp;shelfbrowse_itemnumber=[% shelfbrowser_prev_item.itemnumber | uri %]#shelfbrowser" data-prev-itemnumber="[% shelfbrowser_prev_item.itemnumber | html %]">Previous</a>
17
                        </div>
17
                        </div>
18
                      [% END %]
18
                      [% END %]
19
                    </td>
19
                    </td>
20
20
21
                    [% FOREACH item IN shelfbrowser_items %]
21
                    [% FOREACH item IN shelfbrowser_items %]
22
                        <td>
22
                        <td>
23
                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | html %]&amp;shelfbrowse_itemnumber=[% item.itemnumber | html %]#shelfbrowser">
23
                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | uri %]&amp;shelfbrowse_itemnumber=[% item.itemnumber | uri %]#shelfbrowser">
24
                                [% IF ( OPACLocalCoverImages ) %]
24
                                [% IF ( OPACLocalCoverImages ) %]
25
                                    <div title="[% item.biblionumber |url %]" class="[% item.biblionumber | html %] thumbnail-shelfbrowser" id="local-thumbnail-shelf-[% item.biblionumber | html %]"></div>
25
                                    <div title="[% item.biblionumber |url %]" class="[% item.biblionumber | html %] thumbnail-shelfbrowser" id="local-thumbnail-shelf-[% item.biblionumber | html %]"></div>
26
                                [% END %]
26
                                [% END %]
Lines 67-73 Link Here
67
                    <td rowspan="2">
67
                    <td rowspan="2">
68
                        [% IF shelfbrowser_next_item %]
68
                        [% IF shelfbrowser_next_item %]
69
                            <div id="browser_next">
69
                            <div id="browser_next">
70
                                <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% shelfbrowser_next_item.biblionumber | html %]&amp;shelfbrowse_itemnumber=[% shelfbrowser_next_item.itemnumber | html %]#shelfbrowser" data-next-itemnumber="[% shelfbrowser_next_item.itemnumber | html %]">Next</a>
70
                                <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% shelfbrowser_next_item.biblionumber | uri %]&amp;shelfbrowse_itemnumber=[% shelfbrowser_next_item.itemnumber | uri %]#shelfbrowser" data-next-itemnumber="[% shelfbrowser_next_item.itemnumber | html %]">Next</a>
71
                            </div>
71
                            </div>
72
                        [% END %]
72
                        [% END %]
73
                    </td>
73
                    </td>
Lines 77-83 Link Here
77
                    [% FOREACH item IN shelfbrowser_items %]
77
                    [% FOREACH item IN shelfbrowser_items %]
78
                        <td class="top">
78
                        <td class="top">
79
                            [% item.itemcallnumber | html %]
79
                            [% item.itemcallnumber | html %]
80
                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | html %]&amp;shelfbrowse_itemnumber=[% item.itemnumber | html %]#shelfbrowser">
80
                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | uri %]&amp;shelfbrowse_itemnumber=[% item.itemnumber | uri %]#shelfbrowser">
81
                                [% item.title | html %]
81
                                [% item.title | html %]
82
                                [% FOREACH subtitl IN item.subtitle %]
82
                                [% FOREACH subtitl IN item.subtitle %]
83
                                    [% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %]
83
                                    [% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt (-1 / +1 lines)
Lines 67-73 Link Here
67
                        <h3>Report issues and broken links</h3>
67
                        <h3>Report issues and broken links</h3>
68
                        <ul>
68
                        <ul>
69
                            <li>To report this error, please contact the Koha Administrator.
69
                            <li>To report this error, please contact the Koha Administrator.
70
                                    <a href="mailto:[% admin | html %]">Send email</a>.</li>
70
                                    <a href="mailto:[% admin | uri %]">Send email</a>.</li>
71
                        </ul>
71
                        </ul>
72
                    </div> <!-- / #errormsg[% errno | html %] -->
72
                    </div> <!-- / #errormsg[% errno | html %] -->
73
                </div> <!-- / .span10/12 -->
73
                </div> <!-- / .span10/12 -->
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt (-1 / +1 lines)
Lines 32-38 Link Here
32
                        [% Koha.Preference( 'OpacMaintenanceNotice' ) | html %]
32
                        [% Koha.Preference( 'OpacMaintenanceNotice' ) | html %]
33
                    [% ELSE %]
33
                    [% ELSE %]
34
                        <h2>System Maintenance</h2>
34
                        <h2>System Maintenance</h2>
35
                          <p>The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon! If you have any questions, please contact the <a href="mailto:[% KohaAdminEmailAddress | html %]">site administrator</a></p>
35
                          <p>The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon! If you have any questions, please contact the <a href="mailto:[% KohaAdminEmailAddress | uri %]">site administrator</a></p>
36
                    [% END %]
36
                    [% END %]
37
                </div>
37
                </div>
38
            </div>
38
            </div>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt (-1 / +1 lines)
Lines 120-126 Link Here
120
                        <ul>
120
                        <ul>
121
                            [% FOREACH advsearchloo IN advancedsearchesloop %]
121
                            [% FOREACH advsearchloo IN advancedsearchesloop %]
122
                                <li id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]">
122
                                <li id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]">
123
                                <a href="#advsearch-[% advsearchloo.advanced_search_type | html %]">
123
                                <a href="#advsearch-[% advsearchloo.advanced_search_type | uri %]">
124
                               [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item type
124
                               [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item type
125
                               [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]Collection
125
                               [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]Collection
126
                               [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving location
126
                               [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving location
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt (-2 / +2 lines)
Lines 10-16 Link Here
10
    <div class="main">
10
    <div class="main">
11
        <ul class="breadcrumb">
11
        <ul class="breadcrumb">
12
            <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
12
            <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
13
            <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]">Details for [% bibliotitle | html %]</a> <span class="divider">&rsaquo;</span></li>
13
            <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]">Details for [% bibliotitle | html %]</a> <span class="divider">&rsaquo;</span></li>
14
            <li><a href="#">[% IF ( typeissue ) %]Subscribe to a subscription alert [% ELSIF ( typeissuecancel ) %] Unsubscribe from a subscription alert [% END %]</a></li>
14
            <li><a href="#">[% IF ( typeissue ) %]Subscribe to a subscription alert [% ELSIF ( typeissuecancel ) %] Unsubscribe from a subscription alert [% END %]</a></li>
15
        </ul>
15
        </ul>
16
16
Lines 43-49 Link Here
43
                                <input type="hidden" name="biblionumber" value="[% biblionumber | html %]">
43
                                <input type="hidden" name="biblionumber" value="[% biblionumber | html %]">
44
                                <input type="hidden" name="op" value="cancel_confirmed">
44
                                <input type="hidden" name="op" value="cancel_confirmed">
45
                                <input type="submit" value="Yes" class="btn">
45
                                <input type="submit" value="Yes" class="btn">
46
                                <a href="opac-serial-issues.pl?biblionumber=[% biblionumber | html %]" class="cancel">No</a>
46
                                <a href="opac-serial-issues.pl?biblionumber=[% biblionumber | uri %]" class="cancel">No</a>
47
                            </form>
47
                            </form>
48
                        [% END %]
48
                        [% END %]
49
                    </div> <!-- / #useralertsubscribe -->
49
                    </div> <!-- / #useralertsubscribe -->
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt (-2 / +2 lines)
Lines 46-58 Link Here
46
                        [% END %]
46
                        [% END %]
47
47
48
                        <h1>Entry [% authtypetext | html %]</h1>
48
                        <h1>Entry [% authtypetext | html %]</h1>
49
                        <p><a href="opac-search.pl?type=opac&amp;q=[% authid | html %]&amp;idx=an,phr">Number of records used in: [% count | html %]</a></p>
49
                        <p><a href="opac-search.pl?type=opac&amp;q=[% authid | uri %]&amp;idx=an,phr">Number of records used in: [% count | html %]</a></p>
50
                            [% FOREACH Tag0X IN Tab0XX %]
50
                            [% FOREACH Tag0X IN Tab0XX %]
51
                                <p><b>[% Tag0X.tag | html %]</b></p>
51
                                <p><b>[% Tag0X.tag | html %]</b></p>
52
                                <ul>
52
                                <ul>
53
                                [% FOREACH subfiel IN Tag0X.subfield %]
53
                                [% FOREACH subfiel IN Tag0X.subfield %]
54
                                    <li><b>[% subfiel.marc_lib | $raw %]:</b>
54
                                    <li><b>[% subfiel.marc_lib | $raw %]:</b>
55
                                    [% IF subfiel.isurl %]<a href="[% subfiel.marc_value | html %]">[% subfiel.marc_value | html %]</a>
55
                                    [% IF subfiel.isurl %]<a href="[% subfiel.marc_value | uri %]">[% subfiel.marc_value | html %]</a>
56
                                    [% ELSE %][% subfiel.marc_value | html %][% END %]</li>
56
                                    [% ELSE %][% subfiel.marc_value | html %][% END %]</li>
57
                                [% END %]
57
                                [% END %]
58
                                </ul>
58
                                </ul>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt (-1 / +1 lines)
Lines 48-54 Link Here
48
                        <h1>[% summary.mainentry | html %][% IF authtypetext %] ([% authtypetext | html %])[% END %]</h1>
48
                        <h1>[% summary.mainentry | html %][% IF authtypetext %] ([% authtypetext | html %])[% END %]</h1>
49
49
50
                        <div class="usedin">
50
                        <div class="usedin">
51
                            [% IF count %]<a href="/cgi-bin/koha/opac-search.pl?type=opac&amp;q=[% authid | html %]&amp;idx=an,phr">Number of records used in: [% count | html %]</a>[% ELSE %]This authority is not used in any records.[% END %]
51
                            [% IF count %]<a href="/cgi-bin/koha/opac-search.pl?type=opac&amp;q=[% authid | uri %]&amp;idx=an,phr">Number of records used in: [% count | html %]</a>[% ELSE %]This authority is not used in any records.[% END %]
52
                        </div>
52
                        </div>
53
53
54
                        <div class="authstanza">
54
                        <div class="authstanza">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt (-6 / +6 lines)
Lines 91-97 Link Here
91
                                    </div>
91
                                    </div>
92
                            [% ELSE %]
92
                            [% ELSE %]
93
                                <h4>Shibboleth Login</h4>
93
                                <h4>Shibboleth Login</h4>
94
                                <p><a href="[% shibbolethLoginUrl | html %]">If you have a Shibboleth account, please click here to log in.</a></p>
94
                                <p><a href="[% shibbolethLoginUrl | uri %]">If you have a Shibboleth account, please click here to log in.</a></p>
95
                            [% END %]
95
                            [% END %]
96
                            [% IF ( casAuthentication ) %]
96
                            [% IF ( casAuthentication ) %]
97
                                <h4>CAS login</h4>
97
                                <h4>CAS login</h4>
Lines 106-119 Link Here
106
                        [% IF ( casAuthentication ) %]
106
                        [% IF ( casAuthentication ) %]
107
                            [% IF ( shibbolethAuthentication ) %]
107
                            [% IF ( shibbolethAuthentication ) %]
108
                                [% IF ( casServerUrl ) %]
108
                                [% IF ( casServerUrl ) %]
109
                                    <p><a href="[% casServerUrl | html %]">Please click here to log in.</a><p>
109
                                    <p><a href="[% casServerUrl | uri %]">Please click here to log in.</a><p>
110
                                [% END %]
110
                                [% END %]
111
111
112
                                [% IF ( casServersLoop ) %]
112
                                [% IF ( casServersLoop ) %]
113
                                    <p>Please choose against which one you would like to authenticate: </p>
113
                                    <p>Please choose against which one you would like to authenticate: </p>
114
                                    <ul>
114
                                    <ul>
115
                                        [% FOREACH casServer IN casServersLoop %]
115
                                        [% FOREACH casServer IN casServersLoop %]
116
                                            <li><a href="[% casServer.value | html %]">[% casServer.name | html %]</a></li>
116
                                            <li><a href="[% casServer.value | uri %]">[% casServer.name | html %]</a></li>
117
                                        [% END %]
117
                                        [% END %]
118
                                    </ul>
118
                                    </ul>
119
                                [% END %]
119
                                [% END %]
Lines 126-139 Link Here
126
                                [% END %]
126
                                [% END %]
127
127
128
                                [% IF ( casServerUrl ) %]
128
                                [% IF ( casServerUrl ) %]
129
                                   <p><a href="[% casServerUrl | html %]">If you have a CAS account, please click here to log in.</a><p>
129
                                   <p><a href="[% casServerUrl | uri %]">If you have a CAS account, please click here to log in.</a><p>
130
                                [% END %]
130
                                [% END %]
131
131
132
                                [% IF ( casServersLoop ) %]
132
                                [% IF ( casServersLoop ) %]
133
                                    <p>If you have a CAS account, please choose against which one you would like to authenticate:</p>
133
                                    <p>If you have a CAS account, please choose against which one you would like to authenticate:</p>
134
                                    <ul>
134
                                    <ul>
135
                                        [% FOREACH casServer IN casServersLoop %]
135
                                        [% FOREACH casServer IN casServersLoop %]
136
                                        <li><a href="[% casServer.value | html %]">[% casServer.name | html %]</a></li>
136
                                        <li><a href="[% casServer.value | uri %]">[% casServer.name | html %]</a></li>
137
                                        [% END %]
137
                                        [% END %]
138
                                    </ul>
138
                                    </ul>
139
                                [% END %]
139
                                [% END %]
Lines 201-207 Link Here
201
                    [% ELSE %]
201
                    [% ELSE %]
202
                        <h4>Logging on to the catalog has not been enabled by the library.</h4>
202
                        <h4>Logging on to the catalog has not been enabled by the library.</h4>
203
                        <ul>
203
                        <ul>
204
                            <li>To report this error, you can email the Koha Administrator.<a href="mailto:[% admin | html %]">Email</a></li>
204
                            <li>To report this error, you can email the Koha Administrator.<a href="mailto:[% admin | uri %]">Email</a></li>
205
                            <li>Use top menu bar to navigate to another part of Koha.</li>
205
                            <li>Use top menu bar to navigate to another part of Koha.</li>
206
                        </ul>
206
                        </ul>
207
                    [% END # / IF opacuserlogin %]
207
                    [% END # / IF opacuserlogin %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt (-5 / +5 lines)
Lines 7-13 Link Here
7
        <ul>
7
        <ul>
8
            [% IF ( displayprev ) %]
8
            [% IF ( displayprev ) %]
9
                <li>
9
                <li>
10
                    <a href="opac-authorities-home.pl?startfrom=[% startfromprev | html %]&amp;[% FOREACH searchdat IN searchdata %][% searchdat.term | html %]=[% searchdat.val |url %]&amp;[% END %]resultsperpage=[% resultsperpage | html %]&amp;type=opac&amp;op=do_search&amp;authtypecode=[% authtypecode | html %]&amp;orderby=[% orderby | html %]">
10
                    <a href="opac-authorities-home.pl?startfrom=[% startfromprev | uri %]&amp;[% FOREACH searchdat IN searchdata %][% searchdat.term | uri %]=[% searchdat.val |url %]&amp;[% END %]resultsperpage=[% resultsperpage | uri %]&amp;type=opac&amp;op=do_search&amp;authtypecode=[% authtypecode | uri %]&amp;orderby=[% orderby | uri %]">
11
                        &laquo;
11
                        &laquo;
12
                    </a>
12
                    </a>
13
                </li>
13
                </li>
Lines 16-27 Link Here
16
                [% IF ( number.highlight ) %]
16
                [% IF ( number.highlight ) %]
17
                    <li class="active"><a href="#">[% number.number | html %]</a></li>
17
                    <li class="active"><a href="#">[% number.number | html %]</a></li>
18
                [% ELSE %]
18
                [% ELSE %]
19
                    <li><a href="opac-authorities-home.pl?startfrom=[% number.startfrom | html %]&amp;[% FOREACH searchdat IN number.searchdata %][% searchdat.term | html %]=[% searchdat.val |url %]&amp;[% END %]resultsperpage=[% resultsperpage | html %]&amp;type=opac&amp;op=do_search&amp;authtypecode=[% authtypecode | html %]&amp;orderby=[% orderby | html %]">[% number.number | html %]</a></li>
19
                    <li><a href="opac-authorities-home.pl?startfrom=[% number.startfrom | uri %]&amp;[% FOREACH searchdat IN number.searchdata %][% searchdat.term | uri %]=[% searchdat.val |url %]&amp;[% END %]resultsperpage=[% resultsperpage | uri %]&amp;type=opac&amp;op=do_search&amp;authtypecode=[% authtypecode | uri %]&amp;orderby=[% orderby | uri %]">[% number.number | html %]</a></li>
20
                [% END %]
20
                [% END %]
21
            [% END %]
21
            [% END %]
22
            [% IF ( displaynext ) %]
22
            [% IF ( displaynext ) %]
23
                <li>
23
                <li>
24
                    <a href="opac-authorities-home.pl?startfrom=[% startfromnext | html %]&amp;[% FOREACH searchdat IN searchdata %][% searchdat.term | html %]=[% searchdat.val |url %]&amp;[% END %]&amp;resultsperpage=[% resultsperpage | html %]&amp;type=opac&amp;op=do_search&amp;authtypecode=[% authtypecode | html %]&amp;orderby=[% orderby | html %]">&raquo;</a>
24
                    <a href="opac-authorities-home.pl?startfrom=[% startfromnext | uri %]&amp;[% FOREACH searchdat IN searchdata %][% searchdat.term | uri %]=[% searchdat.val |url %]&amp;[% END %]&amp;resultsperpage=[% resultsperpage | uri %]&amp;type=opac&amp;op=do_search&amp;authtypecode=[% authtypecode | uri %]&amp;orderby=[% orderby | uri %]">&raquo;</a>
25
                </li>
25
                </li>
26
            [% END %]
26
            [% END %]
27
        </ul>
27
        </ul>
Lines 88-98 Link Here
88
                                        [% FOREACH resul IN result %]
88
                                        [% FOREACH resul IN result %]
89
                                            <tr>
89
                                            <tr>
90
                                                <td>[% PROCESS authresult summary=resul.summary %]</td>
90
                                                <td>[% PROCESS authresult summary=resul.summary %]</td>
91
                                                <td><a href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% resul.authid | html %]">Details</a>
91
                                                <td><a href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% resul.authid | uri %]">Details</a>
92
                                                <td>[% resul.authtype | html %]</td>
92
                                                <td>[% resul.authtype | html %]</td>
93
                                                [% UNLESS ( resul.isEDITORS ) %]
93
                                                [% UNLESS ( resul.isEDITORS ) %]
94
                                                    <td>
94
                                                    <td>
95
                                                         [% IF resul.used > 0 %]<a href="/cgi-bin/koha/opac-search.pl?type=opac&amp;op=do_search&amp;q=an=[% resul.authid | html %]">[% resul.used | html %] biblios</a>[% ELSE %]0 biblios[% END %]
95
                                                         [% IF resul.used > 0 %]<a href="/cgi-bin/koha/opac-search.pl?type=opac&amp;op=do_search&amp;q=an=[% resul.authid | uri %]">[% resul.used | html %] biblios</a>[% ELSE %]0 biblios[% END %]
96
                                                    </td>
96
                                                    </td>
97
                                                [% END %]
97
                                                [% END %]
98
                                            </tr>
98
                                            </tr>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt (-3 / +3 lines)
Lines 148-154 Link Here
148
                                                [% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %]
148
                                                [% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %]
149
                                                    <p>
149
                                                    <p>
150
                                                    [% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
150
                                                    [% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
151
                                                        - <a href="[% MARCNOTE.marcnote | html %]">[% MARCNOTE.marcnote | html %]</a>
151
                                                        - <a href="[% MARCNOTE.marcnote | uri %]">[% MARCNOTE.marcnote | html %]</a>
152
                                                    [% ELSE %]
152
                                                    [% ELSE %]
153
                                                        - [% MARCNOTE.marcnote | html %]
153
                                                        - [% MARCNOTE.marcnote | html %]
154
                                                    [% END %]
154
                                                    [% END %]
Lines 201-209 Link Here
201
                                                        [% IF MARCurl.part %]<p>[% MARCurl.part | html %]</p>[% END %]
201
                                                        [% IF MARCurl.part %]<p>[% MARCurl.part | html %]</p>[% END %]
202
202
203
                                                        [% IF OPACURLOpenInNewWindow %]
203
                                                        [% IF OPACURLOpenInNewWindow %]
204
                                                            <a href="[% MARCurl.MARCURL | html %]" title="[% MARCurl.MARCURL | html %]" target="_blank" rel="noreferrer">[% MARCurl.linktext | html %]</a>
204
                                                            <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]" target="_blank" rel="noreferrer">[% MARCurl.linktext | html %]</a>
205
                                                        [% ELSE %]
205
                                                        [% ELSE %]
206
                                                            <a href="[% MARCurl.MARCURL | html %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a>
206
                                                            <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a>
207
                                                        [% END %]
207
                                                        [% END %]
208
208
209
                                                        [% IF MARCurl.notes %][% FOREACH note IN MARCurl.notes %]<p>[% note.note | html %]</p>[% END %][% END %]
209
                                                        [% IF MARCurl.notes %][% FOREACH note IN MARCurl.notes %]<p>[% note.note | html %]</p>[% END %][% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt (-2 / +2 lines)
Lines 32-38 Link Here
32
                                <ul>
32
                                <ul>
33
                                    [% FOREACH HIERARCHY_LOO IN HIERARCHY_LOOP %]
33
                                    [% FOREACH HIERARCHY_LOO IN HIERARCHY_LOOP %]
34
                                        <li>
34
                                        <li>
35
                                            <a href="opac-browser.pl?level=[% HIERARCHY_LOO.level | html %]&amp;filter=[% HIERARCHY_LOO.classification |uri %]">[% HIERARCHY_LOO.description | html %]</a>
35
                                            <a href="opac-browser.pl?level=[% HIERARCHY_LOO.level | uri %]&amp;filter=[% HIERARCHY_LOO.classification |uri %]">[% HIERARCHY_LOO.description | html %]</a>
36
                                        </li>
36
                                        </li>
37
                                        <li style="list-style-type: none;">
37
                                        <li style="list-style-type: none;">
38
                                    [% END %]
38
                                    [% END %]
Lines 45-51 Link Here
45
                                                            [% IF ( LEVEL_LOO.endnode ) %]
45
                                                            [% IF ( LEVEL_LOO.endnode ) %]
46
                                                                <a href="opac-search.pl?q=Dewey-classification:[% LEVEL_LOO.classification |uri %]">[% LEVEL_LOO.description | html %]</a>
46
                                                                <a href="opac-search.pl?q=Dewey-classification:[% LEVEL_LOO.classification |uri %]">[% LEVEL_LOO.description | html %]</a>
47
                                                            [% ELSE %]
47
                                                            [% ELSE %]
48
                                                                <a href="opac-browser.pl?level=[% LEVEL_LOO.level | html %]&amp;filter=[% LEVEL_LOO.classification |uri %]">[% LEVEL_LOO.description | html %]</a>
48
                                                                <a href="opac-browser.pl?level=[% LEVEL_LOO.level | uri %]&amp;filter=[% LEVEL_LOO.classification |uri %]">[% LEVEL_LOO.description | html %]</a>
49
                                                            [% END %]
49
                                                            [% END %]
50
                                                        </p>
50
                                                        </p>
51
                                                        <p style="font-size:0.75em"><i>([% LEVEL_LOO.number | html %] biblios)</i></p>
51
                                                        <p style="font-size:0.75em"><i>([% LEVEL_LOO.number | html %] biblios)</i></p>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt (-3 / +3 lines)
Lines 68-74 Link Here
68
                        <tbody>
68
                        <tbody>
69
                            [% FOREACH cr IN course_reserves %]
69
                            [% FOREACH cr IN course_reserves %]
70
                                <tr>
70
                                <tr>
71
                                    <td><a href="opac-detail.pl?biblionumber=[% cr.biblio.biblionumber | html %]">[% cr.biblio.title | html %]</a></td>
71
                                    <td><a href="opac-detail.pl?biblionumber=[% cr.biblio.biblionumber | uri %]">[% cr.biblio.title | html %]</a></td>
72
                                    <td>[% cr.biblio.author | html %]</td>
72
                                    <td>[% cr.biblio.author | html %]</td>
73
                                    <td>[% ItemTypes.GetDescription( cr.item.itype ) | html %]</td>
73
                                    <td>[% ItemTypes.GetDescription( cr.item.itype ) | html %]</td>
74
                                    <td>[% Branches.GetName( cr.item.holdingbranch ) | html %] <br/> <i>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) | html %]</i></td>
74
                                    <td>[% Branches.GetName( cr.item.holdingbranch ) | html %] <br/> <i>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) | html %]</i></td>
Lines 84-92 Link Here
84
                                        [% END %]
84
                                        [% END %]
85
                                    </td>
85
                                    </td>
86
                                    <td>[% IF (cr.item.uri) %]
86
                                    <td>[% IF (cr.item.uri) %]
87
                                            <a href="[% cr.item.uri | html %]">Item URI</a>
87
                                            <a href="[% cr.item.uri | uri %]">Item URI</a>
88
                                        [% ELSIF (cr.biblioitem.url) %]
88
                                        [% ELSIF (cr.biblioitem.url) %]
89
                                            <a href="[% cr.biblioitem.url | html %]">Record URL</a>
89
                                            <a href="[% cr.biblioitem.url | uri %]">Record URL</a>
90
                                        [% END %]
90
                                        [% END %]
91
                                    </td>
91
                                    </td>
92
                                </tr>
92
                                </tr>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt (-1 / +1 lines)
Lines 42-48 Link Here
42
                        <tbody>
42
                        <tbody>
43
                            [% FOREACH c IN courses %]
43
                            [% FOREACH c IN courses %]
44
                                <tr>
44
                                <tr>
45
                                    <td><a href="opac-course-details.pl?course_id=[% c.course_id | html %]">[% c.course_name | html %]</a></td>
45
                                    <td><a href="opac-course-details.pl?course_id=[% c.course_id | uri %]">[% c.course_name | html %]</a></td>
46
                                    <td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department, 1 ) | html %]</td>
46
                                    <td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department, 1 ) | html %]</td>
47
                                    <td>[% c.course_number | html %]</td>
47
                                    <td>[% c.course_number | html %]</td>
48
                                    <td>[% c.section | html %]</td>
48
                                    <td>[% c.section | html %]</td>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt (-29 / +29 lines)
Lines 59-67 Link Here
59
                    [% END %]
59
                    [% END %]
60
                    [% IF ( OPACAmazonCoverImages ) %]
60
                    [% IF ( OPACAmazonCoverImages ) %]
61
                        [% IF ( OPACURLOpenInNewWindow ) %]
61
                        [% IF ( OPACURLOpenInNewWindow ) %]
62
                            <a href="http://www.amazon[% AmazonTld | html %]/gp/reader/[% normalized_isbn | html %][% AmazonAssocTag | html %]#reader-link" target="_blank" rel="noreferrer">
62
                            <a href="http://www.amazon[% AmazonTld | uri %]/gp/reader/[% normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link" target="_blank" rel="noreferrer">
63
                        [% ELSE %]
63
                        [% ELSE %]
64
                            <a href="http://www.amazon[% AmazonTld | html %]/dp/[% normalized_isbn | html %][% AmazonAssocTag | html %]">
64
                            <a href="http://www.amazon[% AmazonTld | uri %]/dp/[% normalized_isbn | uri %][% AmazonAssocTag | uri %]">
65
                        [% END %]
65
                        [% END %]
66
                            <img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn | html %].01.MZZZZZZZ.jpg" alt="Cover image" /></a>
66
                            <img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn | html %].01.MZZZZZZZ.jpg" alt="Cover image" /></a>
67
                    [% END %]
67
                    [% END %]
Lines 88-96 Link Here
88
                    [% IF ( BakerTaylorEnabled && bt_id ) %]
88
                    [% IF ( BakerTaylorEnabled && bt_id ) %]
89
                        [% IF BakerTaylorBookstoreURL %]
89
                        [% IF BakerTaylorBookstoreURL %]
90
                            [% IF ( OPACURLOpenInNewWindow ) %]
90
                            [% IF ( OPACURLOpenInNewWindow ) %]
91
                                <a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]" target="_blank" rel="noreferrer"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
91
                                <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]" target="_blank" rel="noreferrer"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
92
                            [% ELSE %]
92
                            [% ELSE %]
93
                                <a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
93
                                <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
94
                            [% END %]
94
                            [% END %]
95
                        [% ELSE %]
95
                        [% ELSE %]
96
                            <img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" />
96
                            <img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" />
Lines 184-190 Link Here
184
                                        <a class='authlink' href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% MARCAUTHOR.authoritylink | html %]"><img style="vertical-align:middle" height="15" width="15" src="[% interface | html %]/[% theme | html %]/images/filefind.png"></a>
184
                                        <a class='authlink' href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% MARCAUTHOR.authoritylink | html %]"><img style="vertical-align:middle" height="15" width="15" src="[% interface | html %]/[% theme | html %]/images/filefind.png"></a>
185
                                    [% END %]
185
                                    [% END %]
186
                                    [% IF IDREF and MARCAUTHOR.unimarc3 %]
186
                                    [% IF IDREF and MARCAUTHOR.unimarc3 %]
187
                                        <a href="/cgi-bin/koha/opac-idref.pl?unimarc3=[% MARCAUTHOR.unimarc3 | html %]" title="IdRef" rel="gb_page_center[600,500]">IdRef</a>
187
                                        <a href="/cgi-bin/koha/opac-idref.pl?unimarc3=[% MARCAUTHOR.unimarc3 | uri %]" title="IdRef" rel="gb_page_center[600,500]">IdRef</a>
188
                                    [% END %]
188
                                    [% END %]
189
                                    [% UNLESS ( loop.last ) %]|[% END %]
189
                                    [% UNLESS ( loop.last ) %]|[% END %]
190
                                [% END # /FOREACH MARCAUTHORS %]
190
                                [% END # /FOREACH MARCAUTHORS %]
Lines 337-351 Link Here
337
337
338
                                        [% IF ( OPACURLOpenInNewWindow ) %]
338
                                        [% IF ( OPACURLOpenInNewWindow ) %]
339
                                            [% IF trackclicks == 'track' || trackclicks == 'anonymous' %]
339
                                            [% IF trackclicks == 'track' || trackclicks == 'anonymous' %]
340
                                                <a href="/cgi-bin/koha/tracklinks.pl?uri=[% MARCurl.MARCURL |url%]&amp;biblionumber=[% biblio.biblionumber | html %]" title="[% MARCurl.MARCURL | html %]" target="_blank" rel="noreferrer">
340
                                                <a href="/cgi-bin/koha/tracklinks.pl?uri=[% MARCurl.MARCURL |url%]&amp;biblionumber=[% biblio.biblionumber | uri %]" title="[% MARCurl.MARCURL | html %]" target="_blank" rel="noreferrer">
341
                                            [% ELSE %]
341
                                            [% ELSE %]
342
                                                <a href="[% MARCurl.MARCURL | html %]" title="[% MARCurl.MARCURL | html %]" target="_blank" rel="noreferrer">
342
                                                <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]" target="_blank" rel="noreferrer">
343
                                            [% END %]
343
                                            [% END %]
344
                                        [% ELSE %]
344
                                        [% ELSE %]
345
                                            [% IF trackclicks == 'track' || trackclicks == 'anonymous' %]
345
                                            [% IF trackclicks == 'track' || trackclicks == 'anonymous' %]
346
                                                <a href="/cgi-bin/koha/tracklinks.pl?uri=[% MARCurl.MARCURL |url%]&amp;biblionumber=[% biblio.biblionumber | html %]" title="[% MARCurl.MARCURL | html %]">
346
                                                <a href="/cgi-bin/koha/tracklinks.pl?uri=[% MARCurl.MARCURL |url%]&amp;biblionumber=[% biblio.biblionumber | uri %]" title="[% MARCurl.MARCURL | html %]">
347
                                            [% ELSE %]
347
                                            [% ELSE %]
348
                                                <a href="[% MARCurl.MARCURL | html %]" title="[% MARCurl.MARCURL | html %]">
348
                                                <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]">
349
                                            [% END %]
349
                                            [% END %]
350
                                        [% END %]
350
                                        [% END %]
351
                                        [% MARCurl.linktext | html %]</a>
351
                                        [% MARCurl.linktext | html %]</a>
Lines 380-386 Link Here
380
                    [% IF shelves.count %]
380
                    [% IF shelves.count %]
381
                        <span class="results_summary lists"><span class="label">List(s) this item appears in: </span>
381
                        <span class="results_summary lists"><span class="label">List(s) this item appears in: </span>
382
                        [% FOREACH s IN shelves %]
382
                        [% FOREACH s IN shelves %]
383
                            <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | html %]">[% s.shelfname | html %]</a>
383
                            <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a>
384
                            [% IF ( loop.last ) %][% ELSE %]|[% END %]
384
                            [% IF ( loop.last ) %][% ELSE %]|[% END %]
385
                        [% END %]
385
                        [% END %]
386
                        </span>
386
                        </span>
Lines 503-509 Link Here
503
                    [% IF ( BakerTaylorContentURL ) %]
503
                    [% IF ( BakerTaylorContentURL ) %]
504
                        <span class="results_summary">
504
                        <span class="results_summary">
505
                        <span class="label">Enhanced content: </span>
505
                        <span class="label">Enhanced content: </span>
506
                              [% IF ( OPACURLOpenInNewWindow ) %]<a href="[% BakerTaylorContentURL | html %]" target="_blank" rel="noreferrer">Content Cafe</a>[% ELSE %]<a href="[% BakerTaylorContentURL | html %]">Content Cafe</a>[% END %]
506
                              [% IF ( OPACURLOpenInNewWindow ) %]<a href="[% BakerTaylorContentURL | uri %]" target="_blank" rel="noreferrer">Content Cafe</a>[% ELSE %]<a href="[% BakerTaylorContentURL | html %]">Content Cafe</a>[% END %]
507
                        </span>
507
                        </span>
508
                    [% END # / IF BakerTaylorContentURL %]
508
                    [% END # / IF BakerTaylorContentURL %]
509
509
Lines 555-561 Link Here
555
                                [% IF ( LibraryThingForLibrariesID ) %]
555
                                [% IF ( LibraryThingForLibrariesID ) %]
556
                                    <li id="tab_LTFLreviews">
556
                                    <li id="tab_LTFLreviews">
557
                                        <script src="https://www.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID | html %]"></script>
557
                                        <script src="https://www.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID | html %]"></script>
558
                                        <noscript>This page contains enriched content visible when JavaScript is enabled or by clicking <a href="https://www.librarything.com/forlibraries/noscript.php?id=[% LibraryThingForLibrariesID | html %]&amp;accessibility=1">here</a>.</noscript>
558
                                        <noscript>This page contains enriched content visible when JavaScript is enabled or by clicking <a href="https://www.librarything.com/forlibraries/noscript.php?id=[% LibraryThingForLibrariesID | uri %]&amp;accessibility=1">here</a>.</noscript>
559
                                    </li>
559
                                    </li>
560
                                [% END %]
560
                                [% END %]
561
                            [% END %]
561
                            [% END %]
Lines 634-640 Link Here
634
634
635
                    <div id="holdings">
635
                    <div id="holdings">
636
                        [% IF too_many_items %]
636
                        [% IF too_many_items %]
637
                            <p>This record has many physical items ([% items_count | html %]). <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]&amp;viewallitems=1">Click here to view them all.</a></p>
637
                            <p>This record has many physical items ([% items_count | html %]). <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | uri %]&amp;viewallitems=1">Click here to view them all.</a></p>
638
                        [% ELSIF ( itemloop.size ) %]
638
                        [% ELSIF ( itemloop.size ) %]
639
                            [% INCLUDE items_table items=itemloop tab="holdings" table_id="holdingst" %]
639
                            [% INCLUDE items_table items=itemloop tab="holdings" table_id="holdingst" %]
640
                            [% IF Koha.Preference('OPACAcquisitionDetails') and acquisition_details.total_quantity > 0 %]
640
                            [% IF Koha.Preference('OPACAcquisitionDetails') and acquisition_details.total_quantity > 0 %]
Lines 705-711 Link Here
705
                                [% FOREACH MARCNOTE IN MARCNOTES %]
705
                                [% FOREACH MARCNOTE IN MARCNOTES %]
706
                                    <p>
706
                                    <p>
707
                                    [% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
707
                                    [% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
708
                                        <a href="[% MARCNOTE.marcnote | html %]">[% MARCNOTE.marcnote | html %]</a>
708
                                        <a href="[% MARCNOTE.marcnote | uri %]">[% MARCNOTE.marcnote | html %]</a>
709
                                    [% ELSE %]
709
                                    [% ELSE %]
710
                                        [% MARCNOTE.marcnote FILTER html_line_break | html %]
710
                                        [% MARCNOTE.marcnote FILTER html_line_break | html %]
711
                                    [% END %]
711
                                    [% END %]
Lines 863-869 Link Here
863
                                    </table>
863
                                    </table>
864
                                [% END # / IF subscription.latestserials %]
864
                                [% END # / IF subscription.latestserials %]
865
                            [% END # / FOREACH subscriptions %]
865
                            [% END # / FOREACH subscriptions %]
866
                            <p class="subscription_moredetails"><a href="opac-serial-issues.pl?biblionumber=[% biblio.biblionumber | html %]">More details</a></p>
866
                            <p class="subscription_moredetails"><a href="opac-serial-issues.pl?biblionumber=[% biblio.biblionumber | uri %]">More details</a></p>
867
                        </div> <!-- / #subscriptions -->
867
                        </div> <!-- / #subscriptions -->
868
                    [% END # IF subscriptionsnumber %]
868
                    [% END # IF subscriptionsnumber %]
869
869
Lines 982-988 Link Here
982
                                            [% UNLESS ( item_level_itypes ) %]
982
                                            [% UNLESS ( item_level_itypes ) %]
983
                                                <td>[% XISBN.description | html %]</td>
983
                                                <td>[% XISBN.description | html %]</td>
984
                                            [% END %]
984
                                            [% END %]
985
                                            <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% XISBN.biblionumber | html %]">[% XISBN.title | html %]</a>
985
                                            <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% XISBN.biblionumber | uri %]">[% XISBN.title | html %]</a>
986
                                                [% IF ( XISBN.author ) %]<span> by </span>[% XISBN.author | html %][% END %]
986
                                                [% IF ( XISBN.author ) %]<span> by </span>[% XISBN.author | html %][% END %]
987
                                                [% IF ( XISBN.copyrightdate ) %]<span> &copy;</span>[% XISBN.copyrightdate | html %][% END %]
987
                                                [% IF ( XISBN.copyrightdate ) %]<span> &copy;</span>[% XISBN.copyrightdate | html %][% END %]
988
                                                [% IF ( XISBN.publishercode ) %]
988
                                                [% IF ( XISBN.publishercode ) %]
Lines 1075-1090 Link Here
1075
                        <ul class="pg_menu clearfix">
1075
                        <ul class="pg_menu clearfix">
1076
                            <li class="left_results">
1076
                            <li class="left_results">
1077
                                [% IF ( previousBiblionumber ) %]
1077
                                [% IF ( previousBiblionumber ) %]
1078
                                    <a href="opac-detail.pl?biblionumber=[% previousBiblionumber | html %][% IF ( query_desc && OpacHighlightedWords ) %]&query_desc=[% query_desc |uri %][% END %]" title="See: [% IF ( previousTitle ) %][% previousTitle | html %][% ELSE %]previous biblio[% END %]"><i class="fa fa-angle-double-left"></i> Previous</a>
1078
                                    <a href="opac-detail.pl?biblionumber=[% previousBiblionumber | uri %][% IF ( query_desc && OpacHighlightedWords ) %]&query_desc=[% query_desc |uri %][% END %]" title="See: [% IF ( previousTitle ) %][% previousTitle | html %][% ELSE %]previous biblio[% END %]"><i class="fa fa-angle-double-left"></i> Previous</a>
1079
                                [% ELSE %]
1079
                                [% ELSE %]
1080
                                    <span>Previous</span>
1080
                                    <span>Previous</span>
1081
                                [% END %]
1081
                                [% END %]
1082
                            </li>
1082
                            </li>
1083
                            [%# busc is already URI encoded %]
1083
                            [%# busc is already URI encoded %]
1084
                            <li class="back_results"><a href="opac-search.pl?[% busc | html %]" title="Back to the results search list">Back to results</a></li>
1084
                            <li class="back_results"><a href="opac-search.pl?[% busc | uri %]" title="Back to the results search list">Back to results</a></li>
1085
                            <li class="right_results">
1085
                            <li class="right_results">
1086
                                [% IF ( nextBiblionumber ) %]
1086
                                [% IF ( nextBiblionumber ) %]
1087
                                    <a href="opac-detail.pl?biblionumber=[% nextBiblionumber | html %][% IF ( query_desc && OpacHighlightedWords ) %]&query_desc=[% query_desc |uri %][% END %]" title="See: [% IF ( nextTitle ) %][% nextTitle | html %][% ELSE %]next biblio[% END %]">Next <i class="fa fa-angle-double-right"></i></a>
1087
                                    <a href="opac-detail.pl?biblionumber=[% nextBiblionumber | uri %][% IF ( query_desc && OpacHighlightedWords ) %]&query_desc=[% query_desc |uri %][% END %]" title="See: [% IF ( nextTitle ) %][% nextTitle | html %][% ELSE %]next biblio[% END %]">Next <i class="fa fa-angle-double-right"></i></a>
1088
                                [% ELSE %]
1088
                                [% ELSE %]
1089
                                    <span>Next</span>
1089
                                    <span>Next</span>
1090
                                [% END %]
1090
                                [% END %]
Lines 1100-1106 Link Here
1100
                                        [% ELSE %]
1100
                                        [% ELSE %]
1101
                                            <li class="li_pag_[% loop.count | html %]">
1101
                                            <li class="li_pag_[% loop.count | html %]">
1102
                                        [% END %]
1102
                                        [% END %]
1103
                                        <a href="opac-detail.pl?biblionumber=[% listitem.biblionumber | html %]&amp;query_desc=[% query_desc |uri %]" title="View record &quot;[% listitem.title | html %]&quot;" class="a_pag" id="a_pag_[% loop.count | html %]">[% loop.count + offset | html %]</a></li>
1103
                                        <a href="opac-detail.pl?biblionumber=[% listitem.biblionumber | uri %]&amp;query_desc=[% query_desc |uri %]" title="View record &quot;[% listitem.title | html %]&quot;" class="a_pag" id="a_pag_[% loop.count | html %]">[% loop.count + offset | html %]</a></li>
1104
                                    [% END %]
1104
                                    [% END %]
1105
                                </ul>
1105
                                </ul>
1106
                            </div>
1106
                            </div>
Lines 1108-1116 Link Here
1108
                                <ul id="ul_pagination_lists">
1108
                                <ul id="ul_pagination_lists">
1109
                                    [% FOREACH listitem IN listResults %]
1109
                                    [% FOREACH listitem IN listResults %]
1110
                                        [% IF ( listitem.biblionumber == biblionumber ) %]
1110
                                        [% IF ( listitem.biblionumber == biblionumber ) %]
1111
                                            <li id="li_pag_[% loop.count | html %]" class="highlight" title="Go to detail"><span class="li_pag_index"><i class="fa fa-arrow-left"></i> [% loop.count  + offset | html %]</span><a href="opac-detail.pl?biblionumber=[% biblionumber | html %]&amp;query_desc=[% query_desc |uri %]">[% title | html %]</a><br> [% IF ( author ) %]by [% author | html %][% END %]</li>
1111
                                            <li id="li_pag_[% loop.count | html %]" class="highlight" title="Go to detail"><span class="li_pag_index"><i class="fa fa-arrow-left"></i> [% loop.count  + offset | html %]</span><a href="opac-detail.pl?biblionumber=[% biblionumber | uri %]&amp;query_desc=[% query_desc |uri %]">[% title | html %]</a><br> [% IF ( author ) %]by [% author | html %][% END %]</li>
1112
                                        [% ELSE %]
1112
                                        [% ELSE %]
1113
                                            <li id="li_pag_[% loop.count | html %]" title="Go to detail"><span class="li_pag_index">[% loop.count + offset | html %]</span><a href="opac-detail.pl?biblionumber=[% listitem.biblionumber | html %]&amp;query_desc=[% query_desc |uri %]">[% listitem.title | html %]</a><br> [% IF ( listitem.author ) %]by [% listitem.author | html %][% END %]</li>
1113
                                            <li id="li_pag_[% loop.count | html %]" title="Go to detail"><span class="li_pag_index">[% loop.count + offset | html %]</span><a href="opac-detail.pl?biblionumber=[% listitem.biblionumber | uri %]&amp;query_desc=[% query_desc |uri %]">[% listitem.title | html %]</a><br> [% IF ( listitem.author ) %]by [% listitem.author | html %][% END %]</li>
1114
                                        [% END %]
1114
                                        [% END %]
1115
                                    [% END %]
1115
                                    [% END %]
1116
                                </ul>
1116
                                </ul>
Lines 1156-1162 Link Here
1156
        [% IF ( LibraryThingForLibrariesID ) %]
1156
        [% IF ( LibraryThingForLibrariesID ) %]
1157
            <script src="https://ltfl.librarything.com/forlibraries/widget.js?systype=koha&amp;id=[% LibraryThingForLibrariesID | html %]"></script>
1157
            <script src="https://ltfl.librarything.com/forlibraries/widget.js?systype=koha&amp;id=[% LibraryThingForLibrariesID | html %]"></script>
1158
            <noscript>This page contains enriched content visible when JavaScript is enabled or by clicking
1158
            <noscript>This page contains enriched content visible when JavaScript is enabled or by clicking
1159
            <a href="https://www.librarything.com/forlibraries/noscript.php?id=[% LibraryThingForLibrariesID | html %]&amp;accessibility=1">here</a>.</noscript>
1159
            <a href="https://www.librarything.com/forlibraries/noscript.php?id=[% LibraryThingForLibrariesID | uri %]&amp;accessibility=1">here</a>.</noscript>
1160
        [% END %]
1160
        [% END %]
1161
1161
1162
        [% IF ( NovelistSelectProfile && ( normalized_isbn || normalized_upc ) ) %]
1162
        [% IF ( NovelistSelectProfile && ( normalized_isbn || normalized_upc ) ) %]
Lines 1232-1238 Link Here
1232
                            <link property="businessFunction" href="http://purl.org/goodrelations/v1#LeaseOut">
1232
                            <link property="businessFunction" href="http://purl.org/goodrelations/v1#LeaseOut">
1233
                            <span class="[% ITEM_RESULT.holding_branch_opac_info ? 'branch-info-tooltip-trigger' : '' %]" title="">
1233
                            <span class="[% ITEM_RESULT.holding_branch_opac_info ? 'branch-info-tooltip-trigger' : '' %]" title="">
1234
                                [% IF ( ITEM_RESULT.branchurl ) %]
1234
                                [% IF ( ITEM_RESULT.branchurl ) %]
1235
                                    <a href="[% ITEM_RESULT.branchurl | html %]">[% ITEM_RESULT.branchname | html %]</a>
1235
                                    <a href="[% ITEM_RESULT.branchurl | uri %]">[% ITEM_RESULT.branchname | html %]</a>
1236
                                [% ELSE %]
1236
                                [% ELSE %]
1237
                                    <span>[% ITEM_RESULT.branchname | html %]</span>
1237
                                    <span>[% ITEM_RESULT.branchname | html %]</span>
1238
                                [% END %]
1238
                                [% END %]
Lines 1254-1260 Link Here
1254
                                [% IF Branches.GetURL( ITEM_RESULT.homebranch ) %]
1254
                                [% IF Branches.GetURL( ITEM_RESULT.homebranch ) %]
1255
                                    [% home_branch_url = Branches.GetURL( ITEM_RESULT.homebranch ) | html %]
1255
                                    [% home_branch_url = Branches.GetURL( ITEM_RESULT.homebranch ) | html %]
1256
                                    [% IF ( home_branch_url ) %]
1256
                                    [% IF ( home_branch_url ) %]
1257
                                         <a href="[% home_branch_url | html %]">[% Branches.GetName( ITEM_RESULT.homebranch ) | html %]</a>
1257
                                         <a href="[% home_branch_url | uri %]">[% Branches.GetName( ITEM_RESULT.homebranch ) | html %]</a>
1258
                                    [% ELSE %]
1258
                                    [% ELSE %]
1259
                                        <span>[% Branches.GetName( ITEM_RESULT.homebranch ) | html %]</span>
1259
                                        <span>[% Branches.GetName( ITEM_RESULT.homebranch ) | html %]</span>
1260
                                    [% END %]
1260
                                    [% END %]
Lines 1286-1292 Link Here
1286
                                [% IF ( ITEM_RESULT.itemnumber == starting_itemnumber ) %]
1286
                                [% IF ( ITEM_RESULT.itemnumber == starting_itemnumber ) %]
1287
                                    (<a class="close_shelf" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber | html %]&amp;shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber | html %]#[% tab | html %]">Browse shelf</a>)
1287
                                    (<a class="close_shelf" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber | html %]&amp;shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber | html %]#[% tab | html %]">Browse shelf</a>)
1288
                                [% ELSE %]
1288
                                [% ELSE %]
1289
                                    (<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber | html %]&amp;shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber | html %]#[% tab | html %]">Browse shelf</a>)
1289
                                    (<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber | uri %]&amp;shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber | uri %]#[% tab | uri %]">Browse shelf</a>)
1290
                                [% END %]
1290
                                [% END %]
1291
                            [% END %]
1291
                            [% END %]
1292
                        [% END %]
1292
                        [% END %]
Lines 1316-1329 Link Here
1316
                                    [% IF Koha.Preference("OPACURLOpenInNewWindow") %]
1316
                                    [% IF Koha.Preference("OPACURLOpenInNewWindow") %]
1317
                                    <a target="_blank" rel="noreferrer" href="/cgi-bin/koha/tracklinks.pl?uri=[% ITEM_RESULT.uri | uri %]&amp;biblionumber=[% biblio.biblionumber | html %]&amp;itemnumber=[% ITEM_RESULT.itemnumber | url %]" property="url"> Link to resource </a>
1317
                                    <a target="_blank" rel="noreferrer" href="/cgi-bin/koha/tracklinks.pl?uri=[% ITEM_RESULT.uri | uri %]&amp;biblionumber=[% biblio.biblionumber | html %]&amp;itemnumber=[% ITEM_RESULT.itemnumber | url %]" property="url"> Link to resource </a>
1318
                                    [% ELSE %]
1318
                                    [% ELSE %]
1319
                                    <a href="/cgi-bin/koha/tracklinks.pl?uri=[% ITEM_RESULT.uri | uri %]&amp;biblionumber=[% biblio.biblionumber | html %]&amp;itemnumber=[% ITEM_RESULT.itemnumber | url %]" property="url"> Link to resource </a>
1319
                                    <a href="/cgi-bin/koha/tracklinks.pl?uri=[% ITEM_RESULT.uri | uri %]&amp;biblionumber=[% biblio.biblionumber | uri %]&amp;itemnumber=[% ITEM_RESULT.itemnumber | url %]" property="url"> Link to resource </a>
1320
                                    [% END %]
1320
                                    [% END %]
1321
1321
1322
                                [% ELSE %]
1322
                                [% ELSE %]
1323
                                    [% IF Koha.Preference("OPACURLOpenInNewWindow") %]
1323
                                    [% IF Koha.Preference("OPACURLOpenInNewWindow") %]
1324
                                    <a target="_blank" rel="noreferrer" href="[% ITEM_RESULT.uri | html %]" property="url">[% ITEM_RESULT.uri | html %]</a>
1324
                                    <a target="_blank" rel="noreferrer" href="[% ITEM_RESULT.uri | html %]" property="url">[% ITEM_RESULT.uri | html %]</a>
1325
                                    [% ELSE %]
1325
                                    [% ELSE %]
1326
                                    <a href="[% ITEM_RESULT.uri | html %]" property="url">[% ITEM_RESULT.uri | html %]</a>
1326
                                    <a href="[% ITEM_RESULT.uri | uri %]" property="url">[% ITEM_RESULT.uri | html %]</a>
1327
                                    [% END %]
1327
                                    [% END %]
1328
                                [% END %]
1328
                                [% END %]
1329
                            [% END %]
1329
                            [% END %]
Lines 1352-1358 Link Here
1352
                                [% FOREACH r IN ITEM_RESULT.course_reserves %]
1352
                                [% FOREACH r IN ITEM_RESULT.course_reserves %]
1353
                                    [% IF r.course.enabled == 'yes' %]
1353
                                    [% IF r.course.enabled == 'yes' %]
1354
                                        <p>
1354
                                        <p>
1355
                                            <a href="opac-course-details.pl?course_id=[% r.course.course_id | html %]">
1355
                                            <a href="opac-course-details.pl?course_id=[% r.course.course_id | uri %]">
1356
                                            [% r.course.course_name | html %]
1356
                                            [% r.course.course_name | html %]
1357
                                            <!--[% IF r.course.course_number %] [% r.course.course_number | html %] [% END %]-->
1357
                                            <!--[% IF r.course.course_number %] [% r.course.course_number | html %] [% END %]-->
1358
                                            [% IF r.course.section %] [% r.course.section | html %] [% END %]
1358
                                            [% IF r.course.section %] [% r.course.section | html %] [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt (-1 / +1 lines)
Lines 66-72 Link Here
66
                                    <fieldset class="action">
66
                                    <fieldset class="action">
67
                                        <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
67
                                        <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
68
                                        <input type="submit" name="save" class="btn" value="Go" />
68
                                        <input type="submit" name="save" class="btn" value="Go" />
69
                                        <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | html %]" class="cancel close" data-dismiss="modal">Cancel</a>
69
                                        <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel close" data-dismiss="modal">Cancel</a>
70
                                    </fieldset>
70
                                    </fieldset>
71
                                </form>
71
                                </form>
72
                                [% IF ( modal ) %]
72
                                [% IF ( modal ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt (-1 / +1 lines)
Lines 16-22 Link Here
16
    <div class="main">
16
    <div class="main">
17
        <ul class="breadcrumb">
17
        <ul class="breadcrumb">
18
            <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
18
            <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
19
            <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]">Details for [% bibliotitle | html %]</a> <span class="divider">&rsaquo;</span></li>
19
            <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]">Details for [% bibliotitle | html %]</a> <span class="divider">&rsaquo;</span></li>
20
            <li><a href="#">Full subscription history</a></li>
20
            <li><a href="#">Full subscription history</a></li>
21
        </ul>
21
        </ul>
22
22
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt (-2 / +2 lines)
Lines 37-44 Link Here
37
                [% FOREACH doc IN role.docs %]
37
                [% FOREACH doc IN role.docs %]
38
                  <tr>
38
                  <tr>
39
                    <td>[% doc.citation | html %]</td>
39
                    <td>[% doc.citation | html %]</td>
40
                    <td><a href="/cgi-bin/koha/opac-search.pl?q=ident:[% doc.ppn | html %]" target="_blank">Koha</a></td>
40
                    <td><a href="/cgi-bin/koha/opac-search.pl?q=ident:[% doc.ppn | uri %]" target="_blank">Koha</a></td>
41
                    <td><a href="http://www.sudoc.fr/[% doc.ppn | html %]" target="_blank" rel="noreferrer">Sudoc</a></td>
41
                    <td><a href="http://www.sudoc.fr/[% doc.ppn | uri %]" target="_blank" rel="noreferrer">Sudoc</a></td>
42
                  </tr>
42
                  </tr>
43
                [% END %]
43
                [% END %]
44
              </tbody>
44
              </tbody>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt (-4 / +4 lines)
Lines 61-67 Link Here
61
                            <p>
61
                            <p>
62
                                [% Koha.Preference('ILLModuleCopyrightClearance') | $raw %]
62
                                [% Koha.Preference('ILLModuleCopyrightClearance') | $raw %]
63
                            </p>
63
                            </p>
64
                            <a href="?method=create&stage=copyrightclearance&backend=[% whole.value.backend | html %]"
64
                            <a href="?method=create&stage=copyrightclearance&backend=[% whole.value.backend | uri %]"
65
                               class="btn btn-sm btn-default"><i class="fa fa-check"></i> Yes</a>
65
                               class="btn btn-sm btn-default"><i class="fa fa-check"></i> Yes</a>
66
                            <a href="/cgi-bin/koha/opac-illrequests.pl"
66
                            <a href="/cgi-bin/koha/opac-illrequests.pl"
67
                               class="btn btn-sm btn-default"><i class="fa fa-times"></i> No</a>
67
                               class="btn btn-sm btn-default"><i class="fa fa-times"></i> No</a>
Lines 98-104 Link Here
98
                                </button>
98
                                </button>
99
                                <ul id="backend-dropdown-options" class="dropdown-menu nojs" aria-labelledby="ill-backend-dropdown">
99
                                <ul id="backend-dropdown-options" class="dropdown-menu nojs" aria-labelledby="ill-backend-dropdown">
100
                                    [% FOREACH backend IN backends %]
100
                                    [% FOREACH backend IN backends %]
101
                                        <li><a href="/cgi-bin/koha/opac-illrequests.pl?method=create&amp;backend=[% backend | html %]">[% backend | html %]</a></li>
101
                                        <li><a href="/cgi-bin/koha/opac-illrequests.pl?method=create&amp;backend=[% backend | uri %]">[% backend | html %]</a></li>
102
                                    [% END %]
102
                                    [% END %]
103
                                </ul>
103
                                </ul>
104
                        [% ELSE %]
104
                        [% ELSE %]
Lines 139-145 Link Here
139
                                    <td>[% request.placed | html %]</td>
139
                                    <td>[% request.placed | html %]</td>
140
                                    <td>[% request.updated | html %]</td>
140
                                    <td>[% request.updated | html %]</td>
141
                                    <td>
141
                                    <td>
142
                                        <a href="/cgi-bin/koha/opac-illrequests.pl?method=view&amp;illrequest_id=[% request.id | html %]" class="btn btn-default btn-small pull-right">View</a>
142
                                        <a href="/cgi-bin/koha/opac-illrequests.pl?method=view&amp;illrequest_id=[% request.id | uri %]" class="btn btn-default btn-small pull-right">View</a>
143
                                    </td>
143
                                    </td>
144
                                </tr>
144
                                </tr>
145
                            [% END %]
145
                            [% END %]
Lines 164-170 Link Here
164
                                    [% IF request.biblio_id %]
164
                                    [% IF request.biblio_id %]
165
                                        <li>
165
                                        <li>
166
                                            <label for="biblio">Requested item:</label>
166
                                            <label for="biblio">Requested item:</label>
167
                                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% request.biblio_id | html %]">Click here to view</a>
167
                                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% request.biblio_id | uri %]">Click here to view</a>
168
                                        </li>
168
                                        </li>
169
                                    [% END %]
169
                                    [% END %]
170
                                    <li>
170
                                    <li>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt (-1 / +1 lines)
Lines 94-100 Link Here
94
                                <div id="thumbnails">
94
                                <div id="thumbnails">
95
                                    [% FOREACH img IN images %]
95
                                    [% FOREACH img IN images %]
96
                                        [% IF img %]
96
                                        [% IF img %]
97
                                            <a href="/cgi-bin/koha/opac-imageviewer.pl?biblionumber=[% biblionumber | url %]&amp;imagenumber=[% img | html %]" onclick="showCover([% img | html %]); return false;">
97
                                            <a href="/cgi-bin/koha/opac-imageviewer.pl?biblionumber=[% biblionumber | url %]&amp;imagenumber=[% img | uri %]" onclick="showCover([% img | html %]); return false;">
98
                                            [% IF ( imagenumber == img ) %]
98
                                            [% IF ( imagenumber == img ) %]
99
                                                <img class="thumbnail selected" id="[% img | html %]" src="/cgi-bin/koha/opac-image.pl?imagenumber=[% img | html %]&amp;thumbnail=1" alt="Thumbnail"/>
99
                                                <img class="thumbnail selected" id="[% img | html %]" src="/cgi-bin/koha/opac-image.pl?imagenumber=[% img | html %]&amp;thumbnail=1" alt="Thumbnail"/>
100
                                            [% ELSE %]
100
                                            [% ELSE %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-1 / +1 lines)
Lines 71-77 Link Here
71
            </div>
71
            </div>
72
            <div id="rssnews-container">
72
            <div id="rssnews-container">
73
                <!-- Logged in users have a branch code or it could be explicitly set -->
73
                <!-- Logged in users have a branch code or it could be explicitly set -->
74
                <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-news-rss.pl?branchcode=[% branchcode | html %]"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png"></a>
74
                <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-news-rss.pl?branchcode=[% branchcode | uri %]"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png"></a>
75
                [% IF Branches.all.size == 1 %]
75
                [% IF Branches.all.size == 1 %]
76
                    [% IF branchcode %]
76
                    [% IF branchcode %]
77
                        RSS feed for [% Branches.GetName( branchcode ) | html %] library news.
77
                        RSS feed for [% Branches.GetName( branchcode ) | html %] library news.
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (-1 / +1 lines)
Lines 126-132 Link Here
126
                    </fieldset>
126
                    </fieldset>
127
                [% END %]
127
                [% END %]
128
                [% IF ( extended_unique_id_failed_code ) %]
128
                [% IF ( extended_unique_id_failed_code ) %]
129
                    <div class="alert" id="extended_unique_id_failed"><a href="#patron-attr-start-[% extended_unique_id_failed_code | html %]">[% extended_unique_id_failed_description _ ': ' | html %]</a> Value is already in use ([% extended_unique_id_failed_value | html %])</div>
129
                    <div class="alert" id="extended_unique_id_failed"><a href="#patron-attr-start-[% extended_unique_id_failed_code | uri %]">[% extended_unique_id_failed_description _ ': ' | html %]</a> Value is already in use ([% extended_unique_id_failed_value | html %])</div>
130
                [% END %]
130
                [% END %]
131
131
132
                <form method="post" action="/cgi-bin/koha/opac-memberentry.pl" id="memberentry-form" autocomplete="off">
132
                <form method="post" action="/cgi-bin/koha/opac-memberentry.pl" id="memberentry-form" autocomplete="off">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt (-2 / +2 lines)
Lines 44-50 Link Here
44
[% END %][% END %][% END %]
44
[% END %][% END %][% END %]
45
45
46
[% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %]
46
[% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %]
47
[% IF ( BakerTaylorEnabled ) %][% IF bt_id %]<a href="https://[% BakerTaylorBookstoreURL |url %][% bt_id | html %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL |url %][% bt_id | html %]" /></a>[% END %][% END %]
47
[% IF ( BakerTaylorEnabled ) %][% IF bt_id %]<a href="https://[% BakerTaylorBookstoreURL |url %][% bt_id | uri %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL |url %][% bt_id | html %]" /></a>[% END %][% END %]
48
	   <p>[% IF ( SEARCH_RESULT.author ) %]By [% SEARCH_RESULT.author | html %]. [% END %]
48
	   <p>[% IF ( SEARCH_RESULT.author ) %]By [% SEARCH_RESULT.author | html %]. [% END %]
49
	   [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place | html %] [% END %][% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode | html %][% END %][% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear | html %]
49
	   [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place | html %] [% END %][% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode | html %][% END %][% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear | html %]
50
                    [% ELSE %][% IF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate | html %][% END %][% END %]
50
                    [% ELSE %][% IF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate | html %][% END %][% END %]
Lines 54-60 Link Here
54
                        [% IF ( SEARCH_RESULT.isbn ) %] [% SEARCH_RESULT.isbn | html %][% END %]
54
                        [% IF ( SEARCH_RESULT.isbn ) %] [% SEARCH_RESULT.isbn | html %][% END %]
55
       </p>
55
       </p>
56
[% IF Koha.Preference( 'RequestOnOpac' ) == 1 %]
56
[% IF Koha.Preference( 'RequestOnOpac' ) == 1 %]
57
<p><a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]">Place Hold on <i>[% SEARCH_RESULT.title | html %]</i></a></p>
57
<p><a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Place Hold on <i>[% SEARCH_RESULT.title | html %]</i></a></p>
58
[% END %]
58
[% END %]
59
						]]></description>
59
						]]></description>
60
       <guid>[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]</guid>
60
       <guid>[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]</guid>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt (-1 / +1 lines)
Lines 65-71 Link Here
65
                            ("<strong>[% email | html %]</strong>")
65
                            ("<strong>[% email | html %]</strong>")
66
                        [% END %]
66
                        [% END %]
67
                        <br/>You should have received an email with a link to reset your password.
67
                        <br/>You should have received an email with a link to reset your password.
68
                        <br/>If you did not receive this email, you can request a new one: <a href="/cgi-bin/koha/opac-password-recovery.pl?resendEmail=true&email=[% email | html %]&username=[% username | html %]">Get new password recovery link</a>
68
                        <br/>If you did not receive this email, you can request a new one: <a href="/cgi-bin/koha/opac-password-recovery.pl?resendEmail=true&email=[% email | uri %]&username=[% username | uri %]">Get new password recovery link</a>
69
                    [% ELSIF (errPassNotMatch) %]
69
                    [% ELSIF (errPassNotMatch) %]
70
                        The passwords do not match.
70
                        The passwords do not match.
71
                    [% ELSIF password_too_short %]
71
                    [% ELSIF password_too_short %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt (-2 / +2 lines)
Lines 96-102 Link Here
96
                                                <td>
96
                                                <td>
97
                                                    [% IF  OPACAmazonCoverImages %]
97
                                                    [% IF  OPACAmazonCoverImages %]
98
                                                        [% IF  issue.normalized_isbn %]
98
                                                        [% IF  issue.normalized_isbn %]
99
                                                            <a href="http://www.amazon.com/gp/reader/[% issue.normalized_isbn | html %][% AmazonAssocTag | html %]#reader-link"><img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% issue.normalized_isbn | html %].01.THUMBZZZ.jpg" alt="" class="item-thumbnail" /></a>
99
                                                            <a href="http://www.amazon.com/gp/reader/[% issue.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link"><img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% issue.normalized_isbn | html %].01.THUMBZZZ.jpg" alt="" class="item-thumbnail" /></a>
100
                                                        [% ELSE %]
100
                                                        [% ELSE %]
101
                                                             <span class="no-image">No cover image available</span>
101
                                                             <span class="no-image">No cover image available</span>
102
                                                        [% END %]
102
                                                        [% END %]
Lines 113-119 Link Here
113
                                                [% IF BakerTaylorEnabled %]
113
                                                [% IF BakerTaylorEnabled %]
114
                                                    [% bt_id = ( issue.normalized_upc || issue.normalized_isbn ) | html %]
114
                                                    [% bt_id = ( issue.normalized_upc || issue.normalized_isbn ) | html %]
115
                                                    [% IF ( bt_id ) %]
115
                                                    [% IF ( bt_id ) %]
116
                                                       <a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
116
                                                       <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
117
                                                    [% ELSE %]
117
                                                    [% ELSE %]
118
                                                       <span class="no-image">No cover image available</span>
118
                                                       <span class="no-image">No cover image available</span>
119
                                                    [% END %]
119
                                                    [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (-9 / +9 lines)
Lines 43-56 Link Here
43
                        <strong>No results found!</strong>
43
                        <strong>No results found!</strong>
44
                        <p>
44
                        <p>
45
                            [% IF ( searchdesc ) %]
45
                            [% IF ( searchdesc ) %]
46
                                No results found for that in [% LibraryName | html %] catalog. <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi | html | url %]&amp;format=rss2" class="rsssearchlink noprint"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a>
46
                                No results found for that in [% LibraryName | html %] catalog. <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi | html | url %]&amp;format=rss2" class="rsssearchlink noprint"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a>
47
                            [% ELSE %]
47
                            [% ELSE %]
48
                                You did not specify any search criteria.
48
                                You did not specify any search criteria.
49
                            [% END %]
49
                            [% END %]
50
                        </p>
50
                        </p>
51
                        [% IF ( ReturnPath ) %]
51
                        [% IF ( ReturnPath ) %]
52
                           <div class="returntosearch">
52
                           <div class="returntosearch">
53
                                <p><a href="[% ReturnPath | html %]">Return to the last advanced search</a></p>
53
                                <p><a href="[% ReturnPath | uri %]">Return to the last advanced search</a></p>
54
                            </div>
54
                            </div>
55
                        [% END %]
55
                        [% END %]
56
                        [% IF ( OPACNoResultsFound ) %]
56
                        [% IF ( OPACNoResultsFound ) %]
Lines 87-93 Link Here
87
                                [% END %]
87
                                [% END %]
88
                            ).
88
                            ).
89
                        [% END %]
89
                        [% END %]
90
                        <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |html | url %]&amp;count=[% countrss | html %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink noprint"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a>
90
                        <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |html | url %]&amp;count=[% countrss | uri %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink noprint"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a>
91
                    [% END # / IF total %]
91
                    [% END # / IF total %]
92
                    </p>
92
                    </p>
93
                [% END # / IF searchdesc %]
93
                [% END # / IF searchdesc %]
Lines 104-110 Link Here
104
                        <ul style="list-style: none;">
104
                        <ul style="list-style: none;">
105
                            [% FOREACH SPELL_SUGGES IN SPELL_SUGGEST %]
105
                            [% FOREACH SPELL_SUGGES IN SPELL_SUGGEST %]
106
                            <li>
106
                            <li>
107
                                <a href="/cgi-bin/koha/opac-search.pl?q=[% SPELL_SUGGES.spsuggestion | html %]">[% SPELL_SUGGES.spsuggestion | html %]</a>
107
                                <a href="/cgi-bin/koha/opac-search.pl?q=[% SPELL_SUGGES.spsuggestion | uri %]">[% SPELL_SUGGES.spsuggestion | html %]</a>
108
                            </li>
108
                            </li>
109
                            [% END %]
109
                            [% END %]
110
                        </ul>
110
                        </ul>
Lines 112-118 Link Here
112
                    [% IF ( total ) %]
112
                    [% IF ( total ) %]
113
                        [% IF ( ReturnPath ) %]
113
                        [% IF ( ReturnPath ) %]
114
                            <div class="returntosearch">
114
                            <div class="returntosearch">
115
                                <p><a href="[% ReturnPath | html %]">Return to the last advanced search</a></p>
115
                                <p><a href="[% ReturnPath | uri %]">Return to the last advanced search</a></p>
116
                            </div>
116
                            </div>
117
                        [% END %]
117
                        [% END %]
118
                    [% END %]
118
                    [% END %]
Lines 283-289 Link Here
283
                                                    [% IF ( BakerTaylorEnabled && BakerTaylorBookstoreURL ) %]
283
                                                    [% IF ( BakerTaylorEnabled && BakerTaylorBookstoreURL ) %]
284
                                                        [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %]
284
                                                        [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %]
285
                                                        [% IF ( bt_id ) %]
285
                                                        [% IF ( bt_id ) %]
286
                                                            <a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]">
286
                                                            <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]">
287
                                                                <img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" />
287
                                                                <img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" />
288
                                                            </a>
288
                                                            </a>
289
                                                        [% ELSE %]
289
                                                        [% ELSE %]
Lines 294-302 Link Here
294
                                                    [% IF ( IDreamBooksResults && SEARCH_RESULT.normalized_isbn ) %]
294
                                                    [% IF ( IDreamBooksResults && SEARCH_RESULT.normalized_isbn ) %]
295
                                                        <div class="idbresult" style="display: none;">
295
                                                        <div class="idbresult" style="display: none;">
296
                                                            [% IF ( IDreamBooksReviews ) %]
296
                                                            [% IF ( IDreamBooksReviews ) %]
297
                                                                <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]#idb_critic_reviews">
297
                                                                <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]#idb_critic_reviews">
298
                                                            [% ELSE %]
298
                                                            [% ELSE %]
299
                                                                <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]">
299
                                                                <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">
300
                                                            [% END %]
300
                                                            [% END %]
301
                                                            [% SEARCH_RESULT.normalized_isbn | html %]</a>
301
                                                            [% SEARCH_RESULT.normalized_isbn | html %]</a>
302
                                                        </div>
302
                                                        </div>
Lines 462-468 Link Here
462
                                                        <span class="label">Lists:</span>
462
                                                        <span class="label">Lists:</span>
463
                                                            <ul>
463
                                                            <ul>
464
                                                                [% FOREACH shelf IN SEARCH_RESULT.shelves %]
464
                                                                [% FOREACH shelf IN SEARCH_RESULT.shelves %]
465
                                                                    <li><a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | html %]">[% shelf.shelfname | html %]</a></li>
465
                                                                    <li><a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]">[% shelf.shelfname | html %]</a></li>
466
                                                                    [%~ UNLESS loop.last %], [% ELSE %].[% END ~%]
466
                                                                    [%~ UNLESS loop.last %], [% ELSE %].[% END ~%]
467
                                                                [% END %]
467
                                                                [% END %]
468
                                                            </ul>
468
                                                            </ul>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt (-1 / +1 lines)
Lines 48-54 Link Here
48
                            [% FOREACH routinglist IN routinglists %]
48
                            [% FOREACH routinglist IN routinglists %]
49
                                [% IF ( titles_loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
49
                                [% IF ( titles_loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
50
                                    <td>
50
                                    <td>
51
                                        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% routinglist.subscription.biblio.biblionumber | html %]">
51
                                        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% routinglist.subscription.biblio.biblionumber | uri %]">
52
                                            [% routinglist.subscription.biblio.title | html %]
52
                                            [% routinglist.subscription.biblio.title | html %]
53
                                        </a>
53
                                        </a>
54
                                    </td>
54
                                    </td>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt (-4 / +4 lines)
Lines 71-77 Link Here
71
                                                    <tr>
71
                                                    <tr>
72
                                                        <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
72
                                                        <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
73
                                                        <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
73
                                                        <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
74
                                                        <td><a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&amp;[% s.query_cgi | html %]&amp;count=[% countrss | html %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td>
74
                                                        <td><a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&amp;[% s.query_cgi | uri %]&amp;count=[% countrss | uri %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td>
75
                                                        <td>[% s.total | html %]</td>
75
                                                        <td>[% s.total | html %]</td>
76
                                                    </tr>
76
                                                    </tr>
77
                                                [% END %]
77
                                                [% END %]
Lines 111-117 Link Here
111
                                                <tr>
111
                                                <tr>
112
                                                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
112
                                                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
113
                                                    <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
113
                                                    <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
114
                                                    <td><a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&amp;[% s.query_cgi | html %]&amp;count=[% countrss | html %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td>
114
                                                    <td><a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&amp;[% s.query_cgi | uri %]&amp;count=[% countrss | uri %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td>
115
                                                    <td>[% s.total | html %]</td>
115
                                                    <td>[% s.total | html %]</td>
116
                                                </tr>
116
                                                </tr>
117
                                            [% END %]
117
                                            [% END %]
Lines 156-162 Link Here
156
                                                    <tr>
156
                                                    <tr>
157
                                                        <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
157
                                                        <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
158
                                                        <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
158
                                                        <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
159
                                                        <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td>
159
                                                        <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
160
                                                        <td>[% s.total | html %]</td>
160
                                                        <td>[% s.total | html %]</td>
161
                                                    </tr>
161
                                                    </tr>
162
                                                [% END %]
162
                                                [% END %]
Lines 193-199 Link Here
193
                                                    <tr>
193
                                                    <tr>
194
                                                        <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
194
                                                        <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
195
                                                        <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
195
                                                        <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
196
                                                        <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td>
196
                                                        <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
197
                                                        <td>[% s.total | html %]</td>
197
                                                        <td>[% s.total | html %]</td>
198
                                                    </tr>
198
                                                    </tr>
199
                                                [% END %]
199
                                                [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt (-3 / +3 lines)
Lines 10-16 Link Here
10
    <div class="main">
10
    <div class="main">
11
        <ul class="breadcrumb">
11
        <ul class="breadcrumb">
12
            <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
12
            <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
13
            <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]">Details for [% bibliotitle | html %]</a> <span class="divider">&rsaquo;</span></li>
13
            <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]">Details for [% bibliotitle | html %]</a> <span class="divider">&rsaquo;</span></li>
14
            <li><a href="#">Issues for a subscription</a></li>
14
            <li><a href="#">Issues for a subscription</a></li>
15
        </ul>
15
        </ul>
16
16
Lines 137-147 Link Here
137
                                    [% IF ( subscription_LOO.letter ) %]
137
                                    [% IF ( subscription_LOO.letter ) %]
138
                                        [% IF ( loggedinusername ) %]
138
                                        [% IF ( loggedinusername ) %]
139
                                            [% IF ( subscription_LOO.hasalert ) %]
139
                                            [% IF ( subscription_LOO.hasalert ) %]
140
                                                You have subscribed to email notification on new issues <a href="opac-alert-subscribe.pl?op=cancel&amp;subscriptionid=[% subscription_LOO.subscriptionid | html %]&amp;referer=serial&amp;biblionumber=[% subscription_LOO.biblionumber | html %]" class="btn" title="Cancel email notification">
140
                                                You have subscribed to email notification on new issues <a href="opac-alert-subscribe.pl?op=cancel&amp;subscriptionid=[% subscription_LOO.subscriptionid | uri %]&amp;referer=serial&amp;biblionumber=[% subscription_LOO.biblionumber | uri %]" class="btn" title="Cancel email notification">
141
                                                    Cancel email notification
141
                                                    Cancel email notification
142
                                                </a>
142
                                                </a>
143
                                            [% ELSE %]
143
                                            [% ELSE %]
144
                                                <a href="opac-alert-subscribe.pl?subscriptionid=[% subscription_LOO.subscriptionid | html %]&amp;referer=serial&amp;biblionumber=[% subscription_LOO.biblionumber | html %]" class="btn" title="Subscribe to email notification on new issues">
144
                                                <a href="opac-alert-subscribe.pl?subscriptionid=[% subscription_LOO.subscriptionid | uri %]&amp;referer=serial&amp;biblionumber=[% subscription_LOO.biblionumber | uri %]" class="btn" title="Subscribe to email notification on new issues">
145
                                                    Subscribe to email notification on new issues
145
                                                    Subscribe to email notification on new issues
146
                                                </a>
146
                                                </a>
147
                                            [% END %]
147
                                            [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt (-11 / +11 lines)
Lines 48-60 Link Here
48
48
49
        [% IF shelf and shelf.is_private %]
49
        [% IF shelf and shelf.is_private %]
50
            [% IF op == 'view' OR op == 'edit_form' %]
50
            [% IF op == 'view' OR op == 'edit_form' %]
51
                <li><span class="divider">&rsaquo;</span> <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=[% PRIVATE | html %]">Your lists</a></li>
51
                <li><span class="divider">&rsaquo;</span> <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=[% PRIVATE | uri %]">Your lists</a></li>
52
            [% ELSE %]
52
            [% ELSE %]
53
                <li><span class="divider">&rsaquo;</span> Your lists</li>
53
                <li><span class="divider">&rsaquo;</span> Your lists</li>
54
            [% END %]
54
            [% END %]
55
        [% ELSIF shelf AND shelf.is_public %]
55
        [% ELSIF shelf AND shelf.is_public %]
56
            [% IF op == 'view' %]
56
            [% IF op == 'view' %]
57
                <li><span class="divider">&rsaquo;</span> <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=[% PUBLIC | html %]">Public lists</a></li>
57
                <li><span class="divider">&rsaquo;</span> <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=[% PUBLIC | uri %]">Public lists</a></li>
58
            [% ELSE %]
58
            [% ELSE %]
59
                <li><span class="divider">&rsaquo;</span> Public lists</li>
59
                <li><span class="divider">&rsaquo;</span> Public lists</li>
60
            [% END %]
60
            [% END %]
Lines 151-157 Link Here
151
                    [% IF shelf AND op == 'view' %]
151
                    [% IF shelf AND op == 'view' %]
152
                        <h3>
152
                        <h3>
153
                            [% shelf.shelfname | html %]
153
                            [% shelf.shelfname | html %]
154
                            <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-shelves.pl?rss=1&amp;op=view&amp;shelfnumber=[% shelf.shelfnumber | html %]" class="rss-list-link noprint">
154
                            <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-shelves.pl?rss=1&amp;op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="rss-list-link noprint">
155
                                <img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this list" title="Subscribe to this list" border="0" class="rsssearchicon"/>
155
                                <img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this list" title="Subscribe to this list" border="0" class="rsssearchicon"/>
156
                            </a>
156
                            </a>
157
                        </h3>
157
                        </h3>
Lines 160-169 Link Here
160
                             <div id="toolbar" class="toolbar clearfix">
160
                             <div id="toolbar" class="toolbar clearfix">
161
                                 <div class="list-actions">
161
                                 <div class="list-actions">
162
                                    <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?op=add_form">New list</a> <span class="sep">|</span>
162
                                    <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?op=add_form">New list</a> <span class="sep">|</span>
163
                                    <a href="/cgi-bin/koha/opac-downloadshelf.pl?shelfnumber=[% shelf.shelfnumber | html %]" class="download" data-toggle="modal" data-target="#modalWin">Download list</a>
163
                                    <a href="/cgi-bin/koha/opac-downloadshelf.pl?shelfnumber=[% shelf.shelfnumber | uri %]" class="download" data-toggle="modal" data-target="#modalWin">Download list</a>
164
164
165
                                    [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
165
                                    [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
166
                                        <span class="sendlist"><a href="/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelf.shelfnumber | html %]" class="send" onclick="open('/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelf.shelfnumber | html %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send list</a></span>
166
                                        <span class="sendlist"><a href="/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelf.shelfnumber | uri %]" class="send" onclick="open('/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelf.shelfnumber | html %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send list</a></span>
167
                                    [% END %]
167
                                    [% END %]
168
168
169
                                    <a class="print-small" target="_blank" href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | html %]&sortfield=[% sortfield | html %]&direction=[% direction |uri %]&print=1">Print list</a>
169
                                    <a class="print-small" target="_blank" href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | html %]&sortfield=[% sortfield | html %]&direction=[% direction |uri %]&print=1">Print list</a>
Lines 186-192 Link Here
186
                                            <input type="submit" class="deleteshelf" value="Delete list" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST);"/>
186
                                            <input type="submit" class="deleteshelf" value="Delete list" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST);"/>
187
                                        </form>
187
                                        </form>
188
                                        [% IF category == PRIVATE && Koha.Preference('OpacAllowSharingPrivateLists') %]
188
                                        [% IF category == PRIVATE && Koha.Preference('OpacAllowSharingPrivateLists') %]
189
                                            <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% shelf.shelfnumber | html %]" class="sharelist">Share list</a>
189
                                            <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% shelf.shelfnumber | uri %]" class="sharelist">Share list</a>
190
                                        [% END %]
190
                                        [% END %]
191
                                    [% ELSIF category == PRIVATE # not manageshelf and private means shared %]
191
                                    [% ELSIF category == PRIVATE # not manageshelf and private means shared %]
192
                                        <form action="/cgi-bin/koha/opac-shelves.pl" method="post" class="form-inline">
192
                                        <form action="/cgi-bin/koha/opac-shelves.pl" method="post" class="form-inline">
Lines 349-355 Link Here
349
                                                        [% IF ( BakerTaylorEnabled ) %]
349
                                                        [% IF ( BakerTaylorEnabled ) %]
350
                                                            [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) | html %]
350
                                                            [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) | html %]
351
                                                            [% IF ( bt_id ) %]
351
                                                            [% IF ( bt_id ) %]
352
                                                                <a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
352
                                                                <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
353
                                                            [% ELSE %]
353
                                                            [% ELSE %]
354
                                                                <span class="no-image">No cover image available</span>
354
                                                                <span class="no-image">No cover image available</span>
355
                                                            [% END %]
355
                                                            [% END %]
Lines 623-631 Link Here
623
                            <fieldset class="action">
623
                            <fieldset class="action">
624
                                <input type="submit" value="Save" class="btn" />
624
                                <input type="submit" value="Save" class="btn" />
625
                                [% IF referer == 'view' %]
625
                                [% IF referer == 'view' %]
626
                                    <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | html %]" class="cancel">Cancel</a>
626
                                    <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel">Cancel</a>
627
                                [% ELSE %]
627
                                [% ELSE %]
628
                                     <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=[% PRIVATE | html %]" class="cancel">Cancel</a>
628
                                     <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=[% PRIVATE | uri %]" class="cancel">Cancel</a>
629
                                 [% END %]
629
                                 [% END %]
630
630
631
                            </fieldset>
631
                            </fieldset>
Lines 677-683 Link Here
677
                                        [% FOREACH s IN shelves %]
677
                                        [% FOREACH s IN shelves %]
678
                                            [% SET contents = s.get_contents %]
678
                                            [% SET contents = s.get_contents %]
679
                                            <tr>
679
                                            <tr>
680
                                                <td><a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | html %]">[% s.shelfname | html %]</a></td>
680
                                                <td><a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a></td>
681
                                                <td>[% IF contents.count %][% contents.count | html %] [% IF contents.count == 1 %]item[% ELSE %]items[% END %][% ELSE %]Empty[% END %]</td>
681
                                                <td>[% IF contents.count %][% contents.count | html %] [% IF contents.count == 1 %]item[% ELSE %]items[% END %][% ELSE %]Empty[% END %]</td>
682
                                                <td>
682
                                                <td>
683
                                                    [% IF s.is_private %]
683
                                                    [% IF s.is_private %]
Lines 706-712 Link Here
706
                                                        </form>
706
                                                        </form>
707
                                                    [% END %]
707
                                                    [% END %]
708
                                                    [% IF s.is_private AND s.can_be_managed( loggedinusernumber ) AND Koha.Preference('OpacAllowSharingPrivateLists') %]
708
                                                    [% IF s.is_private AND s.can_be_managed( loggedinusernumber ) AND Koha.Preference('OpacAllowSharingPrivateLists') %]
709
                                                        <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% s.shelfnumber | html %]" class="sharelist">Share</a>
709
                                                        <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% s.shelfnumber | uri %]" class="sharelist">Share</a>
710
                                                    [% END %]
710
                                                    [% END %]
711
                                                    [% IF s.is_shared_with( loggedinusernumber ) %]
711
                                                    [% IF s.is_shared_with( loggedinusernumber ) %]
712
                                                        <form action="opac-shelves.pl" method="post" class="form-inline">
712
                                                        <form action="opac-shelves.pl" method="post" class="form-inline">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt (-1 / +1 lines)
Lines 17-23 Link Here
17
[% END %][% END %][% END %]
17
[% END %][% END %][% END %]
18
18
19
[% bt_id = ( review.normalized_upc || review.normalized_isbn ) | html %]
19
[% bt_id = ( review.normalized_upc || review.normalized_isbn ) | html %]
20
[% IF ( BakerTaylorEnabled && bt_id ) %]<a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>[% END %]
20
[% IF ( BakerTaylorEnabled && bt_id ) %]<a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>[% END %]
21
        [% IF ( review.author ) %]<p>By [% review.author | html %].</p> [% END %]
21
        [% IF ( review.author ) %]<p>By [% review.author | html %].</p> [% END %]
22
        <p>[% IF ( review.place ) %][% review.place | html %] [% END %][% IF ( review.publishercode ) %][% review.publishercode | html %][% END %][% IF ( review.publicationyear ) %] [% review.publicationyear | html %]
22
        <p>[% IF ( review.place ) %][% review.place | html %] [% END %][% IF ( review.publishercode ) %][% review.publishercode | html %][% END %][% IF ( review.publicationyear ) %] [% review.publicationyear | html %]
23
                    [% ELSE %][% IF ( review.copyrightdate ) %] [% review.copyrightdate | html %][% END %][% END %]
23
                    [% ELSE %][% IF ( review.copyrightdate ) %] [% review.copyrightdate | html %][% END %][% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt (-2 / +2 lines)
Lines 29-35 Link Here
29
                    <div class="span12">
29
                    <div class="span12">
30
                [% END %]
30
                [% END %]
31
                   <div id="showreviews" class="searchresults maincontent">
31
                   <div id="showreviews" class="searchresults maincontent">
32
                        <h3>Recent comments <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-showreviews.pl?format=rss" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to recent comments" title="Subscribe to recent comments" border="0" class="rsssearchicon"/></a></h3>
32
                        <h3>Recent comments <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-showreviews.pl?format=rss" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to recent comments" title="Subscribe to recent comments" border="0" class="rsssearchicon"/></a></h3>
33
                        <table class="table table-striped">
33
                        <table class="table table-striped">
34
                            [% FOREACH review IN reviews %]
34
                            [% FOREACH review IN reviews %]
35
                                <tr>
35
                                <tr>
Lines 140-146 Link Here
140
                                        [% bt_id = ( review.normalized_upc || review.normalized_isbn ) | html %]
140
                                        [% bt_id = ( review.normalized_upc || review.normalized_isbn ) | html %]
141
                                        [% IF ( BakerTaylorEnabled ) %]
141
                                        [% IF ( BakerTaylorEnabled ) %]
142
                                            [% IF ( bt_id ) %]
142
                                            [% IF ( bt_id ) %]
143
                                                <a href="https://[% review.BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker &amp; Taylor" src="[% review.BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
143
                                                <a href="https://[% review.BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker &amp; Taylor" src="[% review.BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
144
                                            [% ELSE %]
144
                                            [% ELSE %]
145
                                                <span class="no-image">No cover image available</span>
145
                                                <span class="no-image">No cover image available</span>
146
                                            [% END %]
146
                                            [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt (-1 / +1 lines)
Lines 41-47 Link Here
41
                                    </fieldset>
41
                                    </fieldset>
42
42
43
                                    [% FOREACH LOO IN LOOP %]
43
                                    [% FOREACH LOO IN LOOP %]
44
                                        <a href="/cgi-bin/koha/opac-search.pl?idx=su&amp;q=&quot;[% LOO.entry | html %]&quot;" style="font-size:[% LOO.weight | html %]px;">[% LOO.entry | html %]</a>
44
                                        <a href="/cgi-bin/koha/opac-search.pl?idx=su&amp;q=&quot;[% LOO.entry | uri %]&quot;" style="font-size:[% LOO.weight | html %]px;">[% LOO.entry | html %]</a>
45
                                    [% END %]
45
                                    [% END %]
46
                                [% ELSE %]
46
                                [% ELSE %]
47
                                    <p>Note: This feature only available to French catalogs where ISBD subjects have been populated, and an index built by separate script.</p>
47
                                    <p>Note: This feature only available to French catalogs where ISBD subjects have been populated, and an index built by separate script.</p>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt (-1 / +1 lines)
Lines 80-86 Link Here
80
                                              [% END %]
80
                                              [% END %]
81
                                            </td>
81
                                            </td>
82
                                            <td><span class="tdlabel">Checkouts: </span> <span title="[% result.count | html %]">[% result.count | html %]</span></td>
82
                                            <td><span class="tdlabel">Checkouts: </span> <span title="[% result.count | html %]">[% result.count | html %]</span></td>
83
                                            [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]<td>[% IF Koha.Preference( 'RequestOnOpac' ) == 1 %][% UNLESS ( result.norequests ) %]<a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% result.biblionumber | html %]">Place hold</a>[% END %][% END %]</td>[% END %]
83
                                            [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]<td>[% IF Koha.Preference( 'RequestOnOpac' ) == 1 %][% UNLESS ( result.norequests ) %]<a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% result.biblionumber | uri %]">Place hold</a>[% END %][% END %]</td>[% END %]
84
                                            </tr>
84
                                            </tr>
85
                                    [% END %]
85
                                    [% END %]
86
                                </tbody>
86
                                </tbody>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-7 / +7 lines)
Lines 213-219 Link Here
213
213
214
                                                    [% IF ( OPACAmazonCoverImages ) %]
214
                                                    [% IF ( OPACAmazonCoverImages ) %]
215
                                                        [% IF ( ISSUE.normalized_isbn ) %]
215
                                                        [% IF ( ISSUE.normalized_isbn ) %]
216
                                                            <a href="http://www.amazon.com/gp/reader/[% ISSUE.normalized_isbn | html %][% AmazonAssocTag | html %]#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn | html %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail"/></a>
216
                                                            <a href="http://www.amazon.com/gp/reader/[% ISSUE.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn | html %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail"/></a>
217
                                                        [% ELSE %]
217
                                                        [% ELSE %]
218
                                                            <a href="#"><span class="no-image">No cover image available</span></a>
218
                                                            <a href="#"><span class="no-image">No cover image available</span></a>
219
                                                        [% END %]
219
                                                        [% END %]
Lines 230-236 Link Here
230
                                                    [% IF ( BakerTaylorEnabled ) %]
230
                                                    [% IF ( BakerTaylorEnabled ) %]
231
                                                        [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) | html %]
231
                                                        [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) | html %]
232
                                                        [% IF ( bt_id ) %]
232
                                                        [% IF ( bt_id ) %]
233
                                                            <a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
233
                                                            <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
234
                                                        [% ELSE %]
234
                                                        [% ELSE %]
235
                                                            <span class="no-image">No cover image available</span><!-- BakerTaylor needs normalized_upc or normalized_isbn! -->
235
                                                            <span class="no-image">No cover image available</span><!-- BakerTaylor needs normalized_upc or normalized_isbn! -->
236
                                                        [% END %]
236
                                                        [% END %]
Lines 286-292 Link Here
286
                                                    [% IF ISSUE.renewed %]<span class="blabel label-success">Renewed!</span><br />[% END %]
286
                                                    [% IF ISSUE.renewed %]<span class="blabel label-success">Renewed!</span><br />[% END %]
287
                                                    [% IF ( ISSUE.status ) %]
287
                                                    [% IF ( ISSUE.status ) %]
288
                                                        [% IF ( canrenew ) %]
288
                                                        [% IF ( canrenew ) %]
289
                                                            <input type="checkbox" name="item" value="[% ISSUE.itemnumber | html %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber | html %]&amp;borrowernumber=[% ISSUE.borrowernumber | html %]">Renew</a>
289
                                                            <input type="checkbox" name="item" value="[% ISSUE.itemnumber | uri %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber | uri %]&amp;borrowernumber=[% ISSUE.borrowernumber | uri %]">Renew</a>
290
                                                        [% END %]
290
                                                        [% END %]
291
                                                        [% IF ISSUE.renewalfee > 0 %]
291
                                                        [% IF ISSUE.renewalfee > 0 %]
292
                                                            <span class="renewalfee">Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) | html %]': [% ISSUE.renewalfee | $Price %]</span>
292
                                                            <span class="renewalfee">Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) | html %]': [% ISSUE.renewalfee | $Price %]</span>
Lines 432-438 Link Here
432
                                            [% FOREACH i IN r.issues %]
432
                                            [% FOREACH i IN r.issues %]
433
                                                <tr>
433
                                                <tr>
434
                                                    <td>
434
                                                    <td>
435
                                                        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber | html %]">
435
                                                        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber | uri %]">
436
                                                            [% i.item.biblio.title | html %][% IF ( i.item.enumchron ) %] [% i.item.enumchron | html %][% END %]
436
                                                            [% i.item.biblio.title | html %][% IF ( i.item.enumchron ) %] [% i.item.enumchron | html %][% END %]
437
                                                        </a>
437
                                                        </a>
438
                                                    </td>
438
                                                    </td>
Lines 488-494 Link Here
488
                                                    <td class="jacketcell">
488
                                                    <td class="jacketcell">
489
                                                    [% IF ( OPACAmazonCoverImages ) %]
489
                                                    [% IF ( OPACAmazonCoverImages ) %]
490
                                                        [% IF ( OVERDUE.normalized_isbn ) %]
490
                                                        [% IF ( OVERDUE.normalized_isbn ) %]
491
                                                            <a href="http://www.amazon.com/gp/reader/[% OVERDUE.normalized_isbn | html %][% AmazonAssocTag | html %]#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% OVERDUE.normalized_isbn | html %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail" /></a>
491
                                                            <a href="http://www.amazon.com/gp/reader/[% OVERDUE.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% OVERDUE.normalized_isbn | html %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail" /></a>
492
                                                        [% ELSE %]
492
                                                        [% ELSE %]
493
                                                            <a href="#"><span class="no-image">No cover image available</span></a>
493
                                                            <a href="#"><span class="no-image">No cover image available</span></a>
494
                                                        [% END %]
494
                                                        [% END %]
Lines 505-511 Link Here
505
                                                    [% IF ( BakerTaylorEnabled ) %]
505
                                                    [% IF ( BakerTaylorEnabled ) %]
506
                                                        [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) | html %]
506
                                                        [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) | html %]
507
                                                        [% IF ( bt_id ) %]
507
                                                        [% IF ( bt_id ) %]
508
                                                            <a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
508
                                                            <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
509
                                                        [% ELSE %]
509
                                                        [% ELSE %]
510
                                                            <span class="no-image">No cover image available</span><!-- BakerTaylor needs normalized_upc or normalized_isbn! -->
510
                                                            <span class="no-image">No cover image available</span><!-- BakerTaylor needs normalized_upc or normalized_isbn! -->
511
                                                        [% END %]
511
                                                        [% END %]
Lines 551-557 Link Here
551
                                                            Account frozen
551
                                                            Account frozen
552
                                                        [% ELSIF ( OVERDUE.status ) %]
552
                                                        [% ELSIF ( OVERDUE.status ) %]
553
                                                            [% IF ( canrenew ) %]
553
                                                            [% IF ( canrenew ) %]
554
                                                                <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% OVERDUE.itemnumber | html %]&amp;bornum=[% OVERDUE.borrowernumber | html %]">Renew</a>
554
                                                                <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% OVERDUE.itemnumber | uri %]&amp;bornum=[% OVERDUE.borrowernumber | uri %]">Renew</a>
555
                                                            [% END %]
555
                                                            [% END %]
556
                                                                <span class="renewals">([% OVERDUE.renewsleft | html %] of [% OVERDUE.renewsallowed | html %] renewals remaining)</span>
556
                                                                <span class="renewals">([% OVERDUE.renewsleft | html %] of [% OVERDUE.renewsallowed | html %] renewals remaining)</span>
557
                                                        [% ELSIF ( OVERDUE.norenew_overdue ) %]
557
                                                        [% ELSIF ( OVERDUE.norenew_overdue ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-1 / +1 lines)
Lines 239-245 Link Here
239
                                                <td>[% ISSUE.issuedate | html %]</td>
239
                                                <td>[% ISSUE.issuedate | html %]</td>
240
                                                <td>
240
                                                <td>
241
                                                    [% UNLESS ( noitemlinks ) %]
241
                                                    [% UNLESS ( noitemlinks ) %]
242
                                                        <a href="/cgi-bin/koha/opac-detail.pl?bib=[% ISSUE.  biblionumber | html %]">[% ISSUE.title | html %]</a>
242
                                                        <a href="/cgi-bin/koha/opac-detail.pl?bib=[% ISSUE.  biblionumber | uri %]">[% ISSUE.title | html %]</a>
243
                                                    [% ELSE %]
243
                                                    [% ELSE %]
244
                                                        <strong>[% ISSUE.title | html %]</strong>
244
                                                        <strong>[% ISSUE.title | html %]</strong>
245
                                                    [% END %]
245
                                                    [% END %]
(-)a/misc/cronjobs/rss/lastAcquired-1.0.tt (-1 / +1 lines)
Lines 32-38 Link Here
32
<br>[% place | html %] [% i.publishercode | html %] [% i.publicationyear | html %]
32
<br>[% place | html %] [% i.publishercode | html %] [% i.publicationyear | html %]
33
<br>[% pages | html %] [% i.illus | html %] [% i.size | html %]
33
<br>[% pages | html %] [% i.illus | html %] [% i.size | html %]
34
[% IF i.notes %]<br><br>[% i.notes | html %][% END %]<br>
34
[% IF i.notes %]<br><br>[% i.notes | html %][% END %]<br>
35
<a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber | html %]">View Details</a> | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber | html %]">Reserve this Item</a>[% IF i.author %] | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?marclist=biblio.author&amp;and_or=and&amp;excluding=&amp;operator=contains&amp;value=[% i.author | html %]&amp;resultsperpage=20&amp;orderby=biblio.title&amp;op=do_search">More by this Author</a>[% END %]
35
<a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber | uri %]">View Details</a> | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber | html %]">Reserve this Item</a>[% IF i.author %] | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?marclist=biblio.author&amp;and_or=and&amp;excluding=&amp;operator=contains&amp;value=[% i.author | html %]&amp;resultsperpage=20&amp;orderby=biblio.title&amp;op=do_search">More by this Author</a>[% END %]
36
]]></description>
36
]]></description>
37
 </item>
37
 </item>
38
[% END %]
38
[% END %]
(-)a/misc/cronjobs/rss/lastAcquired-2.0.tt (-2 / +1 lines)
Lines 25-31 Link Here
25
<br>[% IF i.publishercode %][% i.place | html %] [% i.publishercode | html %] [% publicationyear | html %]<br>[% END %]
25
<br>[% IF i.publishercode %][% i.place | html %] [% i.publishercode | html %] [% publicationyear | html %]<br>[% END %]
26
[% IF i.pages %][% i.pages | html %][% i.illus | html %][% i.size | html %][% END %]
26
[% IF i.pages %][% i.pages | html %][% i.illus | html %][% i.size | html %][% END %]
27
[% IF i.notes %]<p>[% i.notes | html %]</p>[% END %]<br>
27
[% IF i.notes %]<p>[% i.notes | html %]</p>[% END %]<br>
28
<a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber | html %]">View Details</a> | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber | html %]">Reserve this Item</a>[% IF i.author %] | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?marclist=biblio.author&amp;and_or=and&amp;excluding=&amp;operator=contains&amp;value=[% i.author | html %]&amp;resultsperpage=20&amp;orderby=biblio.title&amp;op=do_search">More by this Author</a>[% END %]
28
<a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber | uri %]">View Details</a> | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber | html %]">Reserve this Item</a>[% IF i.author %] | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?marclist=biblio.author&amp;and_or=and&amp;excluding=&amp;operator=contains&amp;value=[% i.author | html %]&amp;resultsperpage=20&amp;orderby=biblio.title&amp;op=do_search">More by this Author</a>[% END %]
29
]]></description>
29
]]></description>
30
 </item>
30
 </item>
31
[% END %]
31
[% END %]
32
- 

Return to bug 21526