View | Details | Raw Unified | Return to bug 19028
Collapse All | Expand All

(-)a/admin/columns_settings.yml (+3 lines)
Lines 265-270 modules: Link Here
265
        -
265
        -
266
          columnname: item_home_location
266
          columnname: item_home_location
267
        -
267
        -
268
          columnname: item_shelving_location
269
          is_hidden: 1
270
        -
268
          columnname: item_ccode
271
          columnname: item_ccode
269
        -
272
        -
270
          columnname: item_callnumber
273
          columnname: item_callnumber
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-5 / +6 lines)
Lines 143-154 OPAC: Link Here
143
                  both: "home and holding libraries"
143
                  both: "home and holding libraries"
144
            - for items on the OPAC record details page.
144
            - for items on the OPAC record details page.
145
        -
145
        -
146
            - Display the shelving location under the
146
            - 'Display the shelving location '
147
            - pref: OpacLocationBranchToDisplayShelving
147
            - pref: OpacLocationOnDetail
148
              choices:
148
              choices:
149
                  home: "home library"
149
                  home: "below the home library"
150
                  holding: "holding library"
150
                  holding: "below the holding library"
151
                  both: "home and holding libraries"
151
                  both: "below both home and holding libraries"
152
                  column: "on a separate column"
152
            - for items on the OPAC record details page.
153
            - for items on the OPAC record details page.
153
        -
154
        -
154
            - pref: OpacKohaUrl
155
            - pref: OpacKohaUrl
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt (-2 / +9 lines)
Lines 1188-1193 Link Here
1188
                <th id="item_home_location" data-colname="item_home_location" class="item_location">Home library</th>[% END %]
1188
                <th id="item_home_location" data-colname="item_home_location" class="item_location">Home library</th>[% END %]
1189
        [% IF ( itemdata_ccode ) %]
1189
        [% IF ( itemdata_ccode ) %]
1190
                <th id="item_ccode" data-colname="item_ccode" class="collection">Collection</th>[% END %]
1190
                <th id="item_ccode" data-colname="item_ccode" class="collection">Collection</th>[% END %]
1191
        [% IF ( Koha.Preference('OpacLocationOnDetail') == 'column' && itemdata_location ) %]
1192
                <th id="item_shelving_location" data-colname="item_shelving_location" class="shelving_location">Shelving location</th>[% END %]
1191
                <th id="item_callnumber" data-colname="item_callnumber" class="call_no">Call number</th>
1193
                <th id="item_callnumber" data-colname="item_callnumber" class="call_no">Call number</th>
1192
        [% IF ( itemdata_enumchron ) %]
1194
        [% IF ( itemdata_enumchron ) %]
1193
                <th id="item_enumchron" data-colname="item_enumchron" class="vol_info">Vol info</th>[% END %]
1195
                <th id="item_enumchron" data-colname="item_enumchron" class="vol_info">Vol info</th>[% END %]
Lines 1240-1246 Link Here
1240
                            </span>
1242
                            </span>
1241
                            <div class="branch-info-tooltip">[% ITEM_RESULT.holding_branch_opac_info %]</div>
1243
                            <div class="branch-info-tooltip">[% ITEM_RESULT.holding_branch_opac_info %]</div>
1242
1244
1243
                            [% IF ( OpacLocationBranchToDisplayShelving == 'holding' || OpacLocationBranchToDisplayShelving == 'both' ) %]
