From 0c725901bb1f57c99f5bd535926fa7112e43e0e4 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 15 Mar 2012 10:27:12 -0400
Subject: [PATCH] Bug 7720 - Ambiguity in OPAC Details location.
Content-Type: text/plain; charset="utf-8"

Currently, in opac-detail.pl, there exists a column named 'Location'.
This column lists the name of the holding branch, and the item's
location description. This can cause confusion to borrowers, as
they may assume that the holding branch is the *owning* branch
(homebranch) of an item.

This could cause a situation where a borrower waits for an
item to be returned to his or her library, only to find that
the library never owned that item, and it was transferred back
to it's homebranch. It could also lead a borrower to falsely
assume that his or her home library does not own a copy of a
particular item because the borrower does not see an his or her
home library listed for any of the items on the record.

In addition, even when the holding branch is different
than the home branch, the item's shelving location is displayed,
even though that branch may not use that location.

This commit makes the item details table equivilent to the intranet
details page by adding a "Home Library" column, which displays the
item's home library, as well as the shelving location.

If singleBranchMode is enabled, this column disappears and the
"Location" column displays the shelving location only.

This commit adds two new system preferences:

OpacLocationBranchToDisplay, which defines whether
to display the holding library, the home library,
or both for the opac details page.

OpacLocationBranchToDisplayShelving, which defines
where the shelving location should be displayed,
under the home library, the holding library, or both.

http://bugs.koha-community.org/show_bug.cgi?id=7220

