Attachment #80755 for bug #21526

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




            <input type="submit" class="submit" value="Search" />
          </form>
        </li>
        <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a suggestion</a></li>
        <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a subscription</a></li>
        <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a new (empty) record</a></li>
        <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From an external source</a></li>
        <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"> From a new file</a></li>
        <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]"> From a staged file</a></li>
        [% 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 %]
      </ul>
    [% ELSE %]
        <div class="dialog alert">

Lines 16-25 function confirm_deletion() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc (-2 / +2 lines)
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 %]&op=add_form">Basket</a></li>	19	<li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid \| uri %]&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&booksellerid=[% booksellerid \| html %]">Contract</a></li>	22	<li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&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>

Lines 30-36 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc (-1 / +1 lines)
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 %]




                        <li role="separator" class="divider"></li>
                    [% END %]
                    [% FOREACH authority_type IN authority_types %]
                        <li><a href="/cgi-bin/koha/authorities/authorities.pl?authtypecode=[% authority_type.authtypecode | uri %]">[% authority_type.authtypetext | html %]</a></li>
                    [% END %]
                </ul>
            </div>

                <span class="caret"></span>
                </a>
                <ul class="dropdown-menu">
                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=mads&amp;op=export&amp;authid=[% authid | uri %]">MADS (XML)</a></li>
                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=marcxml&amp;op=export&amp;authid=[% authid | uri %]">MARCXML</a></li>
                    <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>
                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=utf8&amp;op=export&amp;authid=[% authid | uri %]">MARC (Unicode/UTF-8)</a></li>
                </ul>
            </div>
        [% END %]

Lines 10-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc (-1 / +1 lines)
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 %]

Lines 31-37 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc (-1 / +1 lines)
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&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&biblionumber=[% biblio_object_id \| url %]">Subscription(s)</a></li>[% END %]

Lines 7-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc (-2 / +2 lines)
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 %]




                    [% ELSE %]
                        <li>
                    [% END %]
                    <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>
                </ul>
        </div>

        <div class="btn-group">
            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
                <ul class="dropdown-menu">
                    <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>
                    <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>
                </ul>
        </div>


                    [% ELSE %]
                    <li class="disabled">
                    [% END %]
                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&amp;authcat=MONTHS">Plan by months</a></li>
                    [% IF ( CAN_user_acquisition_planning_manage ) %]
                    <li>
                    [% ELSE %]
                    <li class="disabled">
                    [% END %]
                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&amp;authcat=BRANCHES">Plan by libraries</a></li>
                    [% IF ( CAN_user_acquisition_planning_manage ) %]
                    <li>
                    [% ELSE %]
                    <li class="disabled">
                    [% END %]
                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&amp;authcat=ITEMTYPES">Plan by item types</a></li>
                    [% FOREACH auth_cats_loo IN auth_cats_loop %]
                        [% IF ( CAN_user_acquisition_planning_manage ) %]
                        <li>
                        [% ELSE %]
                        <li class="disabled">
                        [% END %]
                        <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>
                        </li>
                    [% END %]
                </ul>




            [% END %]

            [% IF ( EasyAnalyticalRecords && CAN_user_editcatalogue_edit_catalogue ) %]
                <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&amp;analyze=1">Analyze items</a></li>
            [% END %]
            [% IF CAN_user_editcatalogue_edit_catalogue && ! EasyAnalyticalRecords %]
                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber | uri %]">New child record</a></li>
            [% END %]
    </ul>
    </div>

                [% END %]
            [% END %]

            [% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber | uri %]">Attach item</a></li>[% END %]

            [% 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 %]
            [% 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 %]

            [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
                <li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]&amp;op=duplicate">Edit as new (duplicate)</a></li>

    <div class="btn-group">
    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Save <span class="caret"></span></button>
    <ul class="dropdown-menu">
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&amp;op=export&amp;bib=[% biblionumber | uri %]">BIBTEX</a></li>
        <li><a href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a></li>
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marcxml&amp;op=export&amp;bib=[% biblionumber | uri %]">MARCXML</a></li>
        <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>
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=utf8&amp;op=export&amp;bib=[% biblionumber | uri %]">MARC (Unicode/UTF-8)</a></li>
        <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>
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=mods&amp;op=export&amp;bib=[% biblionumber | uri %]">MODS (XML)</a></li>
        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=ris&amp;op=export&amp;bib=[% biblionumber | uri %]">RIS</a></li>
    </ul>
    </div>


                    <span class="caret"></span>
                </button>
                <ul class="dropdown-menu">
                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]">Place hold</a></li>
                    <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>
                </ul>
            </div>
        [% ELSE %]




[%- biblioitem = item.biblioitem -%]
[
  "[% FILTER escape_quotes = replace('"', '\"') ~%]
    <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 %]
  [%~ END %]",
  "[% (biblioitem.publicationyear || biblio.copyrightdate) | html %]",
  "[% biblioitem.publishercode | html %]",
  "[% AuthorisedValues.GetByCode( 'CCODE', item.ccode ) | html %]",
  "[% FILTER escape_quotes ~%]
    <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>
  [%~ END %]",
  "[% item.itemcallnumber | html %]",
  "[% Branches.GetName(item.homebranch) | html %]",

  "[% item.status | html %]",
  "[% (item.issues || 0) | html %]",
  "[% FILTER escape_quotes ~%]
    <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>
  [%~ END %]"
]




<div id="menu">
<ul>
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
        [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber | uri %]">Check out</a></li>
        [% IF Koha.Preference('BatchCheckouts') && Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ patron.categorycode _ '$').size > 0 %]
          [% 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>
        [% END %]
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers %]
        [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">Details</a></li>
    [% END %]
    [% IF ( CAN_user_updatecharges ) %]
        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">Fines</a></li>
    [% END %]
    [% IF ( CAN_user_circulate_circulate_remaining_permissions  )  %]
        [% 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 %]
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers %]
        [% IF ( intranetreadinghistory ) %]
            [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% patron.borrowernumber | uri %]">Circulation history</a></li>
        [% END %]
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers %]
        [% IF ( intranetreadinghistory ) %]
            [% IF ( holdshistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/holdshistory.pl?borrowernumber=[% patron.borrowernumber | uri %]">Holds history</a></li>
        [% END %]
    [% END %]
    [% IF ( CAN_user_tools_view_system_logs ) %]
        [% 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>
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers %]
    [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber | uri %]">Notices</a></li>
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers %]
        [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% patron.borrowernumber | uri %]">Statistics</a></li>
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers %]
        [% IF ( EnableBorrowerFiles ) %]
            [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber | uri %]">Files</a></li>
        [% END %]
    [% END %]

    [% IF CAN_user_acquisition_suggestions_manage %]
        [% 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>
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
        [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber | uri %]">Discharges</a></li>
    [% END %]
    [% IF Koha.Preference('HouseboundModule') %]
        [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | uri %]">Housebound</a></li>
    [% END %]
    [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% patron.borrowernumber | uri %]">Interlibrary loans</a></li>
    [% END %]
</ul></div>
[% END %]




<div id="search-facets">
<h4>Refine your search</h4>
<ul>
    <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>
	[% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search | html %][% END %])</li>[% END %]
	</li>


      [% IF facet.active %]
        [% SET local_url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
        <span class="facet-label">[% facet.facet_label_value | html %]</span>
        [<a href="[% local_url | uri %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
      [% ELSE %]
        [% SET local_url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
        <span class="facet-label"><a href="[% local_url | uri %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span>
        [% IF ( displayFacetCount ) %]
          <span class="facet-count"> ([% facet.facet_count | html %])</span>
        [% END %]

  [% END %]
  [% IF ( facets_loo.expandable ) %]
      <li class="showmore">
          <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>
      </li>
  [% END %]
</ul></li>

Lines 123-129 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc (-2 / +2 lines)
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 %]" />

Lines 9-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc (-1 / +1 lines)
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&backend=[% backend \| html %]">[% backend \| html %]</a></li>	12	<li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=[% backend \| uri %]">[% backend \| html %]</a></li>
13	[% END %]	13	[% END %]
14	</ul>	14	</ul>
15	</div>	15	</div>

Lines 31-37 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc (-2 / +2 lines)
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 %]

Lines 59-65 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-1 / +1 lines)
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') %]

Lines 50-56 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc (-1 / +1 lines)
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>

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc (-2 / +3 lines)
		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 -%]




    <div class="btn-group" id="new-patron-button">
        <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>
            <ul class="dropdown-menu">
                [% 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 %]
            </ul>
    </div>
    [% IF Koha.Preference('PatronQuickAddFields') || Koha.Preference('BorrowerMandatoryField') %]
    <div class="btn-group" id="quick-add-new-patron-button">
        <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>
            <ul class="dropdown-menu">
                [% 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 %]
            </ul>
    </div>
    [% END %]




[% IF ( subscriptionid ) %]
<ul>
<li><a href="serials-collection.pl?subscriptionid=[% subscriptionid | uri %]">Serial collection</a></li>
  [% UNLESS closed %]
    [% IF ( routing && CAN_user_serials_routing ) %]
        [% IF ( hasRouting ) %]
             <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]">Edit routing list</a></li>
        [% ELSE %]
            <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]&amp;op=new">Create routing list</a></li>
        [% END %]
    [% END %]
  [% END %]

Lines 16-25 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc (-2 / +2 lines)
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&subscriptionid=[% subscriptionid \| html %]">Edit subscription</a></li>	19	<a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&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&subscriptionid=[% subscriptionid \| html %]">Edit as new (duplicate)</a></li>	22	<a href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&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>




[% IF ( booksellerid ) %]
<div id="menu">
    <ul>
        [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]">Baskets</a></li>[% END %]
        [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket groups</a></li>[% END %]
        [% IF ( CAN_user_acquisition_contracts_manage ) %]<li><a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a></li>[% END %]
        <li><a href="/cgi-bin/koha/acqui/invoices.pl?supplierid=[% booksellerid | uri %]&amp;op=do_search">Invoices</a></li>
        [% IF ( CAN_user_acquisition_order_manage ) %][% IF ( basketno ) %]
        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;owner=1">Uncertain prices</a></li>
        [% ELSE %]
        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&amp;owner=1">Uncertain prices</a></li>
        [% END %] [% END %]
    </ul>
</div>




        <div class="btn-group">
            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
            <ul class="dropdown-menu">
                <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>
                <li><a id="deleteshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=delete&amp;shelfnumber=[% shelf.shelfnumber | html %]">Delete list</a></li>
            </ul>
        </div>

        <div class="btn-group">
            <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>
                <ul class="dropdown-menu">
                    <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=iso2709&amp;shelfid=[% shelf.shelfnumber | uri %]">iso2709</a></li>
                    <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=ris&amp;shelfid=[% shelf.shelfnumber | uri %]">RIS</a></li>
                    <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=bibtex&amp;shelfid=[% shelf.shelfnumber | uri %]">BibTex</a></li>
                    [% FOREACH csv_profile IN csv_profiles %]
                        <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>
                    [% END %]
                </ul>
        </div>




                <td>Budget [% loop_budge.budget_period_description | html %] [id=[% loop_budge.budget_period_id | html %]][% UNLESS loop_budge.budget_period_active %] (inactive)[% END %]</td>
                <td>
                    [% IF ( CAN_user_acquisition_budget_manage ) %]
                        <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% loop_budge.budget_period_id | uri %]">[% loop_budge.budget_code | html %]</a>
                    [% ELSE %]
                        [% loop_budge.budget_code | html %]
                    [% END %]
                </td>
                <td>[% loop_budge.budget_name | html %]</td>
                <td>[% IF ( loop_budge.budget_owner ) %]
                        <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>
                    [% ELSE %]
                        &nbsp;
                    [% END %]

                    [% END %]
                </td>
                <td class="data">
                    <a href="ordered.pl?fund=[% loop_budge.budget_id | uri %]&amp;fund_code=[% loop_budge.budget_code | uri %]">
                    [% IF loop_budge.budget_parent_id %]
                        [% loop_budge.budget_ordered | $Price %]
                    [% ELSE %]

                    </a>
                </td>
                <td class="data">
                    <a href="spent.pl?fund=[% loop_budge.budget_id | uri %]&amp;fund_code=[% loop_budge.budget_code | uri %]">
                    [% IF loop_budge.budget_parent_id %]
                        [% loop_budge.budget_spent | $Price %]
                    [% ELSE %]




                              <span class="citation">[% biblio.citation | html %]</span>
                            </label>
                            <span class="links" style="font-weight: normal;">
                              ( <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> )
                            </span>
                          </legend>
                          <div style="float:left">

                                    [% biblio_lis.overlay_status | html %]
                                [% END %]
                                [% IF ( biblio.match_biblionumber ) %]
                                  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>
                                [% END %]
                              </span>
                            </li>

                        </td>
                        <td><span title="[% batch_lis.staged_date | html %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 | html %]</span></td>
                        <td>[% batch_lis.num_records | html %]</td>
                        <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>
                      </tr>
                      [% END %]
                    </tbody>




<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;
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> &rsaquo;
    [% UNLESS ( basketno ) %][% IF ( delete_confirmed ) %]Deleted [% ELSE %]New [% END %][% END %]Basket [% basketname | html %] [% IF ( basketno ) %]([% basketno | html %])[% END %] for [% booksellername | html %]
</div>


                    [% IF active %]
                        <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>
                    [% END %]
                    <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>
                    [%# FIXME This action should not be available for everyone %]
                    <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>
                   [% IF ( unclosable ) %]
                    [% ELSIF ( uncertainprices ) %]
                        <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>
                        <div title="Can not close baskets that have items with uncertain prices in them." class="btn-group">
                            <a href="" class="btn btn-default btn-sm disabled" id="closebutton"><i class="fa fa-times-circle"></i> Close this basket</a>
                        </div>
                    [% ELSE %]
                        <div class="btn-group">
                            <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>
                        </div>
                    [% END %]

                    [% PROCESS csv_export %]

                        [% IF ediaccount %]
                        <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>
                        [% END %]

                        [% IF ( active && books_loop ) %]

                    <p><strong>The following records could not be deleted:</strong></p>
                    <ul>
                    [% FOREACH cannotdelbiblio IN cannotdelbiblios %]
                        <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cannotdelbiblio.biblionumber | uri %]">[% cannotdelbiblio.title | html %]</a> by [% cannotdelbiblio.author | html %]:
                            <ul>
                            [% IF (cannotdelbiblio.itemcount) %]<li>[% cannotdelbiblio.itemcount | html %] item(s) attached.</li>[% END %]
                            [% IF (cannotdelbiblio.subscriptions) %]<li>[% cannotdelbiblio.subscriptions | html %] subscription(s) attached.</li>[% END %]

                </div>
                <a href="booksellers.pl">Click here to go back to booksellers page</a>
            [% ELSE %]
                <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>
            [% END %]
        [% ELSE %]


                [% END %]
            </div>
        [% END %]
        <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
        [% IF ( basketno ) %]
            <div id="acqui_basket_summary" class="yui-g">
                <div class="rows">

                [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote | html %]</li>[% END %]
                [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %]
                [% IF ( basketcontractno ) %]
                    <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>
                [% END %]
                [% IF deliveryplace %]<li><span class="label">Delivery place:</span> [% Branches.GetName( deliveryplace ) | html %]</li>[% END %]
                [% IF billingplace %]<li><span class="label">Billing place:</span> [% Branches.GetName( billingplace ) | html %]</li>[% END %]

                          [% END %]
                          [% IF basketgroup.closed %]
                              [% IF ( CAN_user_acquisition_group_manage ) %]
                                  <a href="basketgroup.pl?op=add&booksellerid=[% booksellerid | uri %]&basketgroupid=[% basketgroup.id | uri %]" title="basketgroup">[% basketgroup.name | html %] (closed)</a>
                              [% ELSE %]
                                  [% basketgroup.name | html %] (closed)
                              [% END %]

        [% END %]
        [% IF ( duplinbatch ) %]<div class="dialog alert">
        <h4>Duplicate warning</h4>
        <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>
        </div>[% END %]

        <div id="acqui_basket_content" class="yui-g">

                            <p>
                                [% IF ( books_loo.order_received ) %] (rcvd)[% END %]
                                [% IF books_loo.title %]
                                    <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 %]
                                [% ELSE %]
                                    <em>Deleted bibliographic record, can't find title</em><br />
                                [% END %]

                                [% IF ( books_loo.suggestionid ) %]
                                    <br/>
                                    Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby | html %] [% END %]
                                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid | uri %]&amp;op=show">suggestion #[% books_loo.suggestionid | html %]</a>)
                                [% END %]
                            </p>
                                [% IF ( books_loo.order_internalnote ) %]

                              [% bookseller = books_loo.transferred_from.bookseller | html %]
                              [% timestamp = books_loo.transferred_from.timestamp | html %]
                              <p>Transferred from basket:
                                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
                                (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
                                on <span title="[% timestamp | $KohaDates with_hours = 1 | html %]">
                                  [% timestamp | $KohaDates %]
                                </span>

                        [% IF ( active ) %]
                            [% UNLESS ( closedate ) %]
                            <td>
                                <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Modify</a>
                                [% UNLESS (books_loo.order_received) %]
                                    <br />
                                    <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a>

                            [% IF ( books_loo.left_holds_on_order ) %]
                            <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>
                            [% ELSE %]
                            <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>
                            [% END %]
                            [% IF ( books_loo.can_del_bib ) %]
                            <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>
                            [% ELSE %]
                            <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br>
                            [% END %]

                        [% bookseller = order.transferred_to.bookseller | html %]
                        [% timestamp = order.transferred_to.timestamp | html %]
                        <p>Transferred to basket:
                          <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
                          (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
                          on <span title="[% timestamp | $KohaDates with_hours = 1 | html %]">
                            [% timestamp | $KohaDates %]
                          </span>





<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;
[% IF ( grouping ) %]
    <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>
[% ELSE %]
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> &rsaquo; Basket grouping</div>
[% END %]



                        </div>
                    [% END %]
                    [% IF (name && closedbg) %]
                        <h1>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
                    [% ELSIF (name) %]
                        <h1>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
                    [% ELSE %]
                        <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
                    [% END %]
                    <div id="basketgroupcolumns" class="row">
                        [% UNLESS (closedbg) %]

                                                    [% IF ( baskets ) %]
                                                        [% FOREACH basket IN baskets %]
                                                            <li class="ungrouped" id="b-[% basket.basketno | html %]" >
                                                                <a href="basket.pl?basketno=[% basket.basketno | uri %]">
                                                                    [% IF ( basket.basketname ) %]
                                                                        [% basket.basketname | html %]
                                                                    [% ELSE %]

                                                [% END %]
                                                [% FOREACH selectedbasket IN selectedbaskets %]
                                                    <li class="grouped" id="b-[% selectedbasket.basketno | html %]" >
                                                        <a href="basket.pl?basketno=[% selectedbasket.basketno | uri %]">
                                                            [% IF ( selectedbasket.basketname ) %]
                                                                [% selectedbasket.basketname | html %]
                                                            [% ELSE %]

                                            <input type="hidden" name="basketgroupid" value="[% basketgroupid | html %]" />
                                        [% END %]
                                        <input type="hidden" name="op" value="attachbasket" />
                                        <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]" class="cancel">Cancel</a>
                                    </fieldset>
                                [% END %]
                            </form>

                    </div>
                [% ELSE %]
                    <div id="toolbar" class="btn-toolbar">
                        <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>
                    </div>
                    <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
                    [% IF (NoEDIMessage) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %]

Lines 21-27 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt (-1 / +1 lines)
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 %]




        </p>
    [% END %]
    [% IF ( allbaskets ) %]
        <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&amp;booksellerid=[% booksellerid | uri %]">Show active baskets only</a>
    [% ELSE %]
        <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;allbaskets=1">Show all baskets</a>
    [% END %]
    [% UNLESS booksellerid %]
        | <a href="#" id="show_active_vendors">Show active vendors only</a><a href="#" id="show_all_vendors">Show all vendors</a>

                                            [% IF basketgroup.closed %]
                                              [% basketgroup.name | html %] (closed)
                                            [% ELSE %]
                                              <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% basket.booksellerid | uri %]&amp;basketgroupid=[% basketgroup.id | uri %]">[% basketgroup.name | html %]</a>
                                            [% END %]
                                          [% END %]
                                        </td>

Lines 9-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt (-3 / +3 lines)
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




<td><span title="[% msg.transfer_date | html %]">[% msg.transfer_date | $KohaDates %]</span></td>
<td>[% msg.status | html %]</td>
<td>
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% msg.vendor_id | uri %]">
        [% msg.vendor.name | html %]
    </a>
</td>
<td>
[% IF msg.message_type == 'QUOTE' || msg.message_type == 'ORDERS' %]
    [% IF msg.basketno %]
    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% msg.basketno.basketno | uri %]">
    Basket: [% msg.basketno.basketno | html %]
    </a>
    [% END %]
[% ELSE %]
<!-- Assuming invoices -->
     <a href="/cgi-bin/koha/acqui/invoices.pl?message_id=[% msg.id | uri %]">
      Invoices
     </a>
