From f7abff91915afe103e7d7a37fe64dd6721401da2 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 14 Nov 2022 16:48:22 +0000 Subject: [PATCH] Bug 32042: Add page-section to catalog's item detail view This patch adds a couple of .page-section divs to the item detail view in the catalog. A "clearfix" class is also added in order to make sure the sections don't overlap. To test, apply the patch and locate a bibliographic record in the catalog. - In the sidebar menu of the bibliographic detail view, click "Items." - On the item detail page, confirm that the information is displayed well. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/catalogue/moredetail.tt | 704 +++++++++--------- 1 file changed, 351 insertions(+), 353 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index bfb6c4712d..765c87fef4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -8,7 +8,7 @@ [% INCLUDE 'doc-head-open.inc' %] Item details for [% INCLUDE 'biblio-title-head.inc' %] › Catalog › Koha [% INCLUDE 'doc-head-close.inc' %] - + [% USE KohaDates %] @@ -47,55 +47,51 @@ [% INCLUDE 'cat-toolbar.inc' %]
- -

[% title | html %]

- [% IF ( subtitle ) %] -

[% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %]

- [% END %] - [% IF ( author ) %] -

by [% author | html %]

- [% END %] - -
-
-
    -
  1. Biblionumber: [% biblionumber | html %] 
    2. - [% UNLESS ( item_level_itypes ) %] -
  2. Item type: [% itemtypename | html %] 
    3. - [% END %] - [% IF ( rentalcharge ) %] -
  3. Rental charge:[% rentalcharge | $Price %] 
    4. - [% END %] - [% IF ( rentalcharge_daily ) %] -
  4. Daily rental charge:[% rentalcharge_daily | $Price %] 
    5. - [% END %] - [% IF ( rentalcharge_hourly ) %] -
  5. Hourly rental charge:[% rentalcharge_hourly | $Price %] 
    6. - [% END %] -
  6. ISBN: [% isbn | html %] 
    7. -
  7. Publication details:[% place | html %] [% publishercode | html %] [% publicationyear | html %] 
    8. - [% IF ( volumeddesc ) %] -
  8. Volume: [% volumeddesc | html %]
    9. - [% END %] -
  9. Physical details: [% pages | html %] [% illus | html %] [% size | html %] 
    10. - [% IF ( bnotes ) %] -
  10. Notes: [% bnotes | html %]
    11. - [% END %] -
  11. - No. of items: - [% count | html %] - [% IF ( hiddencount ) %] - total ([% showncount | html %] shown / [% hiddencount | html %] hidden) - Show all items +
    +

    [% title | html %]

    + [% IF ( subtitle ) %] +

    [% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %]

    + [% END %] + [% IF ( author ) %] +

    by [% author | html %]

    + [% END %] +
    +
    +
      +
    1. Biblionumber: [% biblionumber | html %] 
      2. + [% UNLESS ( item_level_itypes ) %] +
    2. Item type: [% itemtypename | html %] 
      3. [% END %] - -
    -
    -
    - - [% IF ONLY_ONE || updated_exclude_from_local_holds_priority.defined %] -
    - [% END %] + [% IF ( rentalcharge ) %] +
  12. Rental charge:[% rentalcharge | $Price %] 
    13. + [% END %] + [% IF ( rentalcharge_daily ) %] +
  13. Daily rental charge:[% rentalcharge_daily | $Price %] 
    14. + [% END %] + [% IF ( rentalcharge_hourly ) %] +
  14. Hourly rental charge:[% rentalcharge_hourly | $Price %] 
    15. + [% END %] +
  15. ISBN: [% isbn | html %] 
    16. +
  16. Publication details:[% place | html %] [% publishercode | html %] [% publicationyear | html %] 
    17. + [% IF ( volumeddesc ) %] +
  17. Volume: [% volumeddesc | html %]
    18. + [% END %] +
  18. Physical details: [% pages | html %] [% illus | html %] [% size | html %] 
    19. + [% IF ( bnotes ) %] +
  19. Notes: [% bnotes | html %]
    20. + [% END %] +
  20. + No. of items: + [% count | html %] + [% IF ( hiddencount ) %] + total ([% showncount | html %] shown / [% hiddencount | html %] hidden) + Show all items + [% END %] +
    21. +
