From 1ece057f57843c71678ecef60bf950472e84d2b7 Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 8 Oct 2018 10:27:26 -0400
Subject: [PATCH] formatting the client info output for off canvas

---
 sections/footer.php     | 63 ++++++++++++++++++++---------------------
 sections/off-canvas.php |  9 ++----
 2 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/sections/footer.php b/sections/footer.php
index 3f98908..7f11be0 100644
--- a/sections/footer.php
+++ b/sections/footer.php
@@ -1,37 +1,36 @@
 
 <footer class="main opensearchserver.ignore">
-<div class="row large-row">
-    <!-- <div id="footer-logo-container" class="small-12 large-4 columns">
-        <a href="<?php echo get_bloginfo('url'); ?>">
-            <img src="<?php echo get_template_directory_uri();?>/assets/logo.jpg" alt="" class="footer-logo">
-        </a>
-    </div> -->
-    <div id="footer-address" class="large-12 columns show-for-large-up">
-        <?php if ( function_exists( 'glm_get_clientinfo_option' ) ) :?>
-            <?php if ( glm_get_clientinfo_option( 'address' ) ) :?>
-            <span><?php echo glm_get_clientinfo_option( 'address' );?></span>
+    <div class="row large-row">
+        <!-- <div id="footer-logo-container" class="small-12 large-4 columns">
+            <a href="<?php echo get_bloginfo('url'); ?>">
+                <img src="<?php echo get_template_directory_uri();?>/assets/logo.jpg" alt="" class="footer-logo">
+            </a>
+        </div> -->
+        <div id="footer-address" class="large-12 columns show-for-large-up">
+            <?php if ( function_exists( 'glm_get_clientinfo_option' ) ) :?>
+                <?php if ( glm_get_clientinfo_option( 'address' ) ) :?>
+                <span><?php echo glm_get_clientinfo_option( 'address' );?></span>
+                <?php endif;?>
+                <?php if ( glm_get_clientinfo_option( 'city' ) ) :?>
+                <span><?php echo glm_get_clientinfo_option( 'city' );?></span>
+                <?php endif;?>
+                <?php if ( glm_get_clientinfo_option( 'state' ) ) :?>
+                <span><?php echo glm_get_clientinfo_option( 'state' );?></span>
+                <?php endif;?>
+                <?php if ( glm_get_clientinfo_option( 'zip' ) ) :?>
+                <span><?php echo glm_get_clientinfo_option( 'zip' );?></span>
+                <?php endif;?>
+                <br>
+                <?php if ( glm_get_clientinfo_option( 'phone' ) ) :?>
+                <span class="phone"><?php echo glm_get_clientinfo_option( 'phone' );?></span>
+                <span class="bullet">&#8226;</span>
+                <?php endif;?>
+                <?php if ( glm_get_clientinfo_option( 'email' ) ) :?>
+                <a class="email-link" href="mailto:<?php echo glm_get_clientinfo_option( 'email' );?>">Email</a>
+                <span class="bullet">&#8226;</span>
+                <?php endif;?>
+                <a class="contact-us-link" href="<?php echo get_permalink( 131 )?>">Contact Us</a>
             <?php endif;?>
-            <?php if ( glm_get_clientinfo_option( 'city' ) ) :?>
-            <span><?php echo glm_get_clientinfo_option( 'city' );?></span>
-            <?php endif;?>
-            <?php if ( glm_get_clientinfo_option( 'state' ) ) :?>
-            <span><?php echo glm_get_clientinfo_option( 'state' );?></span>
-            <?php endif;?>
-            <?php if ( glm_get_clientinfo_option( 'zip' ) ) :?>
-            <span><?php echo glm_get_clientinfo_option( 'zip' );?></span>
-            <?php endif;?>
-            <br>
-            <?php if ( glm_get_clientinfo_option( 'phone' ) ) :?>
-            <span class="phone"><?php echo glm_get_clientinfo_option( 'phone' );?></span>
-            <span class="bullet">&#8226;</span>
-            <?php endif;?>
-            <?php if ( glm_get_clientinfo_option( 'email' ) ) :?>
-            <a class="email-link" href="mailto:<?php echo glm_get_clientinfo_option( 'email' );?>">Email</a>
-            <span class="bullet">&#8226;</span>
-            <?php endif;?>
-            <a class="contact-us-link" href="<?php echo get_permalink( 131 )?>">Contact Us</a>
-        <?php endif;?>
+        </div>
     </div>
- 
-</div>
 </footer>
\ No newline at end of file
diff --git a/sections/off-canvas.php b/sections/off-canvas.php
index 9d9507b..1110a96 100644
--- a/sections/off-canvas.php
+++ b/sections/off-canvas.php
@@ -11,14 +11,9 @@
                                 <li><?php echo glm_get_clientinfo_option('address');?></li>
                                 <?php endif;?>
                                 <?php if (glm_get_clientinfo_option('city')) :?>
-                                <li><?php echo glm_get_clientinfo_option('city');?></li>
-                                <?php endif;?>
-                                <?php if (glm_get_clientinfo_option('state')) :?>
-                                <li><?php echo glm_get_clientinfo_option('state');?></li>
-                                <?php endif;?>
-                                <?php if (glm_get_clientinfo_option('zip')) :?>
-                                <li><?php echo glm_get_clientinfo_option('zip');?></li>
+                                <li><?php echo glm_get_clientinfo_option('city'). ", " . glm_get_clientinfo_option('state') . " ". glm_get_clientinfo_option('zip');?></li>
                                 <?php endif;?>
+        
                                 <?php if (glm_get_clientinfo_option('phone')) :?>
                                 <li class="phone"><?php echo glm_get_clientinfo_option('phone');?></li>
                                 <?php endif;?>
-- 
2.17.1