1245
                            [% IF ( Koha.Preference('OpacLocationOnDetail') == 'holding' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %]
1244
                                <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
1246
                                <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
1245
                            [% END %]
1247
                            [% END %]
1246
1248
Lines 1265-1271 Link Here
1265
                            </span>
1267
                            </span>
1266
                            <div class="branch-info-tooltip">[% ITEM_RESULT.home_branch_opac_info %]</div>
1268
                            <div class="branch-info-tooltip">[% ITEM_RESULT.home_branch_opac_info %]</div>
1267
1269
1268
                            [% IF ( OpacLocationBranchToDisplayShelving == 'home' || OpacLocationBranchToDisplayShelving == 'both' ) %]
1270
                            [% IF ( Koha.Preference('OpacLocationOnDetail') == 'home' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %]
1269
                                <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
1271
                                <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
1270
                            [% END %]
1272
                            [% END %]
1271
1273
Lines 1275-1280 Link Here
1275
                    [% IF ( itemdata_ccode ) %]
1277
                    [% IF ( itemdata_ccode ) %]
1276
                        <td class="collection">[% ITEM_RESULT.ccode %]</td>
1278
                        <td class="collection">[% ITEM_RESULT.ccode %]</td>
1277
                    [% END %]
1279
                    [% END %]
1280
1281
                    [% IF ( Koha.Preference('OpacLocationOnDetail') == 'column' && itemdata_location ) %]
1282
                        <td class="shelving_location">[% ITEM_RESULT.location_description %]</td>
1283
                    [% END %]
1284
1278
                    <td class="call_no" property="sku">
1285
                    <td class="call_no" property="sku">
1279
                        [% IF ( ITEM_RESULT.itemcallnumber ) %]
1286
                        [% IF ( ITEM_RESULT.itemcallnumber ) %]
1280
                            [% ITEM_RESULT.itemcallnumber %]
1287
                            [% ITEM_RESULT.itemcallnumber %]
(-)a/opac/opac-detail.pl (-5 / +4 lines)
Lines 687-693 if ( not $viewallitems and @items > $max_items_to_display ) { Link Here
687
        $itm->{'imageurl'}    = getitemtypeimagelocation( 'opac', $itemtypes->{ $itm->{itype} }->{'imageurl'} );
687
        $itm->{'imageurl'}    = getitemtypeimagelocation( 'opac', $itemtypes->{ $itm->{itype} }->{'imageurl'} );
688
        $itm->{'description'} = $itemtypes->{ $itm->{itype} }->{translated_description};
688
        $itm->{'description'} = $itemtypes->{ $itm->{itype} }->{translated_description};
689
    }
689
    }
690
    foreach (qw(ccode enumchron copynumber itemnotes uri)) {
690
    foreach (qw(ccode enumchron copynumber itemnotes location_description uri)) {
691
        $itemfields{$_} = 1 if ($itm->{$_});
691
        $itemfields{$_} = 1 if ($itm->{$_});
692
    }
692
    }
693
693
Lines 759-765 my $subtitle = GetRecordValue('subtitle', $record, GetFrameworkCode($bib Link Here
759
                     itemdata_enumchron      => $itemfields{enumchron},
759
                     itemdata_enumchron      => $itemfields{enumchron},
760
                     itemdata_uri            => $itemfields{uri},
760
                     itemdata_uri            => $itemfields{uri},
761
                     itemdata_copynumber     => $itemfields{copynumber},
761
                     itemdata_copynumber     => $itemfields{copynumber},
762
                     itemdata_itemnotes          => $itemfields{itemnotes},
762
                     itemdata_itemnotes      => $itemfields{itemnotes},
763
                     itemdata_location       => $itemfields{location_description},
763
                     subtitle                => $subtitle,
764
                     subtitle                => $subtitle,
764
                     OpacStarRatings         => C4::Context->preference("OpacStarRatings"),
765
                     OpacStarRatings         => C4::Context->preference("OpacStarRatings"),
765
    );
766
    );
Lines 1190-1197 if ( C4::Context->preference('UseCourseReserves') ) { Link Here
1190
}
1191
}
1191
1192
1192
$template->param(
1193
$template->param(
1193
    'OpacLocationBranchToDisplay'         => C4::Context->preference('OpacLocationBranchToDisplay') ,
1194
    'OpacLocationBranchToDisplay' => C4::Context->preference('OpacLocationBranchToDisplay'),
1194
    'OpacLocationBranchToDisplayShelving' => C4::Context->preference('OpacLocationBranchToDisplayShelving'),
1195
);
1195
);
1196
1196
1197
output_html_with_http_headers $query, $cookie, $template->output;
1197
output_html_with_http_headers $query, $cookie, $template->output;
1198
- 

Return to bug 19028