http://bugs.koha-community.org/show_bug.cgi?id=3556
---
 C4/Items.pm                                        |   11 +-
 installer/data/mysql/sysprefs.sql                  |    2 +
 installer/data/mysql/updatedatabase.pl             |    8 +
 .../prog/en/modules/admin/preferences/opac.pref    |   16 ++
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |  195 +++++++++++---------
 opac/opac-detail.pl                                |    5 +
 6 files changed, 148 insertions(+), 89 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index 253078d..fcf5447 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -1222,7 +1222,8 @@ sub GetItemsInfo {
            itemtypes.notforloan as notforloan_per_itemtype,
            holding.branchurl,
            holding.branchname,
-           holding.opac_info as branch_opac_info
+           holding.opac_info as branch_opac_info,
+           home.branchurl AS homebranchurl
      FROM items
      LEFT JOIN branches AS holding ON items.holdingbranch = holding.branchcode
      LEFT JOIN branches AS home ON items.homebranch=home.branchcode
@@ -1274,6 +1275,14 @@ sub GetItemsInfo {
         if ( my $bdata = $bsth->fetchrow_hashref ) {
             $data->{'branchname'} = $bdata->{'branchname'};
         }
+        $bsth = $dbh->prepare(
+            "SELECT * FROM branches WHERE branchcode = ?
+        "
+        );
+        $bsth->execute( $data->{'homebranch'} );
+        if ( my $bdata = $bsth->fetchrow_hashref ) {
+            $data->{'homebranchname'} = $bdata->{'branchname'};
+        }
         $data->{'datedue'}        = $datedue;
 
         # get notforloan complete status if applicable
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index a4e4102..b1c9938 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -386,3 +386,5 @@ INSERT INTO systempreferences (variable,value,explanation,type) VALUES('OPACdidy
 INSERT INTO systempreferences (variable,value,explanation,type) VALUES('INTRAdidyoumean',NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free');
 INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('BlockReturnOfWithdrawnItems', '1', '0', 'If enabled, items that are marked as withdrawn cannot be returned.', 'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('HoldsToPullStartDate','2','Set the default start date for the Holds to pull list to this many days ago',NULL,'Integer');
+INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('OpacLocationBranchToDisplay',  'holding',  'holding|home|both',  'In the OPAC, under location show which branch for Location in the record details.',  'Choice');
+INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('OpacLocationBranchToDisplayShelving',  'holding',  'holding|home|both',  'In the OPAC, display the shelving location under which which column.',  'Choice');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 518f23a..200ade7 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -6055,6 +6055,14 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
    SetVersion ($DBversion);
 }
 
+$DBversion = "3.09.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('OpacLocationBranchToDisplay',  'holding',  'holding|home|both',  'In the OPAC, under location show which branch for Location in the record details.',  'Choice')");
+    $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('OpacLocationBranchToDisplayShelving',  'holding',  'holding|home|both',  'In the OPAC, display the shelving location under which which column',  'Choice')");
+    print "Upgrade to $DBversion done (Added system preference OpacLocationBranchToDisplay)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 1a9fa09..ffde956 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -100,6 +100,22 @@ OPAC:
                   no: "Don't show"
             - the name of the patron that has an item checked out on item detail pages on the OPAC.
         -
+            - Display the
+            - pref: OpacLocationBranchToDisplay
+              choices:
+                  home: "home library"
+                  holding: "holding library"
+                  both: "home and holding libraries"
+            - for items on the OPAC record details page.
+        -
+            - Display the shelving location under the
+            - pref: OpacLocationBranchToDisplayShelving
+              choices:
+                  home: "home library"
+                  holding: "holding library"
+                  both: "home and holding libraries"
+            - for items on the OPAC record details page.
+        -
             - pref: OpacKohaUrl
               default: 0
               choices:
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index 1d0523a..087bfd6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -70,17 +70,17 @@
             $("#highlight_toggle_off").show().click(function() {highlightOff(); return false;});[% END %][% END %]
 	[% IF ( GoogleJackets ) %]
         KOHA.Google.GetCoverFromIsbn([% covernewwindow %]);
-	[% END %]
-	[% IF OpenLibraryCovers %]
-	KOHA.OpenLibrary.GetCoverFromIsbn();
-	[% END %]
-	[% IF OPACLocalCoverImages %]
-	KOHA.LocalCover.GetCoverFromBibnumber(true);
-	[% END %]
+        [% END %]
+        [% IF OpenLibraryCovers %]
+        KOHA.OpenLibrary.GetCoverFromIsbn();
+        [% END %]
+        [% IF OPACLocalCoverImages %]
+        KOHA.LocalCover.GetCoverFromBibnumber(true);
+        [% END %]
         [% IF ( NovelistSelectProfile ) %]
         novSelect.loadContentForISBN('[% normalized_isbn %]','[% NovelistSelectProfile %]', '[% NovelistSelectPassword %]', function(d){});
         [% END %]
-	[% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( TagsEnabled ) %]
+        [% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( TagsEnabled ) %]
         $(".tagbutton").click(KOHA.Tags.add_tag_button);[% END %][% END %][% END %]
 
 
@@ -278,17 +278,17 @@ function renderPagination(index, total, ul, highlIndex)
 
 YAHOO.util.Event.onContentReady("furtherm", function () {
     $("#furtherm").css("display","block").css("visibility","hidden");
-	$("#furthersearches").parent().show();
-	var furthersearchesMenu = new YAHOO.widget.Menu("furtherm");
-		furthersearchesMenu.render();
-		furthersearchesMenu.cfg.setProperty("context", ["furthersearches", "tr", "br"]);
-		furthersearchesMenu.subscribe("beforeShow",positionfurthersearchesMenu);
-		furthersearchesMenu.subscribe("show", furthersearchesMenu.focus);
+        $("#furthersearches").parent().show();
+        var furthersearchesMenu = new YAHOO.widget.Menu("furtherm");
+                furthersearchesMenu.render();
+                furthersearchesMenu.cfg.setProperty("context", ["furthersearches", "tr", "br"]);
+                furthersearchesMenu.subscribe("beforeShow",positionfurthersearchesMenu);
+                furthersearchesMenu.subscribe("show", furthersearchesMenu.focus);
         function positionfurthersearchesMenu() {
                     furthersearchesMenu.align("tr", "br");
-		}
-		YAHOO.util.Event.addListener("furthersearches", "click", furthersearchesMenu.show, null, furthersearchesMenu);
-		YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionfurthersearchesMenu);
+                }
+                YAHOO.util.Event.addListener("furthersearches", "click", furthersearchesMenu.show, null, furthersearchesMenu);
+                YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionfurthersearchesMenu);
  });
 //]]>
 </script>
@@ -481,25 +481,25 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 
 <!-- This puts the LTFL reviews in, and if TabbedView is not set, puts the remaining content above the Tabs instead of in them -->
 [% IF ( LibraryThingForLibrariesID ) %]
-	[% UNLESS ( LibraryThingForLibrariesTabbedView ) %]
-		<div class="results_summary"><div id="ltfl_related" class="ltfl"></div></div> 
-		<div class="results_summary"><div id="ltfl_similars" class="ltfl"></div></div> 
-		<div class="results_summary"><div id="ltfl_tagbrowse" class="ltfl"></div></div> 
-	[% END %]
-	<span class="results_summary">
-        <span class="label">Reviews from LibraryThing.com:</span>	
+        [% UNLESS ( LibraryThingForLibrariesTabbedView ) %]
+                <div class="results_summary"><div id="ltfl_related" class="ltfl"></div></div>
+                <div class="results_summary"><div id="ltfl_similars" class="ltfl"></div></div>
+                <div class="results_summary"><div id="ltfl_tagbrowse" class="ltfl"></div></div>
+        [% END %]
+        <span class="results_summary">
+        <span class="label">Reviews from LibraryThing.com:</span>
         <span style="display: block;" class="ltfl_reviews"></span>
     </span>
 [% END %] 
 
 <!--This grabs all of the lists a bib record appears in -->
 [% IF ( GetShelves ) %]
