From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 7 Mar 2017 20:36:53 +0000 (-0500)
Subject: I am making slow progress
X-Git-Tag: v1.0.0^2~148
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=789115246cd38e53349951cb0824162053b075b7;p=WP-Themes%2Fmackinawferry.git

I am making slow progress

I am kind of jumping from bit to bit.  I am in the process of updating
the client info for the footer, which caused me to start working on the
footer area.
---

diff --git a/footer.php b/footer.php
index 05da918..fca463a 100644
--- a/footer.php
+++ b/footer.php
@@ -4,26 +4,24 @@
                             <?php if (is_active_sidebar('sidebar-f')) :?>
                                 <?php dynamic_sidebar('sidebar-f');?>
                             <?php endif;?>
-                            <div class="row medium-uncollapse large-collapse">
-                                <div class="small-10 small-centered medium-uncentered medium-6 large-2 columns small-text-center large-text-left">
-                                    <a href="<?php bloginfo('url')?>"><img alt="footer logo" src="<?php bloginfo('template_url'); ?>/assets/france-journeys-white-logo.png"></a>
+                            <div class="row">
+                                <div class="small-10 small-centered large-uncentered large-4 columns small-text-center">
+                                    <a href="<?php bloginfo('url')?>"><img alt="footer logo" src="<?php bloginfo('template_url'); ?>/assets/star-line-circle-logo.png"></a>
                                 </div>
-                                <?php get_template_part('parts/client-info-footer');?>
-                                <div class="medium-6 small-text-center large-text-left large-2 columns show-for-medium-up social">
-                                    <ul class="text-right">
-                                        <li><a class="facebook" href="https://www.facebook.com/FranceJourneysTravel/" target="_blank"></a></li>
-                                        <li><a class="insta" href="https://www.instagram.com/francejourneys/" target="_blank"></a></li>
-                                        <li><a class="twit" href="https://twitter.com/francejourneys/" target="_blank"></a></li>
-                                        <li><a class="tube" href="https://www.youtube.com/user/FranceJourneys/" target="_blank"></a></li>
-                                    </ul>
+                                <div class="medium-6 large-4 columns show-for-medium-up">
+                                    <?php glm_theme_footer(); ?>
                                 </div>
-                                <div id="sign-up" class="small-10 small-centered medium-uncentered medium-6 large-3 columns small-text-center large-text-left">
-                                    <a href="<?php echo get_permalink(464); ?>"><img src="<?php bloginfo('template_url'); ?>/assets/signup.png"></a>
+                                <div class="medium-6 large-4 columns show-for-medium-up">
+                                    <?php get_template_part('parts/client-info-footer');?>
+                                    <ul class="social">
+                                        <li><a class="facebook" href="#" target="_blank"></a></li>
+                                        <li><a class="insta" href="#" target="_blank"></a></li>
+                                        <li><a class="twit" href="#" target="_blank"></a></li>
+                                        <li><a class="tube" href="#" target="_blank"></a></li>
+                                    </ul>
                                 </div>
                             </div>
                         </footer>
-                    
-                <div class="jvectormap-tip" style="display: none; left: 849px; top: 677px;">Languedoc-Roussillon-Midi-Pyrénées</div>
                 <div id="copyright">
                     <span>Copyright &copy; <?php echo date('Y');?> </span>
                     <span class="bullet"> &#8226; </span>
diff --git a/front-page.php b/front-page.php
index 6fa15a2..d748bd0 100644
--- a/front-page.php
+++ b/front-page.php
@@ -21,9 +21,16 @@
                 <?php //get_sidebar(); ?>
             </div>
 -->
-            <div id="rotation">
-                <?php get_template_part('parts/glm-carousel'); ?>
+        <div class="action-items">
+            <div class="row">
+                <div class="small-12 medium-6 columns">
+                    <a href="#"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/buy-tickets-graphics.png"></a>
+                </div>
+                <div class="small-12 medium-6 columns">
+                    <a><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/schedules-covers.png"></a>
+                </div>
             </div>
+        </div>
         <div class="row">
             <div id="blog-feed" class="small-11 small-centered columns">
                 <?php get_template_part('parts/blog-feed-home'); ?>
