From b01bc045b3a4fe9311d4beb3dbf04e9342a3ad8c Mon Sep 17 00:00:00 2001
From: Paudet <philippe.audet-fortin@inlibro.com>
Date: Mon, 19 Jun 2017 09:27:15 -0400
Subject: [PATCH] Bug 18820: Adding lines that check if opacuserlogin is enable
 and if OpacNav has content.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Dominic Pichette <dominic@inlibro.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt | 8 ++++++--
 1 file changed, 6 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 ba5372e..cd6d642 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -32,10 +32,14 @@
         </div>
     [% END %]
 
-    [% IF ( OpacNav ||  OpacNavBottom  ) %]
+    [% IF ( OpacNav ||  OpacNavBottom  ) && Koha.Preference( 'opacuserlogin' ) == 1 %]
         <div class="span7">
-    [% ELSE %]
+    [% ELSIF Koha.Preference( 'opacuserlogin' ) == 1 %]
         <div class="span9">
+    [% ELSIF ( OpacNav ||  OpacNavBottom  ) %]
+        <div class="span10">
+    [% ELSE %]
+        <div class="span12">
     [% END %]
             [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
                 <form id="news-branch-select" class="form-inline" name="news-branch-select" method="get" action="/cgi-bin/koha/opac-main.pl">
-- 
2.10.2