[% END %]




                            [% CASE 'cancelled' %]Cancelled
                        [% END %]
                    </td>
                    <td>[% order.basketname | html %] (<a href="basket.pl?basketno=[% order.basketno | uri %]">[% order.basketno | html %]</a>)</td>
                    <td>[% order.authorisedbyname | html %]</td>
                    <td>
                        [% IF ( order.basketgroupid ) %]
                            [% order.groupname | html %] (<a href="basketgroup.pl?op=add&booksellerid=[% order.id | uri %]&basketgroupid=[% order.basketgroupid | uri %]">[% order.basketgroupid | html %]</a>)
                        [% ELSE %]
                            &nbsp;
                        [% END %]
                    </td>
                    <td>[% IF ( order.invoicenumber ) %]
                            <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a>
                        [% ELSE %]
                            &nbsp;
                        [% END %]
                    </td>
                    <td>
                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">[% order.title | html %]</a>
                        <br />[% order.author | html %] <br /> [% order.isbn | html %]
                    </td>
                    <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id | uri %]">[% order.name | html %]</a></td>
                    <td><span title="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</span></td>
                    <td>
                        [% IF order.datereceived %]




            <main>

      <h2>Files for invoice: [% invoicenumber | html %]</h2>
      <p><b>Vendor: </b><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a></p>
      <br />
      [% IF errors %]
        <div class="dialog alert">

              <tbody>
                [% FOREACH f IN files %]
                  <tr>
                      <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>
                      <td>[% f.file_type | html %]</td>
                      <td>[% f.file_description | html %]</td>
                      <td class="title-string">

                      </td>
                      <td>[% f.file_size | html %]</td>
                      <td><a class="delete_file" href="?invoiceid=[% invoiceid | html %]&amp;op=delete&amp;file_id=[% f.file_id | html %]">Delete</a></td>
                      <td><a href="?invoiceid=[% invoiceid | uri %]&amp;op=download&amp;file_id=[% f.file_id | uri %]">Download</a></td>
                  </tr>
                [% END %]
              </tbody>




      [% END %]
      <h1>Invoice: [% invoicenumber | html %]</h1>

      <p>Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a></p>
        <form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated">
        <fieldset class="rows">
            <ol>

            <fieldset class="action">
                <input type="submit" value="Save" />
                [% UNLESS orders_loop.size %]
                <a href="invoice.pl?op=delete&invoiceid=[% invoiceid | uri %]" id="delete">Delete</a>
                [% END %]
            </fieldset>
        </fieldset>

                  </fieldset>
              </form>
      <p>
          <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]">Go to receipt page</a>
          [% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]">Manage invoice files</a>[% END %]
      </p>
      <h2>Invoice details</h2>
      <fieldset>

                <tr>
                  <td>
                    [% IF order.biblionumber %]
                      <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">[% order.title | html %]</a>
                      [% IF ( order.author ) %]
                        <br /><em>by</em> [% order.author | html %]
                      [% END %]

                <tbody>
                [% FOREACH f IN files %]
                    <tr>
                         <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>
                         <td>[% f.file_type | html %]</td>
                         <td>[% f.file_description | html %]</td>
                         <td class="title-string">




                <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 %]">
                  <td>[% invoice.is_linked_to_subscriptions | html %]</td>
                  <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td>
                  <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td>
                  <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td>
                  <td>
                    [% IF invoice.shipmentdate %]
                      <span title="[% invoice.shipmentdate | html %]">[% invoice.shipmentdate | $KohaDates %]</span>

                             Actions <b class="caret"></b>
                          </a>
                          <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid | html %]">
                              <li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]"><i class="fa fa-search"></i> Details</a></li>
                            [% IF invoice.closedate %]
                                <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>
                            [% ELSE %]
                                <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>
                            [% END %]
                            [% UNLESS invoice.receivedbiblios || invoice.receiveditems %]
                                <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>
                            [% END %]
                          </ul>
                      </div>

Lines 106-112 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-2 / +2 lines)
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 %]




      [% FOREACH biblio IN resultsloop %]
        <tr>
            <td>
                <p><span class="title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.title | html %]</a></span>
                [% FOREACH subtitle IN biblio.subtitles %] <span class="subtitle">[% subtitle.subfield | html %]</span>[% END %]
                [% IF ( biblio.author ) %]  by <span class="author">[% biblio.author | html %]</span>,[% END %]</p>
                <p>[% IF ( biblio.isbn ) %] [% biblio.isbn | html %][% END %]

                [% biblio.copyrightdate | html %]
            </td>
        <td>
        <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>
        </td>
            <td>
            <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">
                Order
            </a>
            </td>
        </tr>




        [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %]
        [% IF ( basketcontractno ) %]
            <li><span class="label">Contract number: </span>[% basketcontractno | html %]</li>
            <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>
        [% END %]
        [% IF ( authorisedbyname ) %]<li><span class="label">Managed by:</span>  [% authorisedbyname | html %]</li>[% END %]
        [% IF ( creationdate ) %]<li><span class="label">Open on:</span>  [% creationdate | $KohaDates %]</li>[% END %]

        <legend>
            Catalog details
            [% IF ( biblionumber ) %]
                <span><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | uri %]"> Edit record</a></span>
            [% END %]
        </legend>
        [% UNLESS ( existing ) %]

        <ol>
          <li>
            <span class="label">Suggested by: </span>
            [% 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>)
          </li>
        </ol>
        </fieldset>

Lines 45-51 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-1 / +1 lines)
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>

Lines 55-63 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-2 / +2 lines)
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 %]&basketno=[% basketno \| html %]&suggestionid=[% suggestions_loo.suggestionid \| html %]&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 %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestions_loo.suggestionid \| uri %]&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 %]&basketno=[% basketno \| html %]&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 %]&basketno=[% basketno \| uri %]&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>




[% FOREACH order IN ordered %]
    <tr>
	<td class="cell">
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">
	    [% order.title | html %]
            </a>
	</td>
	<td class="cell">
        [% IF ( CAN_user_acquisition_order_manage ) %]
            <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>
        [% ELSE %]
            [% order.ordernumber | html %]
        [% END %]
	</td>
	<td class="cell">
	    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
	</td>
	<td class="cell">
        [% ItemTypes.GetDescription( order.itype ) | html %]

Lines 48-54 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-1 / +1 lines)
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 %]&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 %]&op=show">suggestion #[% suggestionid \| html %]</a>)
52	</li>	52	</li>
53	</ol>	53	</ol>
54	</fieldset>	54	</fieldset>




        <tbody class="filterclass">
        [% FOREACH loop_order IN loop_orders %]
            <tr>
                <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>
                <td>
                  [% IF loop_order.basketgroupid %]
                    [% loop_order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% loop_order.booksellerid | uri %]">[% loop_order.basketgroupid | html %]</a>)
                  [% ELSE %]
                    No basket group
                  [% END %]
                </td>
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber | uri %]&amp;booksellerid=[% loop_order.booksellerid | uri %]">[% loop_order.ordernumber | html %]</a></td>
                <td class="summaryfilterclass">
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber | uri %]">[% loop_order.title | html %]</a>
                [% IF ( loop_order.author ) %] by [% loop_order.author | html %][% END %]
                [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn | html %][% END %]
                [% IF ( loop_order.publishercode ) %]

                [% IF ( loop_order.suggestionid ) %]
                    <br/>
                    Suggested by: [% loop_order.surnamesuggestedby | html %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby | html %] [% END %]
                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_order.suggestionid | uri %]&amp;op=show">suggestion #[% loop_order.suggestionid | html %]</a>)
                [% END %]
                <br />
                [% IF ( loop_order.order_internalnote ) %]
                    <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>
                [% ELSE %]
                    [<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>]
                [% END %]
                [% IF ( loop_order.order_vendornote ) %]
                    <p class="ordernote"><strong>Vendor note: </strong>[% loop_order.order_vendornote | html %]</p>
                [% ELSE %]
                    [<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>]
                [% END %]
                </td>
                <td>
                  <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% loop_order.ordernumber | uri %]" class="previewData">Order</a><br>
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber | uri %]" class="previewData">MARC</a><br>
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_order.biblionumber | uri %]" class="previewData">Card</a>
                </td>
                <td>[% loop_order.replacementprice | $Price %]</td>
                <td>[% loop_order.quantity | html %]</td>

                <td>[% loop_order.total | $Price %]</td>
                <td>[% loop_order.budget_name | html %]</td>
				<td>
                              <a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber | uri %]&amp;invoiceid=[% invoiceid | uri %]">Receive</a>
                    <br />
                    <a href="#" onclick="transfer_order_popup([% loop_order.ordernumber | html %]); return false;">Transfer</a>
				</td>

                        [% IF ( loop_order.left_holds_on_order ) %]
                        <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>
                        [% ELSE %]
                        <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 />
                        [% END %]
                        [% IF ( loop_order.can_del_bib ) %]
                        <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 />
                        [% ELSE %]
                        <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br>
                        [% END %]

[% ELSE %]
    <p>
        Invoice is closed, so you can't receive orders anymore.
        <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>.
    </p>
[% END %]


    <tbody class="filterclass">
        [% FOREACH order IN loop_received %]
            <tr>
                <td>[% order.basketname | html %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% order.basketno | uri %]">[% order.basketno | html %]</a>)</td>
                <td>
                  [% IF order.basketgroupid %]
                    [% order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% order.booksellerid | uri %]">[% order.basketgroupid | html %]</a>)
                  [% ELSE %]
                    No basket group
                  [% END %]
                </td>
                <td>
                  <a href="neworderempty.pl?ordernumber=[% order.ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]">[% order.ordernumber | html %]</a>
                  [% IF (order.parent_ordernumber && (order.parent_ordernumber != order.ordernumber)) %]
                    (<a href="neworderempty.pl?ordernumber=[% order.parent_ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]" title="Original order line">[% order.parent_ordernumber | html %]</a>)
                  [% END %]
                </td>
                <td>
                  [% IF order.total_holds > 0 %]
                    [% IF order.item_holds > 0 %]
                      <span class="error"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% order.biblionumber | uri %]">[% order.item_holds | html %]</a></span>
                    [% ELSE %]
                      0
                    [% END %]
                    /
                    <span class="error"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% order.biblionumber | uri %]">[% order.total_holds | html %]</a></span>
                  [% ELSE %]
                    0
                  [% END %]
                </td>
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">[% order.title | html %]</a>
                [% IF ( order.author ) %] / [% order.author | html %][% END %]
                [% IF ( order.isbn ) %] - [% order.isbn | html %][% END %]
                [% IF ( order.publishercode ) %]

                [% IF ( order.suggestionid ) %]
                    <br/>
                    Suggested by: [% order.surnamesuggestedby | html %][% IF ( order.firstnamesuggestedby ) %], [% order.firstnamesuggestedby | html %] [% END %]
                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% order.suggestionid | uri %]&amp;op=show">suggestion #[% order.suggestionid | html %]</a>)
                [% END %]
                </td>
                <td>
                  <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% order.ordernumber | uri %]" class="previewData">Order</a><br>
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber | uri %]" class="previewData">MARC</a><br>
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% order.biblionumber | uri %]" class="previewData">Card</a>
                </td>
                <td>[% order.replacementprice | $Price %]</td>
                <td>[% order.quantityreceived | html %]</td>

                          Can't cancel receipt
                      </span>
                    [% ELSE %]
                        <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]&op=cancelreceipt&ordernumber=[% order.ordernumber | uri %]">Cancel receipt</a>
                    [% END %]
                </td>
            </tr>

</div>

[% IF (invoiceclosedate) %]
    <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid | uri %]">View invoice</a>
[% ELSE %]
    <form action="/cgi-bin/koha/acqui/invoice.pl" method="get">
        <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" />

      <input type="hidden" value="search" name="op" />
      <input type="hidden" value="[% invoiceid | html %]" name="invoiceid" />
      <input type="submit" value="Filter" />
      <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]">Clear</a>
    </fieldset>
  </fieldset>
</form>




        <p>An error has occurred. Invoice cannot be created.</p>
    </div>
[% END %]
<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1>

    [% IF duplicate_invoices %]
    <div id="parcels_duplicate_invoice" class="dialog alert">

                    <tr>
                        <td>[% invoice.invoicenumber | html %]</td>
                        <td>[% invoice.shipmentdate | $KohaDates %]</td>
                        <td><a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoice.invoiceid | uri %]">Receive</a></td>
                    </tr>
                [% END %]
            </tbody>

            </td>
            <td>
                [% IF ( searchresult.code ) %]
                    <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% searchresult.invoiceid | uri %]">[% searchresult.code | html %]</a>
                [% ELSE %]
                    <abbr title="not available">n/a</abbr>
                [% END %]

<div id="resultnumber">
<!-- Row of numbers corresponding to search result pages -->
[% IF ( displayprev ) %]
    <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>
[% END %]
[% FOREACH number IN numbers %]
    [% IF ( number.highlight ) %]
    <span class="current">[% number.number | html %]</span>
    [% ELSE %]
    <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>
    [% END %]
[% END %]
[% IF ( displaynext ) %]
    <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>
[% END %]
</div>
</div>

                <option value="100">100</option>
                </select></li>
        </ol>
	<fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | uri %]">Clear</a></fieldset>
	</fieldset>
</form>
</aside>




    [% FOREACH order IN spent %]
        <tr>
            <td class="cell">
                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">
                    [% order.title | html %]
                </a>
            </td>

                [% order.ordernumber | html %]
            </td>
            <td class="cell">
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
            </td>
            <td class="cell">
                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a>
            </td>
            <td class="cell">
                [% ItemTypes.GetDescription( order.itype ) | html %]




    <p><span class="label">Alternative phone: </span>[% contact.altphone | html %]</p>
    <p><span class="label">Fax: </span>[% contact.fax | html %]</p>
    [% IF ( contact.email ) %]
        <p><span class="label">Email: </span><a href="mailto:[% contact.email | uri %]">[% contact.email | html %]</a></p>
    [% END %]
    [% IF ( contact.notes ) %]
        <p><span class="label">Notes: </span>[% contact.notes | html %]</p>

                <p><span class="label">Phone: </span>[% phone | html %]</p>
                <p><span class="label">Fax: </span>[% fax | html %]</p>
                [% IF ( url ) %]
                    <p><span class="label">Website: </span><a href="[% url | uri %]">[% url | html %]</a></p>
                [% END %]
                [% IF ( accountnumber ) %]
                    <p><span class="label">Account number: </span>[% accountnumber | html %]</p>

                    [% FOREACH contract IN contracts %]
                        <tr>
                        <td>
                            <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>
                        </td>
                        <td>[% contract.contractdescription | html %]</td>
                        <td><span title="[% contract.contractstartdate | html %]">[% contract.contractstartdate | $KohaDates %]</span></td>

Lines 73-81 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt (-2 / +2 lines)
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 ) %] – [% ordersloo.isbn \| html %][% END %]	80	[% IF ( ordersloo.isbn ) %] – [% ordersloo.isbn \| html %][% END %]
81	[% IF ( ordersloo.publishercode ) %]	81	[% IF ( ordersloo.publishercode ) %]




            <META HTTP-EQUIV=Refresh CONTENT="[% metacontent | html %]">
        [% ELSE %]
        [% IF ( booksellername ) %]
            <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
            <h2>Contact information</h2>
            <p><strong>Address: </strong>
                [% booksellerpostal | html %]

                [% bookselleraddress2 | html %]
                [% bookselleraddress3 | html %]
                [% bookselleraddress4 | html %]
                <a href="[% booksellerurl | uri %]">[% booksellerurl | html %]</a>
            </p>
            <p><strong>Phone: </strong>
                [% booksellerphone | html %] / Fax:

            [% uncertainpriceorder.basketname | html %]
        </td>
	    <td>
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% uncertainpriceorder.biblionumber | uri %]">[% uncertainpriceorder.title | html %]</a>
            [% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author | html %][% END %]
            [% IF ( uncertainpriceorder.publishercode ) %]
                <br /><em>Publisher:</em> [% uncertainpriceorder.publishercode | html %]

            [% END %]
            [% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn | html %][% END %]
            <br />
            <a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% uncertainpriceorder.basketno | uri %]">
                Edit
            </a>
        </td>

Lines 116-122 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-3 / +3 lines)
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&importid=[% breeding_loo.breedingid \| html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode \| uri %]&breedingid=[% breeding_loo.breedingid \| html %]&booksellerid=[% booksellerid \| uri %]&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&importid=[% breeding_loo.breedingid \| html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode \| uri %]&breedingid=[% breeding_loo.breedingid \| html %]&booksellerid=[% booksellerid \| uri %]&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&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&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 %]&breedingid=[% breeding_loo.breedingid \| html %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]">Place order</a></td>	137	<td><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode \| uri %]&breedingid=[% breeding_loo.breedingid \| uri %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]">Order</a></td>
138		138
139	</tr>	139	</tr>
140	[% END %]	140	[% END %]




        </a>
        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetmenu_[% block_budget.budget_period_id | html %]">
              <li>
                  <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>
              </li>
              [% IF block_budget.count %]
                  <li class="disabled">

                  </li>
              [% ELSE %]
                  <li>
                      <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>
                  </li>
              [% END %]
              <li>
                  <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>
              </li>
              <li>
                  <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>
              </li>
              <li>
                  <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>
              </li>
        </ul>
    </div>

    [% END %]
    [% IF close_form %]
        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo;
        <span>Close budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">[% budget_period_description | html %]</a></span>
    [% END %]
    [% IF closed %]
        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo;
        <span>Budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">[% budget_period_description | html %]</a> closed</span>
    [% END %]
    [% IF ( else ) %]
        <span>Budgets administration</span>

        <!-- ###################################### -->
        <input type="submit" value="Save" />
        [% IF ( budget_period_id ) %]
            <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]" class="cancel">Cancel</a>
        [% ELSE %]
            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a>
        [% END %]

    <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>
  [% ELSE %]
    <h3>The unreceived orders from the following funds will be moved</h3>
      Fund list of budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">[% budget_period_description | html %]</a>:
    <table id="budgeth">
      <thead>
        <tr>

          <tbody>
              [% FOREACH period_active IN period_active_loop %]
                <tr>
                <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>
                <td><span title="[% period_active.budget_period_startdate | html %]">[% period_active.budget_period_startdate | $KohaDates %]</span></td>
                <td><span title="[% period_active.budget_period_enddate | html %]">[% period_active.budget_period_enddate | $KohaDates %]</span></td>
                <td>

          <tbody>
              [% FOREACH period_loo IN period_inactive_loop %]
                  <tr>
                  <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>
                  <td><span title="[% period_loo.budget_period_startdate | html %]">[% period_loo.budget_period_startdate | $KohaDates %]</span></td>
                  <td><span title="[% period_loo.budget_period_enddate | html %]">[% period_loo.budget_period_enddate | $KohaDates %]</span></td>
                  <td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span>&nbsp;[% ELSE %][% END %] </td>




<div id="breadcrumbs"><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/aqbudgetperiods.pl">Budgets</a> &rsaquo; [% IF op == 'list' %][% IF budget_period_id %]Funds for '[% budget_period_description | html %]'[% ELSE %]All funds[% END %][% END %]
    [% IF op == 'add_form' %]
      <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 %]
    [% END %]
    [% IF op == 'delete_confirm' %]
      <a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a> &rsaquo; Delete fund?

                   Actions <b class="caret"></b>
                </a>
                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetactions[% budget.budget_id | html %]_[% budget.budget_period_id | html %]">
                    <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>
                    [% IF budget.budget_has_children %]
                        <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>
                    [% ELSE %]
                        <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>
                    [% END %]
                    <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>
                </ul>
            </div>
        </td>

        <span class="label">Owner: </span>
        [% IF  budget_owner %]
            <span  id="budget_owner_name">
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner.borrowernumber | uri %]">
                    [% budget_owner.firstname | html %] [% budget_owner.surname | html %]
                </a> |
            </span>

        <ul style="float:left;" id="budget_users">
            [% FOREACH user IN budget_users %]
                <li id="user_[% user.borrowernumber | html %]">
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% user.borrowernumber | uri %]">
                        [% user.firstname | html %] [% user.surname | html %]
                    </a>
                    &bull; <a href="#" class="del_user" data-borrowernumber="[% user.borrowernumber | html %]"><i class="fa fa-trash"></i> Remove</a>




    &rsaquo;
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
    &rsaquo;
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
    &rsaquo;
    [% IF ( add_form ) %]
        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
        &rsaquo;
        [% IF ( contractnumber ) %]Modify contract '[% contractname | html %]'
        [% ELSE %]New contract
        [% END %]
    [% END %]
    [% IF ( add_validate ) %]
        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
        &rsaquo; Data recorded
    [% END %]
    [% IF ( delete_confirm ) %]
        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
        &rsaquo; Confirm deletion of contract [% contractnumber | html %]
    [% END %]
    [% IF ( delete_confirmed ) %]
        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a> &rsaquo; Contract deleted
    [% END %]
    [% IF ( else ) %]Contracts[% END %]
</div>

                    [% FOREACH loo IN loop %]
                        <tr>
                        <td>
                            <a href="[% loo.script_name | uri %]?op=add_form&amp;booksellerid=[% loo.booksellerid | uri %]&amp;contractnumber=[% loo.contractnumber | uri %]">[% loo.contractname | html %]</a>
                        </td>
                        <td>[% loo.contractdescription | html %]</td>
                        <td>[% loo.contractstartdate | html %]</td>
                        <td>[% loo.contractenddate | html %]</td>
                        <td class="actions">
                            <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>
                            <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>
                        </td>
                        </tr>
                    [% END %]

                    <div class="dialog message">
                        There are no contracts with this vendor.
                        [% IF active %]
                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid | uri %]">Add a contract</a>.
                        [% END %]
                    </div>
                [% END %]

