From b88ec7daeb9749d79ceca99277de2d0a1a3f26ae Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 13 Jan 2023 12:12:30 +0000 Subject: [PATCH] Bug 32633: Add 'page-section' to cataloging and authority pages This patch adds a "page-section" container div around the main section of cataloging and authority pages which lack it. This patch contains indentation changes, so please ignore whitespace when looking at the diff. Apply the patch and view the following pages to confirm that the main content is contained in a white box: - Cataloging -> Cataloging search results - Cataloging -> Edit items: The table of items and the item edit form should each be contained in a page-section. - Authorities -> Search results - Authorites -> Merge authorities: From the authorities search results list, click "Actions -> Merge" for one result, and then "Actions -> Merge" for another. - Click "Next" after selecting a merge reference. - The "Destination record" information should be contained in a page-section. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi --- .../prog/en/includes/merge-record.inc | 6 +- .../modules/authorities/searchresultlist.tt | 2 +- .../prog/en/modules/cataloguing/addbooks.tt | 4 +- .../prog/en/modules/cataloguing/additem.tt | 120 +++++++++--------- 4 files changed, 64 insertions(+), 68 deletions(-) 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

    [% 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 %] - +
    +
      - [% item_header.header_value | html %] -
    + + + + [% 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 %] [% END %] - [% ELSE %] [% UNLESS can_be_edited %] - + [% ELSE %] - - [% END %] - [% 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 %] -
  • Edit
    • -
  • Duplicate
    • -
  • Print label
    • -
  • Delete
    • + [% END %] - [% IF ( OPACBaseURL ) %] -
  • OPAC view
    • - [% END %] - - - [% 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 - -
    		+
    + + Actions + + +
    +     		[% item.$attribute | $KohaDates %][% item.$attribute | $Price %][% item.$attribute | html %][% item.$attribute | $KohaDates %][% item.$attribute | $Price %][% item.$attribute | html %]
    -
    + + +
    [% END %]
    @@ -150,7 +150,7 @@
    -
    +
    [% IF (popup) %] -- 2.39.5