From 934b3d5725e6de74cda6b2b88fd651697fa06067 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Fri, 3 Feb 2017 11:55:30 +0000 Subject: [PATCH] Bug 18061: Restyle catalogue moredetail page Test plan: 0) apply the patch 1) go to items page on any of catalogue record (catalogue/moredetail.pl) 2) confirm the new fancy bootstrap panels and the basic biblio information in table 3) login with user with cataloguing perrmisions and tryy to edit item, change statuses, add/update notes, it should all work as before patch 4) login with user withou cataloguing permission - you should not see the edit links and form --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 5 + .../prog/en/modules/catalogue/moredetail.tt | 192 ++++++++++++--------- 2 files changed, 114 insertions(+), 83 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index a9da2ee..6a27db8 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -2965,3 +2965,8 @@ fieldset.rows + fieldset.action { .yui-u .rows li p label.widelabel { width: auto; } + +#catalogue_detail_biblio h3 { + padding: 1em 0 0.5em; + border-top: 2px solid #CCCCCC; +} 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 b04fd39..8025b71 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -3,7 +3,6 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Catalog › Item details for [% title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield | html %][% END %] [% INCLUDE 'doc-head-close.inc' %] - [% INCLUDE 'browser-strings.inc' %] + +
+
+
+

Statuses [% IF ( ITEM_DAT.status_advisory ) %]( [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext %] [% END %] [% IF ( ITEM_DAT.itemlost ) %]Lost[% END %] [% IF ( ITEM_DAT.damaged ) %]Damaged[% END %] [% IF ( ITEM_DAT.withdrawn ) %]Withdrawn[% END %] )[% END %]

- -
    -
  1. Current location: [% Branches.GetName( ITEM_DAT.holdingbranch ) %] 
  2. -
  3. Checkout status: +
+ + + + [% IF itemlostloop %] -
  • Lost status: +
  • [% IF ITEM_DAT.itemlost != "" && ITEM_DAT.itemlost_on %] -
  • Lost on:[% ITEM_DAT.itemlost_on | $KohaDates %]  
  • + [% END %] [% END %] [% IF itemdamagedloop %] -
  • Damaged status: +
  • [% END %] [% IF itemwithdrawnloop %] -
  • Withdrawn status: +
  • [% IF ITEM_DAT.withdrawn != "" && ITEM_DAT.withdrawn_on %] -
  • Withdrawn on:[% ITEM_DAT.withdrawn_on | $KohaDates %]  
  • + [% END %] [% END %] - -

    History

    -
      +
    Current location:[% Branches.GetName( ITEM_DAT.holdingbranch ) %]
    Checkout status: [% IF ( ITEM_DAT.issue ) %]Checked out to [% IF ( hidepatronname ) %] [% ITEM_DAT.cardnumber %], @@ -98,10 +119,10 @@ Not checked out [% END %] [% END %] -   -
  • Current renewals: [% ITEM_DAT.renewals %] 
  • +
    Current renewals:[% ITEM_DAT.renewals %]
    Lost status: [% IF ( CAN_user_circulate ) %]
    @@ -119,22 +140,21 @@ -
    + [% ELSE %] [% FOREACH itemlostloo IN itemlostloop %] [% IF ( itemlostloo.selected ) %] [% itemlostloo.lib %] [% END %] [% END %] -   [% END %] - +
    Lost on:[% ITEM_DAT.itemlost_on | $KohaDates %]
    Damaged status: [% IF ( CAN_user_circulate ) %]
    @@ -152,20 +172,19 @@ -
    + [% ELSE %] [% FOREACH itemdamagedloo IN itemdamagedloop %] [% IF ( itemdamagedloo.selected ) %] [% itemdamagedloo.lib %] [% END %] [% END %] -   [% END %] - +
    Withdrawn status: [% IF ( CAN_user_circulate ) %]
    @@ -183,94 +202,101 @@ -
    + [% ELSE %] [% FOREACH itemwithdrawn IN itemwithdrawnloop %] [% IF itemwithdrawn.authorised_value == ITEM_DAT.withdrawn %] [% itemwithdrawn.lib %] [% END %] [% END %] -   [% END %] - +
    Withdrawn on:[% ITEM_DAT.withdrawn_on | $KohaDates %]
    + +
    +
    +
    +

    History

    +
    + [% IF ITEM_DAT.basketno %] -
  • Order date: +
  • + [% END %] [% IF ITEM_DAT.dateaccessioned %] -
  • Accession date: +
  • [% END %] [% IF ( ITEM_DAT.invoicenumber ) %] -
  • Invoice number: +
  • [% END %] -
  • Total checkouts:[% IF ( ITEM_DAT.issues ) %][% ITEM_DAT.issues %][% ELSE %]0[% END %] (View item's checkout history)
  • + -
  • Last seen:[% IF ( ITEM_DAT.datelastseen ) %][% ITEM_DAT.datelastseen | $KohaDates %] [%END %] 
  • -
  • Last borrowed:[% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %] 
  • + + [% IF Koha.Preference('StoreLastBorrower') && ITEM_DAT.object.last_returned_by %] -
  • Last returned by: [% ITEM_DAT.object.last_returned_by.cardnumber %] 
  • + [% END %] - [% IF ( ITEM_DAT.card0 ) %]
  • Last borrower: [% ITEM_DAT.card0 %] 
  • [% END %] - [% IF ( ITEM_DAT.card1 ) %]
  • Previous borrower: [% ITEM_DAT.card1 %] 
  • [% END %] - [% IF ( ITEM_DAT.card2 ) %]
  • Previous borrower: [% ITEM_DAT.card2 %] 
  • [% END %] - [% IF ( ITEM_DAT.paidfor ) %]
  • Paid for?: [% ITEM_DAT.paidfor %] 
  • [% END %] + [% IF ( ITEM_DAT.card0 ) %][% END %] + [% IF ( ITEM_DAT.card1 ) %][% END %] + [% IF ( ITEM_DAT.paidfor ) %][% END %] - [% IF ( ITEM_DAT.enumchron ) %]
  • Serial enumeration: [% ITEM_DAT.enumchron %] 
  • [% END %] + [% IF ( ITEM_DAT.enumchron ) %][% END %] -
  • - Public note: +
  • -
  • - Non-public note: +
  • +
    Order date: [% IF ( CAN_user_acquisition_order_manage ) %] [% ITEM_DAT.orderdate | $KohaDates %] [% ELSE %] [% ITEM_DAT.orderdate | $KohaDates %] [% END %] - -
  • Vendor: +
  • Vendor: [% ITEM_DAT.vendor %] - +
    Accession date: [% IF ( CAN_user_acquisition_order_receive && ITEM_DAT.invoiceid ) %] [% ITEM_DAT.dateaccessioned | $KohaDates %] [% ELSE %] [% ITEM_DAT.dateaccessioned | $KohaDates %] [% END %] - +
    Invoice number: [% ITEM_DAT.invoicenumber %] - +
    Total checkouts:[% IF ( ITEM_DAT.issues ) %][% ITEM_DAT.issues %][% ELSE %]0[% END %] (View item's checkout history)
    Last seen:[% IF ( ITEM_DAT.datelastseen ) %][% ITEM_DAT.datelastseen | $KohaDates %] [%END %]
    Last borrowed:[% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %]
    Last returned by:[% ITEM_DAT.object.last_returned_by.cardnumber %]
    Last borrower:[% ITEM_DAT.card0 %]
    Previous borrower:[% ITEM_DAT.card1 %]Previous borrower:[% ITEM_DAT.card2 %]
    Paid for?:[% ITEM_DAT.paidfor %]
    Serial enumeration:[% ITEM_DAT.enumchron %]
    Public note: [% IF ( CAN_user_editcatalogue_edit_items ) %]
    - +
    + +
    +
    [% ELSE %] [% ITEM_DAT.itemnotes %] -   [% END %] - +
    Non-public note: [% IF ( CAN_user_editcatalogue_edit_items ) %]
    - +
    + +
    +
    [% ELSE %] [% ITEM_DAT.itemnotes_nonpublic %] -   [% END %] - - - +
    + + [% END %] -- 2.1.4