+
+
+
[% IF ( ONLY_ONE ) %]
You are only viewing one item. View all
@@ -112,363 +108,365 @@ [% END %] [% FOREACH ITEM_DAT IN ITEM_DATA %] - [% SET not_for_loan = 0 %] - [% IF ITEM_DAT.notforloan || ITEM_DAT.effective_itemtype.notforloan %] - [% SET not_for_loan = 1 %] - [% SET not_for_loan_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => item.notforloan ) %] - [% END %] -
-

- Barcode [% ITEM_DAT.barcode | html %] [% IF not_for_loan %][% not_for_loan_description | html %] [% END %] -

- -

- Item information - [% UNLESS ( ITEM_DAT.nomod ) %] - [% IF ( CAN_user_editcatalogue_edit_items ) %] - Edit item - [% END %] - [% END %] -

+
+ [% SET not_for_loan = 0 %] + [% IF ITEM_DAT.notforloan || ITEM_DAT.effective_itemtype.notforloan %] + [% SET not_for_loan = 1 %] + [% SET not_for_loan_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => item.notforloan ) %] + [% END %] +
+

+ Barcode [% ITEM_DAT.barcode | html %] [% IF not_for_loan %][% not_for_loan_description | html %] [% END %] +

-
-
    -
  1. Home library: [% Branches.GetName( ITEM_DAT.homebranch ) | html %] 
    2. - [% IF ( item_level_itypes ) %] -
  2. Item type: [% ITEM_DAT.itype | html %] 
    3. - [% END %] - [% IF ( ITEM_DAT.ccode) %] -
  3. Collection: [% ITEM_DAT.ccode | html %]
    4. - [% END %] -
  4. Item callnumber: [% ITEM_DAT.itemcallnumber | html %] 
    5. - [% IF ( ITEM_DAT.displaycopy ) %] -
  5. Copy number: [% ITEM_DAT.copyvol | html %] 
    6. - [% END %] - [% IF ( ITEM_DAT.replacementprice ) %] -
  6. Replacement price: [% ITEM_DAT.replacementprice | $Price %] 
    7. - [% END %] - [% IF ITEM_DAT.materials %] -
  7. Materials specified: [% ITEM_DAT.materials | html %]
    8. +

    + Item information + [% UNLESS ( ITEM_DAT.nomod ) %] + [% IF ( CAN_user_editcatalogue_edit_items ) %] + Edit item + [% END %] [% END %] -

-
-
+ -
-

- Statuses - [% IF ( ITEM_DAT.status_advisory ) %] - ([% IF ( not_for_loan ) %] - [% IF not_for_loan_description %] - [% not_for_loan_description | html %] - [% ELSE %] - Not for loan +
+
    +
  1. Home library: [% Branches.GetName( ITEM_DAT.homebranch ) | html %] 
    2. + [% IF ( item_level_itypes ) %] +
  2. Item type: [% ITEM_DAT.itype | html %] 
    3. [% END %] - [% END %] - [% IF ( ITEM_DAT.itemlost ) %]Lost[% END %] - [% IF ( ITEM_DAT.damaged ) %]Damaged[% END %] - [% IF ( ITEM_DAT.withdrawn ) %]Withdrawn[% END %] - ) - [% END %] -