diff --git a/lib/navigation.php b/lib/navigation.php
index 5390177..7598f50 100644
--- a/lib/navigation.php
+++ b/lib/navigation.php
@@ -2,7 +2,7 @@
 
 register_nav_menus(array(
   'top-bar' => 'Site Navigation',
-  'regions' => 'Regions'
+  'footer' => 'Footer'
 ));
 
 /**
diff --git a/parts/client-info-footer.php b/parts/client-info-footer.php
index 380cfa5..8570954 100644
--- a/parts/client-info-footer.php
+++ b/parts/client-info-footer.php
@@ -1,35 +1,33 @@
-<div id="footer_address" class=" medium-6 large-4 columns show-for-medium-up">
+<div id="footer_address">
     <?php if (function_exists('glm_get_clientinfo_option')) :?>
-    <div class="row medium-uncollapse large-collapse">
-        <div class="medium-2 columns footer-img">
-            <img alt="adress" src="<?php bloginfo('template_url');?>/assets/adress-icon.png">
-        </div>
-        <div class="medium-10 columns address">
-            <h4><?php echo glm_get_clientinfo_option('businessName');?></h4>
-            <?php if (glm_get_clientinfo_option('address')):?>
-                <span><?php echo glm_get_clientinfo_option('address');?>,</span> 
-                <span><?php echo glm_get_clientinfo_option('city');?>, <?php echo glm_get_clientinfo_option('state');?>
-                    <?php echo glm_get_clientinfo_option('zip');?></span>
-            <?php endif;?>
-        </div>
-        <div class="medium-2 columns footer-img">
-            <img alt="contact" src="<?php bloginfo('template_url');?>/assets/phone-icon.png">
-        </div>
-        <div class="medium-10 columns contact">
-            <?php if (glm_get_clientinfo_option('phone')) :?>
-                <span><?php echo glm_get_clientinfo_option('phone');?></span>
-            <?php endif;?>
-            <?php if (glm_get_clientinfo_option('phone2')) :?>
-                <span class="bullet"> &#8226; </span><span><?php echo glm_get_clientinfo_option('phone2');?></span>
-            <?php endif;?>
-            <?php if (glm_get_clientinfo_option('email')) :?>
-                <br><a href="mailto:voyage@francejourneys.com"><span><?php echo glm_get_clientinfo_option('email');?></span></a>
-            <?php endif;?>
-        <span class="bullet"> &#8226; </span><a href="<?php echo get_permalink(114); ?>">Blog</a>
-        </div>
-    </div>
-    
-    
-    <?php endif;?>
+                                    <?php if (glm_get_clientinfo_option('address')):?>
+                                        <span><?php echo glm_get_clientinfo_option('address');?></span>
+                                        <span class="bullet"> &#8226; </span>
+                                        <span><?php echo glm_get_clientinfo_option('city');?>, <?php echo glm_get_clientinfo_option('state');?>
+                                            <?php echo glm_get_clientinfo_option('zip');?></span>
+                                    <?php endif;?>
+                                    <?php if (glm_get_clientinfo_option('address2')):?>
+                                        <span class="bullet"> &#8226; </span>
+                                        <span><?php echo glm_get_clientinfo_option('address2');?></span>
+                                        <span class="bullet"> &#8226; </span>
+                                        <span><?php echo glm_get_clientinfo_option('city2');?>, <?php echo glm_get_clientinfo_option('state2');?>
+                                            <?php echo glm_get_clientinfo_option('zip2');?></span>
+                                    <?php endif;?>
+                                    <?php if (glm_get_clientinfo_option('phone')) :?>
+                                        <span class="bullet"> &#8226; </span><span><?php echo glm_get_clientinfo_option('phone');?></span>
+                                    <?php endif;?>
+                                    <?php if (glm_get_clientinfo_option('phone2')) :?>
+                                        <span class="bullet"> &#8226; </span><span><?php echo glm_get_clientinfo_option('phone2');?></span>
+                                    <?php endif;?>
+                                    <?php if (glm_get_clientinfo_option('email')) :?>
+                                        <span class="bullet"> &#8226; </span><span><?php echo glm_get_clientinfo_option('email');?></span>
+                                    <?php endif;?>
+                                    <?php if (glm_get_clientinfo_option('fax')) :?>
+                                        <span class="bullet"> &#8226; </span><span><?php echo glm_get_clientinfo_option('fax');?></span>
+                                    <?php endif;?>
+                                    <?php if (glm_get_clientinfo_option('extra')) :?>
+                                        <span class="bullet"> &#8226; </span><span><?php echo glm_get_clientinfo_option('extra');?></span>
+                                    <?php endif;?>
+                                    <?php endif;?>
 </div>