-	<span class="results_summary"><span class="label">List(s) this item appears in: </span>
-	[% FOREACH GetShelve IN GetShelves %]
-		<a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% GetShelve.shelfnumber %]">[% GetShelve.shelfname %]</a>
-		[% IF ( loop.last ) %][% ELSE %]|[% END %]
-	[% END %]
-	</span>
+        <span class="results_summary"><span class="label">List(s) this item appears in: </span>
+        [% FOREACH GetShelve IN GetShelves %]
+                <a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% GetShelve.shelfnumber %]">[% GetShelve.shelfname %]</a>
+                [% IF ( loop.last ) %][% ELSE %]|[% END %]
+        [% END %]
+        </span>
 [% END %]
 
 [% IF ( TagsEnabled ) %]
@@ -732,12 +732,19 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <div id="holdings">
 [% IF ( count ) %]
     [% IF ( lotsofitems ) %]
-	<p>This record has many physical items. <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]&amp;viewallitems=1#holdings">Click here to view them all.</a></p>
+        <p>This record has many physical items. <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]&amp;viewallitems=1#holdings">Click here to view them all.</a></p>
     [% ELSE %]
     <table id="holdingst">
         <thead><tr>
             [% IF ( item_level_itypes ) %]<th id="item_itemtype">Item type</th>[% END %]
