From 6c2e6f52f7aca7268e63569da510937ca2f9ce73 Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Thu, 28 Feb 2019 13:37:40 +0100 Subject: [PATCH] Bug 22422: improve item location display with class "shelvingloc" In record detail page, item location is displayed with CSS using class "shelvingloc". Many many places at intranet and OPAC can use this class. It allows to change display in all places using CSS customisation. This patch removes the CSS "display:block" for class "shelvingloc". Some places where using "inline" to correct the display. I think the display should not be managed in template. So it will be inline by default and it can be changed by custom CSS, on all places or depending on a selctor. Test plan : 1) Compile SCSS to CSS 2) Add to preferences IntranetUserCSS and OPACUserCSS : .shelvingloc { color:red } 3) Go to pages impacted by patch, be sure to look at cart with "more details" 4) You see item location italic and red --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 1 - .../intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt | 5 +++-- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 5 ++++- .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt | 6 ++---- .../intranet-tmpl/prog/en/modules/circ/branchtransfers.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt | 3 ++- .../intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt | 4 +++- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 1 - koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt | 6 ++++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +- 16 files changed, 29 insertions(+), 24 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index d4acb08186..75ca82ab2c 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -2168,7 +2168,6 @@ i { // style for shelving location in catalogsearch .shelvingloc { - display: block; font-style: italic; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index ef27531a58..93221d1fa0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -185,7 +185,7 @@ [% Branches.GetName( item.holdingbranch ) | html %] [% item.notforloan | html %] [% item.restricted | html %] - [% item.location | html %] + [% item.location | html %] [% item.itemcallnumber | html %] [% item.copynumber | html %] [% item.stocknumber | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt index b861a0f455..ad0301d292 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -224,7 +224,8 @@ [% IF ( BIBLIO_RESULT.ITEM_RESULTS ) %] [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]

- [% ITEM_RESULT.branchname | html %] [% ITEM_RESULT.location_description | html %] + [% ITEM_RESULT.branchname | html %] + [% ITEM_RESULT.location_description | html %] [% IF ( ITEM_RESULT.itemcallnumber ) %] ([% ITEM_RESULT.itemcallnumber | html %]) [% END %] @@ -299,7 +300,7 @@ [% ITEM_RESULT.itemcallnumber | html %] [% ITEM_RESULT.branchname | html %] - [% ITEM_RESULT.location_description | html %] + [% ITEM_RESULT.location_description | html %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index c9bdb8c5a4..4789f1ed01 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -392,7 +392,10 @@ [% END %] [% UNLESS ( singlebranchmode ) %][% Branches.GetName( item.branchcode ) | html %] [% END %] - [% Branches.GetName(item.homebranch) | html %][% item.location | html %] + + [% Branches.GetName(item.homebranch) | html %] + [% item.location | html %] + [% IF ( itemdata_ccode ) %][% item.ccode | html %][% END %] [% IF ( item.itemcallnumber ) %] [% item.itemcallnumber | html %][% END %] [% IF ( volinfo ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 4bd6402659..efab5b04c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -508,7 +508,7 @@

  • [% END %] [% IF ( available_items_loo.branchname ) %][% available_items_loo.branchname | html %][% END %] - [% IF ( available_items_loo.location ) %][% available_items_loo.location | html %][% END %] + [% IF ( available_items_loo.location ) %][% available_items_loo.location | html %][% END %] [% IF ( available_items_loo.itemcallnumber ) %][[% available_items_loo.itemcallnumber | html %]][% END %] ([% available_items_loo.count | html %]) [% IF item_level_itypes && available_items_loo.description %] @@ -530,7 +530,7 @@
  • [% END %] [% IF ( onloan_items_loo.branchname ) %][% onloan_items_loo.branchname | html %][% END %] - [% IF ( onloan_items_loo.location ) %][% onloan_items_loo.location | html %][% END %] + [% IF ( onloan_items_loo.location ) %][% onloan_items_loo.location | html %][% END %] [% IF ( onloan_items_loo.itemcallnumber ) %][[% onloan_items_loo.itemcallnumber | html %]][% END %] ([% onloan_items_loo.count | html %][% IF ( onloan_items_loo.longoverdue ) %], [% onloan_items_loo.longoverdue | html %] long overdue[% END %]) date due: [% onloan_items_loo.due_date | $KohaDates %] [% IF item_level_itypes && onloan_items_loo.description %] @@ -552,7 +552,7 @@
  • [% END %] [% IF ( other_items_loo.branchname ) %][% other_items_loo.branchname | html %][% END %] - [% IF ( other_items_loo.location ) %][% other_items_loo.location | html %][% END %] + [% IF ( other_items_loo.location ) %][% other_items_loo.location | html %][% END %] [% IF ( other_items_loo.itemcallnumber ) %][[% other_items_loo.itemcallnumber | html %]][% END %] [% IF ( other_items_loo.withdrawn ) %]([% AuthorisedValues.GetByCode( 'WITHDRAWN', other_items_loo.withdrawn ) | html %])[% END %] [% IF ( other_items_loo.itemlost ) %]([% AuthorisedValues.GetByCode( 'LOST', other_items_loo.itemlost ) | html %])[% END %] 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 eef01b8ed8..69071b6d3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -103,15 +103,13 @@ [% FOREACH items_loo IN resultsloo.available_items_loop %] [% items_loo.count | html %] [% items_loo.branchname | html %] - - [% IF ( items_loo.location ) %][% items_loo.location | html %][% END %] - [% IF ( items_loo.itemcallnumber ) %][% items_loo.itemcallnumber | html %][% END %] + [% IF ( items_loo.location ) %][% items_loo.location | html %][% END %] + [% IF ( items_loo.itemcallnumber ) %][% items_loo.itemcallnumber | html %][% END %] [% IF ( items_loo.classification ) %] [% items_loo.classification | html %] [% END %] -
    [% END %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt index 5dcd93b114..10c3477527 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -188,7 +188,7 @@ [% trsfitemloo.title | html %] [% trsfitemloo.author | html %] [% trsfitemloo.barcode | html %] - [% trsfitemloo.location | html %] + [% trsfitemloo.location | html %] [% trsfitemloo.itemcallnumber | html %] [% ItemTypes.GetDescription( trsfitemloo.itemtype ) | html %] [% AuthorisedValues.GetByCode( 'CCODE', trsfitemloo.ccode ) | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 115039a24f..2a06845a6c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -711,7 +711,7 @@ [% riloo.barcode | html %] [% Branches.GetName( riloo.homebranch ) | html %] [% Branches.GetName( riloo.holdingbranch ) | html %] - [% riloo.location | html %] + [% riloo.location | html %] [% riloo.itemcallnumber | html %] [% riloo.dateaccessioned | $KohaDates %] [% ItemTypes.GetDescription( riloo.itemtype ) | html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt index 88a770b11b..dcad244d3f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt @@ -46,7 +46,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% IF ( title.items ) %]