From: Ian Weller <ian@gaslightmedia.com>
Date: Fri, 11 Nov 2016 21:20:19 +0000 (-0500)
Subject: Layout work
X-Git-Tag: v1.0.0^2~121
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=18ca8bb42094bec06e6939e21a51f6a77040e3c2;p=WP-Themes%2Foriginalbutterflyhouse.git

Layout work

I have the layout of the grid in place.  The only thing I didn't go back
and do is the blog and search pages.
---

diff --git a/index.php b/index.php
index 5a47a26..2145607 100644
--- a/index.php
+++ b/index.php
@@ -6,7 +6,9 @@
             <div class="off-canvas-wrapper-inner" data-off-canvas-wrapper>
                 <div class="off-canvas-content" data-off-canvas-content>
                     <?php
-                    include "sections/header.php"; 
+                    include "sections/header.php";
+                    include "sections/top-bar";
+                    include "sections/off-canvas";
                     ?>
                     <div class="shadow-wrapper">
                         <?php get_template_part('sections/top-bar');?>
@@ -39,6 +41,7 @@
             </div><!--End of inner-wrap-->
         </div><!--End of off-canvas-->
         <?php wp_footer();?>
+        <script src="https://www.jscache.com/wejs?wtype=cdsscrollingravenarrow&amp;uniq=653&amp;locationId=577142&amp;lang=en_US&amp;border=true&amp;shadow=true&amp;backgroundColor=white&amp;display_version=2"></script>
         <script charset="utf-8" type="text/javascript">var switchTo5x=true;</script>
     </body>
 </html>
\ No newline at end of file
diff --git a/parts/client-info-footer.php b/parts/client-info-footer.php
index ec4237b..786136e 100644
--- a/parts/client-info-footer.php
+++ b/parts/client-info-footer.php
@@ -1,43 +1,39 @@
-<div id="footer_address" class="medium-4 columns show-for-medium-up">
+<div class="medium-6 large-4 columns show-for-medium-up">
     <?php if (function_exists('glm_get_clientinfo_option')) :?>
-
-         <div class="row collapse">
-        <div class="medium-12 large-3 columns">
-            <img id="map" src="<?php bloginfo('template_url');?>/assets/map-icon.png">
-        </div>
-        <div class="small-12 large-9 columns address">
-            <?php if (glm_get_clientinfo_option('address')):?>
+        <h2><?php echo glm_get_clientinfo_option('businessName');?></h2>
+        <?php if (glm_get_clientinfo_option('address')):?>
                 <span><?php echo glm_get_clientinfo_option('address');?></span><br>
                 <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>
-  
 </div>    
-    <?php if (glm_get_clientinfo_option('address2')):?>
+<!--
+    <?php //if (glm_get_clientinfo_option('address2')):?>
         <span class="bullet"> &#8226; </span>
-        <span><?php echo glm_get_clientinfo_option('address2');?></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>
+        <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;?>
-<div class="medium-4 columns show-for-medium-up emailFooter">
-  
-        <div class="row collapse">
-        <div class="small-12 medium-2 medium-offset-1 columns compassIcon">
-            <img id="compass" src="<?php bloginfo('template_url');?>/assets/compass-icon.png">
-        </div>
-        <div class="small-12 medium-8 medium-offset-1 columns dir-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('email')) :?>
-                    <a href="mailto:camppetosega@emmetcounty.org"><span><br>Email</span></a>
-            <?php endif;?>
-        </div>
+-->
+<div class="medium-6 large-4 columns show-for-medium-up text-center">
+    <div id="social-contact">
+        <ul>
+            <li><a href="#" target="_blank"></a></li>
+            <li><a href="#" target="_blank"></a></li>
+            <li><a href="#" target="_blank"></a></li>
+            <li><a href="#" target="_blank"></a></li>
+            <li><a href="#" target="_blank"></a></li>
+        </ul>
+        <?php if (glm_get_clientinfo_option('phone')) :?>
+            <span><?php echo glm_get_clientinfo_option('phone');?></span>
+        <?php endif;?>
+        <?php if (glm_get_clientinfo_option('email')) :?>
+            <span class="bullet"> &#8226; </span><a href="#"><span>Contact Us</span></a>
+        <?php endif;?>
+        <a href="#">Employment Opportunities</a>
     </div>