Lines 16-23 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt (-3 / +3 lines)
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&budget_id=[% budget_line.budget_id \| html %]&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&budget_id=[% budget_line.budget_id \| uri %]&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 %] </span>	79	<td><span id="[% budget_line.budget_amount \| html %]">[% budget_line.budget_amount \| $Price %] </span>
80		80
81		81




  [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a> &rsaquo;
  [% END %]
  [% IF ( else ) %]Authority MARC subfield structure for [% tagfield | html %]
  [% 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;
  [% END %]
  [% IF ( delete_confirm ) %]Confirm deletion of subfield [% tagsubfield | html %]?[% END %]
  [% IF ( delete_confirmed ) %]Data deleted[% END %]

            <ul>
                [% FOREACH loo IN loop %]
                    [% IF ( loo.new_subfield ) %]
                        <li><a href="#sub[% loo.tagsubfield | uri %]field" title="[% loo.liblibrarian | html_entity %]">New</a></li>
                    [% ELSE %]
                        <li><a href="#sub[% loo.tagsubfield | uri %]field" title="[% loo.liblibrarian | html_entity %]">
                            [% loo.tagsubfield | html %]
                    </a></li>
                    [% END %]

                [% IF ( loo.value_builder ) %] | <strong>Plugin:</strong>[% loo.value_builder | html %],[% END %]
            [% END %]
        </td>
        <td><a href="[% loo.delete | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a></td>
    </tr>
    [% END %]
</table>




    [% IF ( add_form ) %]
        [% IF ( use_heading_flags_p ) %]
            [% IF ( heading_modify_tag_p ) %]
                [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] Framework</a>
                [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
                [% END %] &rsaquo; Modify tag
            [% END %]
            [% IF ( heading_add_tag_p ) %]
                [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
                [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
                [% END %] &rsaquo; New tag
            [% END %]
        [% ELSE %]
            [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] Framework</a>
            [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
            [% END %] &rsaquo; [% action | html %]
        [% END %]
    [% ELSE %]
        [% IF ( delete_confirm ) %]
            [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
            [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
            [% END %] &rsaquo; Confirm deletion
        [% ELSE %]
            [% IF ( delete_confirmed ) %]
                [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
                [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
                [% END %] &rsaquo; Data deleted
            [% ELSE %]

        </fieldset>
        <fieldset class="action">
            <input type="submit" value="Submit" />
            <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]" class="cancel">Cancel</a>
        </fieldset>
    </form>
[% END %]

                    <a class="btn btn-default btn-xs dropdown-toggle" id="authtagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#">
                        Actions <b class="caret"></b></a>
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authtagactions[% loo.tagfield | html %]">
                        <li><a href="[% loo.subfield_link | uri %]"><i class="fa fa-eye"></i> Subfields</a></li>
                        <li><a href="[% loo.edit | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
                        <li><a href="[% loo.delete | uri %]"><i class="fa fa-trash"></i> Delete</a></li>
                    </ul>
                </div>
            </td>

Lines 91-97 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt (-2 / +2 lines)
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&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&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&searchfield=[% searchfield \| url %]&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&searchfield=[% searchfield \| url %]&id=[% loo.id \| html %]"><i class="fa fa-trash"></i> Delete</a></td>
263	</tr>	263	</tr>
264	[% END %]	264	[% END %]

Lines 155-163 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt (-3 / +3 lines)
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&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&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&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&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>

Lines 209-217 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt (-3 / +3 lines)
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&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&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&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&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 -->

Lines 34-40 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt (-1 / +1 lines)
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">

Lines 220-228 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt (-2 / +2 lines)
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 %]

Lines 264-270 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt (-1 / +1 lines)
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>




                    <label for="description" class="required">Description: </label>
                    <input type="text" id="description" name="description" size="48" value="[% itemtype.description | html %]" required="required" /> <span class="required">Required</span>
                    [% IF can_be_translated %]
                        <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>
                    [% END %]
                </li>
                <li>

                            [% ELSE %]
                                <li>
                            [% END %]
                            <a href="#[% imageset.imagesetname | uri %]">[% imageset.imagesetname | html %]</a>
                            </li>
                        [% END %]
                        [% IF itemtype.image_location('intranet').match('^http') %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#remote">Remote image</a></li>

                    </td>
                [% END %]
            <td>
              <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&amp;itemtype=[% itemtype.itemtype | uri %]">
                [% itemtype.itemtype | html %]
              </a>
            </td>

            <td>[% itemtype.processfee | $Price %]</td>
            <td>[% itemtype.checkinmsg | html_line_break | $raw %]</td>
            <td class="actions">
              <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>
              <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>
            </td>
          </tr>
          [% END %]




  <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;
  [% IF ( add_form ) %]
  [% IF ( use_heading_flags_p ) %]
  [% 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
  [% END %]
  [% 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 %]
  [% END %]
  [% END %]
[% 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 %]
[% END %]
[% 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
[% END %]
[% IF ( else ) %]Tag [% tagfield | html %] Subfield structure[% END %]
</div>

   <ul>
        [% FOREACH loo IN loop %]
            [% IF ( loo.new_subfield ) %]
                <li><a href="#sub[% loo.urisubfieldcode | uri %]field" title="[% loo.liblibrarian | html_entity %]">New</a></li>
            [% ELSE %]
                <li><a href="#sub[% loo.urisubfieldcode | uri %]field" title="[% loo.liblibrarian | html_entity %]">
                    [% loo.subfieldcode | html %]
               </a></li>
            [% END %]

    [% FOREACH loo IN loop %] 
        <div class="constraints" id="sub[% loo.urisubfieldcode | html %]field">

               <h3><a href="#basic[% loo.urisubfieldcode | uri %]">Basic constraints</a></h3>
                    <div id="basic[% loo.urisubfieldcode | html %]">
                    <fieldset class="rows">
                	<ol>

                    </div>


            <h3><a href="#advanced[% loo.urisubfieldcode | uri %]">Advanced constraints</a></h3>
            <div id="advanced[% loo.urisubfieldcode | html %]">
            <fieldset class="rows">
                <ol><li><label for="defaultvalue[% loo.row | html %]">Default value:</label>

			</ol>
            </fieldset>
            </div>
            <h3><a href="#oth[% loo.urisubfieldcode | uri %]">Other options (choose one)</a></h3>
            <div id="oth[% loo.urisubfieldcode | html %]">
            <fieldset class="rows">
                    	<ol>

        [% END %]
		</div><!-- /content -->
    <fieldset class="action">
        <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>
    </fieldset>
    </form>
[% END %]

</tr>
[% FOREACH loo IN loop %]
<tr>
    <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>
    <td>
        [% IF ( loo.subfield_ignored ) %]
            <i>[% loo.liblibrarian | html_entity %]</i>

        [% END %]
    </td>
    <td class="actions">
        <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>
        <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>
    </td>
</tr>
[% END %]




&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>
[% IF ( add_form ) %]
&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>
&rsaquo; [% action | html %] [% searchfield | html %]
[% ELSIF ( else ) %]
&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>
[% ELSIF ( delete_confirm ) %]
&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>
&rsaquo; Confirm deletion of tag '[% searchfield | html %]'
[% ELSIF ( delete_confirmed ) %]
&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>
&rsaquo; Data deleted
[% END %]
</div>

                    <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#">
                        Actions <b class="caret"></b></a>
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield | html %]">
                        <li><a href="[% loo.subfield_link | uri %]"><i class="fa fa-eye"></i> Subfields</a></li>
                        <li><a href="[% loo.edit | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
                        <li><a href="[% loo.delete | uri %]"><i class="fa fa-trash"></i> Delete</a></li>
                    </ul>
                </div>
            </td>

                <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#">
                    Actions <b class="caret"></b></a>
                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield | html %]">
                    <li><a href="[% loo.subfield_link | uri %]"><i class="fa fa-eye"></i> Subfields</a></li>
                    <li><a href="[% loo.edit | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
                    <li><a href="[% loo.delete | uri %]"><i class="fa fa-trash"></i> Delete</a></li>
                </ul>
            </div>
        </td>

Lines 92-100 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt (-2 / +2 lines)
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&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&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&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&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>

Lines 255-261 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt (-1 / +1 lines)
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 %]

Lines 206-212 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt (-1 / +1 lines)
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 %]




        <tbody>
        [% FOREACH loo IN loop %]
            <tr>
            <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>
            <td>[% loo.syntax | html %]</td><td>[% loo.encoding | html %]</td><td>[% loo.timeout | html %]</td>
            <td>[% IF ( loo.recordtype == 'biblio' )  %]
                <span>Bibliographic</span>

                        Actions <b class="caret"></b>
                    </a>
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]">
                        <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>
                        <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>
                        <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>
                    </ul>
                </div>
            </td>




[% IF too_many_login_attempts %]
    <div id="login_error"><strong>Error: </strong>This account has been locked!</div>
    [% IF Koha.Preference('OpacResetPassword') && Koha.Preference('OpacBaseURL') %]
        <a href="[% Koha.Preference('OpacBaseURL') | uri %]/cgi-bin/koha/opac-password-recovery.pl">You must reset your password</a>.
    [% END %]
[% ELSIF invalid_username_or_password %]
<div id="login_error"><strong>Error: </strong>Invalid username or password</div>

[% END %]

[% IF ( casServerUrl ) %]
    <p><a href="[% casServerUrl | uri %]">If you have a CAS account, please click here to login</a>.<p>
[% END %]

[% IF ( casServersLoop ) %]
    <p>If you have a CAS account, please choose against which one you would like to authenticate:</p>
<ul>
    [% FOREACH casServer IN casServersLoop %]
        <li><a href="[% casServer.value | uri %]">[% casServer.name | html %]</a></li>
    [% END %]
[% END %]
[% END %]

Lines 190-196 function confirmnotdup(redirect){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt (-2 / +2 lines)
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 %]&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 %]&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





<div id="action">
    [% IF count %]
        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>
    [% ELSE %]
        This authority is not used in any records.
    [% END %]

    <ul>
        [% FOREACH BIG_LOO IN BIG_LOOP %]
            <li>
                <a href="#tab[% BIG_LOO.number | uri %]XX">[% BIG_LOO.number | html %]</a>
            </li>
        [% END %]
    </ul>

                <span title="[% subfiel.long_desc | html %]" class="desc">[% subfiel.short_desc | html %]</span></label>
                [% subfiel.marc_value | html %]
                [% IF ( subfiel.link ) %]
                    <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 %]">
                        <img src="[% interface | html %]/[% theme | html %]/images/filefind.png" height="15" title="Search on [% subfiel.marc_value | html %]">
                    </a>
                [% END %]
                [% IF ( subfiel.authority ) %]
                    <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% subfiel.authority | uri %]" class="button">Auth</a>
                [% END %]
            </p>
        [% END %]

Lines 46-52 div#result { margin-top: 1em; } Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt (-3 / +3 lines)
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 %] — [% 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 %] — [% 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 %] — [% 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 %] — [% 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>




    	[% INCLUDE 'auth-finder-search.inc' %]
        [% IF ( total ) %]<div class="resultnumber">
            [% IF ( displayprev ) %]
                    <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 %]">
                        &lt;&lt;
                    </a>
                [% END %]

                    [% IF ( number.highlight ) %]
                        [% number.number | html %]
                    [% ELSE %]
                        <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 %]">
                            [% number.number | html %]</a>
                    [% END %]
                [% END %]
                [% IF ( displaynext ) %]
                    <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 %]">
                        &gt;&gt;</a>
                [% END %]
            <div>

                        <td>
                            [% IF resul.summary && resul.summary.authorized && resul.summary.authorized.size > 1 %]
                                [% FOREACH authorized IN resul.summary.authorized %]
                                    <a href="javascript:doauth('[% resul.authid | uri %]', '[% index | uri %]', '[% loop.count | uri %]')" title="[% authorized.heading | html %]">[% loop.count | html %]</a>
                                [% END %]
                          [% ELSE %]
                                <a class="btn btn-xs btn-default" href="javascript:doauth('[% resul.authid | html %]', '[% index | html %]', '')"><i class="fa fa-plus"></i> Choose</a>

        </div>
        <div class="resultnumber">
            [% IF ( displayprev ) %]
                    <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 %]">
                        &lt;&lt;
                    </a>
                [% END %]

                    [% IF ( number.highlight ) %]
                        [% number.number | html %]
                    [% ELSE %]
                        <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 %]">
                            [% number.number | html %]</a>
                    [% END %]
                [% END %]
                [% IF ( displaynext ) %]
                    <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 %]">
                        &gt;&gt;</a>
                [% END %]
        </div>[% END %]




    [% FOREACH resul IN result %]
    <tr data-authid="[% resul.authid | html %]">
      <td>[% PROCESS authresult summary=resul.summary %]</td>
      <td><a href="detail.pl?authid=[% resul.authid | uri %]">Details</a></td>
    [% UNLESS ( resul.isEDITORS ) %]
      <td>
      [% IF resul.used > 0 %]
          <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>
      [% ELSE %]
          0 records
      [% END %]

        <a class="btn btn-default btn-xs dropdown-toggle" id="authactions[% resul.authid | html %]" role="button" data-toggle="dropdown" href="#">
        Actions <b class="caret"></b></a>
        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authactions[% resul.authid | html %]">
          <li><a href="/cgi-bin/koha/authorities/authorities.pl?authid=[% resul.authid | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
          <li><a class="merge_auth" href="#merge"><i class="fa fa-compress"></i> Merge</a></li>
          [% UNLESS ( resul.used ) %]
            <li><a onclick='return confirm_deletion("[% resul.authid | html %]")'><i class="fa fa-trash"></i> Delete</a></li>




                        <div class="btn-group">
                            <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>
                            <ul class="dropdown-menu">
                                <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=iso2709&amp;bib_list=[% bib_list | uri %]">iso2709</a></li>
                                <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=ris&amp;bib_list=[% bib_list | uri %]">RIS</a></li>
                                <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=bibtex&amp;bib_list=[% bib_list | uri %]">BibTex</a></li>
                            [% FOREACH csv_profile IN csv_profiles %]
                                <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>
                            [% END %]
                            </ul>
                        </div>

                                                [% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %]
                                                    <p>
                                                    [% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
                                                        - <a href="[% MARCNOTE.marcnote | uri %]">[% MARCNOTE.marcnote | html %]</a>
                                                    [% ELSE %]
                                                        - [% MARCNOTE.marcnote | html %]
                                                    [% END %]

                                            <td>
                                               [% FOREACH MARCurl IN BIBLIO_RESULT.MARCURLS %]
                                                    [% IF MARCurl.part %]<p>[% MARCurl.part | html %]</p>[% END %]
                                                    <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a>
                                                    [% IF MARCurl.notes %]
                                                        [% FOREACH note IN MARCurl.notes %]
                                                            <p>[% note.note | html %]</p>

                                            <input type="checkbox" class="select_record" value="[% BIBLIO_RESULT.biblionumber | html %]" name="bib[% BIBLIO_RESULT.biblionumber | html %]" id="bib[% BIBLIO_RESULT.biblionumber | html %]" />
                                        </td>
                                        <td>
                                            <a href="[% BIBLIO_RESULT.dest | uri %]?biblionumber=[% BIBLIO_RESULT.biblionumber | uri %]" class="open_title">
                                                [% BIBLIO_RESULT.title |html %]
                                                [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %]
                                                    [% subtitl.subfield | html %]




                    <span class="subfield-label">&nbsp;
                    [% UNLESS ( subfiel.hide_marc ) %]<span class="subfield-code">[% subfiel.marc_subfield | html %]</span>[% END %]
                    <span class="desc" title="[% subfiel.long_desc | html %]">[% subfiel.short_desc | html %]</span></span>
                    [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value | uri %]">[% subfiel.marc_value | html %]</a>[% ELSE %][% subfiel.marc_value | html %][% END %]
                    [% IF ( subfiel.link ) %]
                        <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 %]">
                            <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 %]" />
                        </a>
                    [% END %]
                    [% IF ( subfiel.authority ) %]
                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% subfiel.authority | uri %]" class="button">Auth</a>
                    [% END %]
                </p>
            [% END %]

Lines 38-44 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt (-2 / +2 lines)
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




        [% IF shelves.count %]
            <span class="results_summary"><span class="label">Lists that include this title: </span>
            [% FOREACH s IN shelves %]
                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a>
                [% IF ( loop.last ) %][% ELSE %]|[% END %]
            [% END %]
            </span>

                    [% END %]
                    </span>
        [% END %]
        <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>

        [% IF ( holdcount ) %]
            <span class="results_summary">
                <span class="label">Holds:</span>
                <span class="number_box">
                    [% IF CAN_user_reserveforothers_place_holds %]
                        <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]">[% holdcount | html %]</a>
                    [% ELSE %]
                        <span>[% holdcount | html %]</span>
                    [% END %]

            <span class="results_summary">
                <span class="label">Article requests:</span>
                <span class="number_box">
                    <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber | uri %]">[% article_requests_count | html %]</a>
                </span>
            </span>
        [% END %]

        [% END %]
        [% IF ( AmazonCoverImages ) %]
            <div id="amazon-bookcoverimg">
            <a href="http://www.amazon[% AmazonTld | uri %]/gp/reader/[% normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link">
                <img src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn | html %].01.MZZZZZZZ.jpg" alt="" />
        </a></div>
        [% END %]

		<li>[% IF ( MARCurl.part ) %][% MARCurl.part | html %]
			<br />[% END %] 
		<!-- here you might do a tmpl_if name="toc" and use greybox or equivalent for table of contents -->
		<a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a>
			[% IF ( MARCurl.notes ) %]<ul>[% FOREACH note IN MARCurl.notes %]<li>[% note.note | html %]</li>[% END %]</ul>[% END %]</li>
            [% END %]</ul>
</li>


    [% IF ( OPACBaseURL ) %]
        <li><strong>OPAC view:</strong>
        <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]" target="_blank">Open in new window</a>
        </li>
    [% END %]
        <li id="catalogue_detail_marc_preview">
            <strong>MARC Preview:</strong>
            <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblionumber | uri %]" title="MARC" rel="gb_page_center[600,500]">Show</a>
        </li>
        </ul>
        </div>

        [% END %]
        [% IF ( AmazonCoverImages ) %]
            <div id="amazon-bookcoverimg">
            <a href="http://www.amazon[% AmazonTld | uri %]/gp/reader/[% normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link">
            <img src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn | html %].01.MZZZZZZZ.jpg" alt="" />
            </a>
        </div>

        [% IF ( urlS ) %]
            <li><strong>URL:</strong>
                [% FOREACH url IN urlS %]
                    <a href="[% url.url | uri %]">[% url.url | html %]</a>
                [% END %]
            </li>
        [% END %]

            <li><strong>Lists that include this title: </strong>
            <ul>
            [% FOREACH s IN shelves %]
                <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a></li>
            [% END %]
            </ul>
            </li>

                    [% END %]
                    </ul></li>
        [% END %]
            [% 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 %]
        </ul>
		[% END %]


                    </td>
                    <td class="datelastseen"><span title="[% item.datelastseen | html %]">[% item.datelastseen | $KohaDates %]</span></td>
                    <td class="dateaccessioned"><span title="[% item.dateaccessioned | html %]">[% item.dateaccessioned | $KohaDates %]</span></td>
                    <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>
                    [% IF ( volinfo ) %]
                        <td class="enumchron">
                            [% IF ( itemdata_enumchron ) %]

                        </td>
                    [% END %]
                    [% IF ( itemdata_uri ) %]
                        <td class="uri"><a href="[% item.uri | uri %]">[% item.uri | html %]</a></td>
                    [% END %]
                    [% IF ( itemdata_copynumber ) %]
                        <td class="copynumber">[% item.copynumber | html %]</td>

                        <td class="nonpublicnote">[% item.itemnotes_nonpublic | html %]</td>
                    [% END %]
                    [% IF ( SpineLabelShowPrintOnBibDetails ) %]
                        <td><a href="/cgi-bin/koha/labels/spinelabel-print.pl?barcode=[% item.barcode | uri %]" >Print label</a></td>
                    [% END %]
                    [% IF ( hostrecords ) %]
                        <td>[% IF ( item.hostbiblionumber) %]<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.hostbiblionumber | uri %]" >[% item.hosttitle | html %]</a>[% END %]</td>
                    [% END %]
                    [% IF ( analyze ) %]
                        <td>
                            [% IF ( item.countanalytics ) %]
                                <a href="/cgi-bin/koha/catalogue/search.pl?idx=hi&amp;q=[% item.itemnumber | uri %]">[% item.countanalytics | html %] analytics</a>
                            [% END %]
                        </td>
                    [% END %]
                    [% IF ( analyze ) %]
                        <td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?hostbiblionumber=[% item.biblionumber | uri %]&amp;hostitemnumber=[% item.itemnumber | uri %]">Create analytics</a></td>
                    [% END %]

                [% IF ShowCourseReserves %]

                            [% FOREACH r IN item.course_reserves %]
                                [% IF r.course.enabled == 'yes' %]
                                    <p>
                                      <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% r.course.course_id | uri %]">
                                         [% r.course.course_name | html %]
                                         <!--[% IF r.course.course_number %] [% r.course.course_number | html %] [% END %]-->
                                         [% IF r.course.section %] [% r.course.section | html %] [% END %]

        [% PROCESS items_table tab="holdings" items=itemloop %]
        [% END %]
                [% IF ( hiddencount ) %]
                   <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&amp;showallitems=1">Show all items ([% hiddencount | html %] hidden)</a>
                [% END %] 		
		[% IF ( debug_display ) %]
		<br /><br />

    [% FOREACH MARCNOTE IN MARCNOTES %]
        <p>
        [% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
            <a href="[% MARCNOTE.marcnote | uri %]">[% MARCNOTE.marcnote | html %]</a>
        [% ELSE %]
            [% MARCNOTE.marcnote FILTER html_line_break | html %]
        [% END %]

            [% END %]
            </table>
            [% END %]
            <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]">Subscription details</a>
    [% END %]
</div>
</div>

[% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %]
<div id="editions"><h4>Editions</h4>
<table>
[% 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 %]
[% 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 %]
<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 %]
  [% IF ( XISBN.publishercode ) %]
[% 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 %]
    [% END %]

Lines 56-62 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt (-1 / +1 lines)
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 %]&itemnumber=[% checkout.item.itemnumber \| html %]">[% checkout.item.barcode \| html %]</a>	59	<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout.item.biblionumber \| uri %]&itemnumber=[% checkout.item.itemnumber \| uri %]">[% checkout.item.barcode \| html %]</a>
60	[% ELSE %]	60	[% ELSE %]
61		61
62	[% END %]</td>	62	[% END %]</td>




        <li><span class="label">Physical details:</span> [% pages | html %] [% illus | html %] [% size | html %]&nbsp;</li>
        [% IF ( bnotes ) %]<li><span class="label">Notes:</span> [% bnotes | html %]</li>[% END %]
        <li><span class="label">No. of items:</span> [% count | html %]&nbsp;[% IF ( hiddencount ) %]total ([% showncount | html %] shown / [% hiddencount | html %] hidden) 