+ [% IF ( ITEM_DAT.ccode) %] +
  • Collection: [% ITEM_DAT.ccode | html %]
    • + [% END %] +
  • Item callnumber: [% ITEM_DAT.itemcallnumber | html %] 
    • + [% IF ( ITEM_DAT.displaycopy ) %] +
  • Copy number: [% ITEM_DAT.copyvol | html %] 
    • + [% END %] + [% IF ( ITEM_DAT.replacementprice ) %] +
  • Replacement price: [% ITEM_DAT.replacementprice | $Price %] 
    • + [% END %] + [% IF ITEM_DAT.materials %] +
  • Materials specified: [% ITEM_DAT.materials | html %]
    • + [% END %] + +
    +
    -
    -
      -
    1. Current library: [% Branches.GetName( ITEM_DAT.holdingbranch ) | html %] 
      2. -
    2. - Checkout status: - [% SET checkout = ITEM_DAT.object.checkout %] - [% IF ( checkout ) %] - Checked out to [% INCLUDE 'patron-title.inc' patron => checkout.patron hide_patron_infos_if_needed=1 %] - [% IF ( checkout.lastreneweddate ) %] - Last renewed [% checkout.lastreneweddate | $KohaDates %], - [% END %] - [% IF ( checkout.date_due ) %] - Due back on [% checkout.date_due | $KohaDates %] +
      +

      + Statuses + [% IF ( ITEM_DAT.status_advisory ) %] + ([% IF ( not_for_loan ) %] + [% IF not_for_loan_description %] + [% not_for_loan_description | html %] [% ELSE %] - Not checked out + Not for loan [% END %] [% END %] -

      3. -
    3. - Current renewals: - [% ITEM_DAT.renewals | html %] - [% IF ITEM_DAT.renewals %] - [ View ] - [% END %] -
      4. - [% IF itemlostloop %] + [% IF ( ITEM_DAT.itemlost ) %]Lost[% END %] + [% IF ( ITEM_DAT.damaged ) %]Damaged[% END %] + [% IF ( ITEM_DAT.withdrawn ) %]Withdrawn[% END %] + ) + [% END %] + + +
      +
        +
      1. Current library: [% Branches.GetName( ITEM_DAT.holdingbranch ) | html %] 
      2. - Lost status: - [% IF ( CAN_user_circulate ) %] - [% SET ClaimReturnedLostValue = Koha.Preference('ClaimReturnedLostValue') %] -
        - - - + Checkout status: + [% SET checkout = ITEM_DAT.object.checkout %] + [% IF ( checkout ) %] + Checked out to [% INCLUDE 'patron-title.inc' patron => checkout.patron hide_patron_infos_if_needed=1 %] + [% IF ( checkout.lastreneweddate ) %] + Last renewed [% checkout.lastreneweddate | $KohaDates %], + [% END %] + [% IF ( checkout.date_due ) %] + Due back on [% checkout.date_due | $KohaDates %] + [% ELSE %] + Not checked out + [% END %] + [% END %] +
        3. +
      3. + Current renewals: + [% ITEM_DAT.renewals | html %] + [% IF ITEM_DAT.renewals %] + [ View ] + [% END %] +
        4. + [% IF itemlostloop %] +
      4. + Lost status: + [% IF ( CAN_user_circulate ) %] + [% SET ClaimReturnedLostValue = Koha.Preference('ClaimReturnedLostValue') %] + + + + - [% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %] - - [% END %] - - [% FOREACH itemlostloo IN itemlostloop %] - [% IF ClaimReturnedLostValue && !ITEM_DAT.itemlost && itemlostloo.authorised_value == ClaimReturnedLostValue #Filter claims returned status from pulldown %] - - [% ELSIF itemlostloo.authorised_value == ITEM_DAT.itemlost %] - - [% ELSE %] - - [% END %] + [% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %] + [% END %] - - - + + [% FOREACH itemlostloo IN itemlostloop %] + [% IF ClaimReturnedLostValue && !ITEM_DAT.itemlost && itemlostloo.authorised_value == ClaimReturnedLostValue #Filter claims returned status from pulldown %] + + [% ELSIF itemlostloo.authorised_value == ITEM_DAT.itemlost %] + + [% ELSE %] + + [% END %] + [% END %] + + + - [% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %] - -

        Item has been claimed as returned.

        - [% ELSE %] - - - [% END %] - - [% ELSE %] - [% FOREACH itemlostloo IN itemlostloop %] - [% IF ( itemlostloo.selected ) %] - [% itemlostloo.lib | html %] + [% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %] + +

        Item has been claimed as returned.

        + [% ELSE %] + + + [% END %] + + [% ELSE %] + [% FOREACH itemlostloo IN itemlostloop %] + [% IF ( itemlostloo.selected ) %] + [% itemlostloo.lib | html %] + [% END %] [% END %] [% END %] +
        5. + [% IF ITEM_DAT.itemlost != "" && ITEM_DAT.itemlost_on %] +
      5. Lost on:[% ITEM_DAT.itemlost_on | $KohaDates %]
        6. [% END %] - - [% IF ITEM_DAT.itemlost != "" && ITEM_DAT.itemlost_on %] -
      6. Lost on:[% ITEM_DAT.itemlost_on | $KohaDates %]
        7. [% END %] - [% END %] - [% IF itemdamagedloop %] -
      7. - Damaged status: - [% IF ( CAN_user_circulate ) %] -
        - - - - + + + + + +
        + [% ELSE %] + [% FOREACH itemdamagedloo IN itemdamagedloop %] + [% IF ( itemdamagedloo.selected ) %] + [% itemdamagedloo.lib | html %] [% END %] - - - - - [% ELSE %] - [% FOREACH itemdamagedloo IN itemdamagedloop %] - [% IF ( itemdamagedloo.selected ) %] - [% itemdamagedloo.lib | html %] [% END %] [% END %] +
        8. + [% IF ITEM_DAT.damaged != "" && ITEM_DAT.damaged_on %] +
      8. Damaged on:[% ITEM_DAT.damaged_on | $KohaDates %]
        9. [% END %] - - [% IF ITEM_DAT.damaged != "" && ITEM_DAT.damaged_on %] -
      9. Damaged on:[% ITEM_DAT.damaged_on | $KohaDates %]
        10. [% END %] - [% END %] - [% IF itemwithdrawnloop %] -
      10. - Withdrawn status: - [% IF ( CAN_user_circulate ) %] -
        - - - - + + + + + +
        + [% ELSE %] + [% FOREACH itemwithdrawn IN itemwithdrawnloop %] + [% IF itemwithdrawn.authorised_value == ITEM_DAT.withdrawn %] + [% itemwithdrawn.lib | html %] [% END %] - - - - - [% ELSE %] - [% FOREACH itemwithdrawn IN itemwithdrawnloop %] - [% IF itemwithdrawn.authorised_value == ITEM_DAT.withdrawn %] - [% itemwithdrawn.lib | html %] [% END %] [% END %] +
        11. + [% IF ITEM_DAT.withdrawn != "" && ITEM_DAT.withdrawn_on %] +
      11. Withdrawn on:[% ITEM_DAT.withdrawn_on | $KohaDates %]
        12. [% END %] + [% END %] +
      +
      +
    + +
    +

    Priority

    +
    +
      +
    1. + Exclude from local holds priority: +
      + + + + + + +
      2. - [% IF ITEM_DAT.withdrawn != "" && ITEM_DAT.withdrawn_on %] -
    2. Withdrawn on:[% ITEM_DAT.withdrawn_on | $KohaDates %]
      3. +
    +
    +
    + +
    +

    History

    +
    +
      + + [% IF ITEM_DAT.basketno %] +
    1. + Order date: + [% IF ( CAN_user_acquisition_order_manage ) %] + [% ITEM_DAT.orderdate | $KohaDates %] + [% ELSE %] + [% ITEM_DAT.orderdate | $KohaDates %] + [% END %] +
      2. +
    2. + Vendor: + [% ITEM_DAT.vendor | html %] +
      3. [% END %] - [% END %] -
    -
    -
    -
    -

    Priority

    -
    -
      -
    1. - Exclude from local holds priority: -
      - - - - - - -
      -
      2. -
    -
    -
    + + [% END %] -
    -

    History

    -
    -
      + [% IF ( ITEM_DAT.invoicenumber ) %] +
    1. + Invoice number: + [% ITEM_DAT.invoicenumber | html %] +
      2. + [% END %] - [% IF ITEM_DAT.basketno %]
    2. - Order date: - [% IF ( CAN_user_acquisition_order_manage ) %] - [% ITEM_DAT.orderdate | $KohaDates %] + Total checkouts: + [% IF ( ITEM_DAT.issues ) %] + [% ITEM_DAT.issues | html %] [% ELSE %] - [% ITEM_DAT.orderdate | $KohaDates %] + 0 [% END %] + (View item's checkout history)
      3. -
    3. - Vendor: - [% ITEM_DAT.vendor | html %] -
      4. - [% END %] - [% IF ITEM_DAT.dateaccessioned %]
    4. - Accession date: - [% IF ( CAN_user_acquisition_order_receive && ITEM_DAT.invoiceid ) %] - [% ITEM_DAT.dateaccessioned | $KohaDates %] - [% ELSE %] - [% ITEM_DAT.dateaccessioned | $KohaDates %] - [% END %] + Last seen: + [% IF ( ITEM_DAT.datelastseen ) %] + [% ITEM_DAT.datelastseen | $KohaDates %] + [%END %]
      5. - [% END %] - - [% IF ( ITEM_DAT.invoicenumber ) %]
    5. - Invoice number: - [% ITEM_DAT.invoicenumber | html %] + Last borrowed: + [% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %]
      6. - [% END %] + [% IF Koha.Preference('StoreLastBorrower') && ITEM_DAT.object.last_returned_by %] +
    6. + Last returned by: + [% ITEM_DAT.object.last_returned_by.cardnumber | html %] +
      7. + [% END %] + [% IF ( ITEM_DAT.card0 ) %] +
    7. + Last borrower: + [% ITEM_DAT.card0 | html %]  +
      8. + [% END %] + [% IF ( ITEM_DAT.card1 ) %] +
    8. + Previous borrower: + [% ITEM_DAT.card1 | html %]  +
      9. + [% END %] + [% IF ( ITEM_DAT.card2 ) %] +
    9. + Previous borrower: + [% ITEM_DAT.card2 | html %]  +
      10. + [% END %] + [% IF ( ITEM_DAT.paidfor ) %] +
    10. + Paid for?: + [% INCLUDE 'patron-title.inc' patron=ITEM_DAT.paidfor.patron hide_patron_infos_if_needed=1 %] on [% ITEM_DAT.paidfor.created_on | $KohaDates %] +
      11. + [% END %] -
    11. - Total checkouts: - [% IF ( ITEM_DAT.issues ) %] - [% ITEM_DAT.issues | html %] - [% ELSE %] - 0 + [% IF ( ITEM_DAT.enumchron ) %] +
    12. + Serial enumeration: + [% ITEM_DAT.enumchron | html %]  +
      13. [% END %] - (View item's checkout history) - -
    13. - Last seen: - [% IF ( ITEM_DAT.datelastseen ) %] - [% ITEM_DAT.datelastseen | $KohaDates %] - [%END %] -
      14. -
    14. - Last borrowed: - [% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %] -
      15. - [% IF Koha.Preference('StoreLastBorrower') && ITEM_DAT.object.last_returned_by %]
    15. - Last returned by: - [% ITEM_DAT.object.last_returned_by.cardnumber | html %] -
      16. - [% END %] - [% IF ( ITEM_DAT.card0 ) %] -
    16. - Last borrower: - [% ITEM_DAT.card0 | html %]  -
      17. - [% END %] - [% IF ( ITEM_DAT.card1 ) %] -
    17. - Previous borrower: - [% ITEM_DAT.card1 | html %]  -
      18. - [% END %] - [% IF ( ITEM_DAT.card2 ) %] -
    18. - Previous borrower: - [% ITEM_DAT.card2 | html %]  -
      19. - [% END %] - [% IF ( ITEM_DAT.paidfor ) %] -
    19. - Paid for?: - [% INCLUDE 'patron-title.inc' patron=ITEM_DAT.paidfor.patron hide_patron_infos_if_needed=1 %] on [% ITEM_DAT.paidfor.created_on | $KohaDates %] + Public note: + [% IF ( CAN_user_editcatalogue_edit_items ) %] +
      + + + +
      + [% ELSE %] + [% ITEM_DAT.itemnotes | html %] + [% END %]
      20. - [% END %] - [% IF ( ITEM_DAT.enumchron ) %]
    20. - Serial enumeration: - [% ITEM_DAT.enumchron | html %]  + Non-public note: + [% IF ( CAN_user_editcatalogue_edit_items ) %] +
      + + + +
      + [% ELSE %] + [% ITEM_DAT.itemnotes_nonpublic | html %] + [% END %]
      21. - [% END %] - -
    21. - Public note: - [% IF ( CAN_user_editcatalogue_edit_items ) %] -
      - - - -
      - [% ELSE %] - [% ITEM_DAT.itemnotes | html %] - [% END %] -
      22. - -
    22. - Non-public note: - [% IF ( CAN_user_editcatalogue_edit_items ) %] -
      - - - -
      - [% ELSE %] - [% ITEM_DAT.itemnotes_nonpublic | html %] - [% END %] -
      23. -
    -
    -
    + +
    + + [% END # /FOREACH ITEM_DAT %] -- 2.39.5