From 92c1eb7db3d46c1495afd6181514be72bdb703c2 Mon Sep 17 00:00:00 2001
From: Roch D'Amour <roch.damour@inlibro.com>
Date: Thu, 22 Feb 2018 16:08:59 -0500
Subject: [PATCH] Bug 18820: Main block size now adjust to OpacNavRight like it
 would for opacuserlogin
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Test plans  :
- "beforepatch.png" shows the result you get when OpacNavRight and opacnav are set to false.
- "opacuserlogin=f_opacnav=f.png" shows the result with the patch and OpacNavRight and opacnav set to false
- "opacuserlogin=t_opacnav=f.png" shows the result with the patch and OpacNavRight set to true and opacnav set to false

Applied patch, can confirm it functions as expected.
Signed-off-by: Dilan Johnpullé <dilan@calyx.net.au>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
index 4cde3a8be8..892840e0d4 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -33,9 +33,9 @@
         </div>
     [% END %]
 
-    [% IF ( OpacNav ||  OpacNavBottom  ) && Koha.Preference( 'opacuserlogin' ) == 1 %]
+    [% IF ( OpacNav ||  OpacNavBottom  ) && (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
         <div class="span7">
-    [% ELSIF Koha.Preference( 'opacuserlogin' ) == 1 %]
+    [% ELSIF (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
         <div class="span9">
     [% ELSIF ( OpacNav ||  OpacNavBottom  ) %]
         <div class="span10">
-- 
2.39.5