<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&amp;showallitems=1">Show all items</a>[% END %]</li>
    </ol>

    <br clear="all" />
    [% IF ( ONLY_ONE ) %]
        <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>
    [% END %]
    [% FOREACH ITEM_DAT IN ITEM_DATA %]
    <div class="yui-g">
        <h3 id="item[% ITEM_DAT.itemnumber | html %]">Barcode [% ITEM_DAT.barcode | html %]  [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]</h3>
        <div class="listgroup"><h4>Item information [% IF ( CAN_user_editcatalogue_edit_catalogue ) %][% UNLESS ( ITEM_DAT.nomod ) %]
         [% IF ( CAN_user_editcatalogue_edit_items ) %]
         <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>
         [% END %]
         [% END %][% END %]</h4>
            <ol class="bibliodetails">

            [% IF ITEM_DAT.basketno %]
                <li><span class="label">Order date:</span>
                    [% IF ( CAN_user_acquisition_order_manage ) %]
                        <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ITEM_DAT.basketno | uri %]">[% ITEM_DAT.orderdate | $KohaDates %]</a>
                    [% ELSE %]
                        [% ITEM_DAT.orderdate | $KohaDates %]
                    [% END %]

            [% IF ITEM_DAT.dateaccessioned %]
                <li><span class="label">Accession date:</span>
                    [% IF ( CAN_user_acquisition_order_receive && ITEM_DAT.invoiceid ) %]
                        <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% ITEM_DAT.invoiceid | uri %]">[% ITEM_DAT.dateaccessioned | $KohaDates %]</a>
                    [% ELSE %]
                        [% ITEM_DAT.dateaccessioned | $KohaDates %]
                    [% END %]

                </li>
            [% END %]

                <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>

                <li><span class="label">Last seen:</span>[% IF ( ITEM_DAT.datelastseen ) %][% ITEM_DAT.datelastseen | $KohaDates %] [%END %]&nbsp;</li>
                <li><span class="label">Last borrowed:</span>[% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %]&nbsp;</li>
                [% IF Koha.Preference('StoreLastBorrower') && ITEM_DAT.object.last_returned_by %]
                    <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>
                [% END %]
                [% 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 %]
                [% 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 %]
                [% 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 %]
                [% IF ( ITEM_DAT.paidfor ) %]<li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor | html %]&nbsp;</li>[% END %]

                [% IF ( ITEM_DAT.enumchron ) %]<li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron | html %]&nbsp;</li>[% END %]




            <ul style="list-style: none;">
            [% FOREACH SPELL_SUGGES IN SPELL_SUGGEST %]
            <li>
                <a href="/cgi-bin/koha/catalogue/search.pl?q=[% SPELL_SUGGES.spsuggestion | uri %]">[% SPELL_SUGGES.spsuggestion | html %]</a>
            </li>
            [% END %]
            </ul>

                [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
                    <tr>
                        <td>
                            <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>
                        </td>
                        <td>
                            [% SEARCH_RESULT.author | html %]

                            [% ELSE %]
                                [% IF CAN_user_reserveforothers_place_holds %]
                                    <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>
                                    [% 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 %]
                                [% ELSE %]
                                    Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %])
                                [% END %]

                          [% END %]

                          [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
                          | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit record</a>
                          [% END %]
                          [% IF ( CAN_user_editcatalogue_edit_items ) %]
                          | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit items</a>
                          [% END %]

                          [% IF ( OPACBaseURL ) %]
                              <span class="view-in-opac">
                                | <a href="[% Koha.Preference('OPACBaseURL') | uri %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]" target="_blank">OPAC view</a>
                              </span>
                          [% END %]


    [% IF ( outer_sup_results_loo.inner_sup_results_loop ) %]
        [% outer_sup_results_loo.servername | html %]
        [% FOREACH inner_sup_results_loo IN outer_sup_results_loo.inner_sup_results_loop %]
        <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>
        [% END %]
    [% END %]
<!-- </div> -->




                  <tr>
                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
                    <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
                    <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
                    <td>[% s.total | html %]</td>
                  </tr>
                [% END %]

                  <tr>
                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
                    <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
                    <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
                    <td>[% s.total | html %]</td>
                  </tr>
                [% END %]

                  <tr>
                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
                    <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
                    <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
                    <td>[% s.total | html %]</td>
                  </tr>
                [% END %]

                  <tr>
                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
                    <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
                    <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
                    <td>[% s.total | html %]</td>
                  </tr>
                [% END %]

Lines 570-576 function Changefwk() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (-1 / +1 lines)
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




            <ul class="dropdown-menu">
                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=">Default framework</a></li>
                [% FOREACH framework IN frameworks %]
                    <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% framework.frameworktext | html %]</a></li>
                [% END %]
            </ul>
        </div>

            <td><input type="checkbox" class="selection" id="bib[% resultsloo.biblionumber | html %]" name="biblionumber" value="[% resultsloo.biblionumber | html %]" /></td>
            <td>
                <p>
                    <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% resultsloo.biblionumber | uri %]">[% resultsloo.title | html %]</a>
                [% FOREACH subtitl IN resultsloo.subtitle %][% subtitl.subfield | html %][% END %]</p>
                [% IF ( resultsloo.summary ) %]
                    <p>[% resultsloo.summary | html %]</p>

                      Actions <b class="caret"></b>
                    </a>
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% resultsloo.biblionumber | html %]">
                      <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>
                      <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>
                      [% 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 %]
                      [% 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 %]
                    </ul>
                  </div>
                </td>

                      Actions <b class="caret"></b>
                    </a>
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reservoirsearchactions[% breeding_loo.id | html %]">
                      <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>
                      <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>
                      [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
                        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id | uri %]"><i class="fa fa-plus"></i> Add biblio</a></li>
                      [% END %]
                    </ul>
                  </div>




                    var rowid = $(this).parent().attr("id");
                    num_rowid = rowid.replace("row","");
                    $(".linktools").remove();
                    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>');
                    $(edit_link).text(_("Edit item"));
                    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>');
                    $(delete_link).text(_("Delete item"));
                    $(delete_link).on('click', function(e) {
                        return confirm_deletion();

<div id="breadcrumbs">
          <a href="/cgi-bin/koha/mainpage.pl">Home</a>
 &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
 &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>
 &rsaquo; <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber | uri %]">Items</a>
</div>

<div id="doc3" class="yui-t7">

[% IF ( book_on_loan ) %]<div class="dialog alert"><strong>Cannot delete</strong>: item is checked out.</div>[% END %]
[% IF ( book_reserved ) %]<div class="dialogalert"><strong>Cannot delete</strong>: item has a waiting hold.</div>[% END %]
[% IF ( not_same_branch ) %]<div class="dialog alert"><strong>Cannot delete</strong>: The items do not belong to your library.</div>[% END %]
[% 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 %]

<div id="cataloguing_additem_itemlist">
    [% IF ( item_loop ) %]

                          <ul class="dropdown-menu" role="menu" aria-labelledby="itemactions[% item_loo.itemnumber | html %]">

                        [% IF ( item_loo.hostitemflag ) %]
                              <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>
                        [% ELSE %]
                              <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>
                              <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>
                              <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>
                          [% IF ( item_loo.countanalytics ) %]
                              <li><a href="/cgi-bin/koha/catalogue/search.pl?idx=hi&amp;q=% item_loo.itemnumber %]">View analytics</a></li>
                          [% ELSE %]

    <input type="hidden" name="field_value" value="[% itemnumber | html %]" />
    <input type="submit" value="Save changes" onclick="return Check(this.form)">
    <input type="button" id="addnewitem" value="Add a new item">
    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Cancel</a>
    [% END %]</fieldset>
    
    [%# Fields for fast cataloging %]

Lines 41-47 div#result { margin-top: 1em; } Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt (-2 / +2 lines)
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 %]

Lines 34-40 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt (-1 / +1 lines)
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 %]

Lines 22-28 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt (-2 / +2 lines)
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 %]

Lines 84-92 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt (-2 / +2 lines)
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&index=[% index \| html %]&biblionumber=[% resul.biblionumber \| html %]&type=intranet&op=fillinput')">Choose</a>	87	<a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=marc21_linking_section.pl&index=[% index \| uri %]&biblionumber=[% resul.biblionumber \| uri %]&type=intranet&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&index=[% index \| html %]&type=intranet&op=fillinput')">Clear field</a>	89	<a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=marc21_linking_section.pl&index=[% index \| uri %]&type=intranet&op=fillinput')">Clear field</a>
90	[% END %]	90	[% END %]
91	</td>	91	</td>
92	</tr>	92	</tr>

Lines 94-100 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt (-1 / +1 lines)
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>

Lines 137-144 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt (-2 / +2 lines)
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&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&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>




                                        <td><input type="checkbox" reqid="[% ar.id | html %]"/></td>
                                        <td class="ar-title">
                                            <p>
                                                <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% ar.biblionumber | uri %]">
                                                    <strong>[% ar.biblio.title | html %]</strong>
                                                    [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %]
                                                </a>

                                        <td class="ar-barcode">[% ar.item.barcode | html %]</td>
                                        <td class="ar-patron">
                                            <p>
                                                <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | uri %]">
                                                    [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %])
                                                </a>
                                            </p>

                                        <td><input type="checkbox" reqid="[% ar.id | html %]"/></td>
                                        <td class="ar-title">
                                            <p>
                                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ar.biblionumber | uri %]">
                                                    <strong>[% ar.biblio.title | html %]</strong>
                                                    [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %]
                                                </a>

                                        <td class="ar-barcode">[% ar.item.barcode | html %]</td>
                                        <td class="ar-patron">
                                            <p>
                                                <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | uri %]">
                                                    [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %])
                                                </a>
                                            </p>




                            <br />Barcode : [% overduesloo.barcode | html %]
                    </td>
                    <td>
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overduesloo.borrowernumber | uri %]">[% overduesloo.borrowersurname | html %], [% overduesloo.borrowerfirstname | html %]</a>
                        <br />[% overduesloo.cardnumber | html %]
                        <br />[% overduesloo.borrowerphone | html %]<br />
                    [% IF ( overduesloo.borroweremail ) %]<a href="mailto:[% overduesloo.borroweremail | uri %]?subject=Overdue: [% overduesloo.title | uri %]">
                    [% overduesloo.borroweremail | html %]</a>[% END %]
                    </td>
                    <td>[% Branches.GetName( overduesloo.homebranch ) | html %] [% overduesloo.itemcallnumber | html %]

                        </td>
                        <td>
                            <p>
                                <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% todayoverduesloo.biblionumber | uri %]">[% todayoverduesloo.title | html %]</a>
                                &nbsp; (<b>[% todayoverduesloo.description | html %]</b>)
                                <br />Barcode : [% todayoverduesloo.barcode | html %]
                            </p>
                        </td>
                        <td>
                            <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% todayoverduesloo.borrowernumber | uri %]">[% todayoverduesloo.borrowersurname | html %] &nbsp; [% todayoverduesloo.borrowerfirstname | html %]</a>
                            <br />[% todayoverduesloo.cardnumber | html %]<br />
                            <br />[% todayoverduesloo.borrowerphone | html %]<br />
                        [% IF ( todayoverduesloo.borroweremail ) %]<a href="mailto:[% todayoverduesloo.borroweremail | uri %]?subject=Overdue: [% todayoverduesloo.title | uri %]">
                        [% todayoverduesloo.borroweremail | html %]</a>[% END %]
                            </p>
                        </td>
                        <td><p>[% Branches.GetName( todayoverduesloo.homebranch ) | html %] [% todayoverduesloo.itemcallnumber | html %]</p>
                        </td>
                        <td>
                        <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>
                        </td>
                    </tr>
                [% END %]




    <table>
        <caption>
            [% IF ( reserved ) %]
                Reserve found for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
            [% END %]
            [% IF ( waiting ) %]
                Item is marked waiting at [% branchname | html %] for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
            [% END %]
        </caption>
        <tr>

                                  <li>Item is already at destination library.</li>
                              [% END %]
                              [% IF ( errmsgloo.errwasreturned ) %]
                                  <li>Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% errmsgloo.patron.borrowernumber | uri %]">
                                  [% errmsgloo.patron.firstname | html %] [% errmsgloo.patron.surname | html %]
                                  ([% errmsgloo.patron.cardnumber | html %])</a> and has been returned.</li>
                              [% END %]

            </tr>
            [% FOREACH trsfitemloo IN trsfitemloop %]
                <tr>
                    <td class="tf-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% trsfitemloo.biblionumber | uri %]">[% trsfitemloo.title | html %]</a></td>
                    <td class="tf-author">[% trsfitemloo.author | html %]</td>
                    <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>
                    <td class="tf-location">[% trsfitemloo.location | html %]</td>
                    <td class="tf-itemcallnumber">[% trsfitemloo.itemcallnumber | html %]</td>
                    <td class="tf-itemtype">[% ItemTypes.GetDescription( trsfitemloo.itemtype ) | html %]</td>

Lines 72-78 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt (-1 / +1 lines)
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>

Lines 135-141 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (-1 / +1 lines)
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>




[% END %]

[% IF ( RESERVE_WAITING ) %]
    <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>
[% END %]

[% IF ( RESERVED ) %]
    <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>
[% END %]

[% IF ( ISSUED_TO_ANOTHER ) %]
    <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 %]).
      [% IF CAN_user_circulate_force_checkout %]
        Check in and check out?
      [% END %]


			[% IF ( warndeparture ) %]
			<li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
            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>

			</li>
			[% END %]


			[% IF ( expired ) %]
			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
            [% 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>

			</li>
			[% END %]

                   <a class="btn btn-default btn-sm" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a>
                    [% IF (noissues && patron && CAN_user_circulate_force_checkout) %]
                        <span class="override_debarment">
                            <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>
                        </span>
                    [% END %]
               </li>

                    [% FOREACH w IN WaitingHolds %]
                        <ul>
                            <li>
                                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | uri %]">[% w.biblio.title | html %]</a>
                                ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
                                [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
                                [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]

                        [% message.message_date | $KohaDates %]
                        [% Branches.GetName( message.branchcode ) | html %]
                        [% IF message.manager_id %]
                            ( <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> )
                        [% END %]
                        <i>"[% message.message | html %]"</i>
                    </span>

Lines 116-122 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt (-1 / +1 lines)
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 %]&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 %]&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 %]&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 %]&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 %]




                    [% IF item.is_overdue %]</span>[% END %]
                  </td>
                  <td>
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber | uri %]">[% item.firstname | html %] [% item.surname | html %]</a>
                  </td>
                  <td>
                    <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 %]
                  </td>
                  <td>[% item.itemcallnumber | html %]</td>
                  <td>
                    <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>
                  </td>
                  <td>[% Branches.GetName(item.branchcode) | html %]</td>
                  <td>[% AuthorisedValues.GetByCode( 'LOC', item.location ) | html %]</td>





  <p>
    [% IF ( isfiltered ) %]
      <a href="overdue.pl?op=csv&amp;[% csv_param_string | uri %]">Download file of displayed overdues</a>
    [% ELSE %]
      <a href="overdue.pl?op=csv">Download file of all overdues</a>
    [% END %]

          <td>
            [% INCLUDE 'patron-title.inc' patron=overdueloo.patron hide_patron_infos_if_needed=1 link_to="circulation_reserves" %]
            [% IF logged_in_user.can_see_patron_infos( overdueloo.patron ) %]
                [% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email | uri %]?subject=[% INCLUDE subject %] [% overdueloo.title | uri %]">email</a>][% END %]
                [% IF ( overdueloo.phone ) %]([% overdueloo.phone | html %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile | html %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro | html %])[% END %]</td>
            [% END %]
          <td>[% Branches.GetName( overdueloo.patron.branchcode ) | html %]</td>
          <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>
          <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>
          <td>[% overdueloo.itemcallnumber | html %]</td>
          <td>[% overdueloo.replacementprice | $Price %]</td>
          <td>[% overdueloo.itemnotes_nonpublic | html %]</td>

Lines 74-80 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-1 / +1 lines)
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 %]





                            [% ELSIF error == "no_checkout" %]

                                <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>

                            [% ELSIF error == "too_many" %]

                                <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>

                                [% IF Koha.Preference('AllowRenewalLimitOverride') %]
                                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">


                            [% ELSIF error == "patron_restricted" %]

                                <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>

                            [% ELSE %]


                    <div class="dialog message">
                        <h3>Item renewed:</h3>
                        <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 | uri %]&amp;biblionumber=[% item.biblio.biblionumber | uri %]&amp;bi=[% item.biblioitemnumber.biblioitemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a> )
                            renewed for
                            [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> )
                            now due on [% date_due | $KohaDates %]
                        </p>
                    </div>




        <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>
        [% UNLESS blocking_error %]
        &rsaquo;
        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">[% biblio.title | html %]</a>
        &rsaquo;
        Request article
        [% END %]

            <div id="yui-main">
                <div class="yui-b">

                    <h1>Request article from <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.id | uri %]">[% biblio.title | html %]</a></h1>
                    [% IF no_patrons_found %]
                        <div class="dialog alert">
                            <h3>Patron not found</h3>

                                [% FOREACH ar IN biblio.article_requests_current %]
                                    <tr>
                                        <td>[% ar.created_on | $KohaDates %]</td>
                                        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% ar.borrowernumber | uri %]">[% ar.borrower.firstname | html %] [% ar.borrower.surname | html %]</a></td>
                                        <td>[% ar.title | html %]</td>
                                        <td>[% ar.author | html %]</td>
                                        <td>[% ar.volume | html %]</td>

                                        <td>[% ar.patron_notes | html %]</td>
                                        <td>
                                            [% IF ar.item %]
                                                <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% ar.itemnumber | uri %]&biblionumber=[% ar.biblionumber | uri %]">[% ar.item.barcode | html %]</a>
                                            [% END %]
                                        </td>
                                        <td>

Lines 92-98 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt (-1 / +1 lines)
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 %]&booksellerid=[% booksellerid \| html %]&basketno=[% basketno \| html %]&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 %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&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 %]




[% IF ( collectionItemNeedsTransferred ) %]
 <div id="rotating-collection" class="dialog message">
        <h3>Please transfer item to: [% Branches.GetName( collectionBranch ) | html %]</h3>
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
            <p>This item is part of a rotating collection.</p>
            <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>
</div>

    <div class="dialog message">
        <h1>Patron note</h1>
        <p>[% issue.notedate | $KohaDates %]</p>
        <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber | uri %]"> [% title | html %]</a> [% author | html %]</p>
        <p>[% issue.note | html %]</p>
    </div>
[% END %]

[% IF ( fines ) %]
    <div class="dialog alert">
        <h3>Patron has outstanding fines of [% fines | html %].</h3>
        <p><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% fineborrowernumber | uri %]">Make payment</a>.</p>
    </div>
[% END %]


[% IF ( waiting_holds ) %]
    <div id="awaiting-pickup" class="dialog message">
        <h3>[% holdsfirstname | html %] [% holdssurname | html %] has [% waiting_holds | html %] hold(s) waiting for pickup.</h3>
        <p><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% holdsborrowernumber | uri %]">Check out to this patron</a>.</p>
    </div>
[% END %]


[% IF return_date_was_overriden && Borrowers.IsDebarred( borrower ) %]
    <div id="restricted_backdated" class="dialog message">
        <h3>
            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">
                [% patron.firstname | html %] [% patron.surname | html %]
            </a>
            is restricted. Please verify this patron should still be restricted.


[% IF ( wrongbranch ) %]
    <div class="dialog alert"><h3>Cannot check in</h3>
        <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
        </p><strong>NOT CHECKED IN</strong></p>
        <p>This item must be checked in at following library: <strong>[% Branches.GetName( rightbranch ) | html %]</strong></p>
    </div>

    <div id="return2" class="dialog message">
        <!-- WrongTransfer -->
        <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %]</h3>
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
        <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>
        <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>
[% IF ( patron.cardnumber ) %]<h5>Hold for:</h5>
        <ul>
            <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>
            [% INCLUDE display_holdpatron_address %]
            [% IF ( patron.phone ) %]<li>[% patron.phone | html %]</li>[% END %]

                    <h3>
                        Hold found (item is already waiting):
                        <br/>
                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">
                            [% itembarcode | html %]: [% title | html %]
                        </a>
                    </h3>

                    <h4>Hold for:</h4>
                    <ul>
                    <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>
                    [% INCLUDE display_holdpatron_address %]

		<!-- diffbranch -->
        <div id="transfer-needed" class="dialog message audio-alert-action">
            <h3>Hold needing transfer found</h3>
                <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
                <h4>Hold for: </h4>
                    <ul>
                        <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>
                        [% INCLUDE display_holdpatron_address %]
                        [% IF ( patron.phone ) %]<li>[% patron.phone | html %]</li>[% END %]
                        [% 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 %]

    <!-- transfer: item with no reservation, must be returned according to home library circulation rules -->
        <div id="return1" class="dialog message audio-alert-action">
            <h3>Please return item to: [% Branches.GetName( returnbranch ) | html %]</h3>
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
            <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>
        </div>
    [% END %]

	<!-- diffbranch -->
        <h3 class="audio-alert-action">Item consigned:</h3>
        <table>
        <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a></caption>
        <tr>
            <th>Hold for:</th>
            <td>[% INCLUDE 'patron-title.inc' patron=patron %]</td>

                    <h3>
                        Hold found:
                        <br/>
                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">
                            [% itembarcode | html %]: [% title | html %]
                        </a>
                </div>

    <div class="dialog alert audio-alert-warning">
        <h3>Check in message</h3>
        [% IF itembiblionumber %]
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
        [% END %]
        [% FOREACH errmsgloo IN errmsgloop %]
            [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]

               <p class="problem">Item is withdrawn.</p>
            [% END %]
            [% IF ( errmsgloo.debarred ) %]
                <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>
            [% END %]
            [% IF ( errmsgloo.prevdebarred ) %]
                <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p>

                [% ELSE %]Not checked out
                [% END %]
            </td>
            <td class="ci-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% riloo.itembiblionumber | uri %]">
                    [% riloo.itemtitle | html %]
                </a>
                [% IF ( riloo.enumchron ) %]

                [% END %]
            </td>
            <td class="ci-author">[% riloo.itemauthor | html %]</td>
            <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>
            <td class="ci-homelibrary">[% Branches.GetName( riloo.homebranch ) | html %]</td>
            <td class="ci-holdinglibrary">[% Branches.GetName( riloo.holdingbranch ) | html %]</td>
            <td class="ci-shelvinglocation">[% riloo.location | html %]</td>

            <td class="ci-dateaccessioned">[% riloo.dateaccessioned | $KohaDates %]</td>
            <td class="ci-type">[% ItemTypes.GetDescription( riloo.itemtype ) | html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %]</td>
            <td class="ci-patron">[% IF ( riloo.duedate ) %]
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riloo.patron.borrowernumber | uri %]">
                    [% riloo.patron.surname | html %], [% riloo.patron.firstname | html %] ([% riloo.patron.category.description | html %])
                </a>
                [% IF riloo.borissuescount %]
                    <span class="results_summary nowrap">
                        <span class="label">Checkouts:</span>
                        <span class="number_box">
                            <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% riloo.patron.borrowernumber | uri %]">[% riloo.borissuescount | html %]</a>
                        </span>
                    </span>
                [% END %]




                            <br />Barcode: [% reser.barcode | html %]
                    </td>
                    <td>[% IF ( reser.patron ) %]
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reser.patron.borrowernumber | uri %]">
                            [% reser.patron.surname | html %][%IF ( reser.patron.firstname ) %], [% reser.patron.firstname | html %][% END %]
                        </a>
                        [% IF ( reser.patron.phone ) %]<br />[% reser.patron.phone | html %][% END %]
                            [% IF ( reser.patron.first_valid_email_address ) %]
                                <br />
                                [% BLOCK subject %]Hold:[% END %]
                                <a href="mailto:[% reser.patron.first_valid_email_address | uri %]?subject=[% INCLUDE subject %] [% reser.title | uri %]">
                                    [% reser.patron.first_valid_email_address | html %]
                                </a>
                            [% END %]

                    </td>
                    <td>[% IF reser.homebranch %][% Branches.GetName( reser.homebranch ) | html %][% END %]</td>
                    <td>[% reser.itemcallnumber | html %]</td>
                    <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>
                </tr>
            [% END %]</tbody>
            </table>

Lines 119-125 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-1 / +1 lines)
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>





        <h2>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]
            [% IF ( all_branches_link ) %]
            <span style="margin-left:20px"><a href="[% all_branches_link | uri %]">
            View all libraries</a></span>
            [% END %]
        </h2>

                            [% UNLESS ( item_level_itypes ) %][% IF ( reserveloo.itemtype ) %]&nbsp; (<b>[% reserveloo.itemtype | html %]</b>)[% END %][% END %]
                            <br />Barcode: [% reserveloo.barcode | html %]
                    </td>
                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.patron.borrowernumber | uri %]">[% reserveloo.patron.surname | html %], [% reserveloo.patron.firstname | html %]</a>
                        [% IF ( reserveloo.patron.phone ) %]<br />[% reserveloo.patron.phone | html %][% END %]
                        [% IF ( reserveloo.patron.first_valid_email_address ) %]<br /><a href="mailto:[% reserveloo.patron.first_valid_email_address | uri %]?subject=Hold waiting: [% reserveloo.title | uri %]">
                        [% reserveloo.patron.first_valid_email_address | html %]</a>[% END %]
                    </td>
                    <td>[% Branches.GetName( reserveloo.homebranch ) | html %]</td>

                            [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]&nbsp; (<b>[% overloo.itemtype | html %]</b>)[% END %][% END %]
                        <br />Barcode: [% overloo.barcode | html %]
                    </td>
                    <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 />
                        [% IF ( overloo.patron.first_valid_email_address ) %]<a href="mailto:[% overloo.patron.first_valid_email_address | uri %]?subject=Reservation: [% overloo.title |url %]">
        [% overloo.patron.first_valid_email_address | html %]</a>[% END %]
                    </td>
                    <td>[% Branches.GetName( overloo.homebranch ) | html %]</td>

