From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 12 Jan 2017 17:06:40 +0000 (-0500)
Subject: JBAS-1665 Self-register no-wrapper hides sidebar
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=fdf37da2367c631c2ac228e3344b56aa357ec555;p=working%2FEvergreen.git

JBAS-1665 Self-register no-wrapper hides sidebar

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/KCLS/openils/var/templates_kcls/opac/register.tt2 b/KCLS/openils/var/templates_kcls/opac/register.tt2
index 3f64b2872a..2d0c06de57 100644
--- a/KCLS/openils/var/templates_kcls/opac/register.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/register.tt2
@@ -13,18 +13,17 @@ ctx.refresh  = refresh_time _ '; ' _ complete_url;
 # Ugh, CGI.new/.param insists on mangling the return-to URL. 
 # Build the redo_url by hand.
 redo_url = '/eg/opac/register';
+joiner = '?';
 IF return_to;
   redo_url = redo_url _ '?return-to=' _ return_to;
-  SET redo_url = redo_url _ '&no-wrapper=1' IF no_wrapper;
-ELSIF no_wrapper;
-  redo_url = redo_url _ '?no-wrapper=1';
+  joiner = '&';
 END;
+SET redo_url = redo_url _ joiner _ 'no-wrapper=1' IF no_wrapper;
 
 # some useful variables and MACROs for display, 
 # field validation, and added info display
 ctx_org = ctx.physical_loc || ctx.search_ou || ctx.aou_tree.id;
 
-# TODO put these on the EG server?
 card_url = '/images/patron_cards/';
 wallet_cards = [
   '2017_75_Years',
@@ -557,6 +556,7 @@ END; # input_field()
     </form>
     [% END # IF ctx.success %]
     </div><!-- main-content-left -->
+    [% UNLESS no_wrapper %]
     <div id='main-content-right'>
       <h3>
         <a class="blue-link"
@@ -647,6 +647,7 @@ END; # input_field()
         </li>
       </ul>
     </div>
+    [% END %]
     <div class="grid-clear"></div>
   </div>
 </div>