- 
+    
     <?php if (glm_get_clientinfo_option('fax')) :?>
         <span class="bullet"> &#8226; </span><span><?php echo glm_get_clientinfo_option('fax');?></span>
     <?php endif;?>
diff --git a/parts/main-content.php b/parts/main-content.php
index aa839b8..70fd568 100644
--- a/parts/main-content.php
+++ b/parts/main-content.php
@@ -1,4 +1,4 @@
-<div id="main-content" class="small-12 columns">
+<div id="main-content" class="small-12 large-10 columns">
     <?php if(have_posts()) : while(have_posts()): the_post();?>
     <?php the_content();?>
     <?php endwhile; else:?>
diff --git a/parts/slide-show.php b/parts/slide-show.php
index 1d726a4..d4e0126 100644
--- a/parts/slide-show.php
+++ b/parts/slide-show.php
@@ -1,6 +1,5 @@
 <div id="slideshow">
     <ul>
-        Slideshow here (delete me)
     <?php if ( is_active_sidebar( 'slideshow' ) ) : ?>
         <?php dynamic_sidebar( 'slideshow' ); ?>
     <?php endif; ?>
diff --git a/sections/footer.php b/sections/footer.php
index 2fa4791..4f27ecc 100644
--- a/sections/footer.php
+++ b/sections/footer.php
@@ -2,33 +2,14 @@
     <?php if (is_active_sidebar('sidebar-f')) :?>
         <?php dynamic_sidebar('sidebar-f');?>
     <?php endif;?>
-    <div id="res">
-        <div id="request" class="row">
-            <div id="lantern" class="show-for-large-up">
-                <img src="<?php bloginfo('template_url');?>/assets/lantern.png">
-            </div>
-            <div id="res-content" class="small-12 small-offset-0 large-offset-1 large-7 columns">
-                <h1>Request A Reservation</h1>
-                <p>Your perfect site is waiting... <br> Request a reservation now!</p>
-                <a id="request-but" href="<?php echo get_permalink(11); ?>">Request Now!</a>
-            </div>
-            <div id="camp">
-                <img src="<?php bloginfo('template_url');?>/assets/camping-icon.png">
-            </div>
-        </div>
-
-    </div>
     <div class="row">
         <div class="small-12 small-centered columns">
             <div class="row">
-                <div class="small-12 medium-4 columns text-center">
-
-                       <a href="<?php bloginfo('url');?>"><h1>Footer Logo Here</h1></a>
-
-                </div>
                 <?php get_template_part('parts/client-info-footer');?>
+                <div class="small-12 large-4 columns">
+                    <div id="TA_cdsscrollingravenarrow653" class="TA_cdsscrollingravenarrow"><ul id="7O3YU7kx1ku" class="TA_links OmXqkePWE9"><li id="XbrfGZLtoZ" class="mFFpxAib"><a target="_blank" href="https://www.tripadvisor.com/"><img src="https://static.tacdn.com/img2/t4b/Stacked_TA_logo.png" alt="TripAdvisor" class="widEXCIMG" id="CDSWIDEXCLOGO"/></a></li></ul></div>
+                </div>
             </div>
         </div>
-
     </div>
 </footer>
\ No newline at end of file
diff --git a/sections/front-page.php b/sections/front-page.php
index 55e0d97..cd30e76 100644
--- a/sections/front-page.php
+++ b/sections/front-page.php
@@ -6,8 +6,24 @@
         <div class="row">
             <?php get_template_part('parts/main-content');?>
         </div>
+        <div id="video">
+            
+        </div>
+<!--
         <div class="row" data-equalizer data-options="equalize_on_stack: false">
             <?php get_template_part('parts/glm-blocks');?>
         </div>
