From 453e2fe464c6a6b1f3ff39058d164b463c23f55c 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 Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit bc2d9f869ad0bde3e97e3773e0e050503d8083f4) Signed-off-by: Martin Renvoize --- 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 f07d87f3ac..51016bb0d7 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -2107,7 +2107,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 2b17b8ffbe..f5ec5c314f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -186,7 +186,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 dde81042fc..24f79ff7d2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -393,7 +393,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 e2645731c7..86fd6851dd 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 fcef398891..22449d966e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -184,7 +184,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 0ebdaa24cd..0a7a499332 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -707,7 +707,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 ef70cfd1de..21402708b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt @@ -47,7 +47,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% IF ( title.items ) %]
      [% FOREACH item IN title.items %]
    • - [% item.branchname | html %] [% item.location_description | html %] + [% item.branchname | html %] + [% item.location_description | html %] [% IF ( item.itemcallnumber ) %] ([% item.itemcallnumber | html %]) [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index 84bfc524cb..b9d83a4686 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -245,7 +245,9 @@
        [% FOREACH result IN itemsloo.ITEM_RESULTS %] -
      • [% result.holdingbranch | html %] [% IF ( result.location_intranet ) %] ([% result.location_intranet | html %]) [% END %] +
      • + [% result.holdingbranch | html %] + [% IF ( result.location_intranet ) %][% result.location_intranet | html %][% END %] [% IF ( result.itemcallnumber ) %] [[% result.itemcallnumber | html %]] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss index 5db72ee5ca..c957489515 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -2439,7 +2439,6 @@ input { /* style for shelving location in catalogsearch */ .shelvingloc { - display: block; font-style: italic; } diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt index 062a05b6de..64628894c2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt @@ -219,7 +219,8 @@
          [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
        • - [% ITEM_RESULT.branchname | html %][% IF ( ITEM_RESULT.location_opac ) %], [% ITEM_RESULT.location_opac | html %][% END %] + [% ITEM_RESULT.branchname | html %] + [% IF ( ITEM_RESULT.location_opac ) %][% ITEM_RESULT.location_opac | html %][% END %] [% IF ( ITEM_RESULT.itemcallnumber ) %] ([% ITEM_RESULT.itemcallnumber | html %]) [% END %] @@ -273,7 +274,8 @@ [% IF ( BIBLIO_RESULT.ITEM_RESULTS ) %]
            [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
          • - [% ITEM_RESULT.branchname | html %][% IF ( ITEM_RESULT.location_opac ) %], [% ITEM_RESULT.location_opac | html %][% END %] + [% ITEM_RESULT.branchname | html %] + [% IF ( ITEM_RESULT.location_opac ) %][% ITEM_RESULT.location_opac | html %][% END %] [% IF ( ITEM_RESULT.itemcallnumber ) %] ([% ITEM_RESULT.itemcallnumber | html %]) [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index 3ec6ea1572..2a4461b3b0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -1282,7 +1282,7 @@ [% END %] [% IF ( Koha.Preference('OpacLocationOnDetail') == 'column' && itemdata_location ) %] - [% ITEM_RESULT.location_description | html %] + [% ITEM_RESULT.location_description | html %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt index a5ee7ff648..31194b9d97 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt @@ -212,7 +212,7 @@ [% FOREACH available_items_loo IN GROUP_RESULT.available_items_loop %] [% IF ( available_items_loo.branchname ) %][% available_items_loo.branchname | html %][% END %] [% IF ( OPACItemsResultsDisplay ) %] - [% 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 %] [% END %] ([% available_items_loo.count | html %]), diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index 548c0c055c..331af70c2b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -387,13 +387,13 @@ [% END %] [% IF ( singleBranchMode ) %] - [% available_items_loo.location | html %] + [% available_items_loo.location | html %] [% ELSE %] [% available_items_loo.branchname | html %] [% END %] [% IF ( OPACItemsResultsDisplay ) %] - [% UNLESS ( singleBranchMode ) %][% available_items_loo.location | html %][% END %] + [% UNLESS ( singleBranchMode ) %][% available_items_loo.location | html %][% END %] [% IF ( available_items_loo.itemcallnumber ) %][[% available_items_loo.itemcallnumber | html %]][% END %] [% END %] ([% available_items_loo.count | html %]), diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index 581adfdd1e..3f97aa661a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -415,7 +415,7 @@ [% FOREACH ITEM_RESULT IN itemsloo.ITEM_RESULTS %] [% ITEM_RESULT.homebranch | html %] [% IF ( ITEM_RESULT.location_opac ) %] - , [% ITEM_RESULT.location_opac | html %] + [% ITEM_RESULT.location_opac | html %] [% END %] [% IF ( ITEM_RESULT.itemcallnumber ) %] ([% ITEM_RESULT.itemcallnumber | html %]) -- 2.39.5