Lines 35-41 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt (-1 / +1 lines)
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 %]




                            [% END %]
                            <ul class="dropdown-menu">
                                [% FOREACH t IN club_templates %]
                                    <li><a href="/cgi-bin/koha/clubs/clubs-add-modify.pl?club_template_id=[% t.id | uri %]">[% t.name | html %]</a></li>
                                [% END %]
                            </ul>
                        </div>

                                            <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="clubactions[% c.id | html %]">
                                                [% IF ( c.club_enrollments.count ) %]
                                                    <li>
                                                        <a href="club-enrollments.pl?id=[% c.id | uri %]">
                                                            <i class="fa fa-list-ul"></i> Enrollments
                                                        </a>
                                                    </li>
                                                [% ELSE %]
                                                    <li class="disabled">
                                                        <a href="club-enrollments.pl?id=[% c.id | uri %]">
                                                            <i class="fa fa-list-ul"></i> Enrollments
                                                        </a>
                                                    </li>
                                                [% END %]
                                                [% IF CAN_user_clubs_edit_clubs %]
                                                    <li>
                                                        <a href="clubs-add-modify.pl?id=[% c.id | uri %]">
                                                            <i class="fa fa-pencil"></i> Edit
                                                        </a>
                                                    </li>

Lines 38-44 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt (-1 / +1 lines)
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>

Lines 109-115 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt (-1 / +1 lines)
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>

Lines 94-100 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt (-1 / +1 lines)
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 %]




                <li><span class="label">Department</span> [% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) | html %]</li>
                <li><span class="label">Course number</span> [% course.course_number | html %]</li>
                <li><span class="label">Section</span> [% course.section | html %]</li>
                <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>
                <li><span class="label">Staff note</span> [% course.staff_note | html %]</li>
                <li><span class="label">Public note</span> [% course.public_note | html %]</li>
                <li><span class="label">Student count</span> [% course.students_count | html %]</li>

                <tbody>
                    [% FOREACH cr IN course_reserves %]
                        <tr>
                            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cr.biblio.biblionumber | uri %]">[% cr.biblio.title | html %]</a></td>
                            <td>[% cr.biblio.author | html %]</td>
                            <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>
                            <td>[% cr.item.itemcallnumber | html %]</td>
                            [% IF item_level_itypes %]
                            <td>


                            <td>
                                [% IF (cr.item.uri) %]
                                    <a href="[% cr.item.uri | uri %]">Item URI</a>
                                [% ELSIF (cr.biblioitem.url) %]
                                    <a href="[% cr.biblioitem.url | uri %]">Record URL</a>
                                [% END %]
                            </td>


                                [% FOREACH c IN cr.courses %]
                                    [% UNLESS cr.course_id == c.course_id %]
                                        <p>
                                            <a href="course-details.pl?course_id=[% c.course_id | uri %]">
                                                [% c.course_name | html %]
                                                [% IF c.section %] [% c.section | html %] [% END %]
                                                [% IF c.term %] [% AuthorisedValues.GetByCode( 'TERM', c.term ) | html %] [% END %]




                        <tbody>
                            [% FOREACH c IN courses %]
                                <tr>
                                    <td><a href="course-details.pl?course_id=[% c.course_id | uri %]">[% c.course_name | html %]</a></td>
                                    <td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department ) | html %]</td>
                                    <td>[% c.course_number | html %]</td>
                                    <td>[% c.section | html %]</td>
                                    <td>[% AuthorisedValues.GetByCode( 'TERM' c.term ) | html %]</td>
                                    <td>
                                        [% FOREACH i IN c.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 %]
                                    </td>
                                    <td>[% c.staff_note | html %]</td>

Lines 118-124 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt (-1 / +1 lines)
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 %]

Lines 26-32 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt (-1 / +1 lines)
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




                            </fieldset>
                            <fieldset class="action">
                                <input type="submit" class="btn btn-default" value="Send email"/>
                                <span><a href="[% ill_url | uri %]" title="Return to request details">Cancel</a></span>
                            </fieldset>
                        </form>
                    [% ELSE %]

                            <legend>Interlibrary loan request details</legend>
                            <p>No partners have been defined yet. Please create appropriate patron records (by default ILLLIBS category).</p>
                            <p>Be sure to provide email addresses for these patrons.</p>
                            <p><span><a href="[% ill_url | uri %]" title="Return to request details">Cancel</a></span></p>
                        </fieldset>
                    [% END %]
                <!-- generic_confirm ends here -->

                                <div class="borrowernumber">
                                    <span class="label borrowernumber">Patron:</span>
                                    [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
                                    <a href="[% borrowerlink | uri %]" title="View borrower details">
                                    [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %]
                                    </a>
                                </div>

                                <div class="biblio_id">
                                    <span class="label biblio_id">Bibliographic record ID:</span>
                                    [% IF request.biblio_id %]
                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% request.biblio_id | uri %]">[% request.biblio_id | html %]</a>
                                    [% ELSE %]
                                        <span>N/A</span>
                                    [% END %]

Lines 25-31 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-1 / +1 lines)
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&id=[% koha_new.idnew \| html %]">Edit</a>	28	<a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=[% koha_new.idnew \| uri %]">Edit</a>
29	\| <a class="news_delete" href="/cgi-bin/koha/tools/koha-news.pl?op=del&ids=[% koha_new.idnew \| html %]">Delete</a>	29	\| <a class="news_delete" href="/cgi-bin/koha/tools/koha-news.pl?op=del&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 %]




                                &nbsp;
                                [% IF ( accountline.itemnumber ) %]
                                    [% SET biblio = accountline.item.biblio %]
                                    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | uri %]&amp;itemnumber=[% accountline.itemnumber | uri %]">[% biblio.title | html %]</a>
                                [% END %]
                            </td>


                                        <td>[% offset_accountline.amountoutstanding | $Price %]</td>
                                        <td>[% INCLUDE 'accounttype.inc' account => offset_accountline %]</td>
                                        <td>[% offset_accountline.note | html %]</td>
                                        <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | uri %]">[% offset_accountline.manager_id | html %]</a>[% END %]</td>
                                        <td>[% ao.created_on | $KohaDates with_hours => 1 | html %]</td>
                                        <td>[% ao.amount | $Price %]</td>
                                        <td>[% INCLUDE 'account_offset_type.inc' account_offset => ao %]</td>
                                        <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>
                                    </tr>
                                [% END %]
                            [% END %]




<!-- The manual invoice and credit buttons -->
<div class="statictabs">
<ul>
    <li class="active"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account</a></li>
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Pay fines</a></li>
    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a></li>
    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a></li>
</ul>
<div class="tabs-container">
<!-- The table with the account items -->

        [% INCLUDE 'accounttype.inc' accountline => account %]
        [%- IF account.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
        [%- IF account.description %], [% account.description | html %][% END %]
        &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>
      <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td>
      <td>[% account.note | html_line_break %]</td>
      [% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price %]</td>

        [% ELSE %]
          <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>
        [% END %]
        <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>
        [% IF ( reverse_col) %]
          [% IF ( account.payment || account.amount < 0 ) %]
                [% IF account.payment %]
                    <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>
                [% END %]
                [% IF account.amount < 0 %]
                    <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>
                [% END %]
          [% ELSE %]
            &nbsp;

Lines 33-39 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt (-1 / +1 lines)
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>

Lines 45-51 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt (-1 / +1 lines)
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 %]&op=download&file_id=[% f.file_id \| html %]">[% f.file_name \| html %]</a></td>	48	<td><a href="?borrowernumber=[% patron.borrowernumber \| uri %]&op=download&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>

Lines 54-60 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt (-1 / +1 lines)
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>




                      <td>[% entry.id | html %]</td>
                      <td>[% entry.appointment_date | $KohaDates %] ([% entry.day_segment | html %])</td>
                      <td>
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% entry.chooser.borrowernumber | uri %]">
                          [% INCLUDE 'patron-title.inc' patron = entry.chooser invert_name = 0 %]
                        </a>
                      </td>
                      <td>
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% entry.deliverer.borrowernumber | uri %]">
                          [% INCLUDE 'patron-title.inc' patron = entry.deliverer invert_name = 0 %]
                        </a>
                      </td>

                </table>
                [% END %]
                <div class="action">
                  <a href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&borrowernumber=[% patron.borrowernumber | uri %]"
                    class="btn btn-default btn-sm">
                    <i class="fa fa-plus"></i> Add a new delivery
                  </a>

Lines 24-33 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (-4 / +4 lines)
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

Lines 24-33 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-4 / +4 lines)
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




<div id="breadcrumbs">
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
    [% UNLESS blocking_error %]
    &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 %]
<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>
    [% END %]
</div>

	        [% ELSE %]
	        <li id="contact-details" style="display: none">
	        [% END %]
	            <span class="label">Organization #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid | uri %]" target="blank">[% guarantorid | html %]</a>[% END %]
	        </li>
	        <li>
	            <label for="contactname">Organization name: </label>

     <span class="label">Patron #:</span>
     [% IF guarantorid %]
        [% IF logged_in_user.can_see_patron_infos( guarantor ) %]
            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid | uri %]" target="blank">[% guarantorid | html %]</a>
        [% ELSE %]
            [% guarantorid | html %]
        [% END %]

Lines 99-105 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt (-1 / +1 lines)
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" />

Lines 105-111 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt (-1 / +1 lines)
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 %]




            [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span>[% phonepro | html %]</li>[% END %]
            [% IF ( mobile ) %]<li><span class="label">Other phone: </span>[% mobile | html %]</li>[% END %]
            [% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax | html %]</li>[% END %]
            [% IF ( email ) %]<li class="email"><span class="label">Primary email:</span><a href="mailto:[% email | uri %]">[% email | html %]</a></li>[% END %]
            [% IF ( emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a href="mailto:[% emailpro | uri %]">[% emailpro | html %]</a></li>[% END %]
            [% UNLESS ( I ) %]
                [% IF ( inititals ) %]<li><span class="label">Initials: </span>[% initials | html %]</li>[% END %]
                [% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth | $KohaDates %]</li>[% END %]

            [% END %]
    [% IF ( isguarantee ) %]
        [% IF ( guaranteeloop ) %]
            <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>
        [% END %]
    [% ELSE %]
        [% IF ( guarantor.borrowernumber ) %]
            <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>
        [% END %]
    [% END %]
	</ol>





<body id="pat_moremember-print" class="pat">
    <div id="main">
        <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>

        <ul>
            [% IF Koha.Preference( 'AddressFormat' ) %]

                    [% IF ( issue.overdue ) %]<tr class="overdue">[% ELSE %]<tr>[% END %]
                        <td>
                            [% issue.title | html %]
                            <a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issue.itemnumber | uri %]&amp;biblionumber=[% issue.biblionumber | uri %]&amp;bi=[% issue.biblioitemnumber | uri %]"></a>
                        </td>
                        <td>[% issue.author | html %]</td>
                        <td>[% issue.itemcallnumber | html %]</td>

                      [% END %]
                      &nbsp;
                      [% IF ( account.itemnumber AND account.accounttype != 'F' AND account.accounttype != 'FU' ) %]
                          <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>
                  <td>




<h3>[% LibraryName | html %]</h3>
[% IF ( branchname ) %][% branchname | html %]<br />[% END %]
Checked out to [% firstname | html %] [% surname | html %] <br />
(<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber | uri %]">[% cardnumber | html %]</a>)<br />

[% todaysdate | html %]<br />


[% FOREACH issueloo IN issueloop %]
[% IF ( issueloo.red ) %][% ELSE %]
[% IF ( issueloo.today ) %]
<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 />
Barcode: [% issueloo.barcode | html %]<br />
Date due: [% issueloo.date_due | html %]<br /></p>
    [% END %]

<h4>Checked out</h4>
[% FOREACH issueloo IN issueloop %]
[% IF ( issueloo.red ) %][% ELSE %]
<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 />
Barcode: [% issueloo.barcode | html %]<br />
Date due: [% issueloo.date_due | html %]<br /></p>
    [% END %]

<h4>Overdues</h4>
    [% FOREACH issueloo IN issueloop %]
    [% IF ( issueloo.red ) %]
<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 />
Barcode: [% issueloo.barcode | html %]<br />
Date due: [% issueloo.date_due | html %]</p>
[% END %]




                                                [% patron_message.message_date | $KohaDates %]
                                                [% Branches.GetName( patron_message.branchcode ) | html %]
                                                [% IF patron_message.manager_id %]
                                                    ( <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> )
                                                [% END %]
                                                <i>"[% patron_message.message | html %]"</i>
                                            </span>

                                        [% IF ( patron.phone ) %]
                                            <li>
                                                <span class="label">Primary phone: </span>
                                                <a href="tel:[% patron.phone | uri %]">[% patron.phone | html %]</a>
                                            </li>
                                        [% END %]
                                        [% IF ( patron.phonepro ) %]
                                            <li>
                                                <span class="label">Secondary phone: </span>
                                                <a href="tel:[% patron.phonepro | uri %]">[% patron.phonepro | html %]</a>
                                            </li>
                                        [% END %]
                                        [% IF ( patron.mobile ) %]
                                            <li>
                                                <span class="label">Other phone: </span>
                                                <a href="tel:[% patron.mobile | uri %]">[% patron.mobile | html %]</a>
                                            </li>
                                        [% END %]
                                        [% IF ( patron.fax ) %]

                                                <ul>
                                                    [% FOREACH guarantee IN guarantees %]
                                                        [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
                                                            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | uri %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></li>
                                                        [% ELSE %]
                                                            <li>[% guarantee.firstname | html %] [% guarantee.surname | html %]</li>
                                                        [% END %]

                                            <li>
                                                <span class="label">Guarantor:</span>
                                                [% IF guarantor.borrowernumber AND logged_in_user.can_see_patron_infos( guarantor ) %]
                                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber | uri %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a>
                                                [% ELSE %]
                                                    [% guarantor.firstname | html %] [% guarantor.surname | html %]
                                                [% END %]

                                            <ol>
                                                <li>
                                                    <span class="label">SMS number:</span>
                                                    <a href="sms:[% patron.smsalertnumber | uri %]">[% patron.smsalertnumber | html %]</a>
                                                </li>
                                            </ol>
                                        </div>

                                            [% IF ( patron.password ) %]
                                                *******
                                            [% ELSE %]
                                                <span class="problem"><a href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | uri %]">Undefined</a></span>
                                            [% END %]
                                        </li>


                                            [% IF ( patron.B_phone ) %]
                                                <li>
                                                    <span class="label">Phone: </span>
                                                    <a href="tel:[% patron.B_phone | uri %]">[% patron.B_phone |html  %]</a>
                                                </li>
                                            [% END %]


Lines 26-35 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-4 / +4 lines)
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




<div id="breadcrumbs">
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
    <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> &rsaquo;
    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">Pay fines for [% patron.firstname | html %] [% patron.surname | html %]</a> &rsaquo;
    [% IF    ( pay_individual )      %]Pay an individual fine
    [% ELSIF ( writeoff_individual ) %]Write off an individual fine
    [% ELSE %]

<div class="statictabs">
<ul>
    <li>
    <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account</a>
    </li>
    <li class="active">
    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Pay fines</a>
    </li>
    <li>
    <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a>
    </li>
    <li>
    <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a>
    </li>
</ul>
<div class="tabs-container">

Lines 50-56 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt (-1 / +1 lines)
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 %]&op=show">[% s.title \| html %]</a>	53	<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% s.suggestionid \| uri %]&op=show">[% s.title \| html %]</a>
54	[% ELSE %]	54	[% ELSE %]
55	[% s.title \| html %]	55	[% s.title \| html %]
56	[% END %]	56	[% END %]

Lines 72-78 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt (-1 / +1 lines)
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

Lines 53-59 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt (-2 / +2 lines)
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 %]" />

Lines 53-59 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt (-2 / +2 lines)
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 %]

Lines 26-35 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt (-4 / +4 lines)
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>

Lines 138-144 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt (-1 / +1 lines)
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>




                [% FOREACH l IN lists %]
                    [% SET shared_by_other = l.owner.id != logged_in_user.id %]
                    <tr>
                        <td><a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | uri %]">[% l.name | html %]</a></td>
                        <td>[% l.patron_list_patrons_rs.count || 0 | html %]</td>
                        <td>
                            [% IF l.shared %]

                                   Actions <b class="caret"></b>
                                </a>
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id | html %]">
                                    <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>
                                    [% UNLESS shared_by_other %]
                                        <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>
                                        <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>
                                    [% END %]
                                    [% IF ( l.patron_list_patrons_rs.count ) %]

                                        </li>
                                        [% IF CAN_user_tools_edit_patrons %]
                                            <li>
                                                <a href="/cgi-bin/koha/tools/modborrowers.pl?patron_list_id=[% l.patron_list_id | uri %]&op=show">
                                                    <i class="fa fa-pencil"></i> Batch edit patrons
                                                </a>
                                            </li>
                                        [% END %]
                                        [% IF CAN_user_tools_delete_anonymize_patrons %]
                                            <li>
                                                <a href="/cgi-bin/koha/tools/cleanborrowers.pl?step=2&patron_list_id=[% l.patron_list_id | uri %]&checkbox=borrower">
                                                    <i class="fa fa-trash"></i> Batch delete patrons
                                                </a>
                                            </li>




                                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="pluginactions[% plugin.class | html %]">
                                                    [% IF ( CAN_user_plugins_report ) %]
                                                        [% IF plugin.can('report') %]
                                                            <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>
                                                        [% END %]
                                                    [% END %]

                                                    [% IF ( CAN_user_plugins_tool ) %]
                                                        [% IF plugin.can('tool') %]
                                                            <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>
                                                        [% END %]
                                                    [% END %]

                                                    [% IF ( CAN_user_plugins_configure ) %]
                                                        [% IF plugin.can('configure') %]
                                                            <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=configure"><i class="fa fa-cog"></i> Configure</a></li>
                                                        [% END %]
                                                    [% END %]
                                                    [% IF ( CAN_user_plugins_manage ) %]

Lines 76-82 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt (-1 / +1 lines)
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>




                        </td>
                        <td class="report_json_url">
                        [% IF (savedreport.public) %]
                            <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>
                        [% ELSE %]
                            <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>
                        [% END %]

                        <td>[% savedreport.cache_expiry | html %]</td>
                        <td>
                            [% FOR result IN savedreport.results %]
                                <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=retrieve%20results&amp;id=[% result.id | uri %]">[% result.date_run | html %]</a>
                                <br/>
                            [% END %]
                        </td>
                        <td>
                            [% IF savedreport.seems_obsolete %]
                                This report seems obsolete, it uses biblioitems.marcxml field.
                                <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>
                            [% END %]
                        </td>
                        <td>

                                       class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id | html %]" role="button" data-toggle="dropdown"
                                       href="#"><b class="caret"></b></a>
                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]">
                                        <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>
                                        [% IF ( CAN_user_reports_create_reports ) %]
                                            <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>
                                            <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>
                                        [% END %]
                                        <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id | uri %]"><i class="fa fa-clock-o"></i> Schedule</a></li>
                                        [% IF ( CAN_user_reports_delete_reports ) %]
                                            <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>
                                        [% END %]




                            </td>
                        [% END %]
                        <td>
                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber | uri %]" title="[% item.itemnotes | html %]">[% item.biblio.title | html %]</a>
                        </td>
                        <td>[% item.biblio.author | html %]</td>
                        <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => item.itemlost ) | html %]
                        <td><span title="[% item.itemlost_on | html %]">[% item.itemlost_on | $KohaDates %]</span></td>
                        <td>
                            <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% item.biblionumber | uri %]" title="[% item.itemnotes | html %]">[% item.barcode | html %]</a>
                        </td>
                        <td>[% item.itemcallnumber | html %]</td>
                        <td><span title="[% item.datelastseen | html %]">[% item.datelastseen | $KohaDates %]</span></td>

Lines 59-68 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt (-2 / +2 lines)
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>

