diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc index 4231fc318c..260d328fd1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc @@ -68,10 +68,8 @@ [% END %] [% BLOCK mergetarget %] -

Destination record

-
+
    -
    -
    +
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt index 30ff7a6721..3e7e074874 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt @@ -56,7 +56,7 @@ Results [% from | html %] to [% to | html %] of [% total | html %]

    -
    +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt index df35be76ae..0b34c3ffe5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -93,7 +93,6 @@ [%# display the search results %] -
    [% IF ( total ) %]

    Records found in the catalog

    @@ -101,7 +100,7 @@ [% breeding_count | html %] result(s) found in reservoir
    [% pagination_bar | $raw %]
    -
    +
    Summary
    @@ -202,7 +201,6 @@ [% END %] [% END %] [% END # /IF total %] - [% IF ( query ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index e9a512c60e..6d3450fc0b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -74,74 +74,74 @@
    [% IF items %] [% SET date_fields = [ 'dateaccessioned', 'onloan', 'datelastseen', 'datelastborrowed', 'replacementpricedate' ] %] -
    -
     
    - - - - [% FOREACH item_header IN item_header_loop %] - - [% END %] - - - - [% FOREACH item IN items %] - [% SET can_be_edited = ! ( Koha.Preference('IndependentBranches') && ! logged_in_user.is_superlibrarian && item.homebranch != Branches.GetLoggedInBranchname() ) %] - [% IF item.itemnumber == itemnumber%] - [% UNLESS can_be_edited %] - - [% ELSE %] - - [% END %] - [% ELSE %] - [% UNLESS can_be_edited %] - - [% ELSE %] - - [% END %] +
    +
      - [% item_header.header_value | html %] -
    + + + + [% FOREACH item_header IN item_header_loop %] + [% END %] - [% UNLESS can_be_edited %] - - [% ELSE %] - - [% END %] - [% FOREACH header IN item_header_loop %] - [% SET attribute = header.attribute %] - [% IF header.attribute AND date_fields.grep('^' _ attribute _ '$').size %] - - [% ELSIF ( item.$attribute && ( attribute == 'price' || attribute == 'replacementprice' ) ) %] - - [% ELSE %] - - [% END %] - [% END %] - [% END %] - -
      + [% item_header.header_value | html %] +   -
    - - Actions - - -
    -     		[% item.$attribute | $KohaDates %][% item.$attribute | $Price %][% item.$attribute | html %]
    -
    + + + [% FOREACH item IN items %] + [% SET can_be_edited = ! ( Koha.Preference('IndependentBranches') && ! logged_in_user.is_superlibrarian && item.homebranch != Branches.GetLoggedInBranchname() ) %] + [% IF item.itemnumber == itemnumber%] + [% UNLESS can_be_edited %] + + [% ELSE %] + + [% END %] + [% ELSE %] + [% UNLESS can_be_edited %] + + [% ELSE %] + + [% END %] + [% END %] + [% UNLESS can_be_edited %] +   + [% ELSE %] + +
    + + Actions + + +
    + + [% END %] + [% FOREACH header IN item_header_loop %] + [% SET attribute = header.attribute %] + [% IF header.attribute AND date_fields.grep('^' _ attribute _ '$').size %] + [% item.$attribute | $KohaDates %] + [% ELSIF ( item.$attribute && ( attribute == 'price' || attribute == 'replacementprice' ) ) %] + [% item.$attribute | $Price %] + [% ELSE %] + [% item.$attribute | html %] + [% END %] + [% END %] + + [% END %] + + +
    [% END %]
    @@ -150,7 +150,7 @@
    -
    +
    [% IF (popup) %]