+-->
+        <div class="row">
+            <div class="small-12 medium-5 columns text-center">
+                <img src="<?php bloginfo('template_url');?>/assets/downtown-shop.jpg">
+            </div>
+            <div class="medium-2 columns show-for-medium-up">
+<!--                <img src="/assets/">-->
+            </div>
+            <div class="small-12 medium-5 columns text-center">
+                <img src="<?php bloginfo('template_url');?>/assets/online-shop.jpg">
+            </div>
+        </div>
     </div>
 </main>
diff --git a/sections/header.php b/sections/header.php
index f784986..02ed111 100644
--- a/sections/header.php
+++ b/sections/header.php
@@ -6,32 +6,11 @@
                     <a href="<?php bloginfo('url')?>"><img src="<?php bloginfo('template_url');?>/assets/butterfly-house-logo.png"></a>
                     <a href="<?php bloginfo('url')?>"></a>
                 </div>
-            </div>
-        </div>
-        <div class="medium-6 columns show-for-medium-up">
-            <div class="row">
-                <div class="medium-12 columns text-right">
-                    <div class="row medium-uncollapse large-collapse">
-                        <div class="medium-6 large-8 columns">
-                            <a id="contact"  href="<?php echo get_permalink(106); ?>">Contact</a>
-                        </div>
-                        <div class="medium-6 large-4 columns search-top show-for-medium-up">
-                            <?php get_template_part('parts/search-form');?>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div id="under" class="row collapse">
-                <div class="medium-9 columns text-right">
-<!--                <span id="phone">231-347-6536</span>-->
-                </div>
-                <div class="large-3 columns social show-for-large-up">
-<!--
-                    <a href="https://www.facebook.com/camppetosega/" target="_blank"><img src="<?php bloginfo('template_url');?>/assets/facebook-icon.png"></a>
-                    <a href="https://www.youtube.com/user/gappold" target="_blank"><img src="<?php bloginfo('template_url');?>/assets/youtube-icon.png"></a>
--->
+                <div class="small-12 medium-4 columns">
+                    <img src="<?php bloginfo('template_url');?>/assets/purple-butterfly.png">
                 </div>
             </div>
         </div>
+        
     </div>
 </header>
\ No newline at end of file
diff --git a/sections/interior-page.php b/sections/interior-page.php
index 0c82dda..aeead62 100644
--- a/sections/interior-page.php
+++ b/sections/interior-page.php
@@ -1,12 +1,13 @@
 <main class="page-inside">
     <div id="content-wrapper">
         <div class="row">
-            <?php
-            get_template_part('parts/bread-crumbs');
-            ?>
-        </div>
-        <div class="row">
-            <div id="main-content" class="small-12 columns">
+            <div class="small-12 medium-4 large-3 columns">
+                
+            </div>
+            <div id="main-content" class="small-12 medium-8 large-9 columns">
+                <?php
+                get_template_part('parts/bread-crumbs');
+                ?>
                     <?php if(have_posts()) : while(have_posts()): the_post();?>
                     <?php the_content();?>
                     <?php endwhile; else:?>
diff --git a/sections/top-bar.php b/sections/top-bar.php
index d34aeb2..a38b1af 100644
--- a/sections/top-bar.php
+++ b/sections/top-bar.php
@@ -1,9 +1,14 @@
-<nav class="top-bar show-for-large-up" data-topbar role="navigation">
-    <section class="top-bar-section">
-        <?php glm_theme_top_bar(); ?>
-    </section>
-</nav>
-<nav class="tab-bar show-for-medium-down">
+<div class="row">
+    <div class="medium-12 medium-centered large-11 show-for-medium-up">
+    </div>
+    <nav class="top-bar" data-topbar role="navigation">
+        <section class="top-bar-section">
+            <?php glm_theme_top_bar(); ?>
+        </section>
+    </nav>
+</div>
+    
+<nav class="tab-bar show-for-small-down">
     <section class="left-small">
         <a class="left-off-canvas-toggle menu-icon" href="#"><span>Menu</span></a>
     </section>