Lines 52-58 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt (-1 / +1 lines)
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 %]&[% 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 %]&[% 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>

Lines 41-48 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt (-2 / +2 lines)
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>




      <h3>Cannot place hold</h3>
      <ul>
        [% IF ( exceeded_maxreserves ) %]
          <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>
        [% ELSIF ( exceeded_holds_per_record ) %]
          <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>
        [% ELSIF ( alreadypossession ) %]
          <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>
        [% ELSIF ( alreadyreserved ) %]
          <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>
        [% ELSIF ( ageRestricted ) %]
          <li><strong>Age restricted</strong></li>
        [% ELSIF ( none_available ) %]
          <li> <strong>No items are available</strong> to be placed on hold.</li>
        [% ELSIF ( maxreserves ) %]
          <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>
        [% END %]
      </ul>
    [% ELSE %]
        <h3>Cannot place hold on some items</h3>
        [% IF ( exceeded_maxreserves ) %]
          <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>
        [% ELSIF ( exceeded_holds_per_record ) %]
            [% FOREACH biblioloo IN biblioloop %]
                [% IF (biblioloo.tooManyHoldsForThisRecord) %]
                    <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>
                [% END %]
            [% END %]
        [% END %]

[% IF ( expiry || diffbranch || patron.is_debarred || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %]
<div class="dialog message"><ul>
    [% IF ( expiry ) %]
    <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>
    [% END %]

    [% IF patron.is_debarred %]
    <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>
    [% END %]

    [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %]
    <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>
    [% END %]

    [% IF ( diffbranch ) %]
    <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>
    [% END %]

</ul></div>


       <ol> <li><span class="label">Patron:</span>
            [% IF ( patron.borrowernumber ) %]
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a>
            [% ELSE %]
                Not defined yet
            [% END %]

                            Can't be cancelled when item is in transit
                    [% ELSE %]
                    [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
                    [% 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 %]
                    since
                    [% 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>


        </table>
    [% IF ( bibitemloo.hiddencount ) %]
        <form>
        <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>
        </form>
    [% END %] <!-- hiddencount -->
    [% END %] <!-- bibitemloop -->

        [% END %]
          <td>
            <ul>
              <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]">[% biblioloo.title | html %]</a></li>
              [% IF ( biblioloo.publicationyear ) %]
                <li><span class="label">Publication year:</span> [% biblioloo.publicationyear | html %]</li>
              [% END %]

            [% END %]

          [% IF ( biblioloo.alreadyres ) %]
              <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>
          [% END %]
          [% IF ( biblioloo.none_avail ) %]
              <li> <strong>No items are available</strong> to be placed on hold</li>

                    [% IF ( biblioloo.reserveloop ) %]
                        [% IF ( multi_hold ) %]
                            <h3>
                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">
                                    [% biblioloo.title | html %]
                                </a>
                            </h3>




    <tbody>[% FOREACH review IN reviews %]
    <tr>
        <td>
            [% 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 %]
        </td>
        <td>
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% review.biblionumber | uri %]">[% review.bibliotitle | html %]</a>
        </td>
        <td>
            [% review.review | html %]
        </td>
        <td>
            [% 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 %]
            <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>
        </td>
    </tr>
    [% END %]</tbody>

Lines 106-112 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt (-1 / +1 lines)
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 %]&barcode=[% collectionItemsLoo.barcode \| html %]&removeItem=1&action=addItem">Remove</a></td>	109	<td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId \| uri %]&barcode=[% collectionItemsLoo.barcode \| uri %]&removeItem=1&action=addItem">Remove</a></td>
110	</tr>	110	</tr>
111	[% END %]	111	[% END %]
112	</table>	112	</table>

Lines 19-25 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt (-1 / +1 lines)
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




                            <tbody>
                            [% FOREACH collectionsLoo IN collectionsLoop %]
                                <tr>
                                    <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | uri %]">[% collectionsLoo.colTitle | html %]</a></td>
                                    <td>[% collectionsLoo.colDesc | html %]</td>
                                    <td>[% Branches.GetName( collectionsLoo.colBranchcode ) | html %]</td>
                                    <td>

                                        <a class="btn btn-default btn-xs" dropdown-toggle" id="collectionsactions[% collectionsLoo.colId | html %]" role="button" data-toggle="dropdown" href="#">
                                        Actions <b class="caret"></b></a>
                                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="collectionsactions[% collectionsLoo.colId | html %]">
                                            <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>
                                            <li><a href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-exchange"></i> Transfer</a></li>
                                            <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>
                                            <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>
                                        </ul>
                                    </div>

Lines 111-118 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt (-2 / +2 lines)
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&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&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 %]

Lines 130-136 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt (-1 / +1 lines)
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>

Lines 74-80 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt (-1 / +1 lines)
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 %]&op=delete"><i class="fa fa-trash"></i> Delete all</a>	77	<a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid \| uri %]&op=delete"><i class="fa fa-trash"></i> Delete all</a>
78	[% END %]	78	[% END %]
79	</p>	79	</p>
80	</li>	80	</li>




</tr>
[% FOREACH subscription IN subscriptions %]
    <tr>
        <td><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]"># [% subscription.subscriptionid | html %]</a> </td>
        <td>[% subscription.frequency.description | html %]</td>
        <td>[% subscription.numberpattern.label | html %]</td>
        <td>[% IF subscription.branchcode %][% Branches.GetName( subscription.branchcode ) | html %][% END %]</td>

[% END %]
[% IF ( subscr ) %]
[% IF ( subscriptioncount > 1 ) %]
<tr ><td colspan="8">  <a href="serials-collection.pl?biblionumber=[% biblionumber | uri %]">See any subscription attached to this biblio</a></td>
</tr>
[% END %]
[% END %]

            [% IF year.year == 'manage' %]
                <li><a href="#subscription-year-manage">Manage</a></li>
            [% ELSE %]
                <li><a href="#subscription-year-[% year.year | uri %]">[% year.year | html %]</a></li>
            [% END %]
        [% END %]
    [% END %]

                </td>
            [% END %]
[% IF ( subscriptions.size > 1 ) %]
                 <td><a href="serials-collection.pl?subscriptionid=[% serial.subscriptionid | uri %]">[% serial.subscriptionid | html %]</a></td>
[% END %]
                <td>
                    <span title="[% serial.publisheddate | html %]">




[% INCLUDE 'serials-menu.inc' %]
<ul>
    [% FOREACH subscription IN subscriptions %]
        <li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]" title="serial collection for [% subscription.bibliotitle | html %]">Serial collection #[% subscription.subscriptionid | html %]</a></li>
        <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid | html %]</a></li>
        [% IF ( subscription.abouttoexpire ) %]
          [% UNLESS subscription.closed %]
            <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid | html %])">Renew #[% subscription.subscriptionid | html %]</a></li>
          [% END %]
        [% END %]
    [% END %]
    <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>
</div>
</div>
[% INCLUDE 'intranet-bottom.inc' %]




            [% IF ( subscription.issn ) %][% subscription.issn | html %]
            [% END %]
            </td>
            <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]" class="button" title="subscription detail">[% subscription.title | html %]</a>
            </td>
            <td>[% IF ( subscription.publicnotes ) %][% subscription.publicnotes | html %][% END %]
            [% IF ( subscription.internalnotes ) %]([% subscription.internalnotes | html %])[% END %]

                            [% IF ( routing && CAN_user_serials_routing ) %]
                                [% UNLESS ( subscription.cannotedit ) %]
                                    <li>
                                        <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>
                                    </li>
                                [% END %]
                            [% END # IF ( routing && CAN_user_serials_routing ) %]

                            <li>
                                <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]"><i class="fa fa-list-alt"></i> Issue history</a>
                            </li>

                        </ul>

                                [% ELSE %]
                                    [% IF ( subscription.routingedit ) %]
                                        <li>
                                            <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>
                                        </li>
                                    [% ELSE %]
                                        <li>
                                            <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>
                                        </li>
                                    [% END %]
                                [% END %]
                            [% END # IF ( routing && CAN_user_serials_routing ) %]

                            <li>
                                <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]"><i class="fa fa-list-alt"></i> Issue history</a>
                            </li>
                        </ul>
                        </div>

Lines 47-54 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt (-2 / +2 lines)
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>




		<ol>
		<li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li>
        <li><span class="label">Librarian identity:</span> [% librarian | html %]</li>
        <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li>
        <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>
        [% IF ( OPACBaseURL ) %]
            <li>
                <span class="label">OPAC view:</span>

        [% IF ( letter ) %]
            <li>
                <span class="label">Patron notification:</span> [% letter | html %]
                (<a href="/cgi-bin/koha/serials/viewalerts.pl?subscriptionid=[% subscriptionid | uri %]">subscribers</a>)
            </li>
        [% END %]
        [% IF ( hasRouting ) %]<li><span class="label">Routing:</span> yes</li>[% END %]

            <li>
              <span class="label">Manual history: </span>
                [% IF ( manualhistory ) %]
                    Enabled <a href="/cgi-bin/koha/serials/subscription-history.pl?subscriptionid=[% subscriptionid | uri %]">Edit history</a>
                [% ELSE %]
                    Disabled
                [% END %]

                        <td>
                        [% IF order.invoice %]
                            [% IF CAN_user_acquisition %]
                                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]" title="Invoice detail page">
                                   [% order.invoice.invoicenumber | html %]</a>
                            [% ELSE %]
                                [% order.invoice.invoicenumber | html %]

Lines 107-113 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt (-1 / +1 lines)
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>

Lines 243-249 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt (-1 / +1 lines)
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>

Lines 16-22 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt (-2 / +2 lines)
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 %]




                <td>[% suggesteddate | $KohaDates %]</td>
                <td>
                    [% 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 %]
                </td>

                <td>[% manageddate | $KohaDates %]</td>
                <td>
                        [% 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>

                <td>[% accepteddate | $KohaDates %]</td>
                <td>
                    [% 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>

            <tr>
                <th><label for="suggesteddate">Created by:</label> </th>
                <td><input type="text" id="suggesteddate" name="suggesteddate" class="datepicker" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/>[% INCLUDE 'date-format.inc' %]</td>
                <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 %]
                </td>
            </tr>
            <tr>
                <th><label for="managedon">Managed by:</label> </th>
                <td><input type="text" id="managedon" name="manageddate" class="datepicker" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td>
                <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>
            </tr>
            <tr>
                <th><label for="accepteddate">Accepted on:</label> </th>
                <td><input type="text" id="accepteddate" name="accepteddate" class="datepicker" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td>
                <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>
            </tr>
            </tbody>
        </table></li></ol>

    <ul class="ui-tabs-nav">
        [% FOREACH suggestion IN suggestions %]
                <li>
            <a href="#[% suggestion.suggestiontype | uri %]">
            [% IF ( suggestion.suggestiontypelabel ) %]
                [% IF (suggestion.suggestiontypelabel == "Pending") %]Pending
                [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]Accepted

                    <input type="checkbox" name="edit_field" value="[% suggestions_loo.suggestionid | html %]" />
                </td>
                <td>
                    <a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid | uri %]&amp;op=show" title="suggestion" >
                        [% suggestions_loo.title | html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author | html %][% END %]</a>
                    <br />
                    [% IF ( suggestions_loo.copyrightdate ) %]&copy; [% suggestions_loo.copyrightdate | html %] [% END %]

                        [% 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 %]
                </td>
                <td>
                    <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>
                    [% IF ( suggestions_loo.suggesteddate ) %] - [% suggestions_loo.suggesteddate | $KohaDates %][% END %]
                </td>
                <td>
                    <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>
                    [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate | $KohaDates %][% END %]
                </td>
                <td>


            <span id="other_reason[% suggestion.suggestiontype | html %]">
                <input type="text" size="31" id="select-other_reason[% suggestion.suggestiontype | html %]" name="other_reason[% suggestion.suggestiontype | html %]" placeholder="please note your reason here..." />
                <a href="#back[% suggestion.suggestiontype | uri %]">Cancel</a>
            </span>

            <strong style="padding: 0 1em;">OR:</strong>

Lines 41-47 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt (-1 / +1 lines)
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>

Lines 119-125 tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt (-1 / +1 lines)
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 %]&approved=all">[% tagloo.approved_by_name \| html %]</a>[% ELSE %] [% END %]	122	<td>[% IF ( tagloo.approved_by_name ) %]<a href="/cgi-bin/koha/tags/review.pl?approved_by=[% tagloo.approved_by \| uri %]&approved=all">[% tagloo.approved_by_name \| html %]</a>[% ELSE %] [% 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">




            </thead>
            <tbody>
            [% 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 %]
            <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>
            [% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field | html %]</td>
                    [% END %] </tr>
            [% END %]

    <ul>
    [% FOREACH simple_items_displa IN simple_items_display %]
        <li>
            <a href="[% simple_items_displa.itemnumber | uri %]">[% simple_items_displa.barcode | html %]</a>
        </li>
    [% END %]
    </ul>

            <p>[% deleted_items | html %] item(s) deleted.</p>
            [% IF delete_records %] <p>[% deleted_records | html %] record(s) deleted.</p> [% END %]
            [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%]
                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a>
            [% ELSIF src %]
                <a href="[% src | uri %]">Return to where you were</a>
            [% ELSE %]
                <a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Return to batch item deletion</a>
            [% END %]

            [% FOREACH not_deleted_loo IN not_deleted_loop %]
            <tr>
                <td>[% not_deleted_loo.itemnumber | html %]</td>
                <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>
                <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>
            </tr>
            [% END %]




                [% END %]
              <fieldset class="action">
                  [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%]
                      <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a>
                  [% ELSIF src %]
                      <a href="[% src | uri %]">Return to where you were</a>
                  [% ELSE %]
                      <a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a>
                  [% END %]

                [% ELSE %]
                  <td>&nbsp;</td>
                [% END %]
                <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>
                [% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field | html %]</td>
        [% END %] </tr>
            [% END %]

    <ul>
    [% FOREACH simple_items_displa IN simple_items_display %]
  <li>
      [% 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 %]
  </li>
    [% END %]
    </ul>




                  <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>
                  <td><label for="record_id_[% biblio.biblionumber | html %]">[% biblio.biblionumber | html %]</label></td>
                  <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>
                  <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.itemnumbers.size | html %]</a></td>
                  <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.holds_count | html %]</a></td>
                  <td><a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.issues_count | html %]</a></td>
                </tr>
              [% END %]
            </tbody>

              [% FOR authority IN records %]
                <tr>
                  <td><input type="checkbox" name="record_id" value="[% authority.authid | html %]" data-usage="[% authority.count_usage | html %]" /></td>
                  <td><a href="/cgi-bin/koha/authorities/detail.pl?authid=[% authority.authid | uri %]">[% authority.authid | html %]</a></td>
                  <td>[% PROCESS authresult summary=authority.summary %]</td>
                  <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>
                </tr>
              [% END %]
            </tbody>




                [% ELSIF message.code == 'authority_not_exists' %]
                    Authority record [% message.authid | html %] does not exist in the database.
                [% ELSIF message.code == 'biblio_not_modified' %]
                    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.
                [% ELSIF message.code == 'authority_not_modified' %]
                    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.
                [% ELSIF message.code == 'biblio_modified' %]
                    Bibliographic record <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.biblionumber | html %]</a> has successfully been modified.
                [% ELSIF message.code == 'authority_modified' %]
                    Bibliographic record <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% message.authid | uri %]">[% message.authid | html %]</a> has successfully been modified.
                [% END %]
                [% IF message.error %]
                    (The error was: [% message.error | html %]. See the Koha logfile for more information).

                <tr>
                  <td><input type="checkbox" name="record_id" value="[% biblio.biblionumber | html %]" /></td>
                  <td>[% biblio.biblionumber | html %]</td>
                  <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.title | html %]</a></td>
                  <td class="actions">
                    <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>
                  </td>
                </tr>
              [% END %]

              [% FOR authority IN records %]
                <tr>
                  <td><input type="checkbox" name="record_id" value="[% authority.authid | html %]" data-usage="[% authority.count_usage | html %]" /></td>
                  <td><a href="/cgi-bin/koha/authorities/detail.pl?authid=[% authority.authid | uri %]">[% authority.authid | html %]</a></td>
                  <td>[% PROCESS authresult summary=authority.summary %]</td>
                  <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>
                </tr>
              [% END %]
            </tbody>

Lines 268-275 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt (-2 / +2 lines)
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&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&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&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&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 %]

Lines 249-255 td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt (-2 / +2 lines)
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 %]&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 %]&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 %]&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 %]&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>

Lines 193-199 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt (-1 / +1 lines)
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 %]

Lines 203-210 Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt (-2 / +2 lines)
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&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&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&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&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>

Lines 305-313 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt (-2 / +2 lines)
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 %]




<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> 
[% IF ( import_batch_id ) %]
 &rsaquo;
 <a href="[% script_name | uri %]">Manage staged MARC records</a>
 &rsaquo; Batch [% import_batch_id | html %]
[% ELSE %]
 &rsaquo; Manage staged MARC records

      [% IF ( page.current_page ) %]
      <span class="current">[% page.page_number | html %]</span>
      [% ELSE %]
      <a href="[% page.script_name | uri %]?offset=[% page.offset | uri %]">[% page.page_number | html %]</a>
      [% END %]
    [% END %]
</div>

  [% FOREACH batch_lis IN batch_list %]
    <tr>
    <td>[% batch_lis.import_batch_id | html %]</td>
    <td><a href="[% batch_lis.script_name | uri %]?import_batch_id=[% batch_lis.import_batch_id | uri %]">[% batch_lis.file_name | html %]</a></td>
    <td>[% batch_lis.comments | html %]</td>
    <td>[% IF ( batch_lis.record_type == 'auth' ) %]Authority[% ELSE %]Bibliographic[% END %]</td>
    <td>

    </td>
    <td>[% batch_lis.upload_timestamp | html %]</td>
    <td>[% batch_lis.num_records | html %]</td>
    <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>
    <td class="actions">
        [% IF ( batch_lis.can_clean ) %]
          <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" >

      [% IF ( page.current_page ) %]
      <span class="current">[% page.page_number | html %]</span>
      [% ELSE %]
      <a href="[% page.script_name | uri %]?offset=[% page.offset | uri %]">[% page.page_number | html %]</a>
      [% END %]
    [% END %]
</div>

Lines 159-165 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt (-1 / +1 lines)
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>

Lines 61-67 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt (-1 / +1 lines)
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 %]

Lines 46-52 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt (-1 / +1 lines)
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 %]

Lines 37-43 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt (-1 / +1 lines)
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 />




                                    <td>[% loopro.timestamp | html %]</td>
                                    <td>
                                        [% IF loopro.librarian %]
                                            <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>
                                        [% ELSE %]
                                            [% loopro.user | html %]
                                        [% END %]

                                    <td>
                                        [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %]
                                            [% IF loopro.patron %]
                                                <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>
                                            [% ELSE %]
                                                [% loopro.object | html %]
                                            [% END %]
                                        [% ELSE %]
                                                [% IF ( loopro.module == 'CATALOGUING' ) %]
                                                    [% IF ( loopro.info.substr(0, 4) == 'item' ) %]
                                                        <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>
                                                    [% ELSIF ( loopro.info.substr(0, 6) == 'biblio' ) %]
                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.object | uri %]" title="Display detail for this biblio">Biblio [% loopro.object | html %]</a>
                                                    [% ELSE %]
                                                        [% loopro.object | html %]
                                                    [% END %]
                                                [% ELSE %]
                                                    [% IF ( loopro.module == 'SERIAL' ) %]
                                                        <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% loopro.object | uri %]">Subscription [% loopro.object | html %] </a>
                                                    [% ELSE %]
                                                        [% IF ( loopro.module == 'AUTHORITIES' ) %]
                                                            <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% loopro.object | uri %]" title="Display detail for this authority">Authority [% loopro.object | html %]</a>
                                                        [% ELSE %]
                                                            [% loopro.object | html %]
                                                        [% END %]

                                    </td>
                                    <td>
                                        [% IF ( loopro.module == 'CIRCULATION' ) %]
                                            <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>
                                        [% ELSE %]
                                            [% loopro.info | html %]
                                        [% END %]




    [% END %]
    [% IF shelf AND shelf.is_private %] &rsaquo;
        [% IF op == 'view' OR op == 'edit_form' %]
            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;category=[% PRIVATE | uri %]">Your lists</a>
        [% ELSE %]
            Your lists
        [% END %]
    [% ELSIF shelf AND shelf.is_public %] &rsaquo;
        [% IF op == 'view' %]
            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;category=[% PUBLIC | uri %]">Public lists</a>
        [% ELSE %]
            Public lists
        [% END %]


                [% UNLESS ( item_level_itypes ) %]<th>Item type</th>[% END %]
                <th>
                    <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>
                    [% IF sortfield == 'title' %]
                        <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" />
                    [% ELSE %]

                    [% END %]
                </th>
                <th>
                    <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>
                   [% IF sortfield == 'author' %]
                        <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" />
                   [% ELSE %]

                   [% END %]
                 </th>
                <th>
                    <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>
                    [% IF sortfield == 'dateadded' %]
                        <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" />
                    [% ELSE %]

                    [% END %]
                </th>
                <th>
                    <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>
                   [% IF sortfield == 'itemcallnumber' %]
                        <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" />
                   [% ELSE %]

                        [% ELSE %]
                            [% IF ( itemsloo.ITEM_RESULTS.size ) %]
                                <a id="reserve_[% itemsloo.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | html %]">Holds</a>
                                [% 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 %]
                            [% ELSE %]
                                <span class="noholdstext">No holds allowed</span>
                            [% END %]
                        [% END %]
                        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
                            | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% itemsloo.biblionumber | uri %]">Edit record</a>
                        [% END %]
                        [% IF ( CAN_user_editcatalogue_edit_items ) %]
                            | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% itemsloo.biblionumber | uri %]">Edit items</a>
                        [% END %]
                    </p>
            </td>

    <fieldset class="action">
        <input type="submit" value="Save" class="submit" />
        [% IF referer == 'view' %]
           <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel">Cancel</a>
       [% ELSE %]
            [% IF category == PUBLIC %]
                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;category=[% PUBLIC | uri %]" class="cancel">Cancel</a>
            [% ELSE %]
                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;category=[% PRIVATE | uri %]" class="cancel">Cancel</a>
            [% END %]
        [% END %]
    </fieldset>

Lines 24-30 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc (-1 / +1 lines)
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 %]




                                    <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>
                                    [% SET number_of_public_shelves = 0 %]
                                    [% FOREACH s IN some_public_shelves %]
                                        <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>
                                        [% SET number_of_public_shelves = number_of_public_shelves + 1 %]
                                        [% IF number_of_public_shelves >= 10 %][% LAST | html %][% END %]
                                    [% END %]

                                        [% IF some_private_shelves.count %]
                                            [% SET number_of_private_shelves = 0 %]
                                            [% FOREACH s IN some_private_shelves %]
                                                <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>
                                                [% SET number_of_private_shelves = number_of_private_shelves + 1 %]
                                                [% IF number_of_private_shelves >= 10 %][% LAST | html %][% END %]
                                            [% END %]

                        </div>
                    [% ELSE %]
                        <h4>Shibboleth login</h4>
                        <p>If you have a Shibboleth account, please <a href="[% shibbolethLoginUrl | uri %]">click here to login</a>.</p>
                        <h4>Local Login</h4>
                    [% END %]
                [% END %]