-            <th id="item_location">Location</th>
+                [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' || singleBranchMode ) %]
+                        <th>Current Location</th>
+                [% END %]
+                [% UNLESS ( singleBranchMode ) %]
+                        [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %]
+                                <th>Home Library</th>
+                        [% END %]
+                [% END %]
             [% IF ( itemdata_ccode ) %]<th id="item_ccode">Collection</th>[% END %]
             <th id="item_callnumber">Call number</th>
             [% IF ( itemdata_enumchron ) %]<th id="item_enumchron">Vol info</th>[% END %]
@@ -753,45 +760,57 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
             <th>Item hold queue priority</th>
         [% END %]
         </tr></thead>
-	    <tbody>[% FOREACH ITEM_RESULT IN ITEM_RESULTS %]
-      <tr>[% IF ( item_level_itypes ) %]<td class="itype">[% UNLESS ( noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %]<img src="[% ITEM_RESULT.imageurl %]" title="[% ITEM_RESULT.description %]" alt="[% ITEM_RESULT.description %]" />[% END %][% END %] [% ITEM_RESULT.description %]</td>[% END %]
-             <td class="location">
-    [% UNLESS ( singleBranchMode ) %]
-        <span class="[% ITEM_RESULT.branch_opac_info ? 'branch-info-tooltip-trigger' : '' %]">
-        [% IF ( ITEM_RESULT.branchurl ) %]
-        <a href="[% ITEM_RESULT.branchurl %]">[% ITEM_RESULT.branchname %]</a>
-        [% ELSE %]
-        [% ITEM_RESULT.branchname %]
-        [% END %]
-        </span>
-        <div class="branch-info-tooltip">[% ITEM_RESULT.branch_opac_info %]</div>
-    [% END %]
-    <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
-    </td>
-            [% IF ( itemdata_ccode ) %]<td class="collection">[% ITEM_RESULT.ccode %]</td>[% END %]
-        <td class="call_no">[% IF ( ITEM_RESULT.itemcallnumber ) %] [% ITEM_RESULT.itemcallnumber %][% IF ( OPACShelfBrowser ) %] (<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber %]&amp;shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber %]#shelfbrowser">Browse shelf</a>)[% END %][% END %]</td>
-            [% IF ( itemdata_enumchron ) %]<td class="vol_info">[% ITEM_RESULT.enumchron %]</td>[% END %]
-          [% IF ( itemdata_uri ) %]<td class="url"><a href="[% ITEM_RESULT.uri %]">[% ITEM_RESULT.uri %]</a></td>[% END %]
-               [% IF ( itemdata_copynumber ) %]<td class="copynumber">[% ITEM_RESULT.copynumber %]</td>[% END %]
-              <td class="status">[% INCLUDE 'item-status.inc' item = ITEM_RESULT %]</td>
-             [% IF ( itemdata_itemnotes ) %]<td class="notes">[% ITEM_RESULT.itemnotes %]</td>[% END %]
-        <td class="date_due">[% ITEM_RESULT.datedue | $KohaDates %]</td>
-        [% IF ( OPACShowBarcode ) %]<td class="barcode">[% ITEM_RESULT.barcode %]</td>[% END %]
-        [% IF holds_count.defined || show_priority %]
-        <td class="holds_count">
-            [% IF holds_count.defined %] [% ITEM_RESULT.holds_count %] [% END %]
-            [% IF ITEM_RESULT.priority %]
-                [% IF holds_count.defined %]
-                (priority [% ITEM_RESULT.priority %])
-                [% ELSE %]
-                [% ITEM_RESULT.priority %]
+            <tbody>[% FOREACH ITEM_RESULT IN ITEM_RESULTS %]
+            <tr>[% IF ( item_level_itypes ) %]<td>[% UNLESS ( noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %]<img src="[% ITEM_RESULT.imageurl %]" title="[% ITEM_RESULT.description %]" alt="[% ITEM_RESULT.description %]" />[% END %][% END %] [% ITEM_RESULT.description %]</td>[% END %]
+                [% UNLESS ( singleBranchMode ) %]
+                        [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' ) %]
+                                <td>
+                                        <span class="[% ITEM_RESULT.branch_opac_info ? 'branch-info-tooltip-trigger' : '' %]">
+                                                [% IF ( ITEM_RESULT.branchurl ) %]
+                                                        <a href="[% ITEM_RESULT.branchurl %]">[% ITEM_RESULT.branchname %]</a>
+                                                [% ELSE %]
+                                                        [% ITEM_RESULT.branchname %]
+                                                [% END %]
+                                        </span>
+
+                                        [% IF ( OpacLocationBranchToDisplayShelving == 'holding' || OpacLocationBranchToDisplayShelving == 'both' ) %]
+                                                <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
+                                        [% END %]
+
+                                        <div class="branch-info-tooltip">[% ITEM_RESULT.branch_opac_info %]</div>
+                                </td>
+                        [% END %]
+
+                        [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %]
+                                <td>
+                                        <span class="[% ITEM_RESULT.branch_opac_info ? 'branch-info-tooltip-trigger' : '' %]">
+                                                [% IF ( ITEM_RESULT.homebranchurl ) %]
+                                                        <a href="[% ITEM_RESULT.homebranchurl %]">[% ITEM_RESULT.homebranchname %]</a>
+                                                [% ELSE %]
+                                                         [% ITEM_RESULT.homebranchname %]
+                                                [% END %]
+                                        </span>
+
+                                        [% IF ( OpacLocationBranchToDisplayShelving == 'home' || OpacLocationBranchToDisplayShelving == 'both' ) %]
+                                                <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
+                                        [% END %]
+                                </td>
+                        [% END %]
+		[% ELSE %]
+                        <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
                 [% END %]
-            [% END %]
-                </td>
-        [% END %]
-	    </tr>
-	    [% END %]</tbody>
-	</table>
+
+                [% IF ( itemdata_ccode ) %]<td>[% ITEM_RESULT.ccode %]</td>[% END %]
+                <td>[% IF ( ITEM_RESULT.itemcallnumber ) %] [% ITEM_RESULT.itemcallnumber %][% IF ( OPACShelfBrowser ) %] (<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber %]&amp;shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber %]#shelfbrowser">Browse Shelf</a>)[% END %][% END %]</td>
+                [% IF ( itemdata_enumchron ) %]<td>[% ITEM_RESULT.enumchron %]</td>[% END %]
+                [% IF ( itemdata_uri ) %]<td><a href="[% ITEM_RESULT.uri %]">[% ITEM_RESULT.uri %]</a></td>[% END %]
+                [% IF ( itemdata_copynumber ) %]<td>[% ITEM_RESULT.copynumber %]</td>[% END %]
+                <td>[% INCLUDE 'item-status.inc' item = ITEM_RESULT %]</td>
+                [% IF ( itemdata_itemnotes ) %]<td>[% ITEM_RESULT.itemnotes %]</td>[% END %]
+                <td>[% ITEM_RESULT.datedue | $KohaDates %]</td>
+            </tr>
+            [% END %]</tbody>
+        </table>
     [% END %]
     [% IF holds_count.defined || priority %]
     <div id="bib_holds">
@@ -845,7 +864,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     [% IF ( OPACAmazonCoverImages ) %][% IF ( NEXT_SHELF_BROWS.browser_normalized_isbn ) %]
     <img border="0" src="http://images.amazon.com/images/P/[% NEXT_SHELF_BROWS.browser_normalized_isbn %].01._AA75_PU_PU-5_.jpg" alt="" />[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %]
 
-	[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( content_identifier_exists ) %]
+        [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( content_identifier_exists ) %]
     [% IF ( using_https ) %]
     <img border="0" src="https://secure.syndetics.com/index.aspx?isbn=[% NEXT_SHELF_BROWS.browser_normalized_isbn %]/SC.GIF&amp;client=[% SyndeticsClientCode %][% IF ( NEXT_SHELF_BROWS.browser_normalized_upc ) %]&amp;upc=[% NEXT_SHELF_BROWS.browser_normalized_upc %][% END %][% IF ( NEXT_SHELF_BROWS.browser_normalized_oclc ) %]&amp;oclc=[% NEXT_SHELF_BROWS.browser_normalized_oclc %][% END %]&amp;type=xw10" alt="" />
     [% ELSE %]<img border="0" src="http://www.syndetics.com/index.aspx?isbn=[% NEXT_SHELF_BROWS.browser_normalized_isbn %]/SC.GIF&amp;client=[% SyndeticsClientCode %][% IF ( NEXT_SHELF_BROWS.browser_normalized_upc ) %]&amp;upc=[% NEXT_SHELF_BROWS.browser_normalized_upc %][% END %][% IF ( NEXT_SHELF_BROWS.browser_normalized_oclc ) %]&amp;oclc=[% NEXT_SHELF_BROWS.browser_normalized_oclc %][% END %]&amp;type=xw10" alt="" />[% END %]
@@ -937,13 +956,13 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% FOREACH SYNDETICS_REVIEW IN SYNDETICS_REVIEWS %]
     [% IF ( SYNDETICS_REVIEW.title ) %]
     <h4>[% SYNDETICS_REVIEW.title %]</h4>
-	[% FOREACH review IN SYNDETICS_REVIEW.reviews %]
+        [% FOREACH review IN SYNDETICS_REVIEW.reviews %]
 
-	[% IF ( review.content ) %]
-		[% review.content %]
-	[% END %]
+        [% IF ( review.content ) %]
+                [% review.content %]
+        [% END %]
 
-	[% END %]
+        [% END %]
     [% END %]
 [% END %]
 </div>
@@ -1024,25 +1043,25 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 
 [% IF ( LibraryThingForLibrariesID ) %] 
 [% IF ( LibraryThingForLibrariesTabbedView ) %]
-	<!-- Library Thing for Libraries Content --> 
-		<div id="LFTLSimilarItems">
-			<div class="content_set">
-	<!-- Uncommenting this span makes the font smaller in the tab for LTFL -->
+        <!-- Library Thing for Libraries Content -->
+                <div id="LFTLSimilarItems">
+                        <div class="content_set">
+        <!-- Uncommenting this span makes the font smaller in the tab for LTFL -->
     <!-- but breaks Xhtml validation -->
- 	<!--	<span class="results_summary">-->
-				<div id="ltfl_related"></div>
-				<div id="ltfl_similars"></div>
-	<!--			</span>-->
-			</div>
-		</div>
-		 <div id="LTFLTagBrowse">
+         <!--        <span class="results_summary">-->
+                                <div id="ltfl_related"></div>
+                                <div id="ltfl_similars"></div>
+        <!--                        </span>-->
+                        </div>
+                </div>
+                 <div id="LTFLTagBrowse">
                         <div class="content_set">
                                 <!-- <span class="results_summary"> -->
                                 <div id="ltfl_tagbrowse" class="ltfl"></div>
                                 <!-- </span> -->
                         </div>
                 </div>
-	[% END %]
+        [% END %]
 [% END %]
 <!-- /Library Thing for Libraries Content -->
 
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index d9ecdfa..6c7d635 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -975,4 +975,9 @@ if (C4::Context->preference('OpacHighlightedWords')) {
     $template->{VARS}->{query_desc} = $query->param('query_desc');
 }
 
+$template->param(
+    'OpacLocationBranchToDisplay'         => C4::Context->preference('OpacLocationBranchToDisplay') ,
+    'OpacLocationBranchToDisplayShelving' => C4::Context->preference('OpacLocationBranchToDisplayShelving'),
+);
+
 output_html_with_http_headers $query, $cookie, $template->output;
-- 
1.7.2.5