Lines 11-17 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc (-3 / +3 lines)
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&type=opac&operator=contains&marclist=mainentry&and_or=and&orderby=HeadingAsc&value=[% search \| html %]">[% heading \| html %]</a>	56	[% ELSIF search %]<a href="/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operator=contains&marclist=mainentry&and_or=and&orderby=HeadingAsc&value=[% search \| uri %]">[% heading \| html %]</a>
57	[% ELSE %][% heading \| html %]	57	[% ELSE %][% heading \| html %]
58	[% END %]	58	[% END %]
59	[% END %]	59	[% END %]




                <ul>
                    <li>
                        [% IF ( available ) %]
                            <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>
                        [% ELSE %]
                            <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>
                        [% END %]
                    </li>
                </ul>

                                  [% IF facet.active %]
                                    [% SET local_url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
                                    <span class="facet-label">[% facet.facet_label_value | html %]</span>
                                    [<a href="[% local_url | uri %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
                                  [% ELSE %]
                                    [% SET local_url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
                                    <span class="facet-label"><a href="[% local_url | uri %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span>
                                    [% IF ( displayFacetCount ) %]
                                      <span class="facet-count"> ([% facet.facet_count | html %])</span>
                                    [% END %]

                            [% END %]
                            [% IF ( facets_loo.expandable ) %]
                                <li class="showmore">
                                    <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>
                                </li>
                            [% END %]
                        </ul>




     [% IF hits_to_paginate < total %]<h6>[% hits_to_paginate | html %] of [% total | html %] results loaded, refine your search to view other records</h6>[% END %]
        <ul>
            [% IF ( previous_page_offset.defined ) %]
                <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>
                <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>
            [% END %]
            [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
                [% IF ( PAGE_NUMBER.highlight ) %]
                    <li class="active"><a href="#">[% PAGE_NUMBER.pg | html %]</a></li>
                [% ELSE %]
                    <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>
                [% END %]
            [% END %]
            [% IF ( next_page_offset ) %]
                <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>
                <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>
            [% END %]
        </ul>
    </div>




                    <td rowspan="2">
                      [% IF shelfbrowser_prev_item %]
                        <div id="browser_previous">
                            <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>
                        </div>
                      [% END %]
                    </td>

                    [% FOREACH item IN shelfbrowser_items %]
                        <td>
                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | uri %]&amp;shelfbrowse_itemnumber=[% item.itemnumber | uri %]#shelfbrowser">
                                [% IF ( OPACLocalCoverImages ) %]
                                    <div title="[% item.biblionumber |url %]" class="[% item.biblionumber | html %] thumbnail-shelfbrowser" id="local-thumbnail-shelf-[% item.biblionumber | html %]"></div>
                                [% END %]

                    <td rowspan="2">
                        [% IF shelfbrowser_next_item %]
                            <div id="browser_next">
                                <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>
                            </div>
                        [% END %]
                    </td>

                    [% FOREACH item IN shelfbrowser_items %]
                        <td class="top">
                            [% item.itemcallnumber | html %]
                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | uri %]&amp;shelfbrowse_itemnumber=[% item.itemnumber | uri %]#shelfbrowser">
                                [% item.title | html %]
                                [% FOREACH subtitl IN item.subtitle %]
                                    [% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %]

Lines 67-73 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt (-1 / +1 lines)
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 -->

Lines 32-38 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt (-1 / +1 lines)
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>

Lines 120-126 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt (-1 / +1 lines)
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

Lines 10-16 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt (-2 / +2 lines)
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 -->




                        [% END %]

                        <h1>Entry [% authtypetext | html %]</h1>
                        <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>
                            [% FOREACH Tag0X IN Tab0XX %]
                                <p><b>[% Tag0X.tag | html %]</b></p>
                                <ul>
                                [% FOREACH subfiel IN Tag0X.subfield %]
                                    <li><b>[% subfiel.marc_lib | $raw %]:</b>
                                    [% IF subfiel.isurl %]<a href="[% subfiel.marc_value | uri %]">[% subfiel.marc_value | html %]</a>
                                    [% ELSE %][% subfiel.marc_value | html %][% END %]</li>
                                [% END %]
                                </ul>

Lines 48-54 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt (-1 / +1 lines)
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&q=[% authid \| html %]&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&q=[% authid \| uri %]&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">




                                    </div>
                            [% ELSE %]
                                <h4>Shibboleth Login</h4>
                                <p><a href="[% shibbolethLoginUrl | uri %]">If you have a Shibboleth account, please click here to log in.</a></p>
                            [% END %]
                            [% IF ( casAuthentication ) %]
                                <h4>CAS login</h4>

                        [% IF ( casAuthentication ) %]
                            [% IF ( shibbolethAuthentication ) %]
                                [% IF ( casServerUrl ) %]
                                    <p><a href="[% casServerUrl | uri %]">Please click here to log in.</a><p>
                                [% END %]

                                [% IF ( casServersLoop ) %]
                                    <p>Please choose against which one you would like to authenticate: </p>
                                    <ul>
                                        [% FOREACH casServer IN casServersLoop %]
                                            <li><a href="[% casServer.value | uri %]">[% casServer.name | html %]</a></li>
                                        [% END %]
                                    </ul>
                                [% END %]

                                [% END %]

                                [% IF ( casServerUrl ) %]
                                   <p><a href="[% casServerUrl | uri %]">If you have a CAS account, please click here to log in.</a><p>
                                [% END %]

                                [% IF ( casServersLoop ) %]
                                    <p>If you have a CAS account, please choose against which one you would like to authenticate:</p>
                                    <ul>
                                        [% FOREACH casServer IN casServersLoop %]
                                        <li><a href="[% casServer.value | uri %]">[% casServer.name | html %]</a></li>
                                        [% END %]
                                    </ul>
                                [% END %]

                    [% ELSE %]
                        <h4>Logging on to the catalog has not been enabled by the library.</h4>
                        <ul>
                            <li>To report this error, you can email the Koha Administrator.<a href="mailto:[% admin | uri %]">Email</a></li>
                            <li>Use top menu bar to navigate to another part of Koha.</li>
                        </ul>
                    [% END # / IF opacuserlogin %]




        <ul>
            [% IF ( displayprev ) %]
                <li>
                    <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 %]">
                        &laquo;
                    </a>
                </li>

                [% IF ( number.highlight ) %]
                    <li class="active"><a href="#">[% number.number | html %]</a></li>
                [% ELSE %]
                    <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>
                [% END %]
            [% END %]
            [% IF ( displaynext ) %]
                <li>
                    <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>
                </li>
            [% END %]
        </ul>

                                        [% FOREACH resul IN result %]
                                            <tr>
                                                <td>[% PROCESS authresult summary=resul.summary %]</td>
                                                <td><a href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% resul.authid | uri %]">Details</a>
                                                <td>[% resul.authtype | html %]</td>
                                                [% UNLESS ( resul.isEDITORS ) %]
                                                    <td>
                                                         [% 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 %]
                                                    </td>
                                                [% END %]
                                            </tr>




                                                [% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %]
                                                    <p>
                                                    [% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
                                                        - <a href="[% MARCNOTE.marcnote | uri %]">[% MARCNOTE.marcnote | html %]</a>
                                                    [% ELSE %]
                                                        - [% MARCNOTE.marcnote | html %]
                                                    [% END %]

                                                        [% IF MARCurl.part %]<p>[% MARCurl.part | html %]</p>[% END %]

                                                        [% IF OPACURLOpenInNewWindow %]
                                                            <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]" target="_blank" rel="noreferrer">[% MARCurl.linktext | html %]</a>
                                                        [% ELSE %]
                                                            <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a>
                                                        [% END %]

                                                        [% IF MARCurl.notes %][% FOREACH note IN MARCurl.notes %]<p>[% note.note | html %]</p>[% END %][% END %]

Lines 32-38 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt (-2 / +2 lines)
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 %]&filter=[% HIERARCHY_LOO.classification \|uri %]">[% HIERARCHY_LOO.description \| html %]</a>	35	<a href="opac-browser.pl?level=[% HIERARCHY_LOO.level \| uri %]&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 %]&filter=[% LEVEL_LOO.classification \|uri %]">[% LEVEL_LOO.description \| html %]</a>	48	<a href="opac-browser.pl?level=[% LEVEL_LOO.level \| uri %]&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>




                        <tbody>
                            [% FOREACH cr IN course_reserves %]
                                <tr>
                                    <td><a href="opac-detail.pl?biblionumber=[% cr.biblio.biblionumber | uri %]">[% cr.biblio.title | html %]</a></td>
                                    <td>[% cr.biblio.author | html %]</td>
                                    <td>[% ItemTypes.GetDescription( cr.item.itype ) | html %]</td>
                                    <td>[% Branches.GetName( cr.item.holdingbranch ) | html %] <br/> <i>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) | html %]</i></td>

                                        [% END %]
                                    </td>
                                    <td>[% IF (cr.item.uri) %]
                                            <a href="[% cr.item.uri | uri %]">Item URI</a>
                                        [% ELSIF (cr.biblioitem.url) %]
                                            <a href="[% cr.biblioitem.url | uri %]">Record URL</a>
                                        [% END %]
                                    </td>
                                </tr>

Lines 42-48 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt (-1 / +1 lines)
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>




                    [% END %]
                    [% IF ( OPACAmazonCoverImages ) %]
                        [% IF ( OPACURLOpenInNewWindow ) %]
                            <a href="http://www.amazon[% AmazonTld | uri %]/gp/reader/[% normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link" target="_blank" rel="noreferrer">
                        [% ELSE %]
                            <a href="http://www.amazon[% AmazonTld | uri %]/dp/[% normalized_isbn | uri %][% AmazonAssocTag | uri %]">
                        [% END %]
                            <img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn | html %].01.MZZZZZZZ.jpg" alt="Cover image" /></a>
                    [% END %]

                    [% IF ( BakerTaylorEnabled && bt_id ) %]
                        [% IF BakerTaylorBookstoreURL %]
                            [% IF ( OPACURLOpenInNewWindow ) %]
                                <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>
                            [% ELSE %]
                                <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
                            [% END %]
                        [% ELSE %]
                            <img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" />

                                        <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>
                                    [% END %]
                                    [% IF IDREF and MARCAUTHOR.unimarc3 %]
                                        <a href="/cgi-bin/koha/opac-idref.pl?unimarc3=[% MARCAUTHOR.unimarc3 | uri %]" title="IdRef" rel="gb_page_center[600,500]">IdRef</a>
                                    [% END %]
                                    [% UNLESS ( loop.last ) %]|[% END %]
                                [% END # /FOREACH MARCAUTHORS %]


                                        [% IF ( OPACURLOpenInNewWindow ) %]
                                            [% IF trackclicks == 'track' || trackclicks == 'anonymous' %]
                                                <a href="/cgi-bin/koha/tracklinks.pl?uri=[% MARCurl.MARCURL |url%]&amp;biblionumber=[% biblio.biblionumber | uri %]" title="[% MARCurl.MARCURL | html %]" target="_blank" rel="noreferrer">
                                            [% ELSE %]
                                                <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]" target="_blank" rel="noreferrer">
                                            [% END %]
                                        [% ELSE %]
                                            [% IF trackclicks == 'track' || trackclicks == 'anonymous' %]
                                                <a href="/cgi-bin/koha/tracklinks.pl?uri=[% MARCurl.MARCURL |url%]&amp;biblionumber=[% biblio.biblionumber | uri %]" title="[% MARCurl.MARCURL | html %]">
                                            [% ELSE %]
                                                <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]">
                                            [% END %]
                                        [% END %]
                                        [% MARCurl.linktext | html %]</a>

                    [% IF shelves.count %]
                        <span class="results_summary lists"><span class="label">List(s) this item appears in: </span>
                        [% FOREACH s IN shelves %]
                            <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a>
                            [% IF ( loop.last ) %][% ELSE %]|[% END %]
                        [% END %]
                        </span>

                    [% IF ( BakerTaylorContentURL ) %]
                        <span class="results_summary">
                        <span class="label">Enhanced content: </span>
                              [% IF ( OPACURLOpenInNewWindow ) %]<a href="[% BakerTaylorContentURL | uri %]" target="_blank" rel="noreferrer">Content Cafe</a>[% ELSE %]<a href="[% BakerTaylorContentURL | html %]">Content Cafe</a>[% END %]
                        </span>
                    [% END # / IF BakerTaylorContentURL %]


                                [% IF ( LibraryThingForLibrariesID ) %]
                                    <li id="tab_LTFLreviews">
                                        <script src="https://www.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID | html %]"></script>
                                        <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>
                                    </li>
                                [% END %]
                            [% END %]


                    <div id="holdings">
                        [% IF too_many_items %]
                            <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>
                        [% ELSIF ( itemloop.size ) %]
                            [% INCLUDE items_table items=itemloop tab="holdings" table_id="holdingst" %]
                            [% IF Koha.Preference('OPACAcquisitionDetails') and acquisition_details.total_quantity > 0 %]

                                [% FOREACH MARCNOTE IN MARCNOTES %]
                                    <p>
                                    [% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
                                        <a href="[% MARCNOTE.marcnote | uri %]">[% MARCNOTE.marcnote | html %]</a>
                                    [% ELSE %]
                                        [% MARCNOTE.marcnote FILTER html_line_break | html %]
                                    [% END %]

                                    </table>
                                [% END # / IF subscription.latestserials %]
                            [% END # / FOREACH subscriptions %]
                            <p class="subscription_moredetails"><a href="opac-serial-issues.pl?biblionumber=[% biblio.biblionumber | uri %]">More details</a></p>
                        </div> <!-- / #subscriptions -->
                    [% END # IF subscriptionsnumber %]


                                            [% UNLESS ( item_level_itypes ) %]
                                                <td>[% XISBN.description | html %]</td>
                                            [% END %]
                                            <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% XISBN.biblionumber | uri %]">[% XISBN.title | html %]</a>
                                                [% IF ( XISBN.author ) %]<span> by </span>[% XISBN.author | html %][% END %]
                                                [% IF ( XISBN.copyrightdate ) %]<span> &copy;</span>[% XISBN.copyrightdate | html %][% END %]
                                                [% IF ( XISBN.publishercode ) %]

                        <ul class="pg_menu clearfix">
                            <li class="left_results">
                                [% IF ( previousBiblionumber ) %]
                                    <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>
                                [% ELSE %]
                                    <span>Previous</span>
                                [% END %]
                            </li>
                            [%# busc is already URI encoded %]
                            <li class="back_results"><a href="opac-search.pl?[% busc | uri %]" title="Back to the results search list">Back to results</a></li>
                            <li class="right_results">
                                [% IF ( nextBiblionumber ) %]
                                    <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>
                                [% ELSE %]
                                    <span>Next</span>
                                [% END %]

                                        [% ELSE %]
                                            <li class="li_pag_[% loop.count | html %]">
                                        [% END %]
                                        <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>
                                    [% END %]
                                </ul>
                            </div>

                                <ul id="ul_pagination_lists">
                                    [% FOREACH listitem IN listResults %]
                                        [% IF ( listitem.biblionumber == biblionumber ) %]
                                            <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>
                                        [% ELSE %]
                                            <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>
                                        [% END %]
                                    [% END %]
                                </ul>

        [% IF ( LibraryThingForLibrariesID ) %]
            <script src="https://ltfl.librarything.com/forlibraries/widget.js?systype=koha&amp;id=[% LibraryThingForLibrariesID | html %]"></script>
            <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>
        [% END %]

        [% IF ( NovelistSelectProfile && ( normalized_isbn || normalized_upc ) ) %]

                            <link property="businessFunction" href="http://purl.org/goodrelations/v1#LeaseOut">
                            <span class="[% ITEM_RESULT.holding_branch_opac_info ? 'branch-info-tooltip-trigger' : '' %]" title="">
                                [% IF ( ITEM_RESULT.branchurl ) %]
                                    <a href="[% ITEM_RESULT.branchurl | uri %]">[% ITEM_RESULT.branchname | html %]</a>
                                [% ELSE %]
                                    <span>[% ITEM_RESULT.branchname | html %]</span>
                                [% END %]

                                [% IF Branches.GetURL( ITEM_RESULT.homebranch ) %]
                                    [% home_branch_url = Branches.GetURL( ITEM_RESULT.homebranch ) | html %]
                                    [% IF ( home_branch_url ) %]
                                         <a href="[% home_branch_url | uri %]">[% Branches.GetName( ITEM_RESULT.homebranch ) | html %]</a>
                                    [% ELSE %]
                                        <span>[% Branches.GetName( ITEM_RESULT.homebranch ) | html %]</span>
                                    [% END %]

                                [% IF ( ITEM_RESULT.itemnumber == starting_itemnumber ) %]
                                    (<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>)
                                [% ELSE %]
                                    (<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>)
                                [% END %]
                            [% END %]
                        [% END %]

                                    [% IF Koha.Preference("OPACURLOpenInNewWindow") %]
                                    <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>
                                    [% ELSE %]
                                    <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>
                                    [% END %]

                                [% ELSE %]
                                    [% IF Koha.Preference("OPACURLOpenInNewWindow") %]
                                    <a target="_blank" rel="noreferrer" href="[% ITEM_RESULT.uri | html %]" property="url">[% ITEM_RESULT.uri | html %]</a>
                                    [% ELSE %]
                                    <a href="[% ITEM_RESULT.uri | uri %]" property="url">[% ITEM_RESULT.uri | html %]</a>
                                    [% END %]
                                [% END %]
                            [% END %]

                                [% FOREACH r IN ITEM_RESULT.course_reserves %]
                                    [% IF r.course.enabled == 'yes' %]
                                        <p>
                                            <a href="opac-course-details.pl?course_id=[% r.course.course_id | uri %]">
                                            [% r.course.course_name | html %]
                                            <!--[% IF r.course.course_number %] [% r.course.course_number | html %] [% END %]-->
                                            [% IF r.course.section %] [% r.course.section | html %] [% END %]

Lines 66-72 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt (-1 / +1 lines)
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&shelfnumber=[% shelf.shelfnumber \| html %]" class="cancel close" data-dismiss="modal">Cancel</a>	69	<a href="/cgi-bin/koha/opac-shelves.pl?op=view&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 ) %]

Lines 16-22 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt (-1 / +1 lines)
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

Lines 37-44 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt (-2 / +2 lines)
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>




                            <p>
                                [% Koha.Preference('ILLModuleCopyrightClearance') | $raw %]
                            </p>
                            <a href="?method=create&stage=copyrightclearance&backend=[% whole.value.backend | uri %]"
                               class="btn btn-sm btn-default"><i class="fa fa-check"></i> Yes</a>
                            <a href="/cgi-bin/koha/opac-illrequests.pl"
                               class="btn btn-sm btn-default"><i class="fa fa-times"></i> No</a>

                                </button>
                                <ul id="backend-dropdown-options" class="dropdown-menu nojs" aria-labelledby="ill-backend-dropdown">
                                    [% FOREACH backend IN backends %]
                                        <li><a href="/cgi-bin/koha/opac-illrequests.pl?method=create&amp;backend=[% backend | uri %]">[% backend | html %]</a></li>
                                    [% END %]
                                </ul>
                        [% ELSE %]

                                    <td>[% request.placed | html %]</td>
                                    <td>[% request.updated | html %]</td>
                                    <td>
                                        <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>
                                    </td>
                                </tr>
                            [% END %]

                                    [% IF request.biblio_id %]
                                        <li>
                                            <label for="biblio">Requested item:</label>
                                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% request.biblio_id | uri %]">Click here to view</a>
                                        </li>
                                    [% END %]
                                    <li>

Lines 94-100 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt (-1 / +1 lines)
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 %]&imagenumber=[% img \| html %]" onclick="showCover([% img \| html %]); return false;">	97	<a href="/cgi-bin/koha/opac-imageviewer.pl?biblionumber=[% biblionumber \| url %]&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 %]&thumbnail=1" alt="Thumbnail"/>	99	<img class="thumbnail selected" id="[% img \| html %]" src="/cgi-bin/koha/opac-image.pl?imagenumber=[% img \| html %]&thumbnail=1" alt="Thumbnail"/>
100	[% ELSE %]	100	[% ELSE %]

Lines 71-77 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-1 / +1 lines)
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.

Lines 126-132 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (-1 / +1 lines)
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">

Lines 44-50 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt (-2 / +2 lines)
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 & 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 & 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>

Lines 65-71 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt (-1 / +1 lines)
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 %]

Lines 96-102 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt (-2 / +2 lines)
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 & Taylor" src="[% BakerTaylorImageURL \| html %][% bt_id \| html %]" /></a>	116	<a href="https://[% BakerTaylorBookstoreURL \| uri %][% bt_id \| uri %]"><img alt="See Baker & 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 %]




                        <strong>No results found!</strong>
                        <p>
                            [% IF ( searchdesc ) %]
                                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>
                            [% ELSE %]
                                You did not specify any search criteria.
                            [% END %]
                        </p>
                        [% IF ( ReturnPath ) %]
                           <div class="returntosearch">
                                <p><a href="[% ReturnPath | uri %]">Return to the last advanced search</a></p>
                            </div>
                        [% END %]
                        [% IF ( OPACNoResultsFound ) %]

                                [% END %]
                            ).
                        [% END %]
                        <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>
                    [% END # / IF total %]
                    </p>
                [% END # / IF searchdesc %]

                        <ul style="list-style: none;">
                            [% FOREACH SPELL_SUGGES IN SPELL_SUGGEST %]
                            <li>
                                <a href="/cgi-bin/koha/opac-search.pl?q=[% SPELL_SUGGES.spsuggestion | uri %]">[% SPELL_SUGGES.spsuggestion | html %]</a>
                            </li>
                            [% END %]
                        </ul>

                    [% IF ( total ) %]
                        [% IF ( ReturnPath ) %]
                            <div class="returntosearch">
                                <p><a href="[% ReturnPath | uri %]">Return to the last advanced search</a></p>
                            </div>
                        [% END %]
                    [% END %]

                                                    [% IF ( BakerTaylorEnabled && BakerTaylorBookstoreURL ) %]
                                                        [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %]
                                                        [% IF ( bt_id ) %]
                                                            <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]">
                                                                <img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" />
                                                            </a>
                                                        [% ELSE %]

                                                    [% IF ( IDreamBooksResults && SEARCH_RESULT.normalized_isbn ) %]
                                                        <div class="idbresult" style="display: none;">
                                                            [% IF ( IDreamBooksReviews ) %]
                                                                <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]#idb_critic_reviews">
                                                            [% ELSE %]
                                                                <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">
                                                            [% END %]
                                                            [% SEARCH_RESULT.normalized_isbn | html %]</a>
                                                        </div>

                                                        <span class="label">Lists:</span>
                                                            <ul>
                                                                [% FOREACH shelf IN SEARCH_RESULT.shelves %]
                                                                    <li><a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]">[% shelf.shelfname | html %]</a></li>
                                                                    [%~ UNLESS loop.last %], [% ELSE %].[% END ~%]
                                                                [% END %]
                                                            </ul>

Lines 48-54 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt (-1 / +1 lines)
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>




                                                    <tr>
                                                        <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
                                                        <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
                                                        <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>
                                                        <td>[% s.total | html %]</td>
                                                    </tr>
                                                [% END %]

                                                <tr>
                                                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
                                                    <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
                                                    <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>
                                                    <td>[% s.total | html %]</td>
                                                </tr>
                                            [% END %]

                                                    <tr>
                                                        <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
                                                        <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
                                                        <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
                                                        <td>[% s.total | html %]</td>
                                                    </tr>
                                                [% END %]

                                                    <tr>
                                                        <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
                                                        <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
                                                        <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
                                                        <td>[% s.total | html %]</td>
                                                    </tr>
                                                [% END %]




    <div class="main">
        <ul class="breadcrumb">
            <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
            <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]">Details for [% bibliotitle | html %]</a> <span class="divider">&rsaquo;</span></li>
            <li><a href="#">Issues for a subscription</a></li>
        </ul>


                                    [% IF ( subscription_LOO.letter ) %]
                                        [% IF ( loggedinusername ) %]
                                            [% IF ( subscription_LOO.hasalert ) %]
                                                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">
                                                    Cancel email notification
                                                </a>
                                            [% ELSE %]
                                                <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">
                                                    Subscribe to email notification on new issues
                                                </a>
                                            [% END %]





        [% IF shelf and shelf.is_private %]
            [% IF op == 'view' OR op == 'edit_form' %]
                <li><span class="divider">&rsaquo;</span> <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=[% PRIVATE | uri %]">Your lists</a></li>
            [% ELSE %]
                <li><span class="divider">&rsaquo;</span> Your lists</li>
            [% END %]
        [% ELSIF shelf AND shelf.is_public %]
            [% IF op == 'view' %]
                <li><span class="divider">&rsaquo;</span> <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=[% PUBLIC | uri %]">Public lists</a></li>
            [% ELSE %]
                <li><span class="divider">&rsaquo;</span> Public lists</li>
            [% END %]

                    [% IF shelf AND op == 'view' %]
                        <h3>
                            [% shelf.shelfname | html %]
                            <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">
                                <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"/>
                            </a>
                        </h3>

                             <div id="toolbar" class="toolbar clearfix">
                                 <div class="list-actions">
                                    <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?op=add_form">New list</a> <span class="sep">|</span>
                                    <a href="/cgi-bin/koha/opac-downloadshelf.pl?shelfnumber=[% shelf.shelfnumber | uri %]" class="download" data-toggle="modal" data-target="#modalWin">Download list</a>

                                    [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
                                        <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>
                                    [% END %]

                                    <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>

                                            <input type="submit" class="deleteshelf" value="Delete list" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST);"/>
                                        </form>
                                        [% IF category == PRIVATE && Koha.Preference('OpacAllowSharingPrivateLists') %]
                                            <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% shelf.shelfnumber | uri %]" class="sharelist">Share list</a>
                                        [% END %]
                                    [% ELSIF category == PRIVATE # not manageshelf and private means shared %]
                                        <form action="/cgi-bin/koha/opac-shelves.pl" method="post" class="form-inline">

                                                        [% IF ( BakerTaylorEnabled ) %]
                                                            [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) | html %]
                                                            [% IF ( bt_id ) %]
                                                                <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
                                                            [% ELSE %]
                                                                <span class="no-image">No cover image available</span>
                                                            [% END %]

                            <fieldset class="action">
                                <input type="submit" value="Save" class="btn" />
                                [% IF referer == 'view' %]
                                    <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel">Cancel</a>
                                [% ELSE %]
                                     <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=[% PRIVATE | uri %]" class="cancel">Cancel</a>
                                 [% END %]

                            </fieldset>

                                        [% FOREACH s IN shelves %]
                                            [% SET contents = s.get_contents %]
                                            <tr>
                                                <td><a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a></td>
                                                <td>[% IF contents.count %][% contents.count | html %] [% IF contents.count == 1 %]item[% ELSE %]items[% END %][% ELSE %]Empty[% END %]</td>
                                                <td>
                                                    [% IF s.is_private %]

                                                        </form>
                                                    [% END %]
                                                    [% IF s.is_private AND s.can_be_managed( loggedinusernumber ) AND Koha.Preference('OpacAllowSharingPrivateLists') %]
                                                        <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% s.shelfnumber | uri %]" class="sharelist">Share</a>
                                                    [% END %]
                                                    [% IF s.is_shared_with( loggedinusernumber ) %]
                                                        <form action="opac-shelves.pl" method="post" class="form-inline">

Lines 17-23 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt (-1 / +1 lines)
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 & 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 & 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 %]

Lines 29-35 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt (-2 / +2 lines)
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 & Taylor" src="[% review.BakerTaylorImageURL \| html %][% bt_id \| html %]" /></a>	143	<a href="https://[% review.BakerTaylorBookstoreURL \| uri %][% bt_id \| uri %]"><img alt="See Baker & 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 %]

Lines 41-47 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt (-1 / +1 lines)
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&q="[% LOO.entry \| html %]"" style="font-size:[% LOO.weight \| html %]px;">[% LOO.entry \| html %]</a>	44	<a href="/cgi-bin/koha/opac-search.pl?idx=su&q="[% LOO.entry \| uri %]"" 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>

Lines 80-86 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt (-1 / +1 lines)
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>





                                                    [% IF ( OPACAmazonCoverImages ) %]
                                                        [% IF ( ISSUE.normalized_isbn ) %]
                                                            <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>
                                                        [% ELSE %]
                                                            <a href="#"><span class="no-image">No cover image available</span></a>
                                                        [% END %]

                                                    [% IF ( BakerTaylorEnabled ) %]
                                                        [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) | html %]
                                                        [% IF ( bt_id ) %]
                                                            <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
                                                        [% ELSE %]
                                                            <span class="no-image">No cover image available</span><!-- BakerTaylor needs normalized_upc or normalized_isbn! -->
                                                        [% END %]

                                                    [% IF ISSUE.renewed %]<span class="blabel label-success">Renewed!</span><br />[% END %]
                                                    [% IF ( ISSUE.status ) %]
                                                        [% IF ( canrenew ) %]
                                                            <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>
                                                        [% END %]
                                                        [% IF ISSUE.renewalfee > 0 %]
                                                            <span class="renewalfee">Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) | html %]': [% ISSUE.renewalfee | $Price %]</span>

                                            [% FOREACH i IN r.issues %]
                                                <tr>
                                                    <td>
                                                        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber | uri %]">
                                                            [% i.item.biblio.title | html %][% IF ( i.item.enumchron ) %] [% i.item.enumchron | html %][% END %]
                                                        </a>
                                                    </td>

                                                    <td class="jacketcell">
                                                    [% IF ( OPACAmazonCoverImages ) %]
                                                        [% IF ( OVERDUE.normalized_isbn ) %]
                                                            <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>
                                                        [% ELSE %]
                                                            <a href="#"><span class="no-image">No cover image available</span></a>
                                                        [% END %]

                                                    [% IF ( BakerTaylorEnabled ) %]
                                                        [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) | html %]
                                                        [% IF ( bt_id ) %]
                                                            <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
                                                        [% ELSE %]
                                                            <span class="no-image">No cover image available</span><!-- BakerTaylor needs normalized_upc or normalized_isbn! -->
                                                        [% END %]

                                                            Account frozen
                                                        [% ELSIF ( OVERDUE.status ) %]
                                                            [% IF ( canrenew ) %]
                                                                <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% OVERDUE.itemnumber | uri %]&amp;bornum=[% OVERDUE.borrowernumber | uri %]">Renew</a>
                                                            [% END %]
                                                                <span class="renewals">([% OVERDUE.renewsleft | html %] of [% OVERDUE.renewsallowed | html %] renewals remaining)</span>
                                                        [% ELSIF ( OVERDUE.norenew_overdue ) %]

Lines 239-245 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-1 / +1 lines)
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 %]

Lines 32-38 Link Here

(-)a/misc/cronjobs/rss/lastAcquired-1.0.tt (-1 / +1 lines)
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&and_or=and&excluding=&operator=contains&value=[% i.author \| html %]&resultsperpage=20&orderby=biblio.title&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&and_or=and&excluding=&operator=contains&value=[% i.author \| html %]&resultsperpage=20&orderby=biblio.title&op=do_search">More by this Author</a>[% END %]
36	]]></description>	36	]]></description>
37	</item>	37	</item>
38	[% END %]	38	[% END %]

Lines 25-31 Link Here

(-)a/misc/cronjobs/rss/lastAcquired-2.0.tt (-2 / +1 lines)
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&and_or=and&excluding=&operator=contains&value=[% i.author \| html %]&resultsperpage=20&orderby=biblio.title&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&and_or=and&excluding=&operator=contains&value=[% i.author \| html %]&resultsperpage=20&orderby=biblio.title&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

Lines 12-24 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc (-7 / +7 lines)
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 %]&basketno=[% basketno \| html %]">From a suggestion</a></li>	15	<li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]">From a suggestion</a></li>
16	<li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid \| html %]&basketno=[% basketno \| html %]">From a subscription</a></li>	16	<li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]">From a subscription</a></li>
17	<li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| html %]&basketno=[% basketno \| html %]">From a new (empty) record</a></li>	17	<li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]">From a new (empty) record</a></li>
18	<li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid \| html %]&basketno=[% basketno \| html %]">From an external source</a></li>	18	<li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]">From an external source</a></li>
19	<li><a href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basketno \| html %]&booksellerid=[% booksellerid \| html %]"> From a new file</a></li>	19	<li><a href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basketno \| uri %]&booksellerid=[% booksellerid \| uri %]"> From a new file</a></li>
20	<li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid \| html %]&basketno=[% basketno \| html %]"> From a staged file</a></li>	20	<li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid \| uri %]&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 %]&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 %]&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">

Lines 14-20 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc (-5 / +5 lines)
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&op=export&authid=[% authid \| html %]">MADS (XML)</a></li>	47	<li><a href="/cgi-bin/koha/authorities/export.pl?format=mads&op=export&authid=[% authid \| uri %]">MADS (XML)</a></li>
48	<li><a href="/cgi-bin/koha/authorities/export.pl?format=marcxml&op=export&authid=[% authid \| html %]">MARCXML</a></li>	48	<li><a href="/cgi-bin/koha/authorities/export.pl?format=marcxml&op=export&authid=[% authid \| uri %]">MARCXML</a></li>
49	<li><a href="/cgi-bin/koha/authorities/export.pl?format=marc8&op=export&authid=[% authid \| html %]">MARC (non-Unicode/MARC-8)</a></li>	49	<li><a href="/cgi-bin/koha/authorities/export.pl?format=marc8&op=export&authid=[% authid \| uri %]">MARC (non-Unicode/MARC-8)</a></li>
50	<li><a href="/cgi-bin/koha/authorities/export.pl?format=utf8&op=export&authid=[% authid \| html %]">MARC (Unicode/UTF-8)</a></li>	50	<li><a href="/cgi-bin/koha/authorities/export.pl?format=utf8&op=export&authid=[% authid \| uri %]">MARC (Unicode/UTF-8)</a></li>
51	</ul>	51	</ul>
52	</div>	52	</div>
53	[% END %]	53	[% END %]

Lines 5-17 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc (-3 / +3 lines)
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	]

Lines 73-128 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-15 / +15 lines)
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 %]&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 %]&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&modules=MEMBERS&modules=circulation&object=[% patron.borrowernumber \| html %]&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&modules=MEMBERS&modules=circulation&object=[% patron.borrowernumber \| uri %]&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 %]

Lines 15-21 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc (-2 / +2 lines)
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 _ "&multi_hold=1&biblionumbers=" _ biblionumbers %]	21	[% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&multi_hold=1&biblionumbers=" _ biblionumbers %]
Lines 23-29 Link Here
23	[% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&biblionumber=" _ biblionumber %]	23	[% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&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>

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc (-4 / +4 lines)
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 ) %]&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 ) %]&sort_by=[% sort_by \|url %][% END %]&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 ) %]&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 ) %]&sort_by=[% sort_by \|url %][% END %]&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 _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]	34	[% SET local_url = url _ "&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 _ "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]	38	[% SET local_url = url _ "&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 %]&offset=[% offset \|url %][% END %]&expand=[% facets_loo.expand \|url %]#[% facets_loo.type_id \|url %]">Show more</a>	48	<a href="[% url \| uri %][% IF offset %]&offset=[% offset \|url %][% END %]&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>

Lines 8-21 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc (-2 / +2 lines)
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&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&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&categorycode=[% category.categorycode \| html %]&quickadd=true">[% category.description \| html %]</a></li>[% END %]	18	[% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode \| uri %]&quickadd=true">[% category.description \| html %]</a></li>[% END %]
19	</ul>	19	</ul>
20	</div>	20	</div>
21	[% END %]	21	[% END %]

Lines 1-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc (-3 / +3 lines)
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 %]&op=new">Create routing list</a></li>	9	<li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid \| uri %]&op=new">Create routing list</a></li>
10	[% END %]	10	[% END %]
11	[% END %]	11	[% END %]
12	[% END %]	12	[% END %]

Lines 1-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc (-6 / +6 lines)
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 %]&op=do_search">Invoices</a></li>	7	<li><a href="/cgi-bin/koha/acqui/invoices.pl?supplierid=[% booksellerid \| uri %]&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 %]&basketno=[% basketno \| html %]&owner=1">Uncertain prices</a></li>	9	<li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&owner=1">Uncertain prices</a></li>
10	[% ELSE %]	10	[% ELSE %]
11	<li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid \| html %]&owner=1">Uncertain prices</a></li>	11	<li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid \| uri %]&owner=1">Uncertain prices</a></li>
12	[% END %] [% END %]	12	[% END %] [% END %]
13	</ul>	13	</ul>
14	</div>	14	</div>

Lines 113-126 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-4 / +4 lines)
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		125
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 %]&fund_code=[% loop_budge.budget_code \| html %]">	137	<a href="ordered.pl?fund=[% loop_budge.budget_id \| uri %]&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 %]&fund_code=[% loop_budge.budget_code \| html %]">	146	<a href="spent.pl?fund=[% loop_budge.budget_id \| uri %]&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 %]

Lines 88-94 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-3 / +3 lines)
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&importid=[% biblio.import_record_id \| html %]" class="previewData">Card</a> \| <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| html %]&basketno=[% basketno \| html %]&breedingid=[% biblio.import_record_id \| html %]&import_batch_id=[% biblio.import_batch_id \| html %]&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&importid=[% biblio.import_record_id \| html %]" class="previewData">Card</a> \| <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| html %]&basketno=[% basketno \| html %]&breedingid=[% biblio.import_record_id \| html %]&import_batch_id=[% biblio.import_batch_id \| html %]&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 %]&basketno=[% basketno \| html %]&booksellerid=[% booksellerid \| html %]">Add orders</a></td>	416	<td><a href="[% batch_lis.scriptname \| uri %]?import_batch_id=[% batch_lis.import_batch_id \| uri %]&basketno=[% basketno \| uri %]&booksellerid=[% booksellerid \| uri %]">Add orders</a></td>
417	</tr>	417	</tr>
418	[% END %]	418	[% END %]
419	</tbody>	419	</tbody>

Lines 130-138 function submitForm(form) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-9 / +9 lines)
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&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&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 %]

Lines 49-68 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt (-3 / +3 lines)
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 %]

Lines 159-184 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-5 / +5 lines)
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		168
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		174
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 %]

Lines 20-26 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt (-3 / +3 lines)
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 %]&op=download&view=1&file_id=[% f.file_id \| html %]">[% f.file_name \| html %]</a></td>	48	<td><a href="?invoiceid=[% invoiceid \| uri %]&op=download&view=1&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 %]&op=delete&file_id=[% f.file_id \| html %]">Delete</a></td>	55	<td><a class="delete_file" href="?invoiceid=[% invoiceid \| html %]&op=delete&file_id=[% f.file_id \| html %]">Delete</a></td>
56	<td><a href="?invoiceid=[% invoiceid \| html %]&op=download&file_id=[% f.file_id \| html %]">Download</a></td>	56	<td><a href="?invoiceid=[% invoiceid \| uri %]&op=download&file_id=[% f.file_id \| uri %]">Download</a></td>
57	</tr>	57	</tr>
58	[% END %]	58	[% END %]
59	</tbody>	59	</tbody>

Lines 48-55 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-6 / +6 lines)
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&invoiceid=[% invoice.invoiceid \| html %]&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&invoiceid=[% invoice.invoiceid \| uri %]&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&invoiceid=[% invoice.invoiceid \| html %]&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&invoiceid=[% invoice.invoiceid \| uri %]&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&invoiceid=[% invoice.invoiceid \| html %]&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&invoiceid=[% invoice.invoiceid \| uri %]&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>

Lines 51-57 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt (-4 / +4 lines)
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 %]&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 %]&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 %]&basketno=[% basketno \| html %]&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 %]&basketno=[% basketno \| uri %]&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>

Lines 41-47 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-3 / +3 lines)
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&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&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 %]&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 %]&op=show">suggestion #[% suggestionid \| html %]</a>)
245	</li>	245	</li>
246	</ol>	246	</ol>
247	</fieldset>	247	</fieldset>

Lines 40-58 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-3 / +3 lines)
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 %]&booksellerid=[% order.booksellerid \| html %]&basketno=[% order.basketno \| html %]">[% order.ordernumber \| html %]</a>	49	<a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber \| uri %]&booksellerid=[% order.booksellerid \| uri %]&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 %]

Lines 130-146 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-29 / +29 lines)
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 %]&booksellerid=[% loop_order.booksellerid \| html %]">[% loop_order.ordernumber \| html %]</a></td>	141	<td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber \| uri %]&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 ) %] – [% loop_order.isbn \| html %][% END %]	145	[% IF ( loop_order.isbn ) %] – [% 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 %]&op=show">suggestion #[% loop_order.suggestionid \| html %]</a>)	155	(<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_order.suggestionid \| uri %]&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 %]&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 %]&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 %]&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 %]&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 %]&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 %]&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&id=[% loop_order.biblionumber \| html %]" class="previewData">Card</a>	172	<a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&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 %]&invoiceid=[% invoiceid \| html %]">Receive</a>	180	<a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber \| uri %]&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 %]&booksellerid=[% booksellerid \| html %]">[% order.ordernumber \| html %]</a>	289	<a href="neworderempty.pl?ordernumber=[% order.ordernumber \| uri %]&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 %]&booksellerid=[% booksellerid \| html %]" title="Original order line">[% order.parent_ordernumber \| html %]</a>)	291	(<a href="neworderempty.pl?ordernumber=[% order.parent_ordernumber \| uri %]&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 %]&op=show">suggestion #[% order.suggestionid \| html %]</a>)	319	(<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% order.suggestionid \| uri %]&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&id=[% order.biblionumber \| html %]" class="previewData">Card</a>	325	<a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&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>

Lines 28-34 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-7 / +7 lines)
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 %]&startfrom=[% prevstartfrom \| html %][% IF ( datefrom ) %]&datefrom=[% datefrom \| html %][% END %][% IF ( dateto ) %]&dateto=[% dateto \| html %][% END %][% IF ( code ) %]&filter=[% code \| html %][% END %][% IF ( orderby ) %]&orderby=[% orderby \| html %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage \| html %][% END %]&type=intra"><< Previous</a>	111	<a href="parcels.pl?booksellerid=[% booksellerid \| uri %]&startfrom=[% prevstartfrom \| uri %][% IF ( datefrom ) %]&datefrom=[% datefrom \| uri %][% END %][% IF ( dateto ) %]&dateto=[% dateto \| uri %][% END %][% IF ( code ) %]&filter=[% code \| uri %][% END %][% IF ( orderby ) %]&orderby=[% orderby \| uri %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage \| uri %][% END %]&type=intra"><< 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 %]&startfrom=[% number.startfrom \| html %][% IF ( number.datefrom ) %]&datefrom=[% number.datefrom \| html %][% END %][% IF ( number.dateto ) %]&dateto=[% number.dateto \| html %][% END %][% IF ( number.code ) %]&filter=[% number.code \| html %][% END %][% IF ( number.orderby ) %]&orderby=[% number.orderby \| html %][% END %][% IF ( number.resultsperpage ) %]&resultsperpage=[% number.resultsperpage \| html %][% END %]&type=intra">[% number.number \| html %]</a>	117	<a href="parcels.pl?booksellerid=[% booksellerid \| uri %]&startfrom=[% number.startfrom \| uri %][% IF ( number.datefrom ) %]&datefrom=[% number.datefrom \| uri %][% END %][% IF ( number.dateto ) %]&dateto=[% number.dateto \| uri %][% END %][% IF ( number.code ) %]&filter=[% number.code \| uri %][% END %][% IF ( number.orderby ) %]&orderby=[% number.orderby \| uri %][% END %][% IF ( number.resultsperpage ) %]&resultsperpage=[% number.resultsperpage \| uri %][% END %]&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 %]&startfrom=[% nextstartfrom \| html %][% IF ( datefrom ) %]&datefrom=[% datefrom \| html %][% END %][% IF ( dateto ) %]&dateto=[% dateto \| html %][% END %][% IF ( code ) %]&filter=[% code \| html %][% END %][% IF ( orderby ) %]&orderby=[% orderby \| html %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage \| html %][% END %]&type=intra">Next >></a>	121	<a href="parcels.pl?booksellerid=[% booksellerid \| uri %]&startfrom=[% nextstartfrom \| uri %][% IF ( datefrom ) %]&datefrom=[% datefrom \| uri %][% END %][% IF ( dateto ) %]&dateto=[% dateto \| uri %][% END %][% IF ( code ) %]&filter=[% code \| uri %][% END %][% IF ( orderby ) %]&orderby=[% orderby \| uri %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage \| uri %][% END %]&type=intra">Next >></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>

Lines 42-48 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-3 / +3 lines)
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 %]

Lines 65-71 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-3 / +3 lines)
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&contractnumber=[% contract.contractnumber \| html %]&booksellerid=[% contract.booksellerid \| html %]">[% contract.contractname \| html %]</a>	337	<a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber \| uri %]&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>

Lines 25-31 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-4 / +4 lines)
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 %]&booksellerid=[% booksellerid \| html %]&basketno=[% uncertainpriceorder.basketno \| html %]">	105	<a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber \| uri %]&booksellerid=[% booksellerid \| uri %]&basketno=[% uncertainpriceorder.basketno \| uri %]">
106	Edit	106	Edit
107	</a>	107	</a>
108	</td>	108	</td>

Lines 24-48 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt (-9 / +9 lines)
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&booksellerid=[% loo.booksellerid \| html %]&contractnumber=[% loo.contractnumber \| html %]">[% loo.contractname \| html %]</a>	154	<a href="[% loo.script_name \| uri %]?op=add_form&booksellerid=[% loo.booksellerid \| uri %]&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&contractnumber=[% loo.contractnumber \| html %]&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&contractnumber=[% loo.contractnumber \| uri %]&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&contractnumber=[% loo.contractnumber \| html %]&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&contractnumber=[% loo.contractnumber \| uri %]&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&booksellerid=[% booksellerid \| html %]">Add a contract</a>.	170	<a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid \| uri %]">Add a contract</a>.
171	[% END %]	171	[% END %]
172	</div>	172	</div>
173	[% END %]	173	[% END %]

Lines 15-21 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt (-4 / +4 lines)
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 %]&tagsubfield=[% tagsubfield \| html %]&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 %]&tagsubfield=[% tagsubfield \| uri %]&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>

Lines 119-125 Item types administration Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt (-5 / +5 lines)
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&itemtype=[% itemtype.itemtype \| html %]">	348	<a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&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&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&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&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&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 %]

Lines 21-35 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt (-10 / +10 lines)
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>

Lines 43-49 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt (-3 / +3 lines)
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 %]

Lines 44-50 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt (-4 / +4 lines)
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&op=do_search&q=an=[% authid \| html %]">[% count \| html %] record(s)</a>	47	Used in <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&op=do_search&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&marclist=[% subfiel.link \| html %]&operator==&type=intranet&value=[% subfiel.marc_value \|url %]">	84	<a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&marclist=[% subfiel.link \| uri %]&operator==&type=intranet&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 %]