From 8fa5091b9ad878a735aab9949d1c750af04917aa Mon Sep 17 00:00:00 2001
From: Ian Weller <ian@gaslightmedia.com>
Date: Mon, 25 Jul 2016 15:18:22 -0400
Subject: [PATCH] cleaning up adding a new partial for the blog

---
 root/archive.php                     |  40 +--------------------------
 root/assets/logo.png                 | Bin 537 -> 0 bytes
 root/assets/search_button.jpg        | Bin 1470 -> 0 bytes
 root/header.php                      |   1 -
 root/home.php                        |  40 +--------------------------
 root/index.php                       |   5 ----
 root/parts/blog-content.php          |  39 ++++++++++++++++++++++++++
 root/parts/client-info-footer.php    |   3 ++
 root/parts/client-info-offcanvas.php |   3 ++
 root/parts/search.php                |   2 +-
 root/sidebar.php                     |   2 +-
 root/single.php                      |  33 +---------------------
 12 files changed, 50 insertions(+), 118 deletions(-)
 delete mode 100644 root/assets/logo.png
 delete mode 100644 root/assets/search_button.jpg
 create mode 100644 root/parts/blog-content.php

diff --git a/root/archive.php b/root/archive.php
index 0651451..525dd4d 100644
--- a/root/archive.php
+++ b/root/archive.php
@@ -1,45 +1,7 @@
 <?php get_header(); ?>
 <main class="blog-archive">
     <div class="row">
-        <div id="blog-posts-over" class="small-12 medium-9 columns">
-            <?php if(have_posts()) : while(have_posts()): the_post();?>
-            <div class="row content blog-posts-container">
-              <!--  <div class="small-11 small-centered columns"> -->
-                <?php $thumbnail = get_the_post_thumbnail($post->ID, 'blog-feed-front'); ?>
-                <?php if ($thumbnail) { ?>
-                <div class="small-12 medium-4 columns text-center blog-feed-imgs">
-                    <?php echo $thumbnail; ?>
-                </div>
-                <div class="small-12 medium-8 columns blog-feed-contents">
-                    <?php } else { ?>
-                    <div class="small-12 columns blog-feed-content">
-                        <?php } ?>
-
-                        <article id="<?php the_ID()?>" <?php post_class()?>>
-          
-                        <header class="entry-header">
-                            <h1 class="entry-title"><a href="<?php the_permalink(); ?>"><?php the_title();?></a></h1>
-                            <span class="meta date">Posted on <?php the_time('F jS, Y') ?></span>
-                        </header>
-                       <?php echo the_advanced_excerpt('length=250&length_type=characters&no_custom=1&ellipsis=%26hellip;&exclude_tags=a,img,p,div,h1,h2,h3,h4,h5,h6'); ?>
-                        <!--the_advanced_excerpt('length=200&length_type=words&no_custom=1&ellipsis=%26hellip;');-->
-                        <!-- This could be wrapped in php tags and be functional,
-                                but it is easier to change this in admin side-->
-                        
-                    </article>
-                </div>
-            </div>
-            <?php endwhile; ?>
-            <div class="navigation">
-                <span class="newer"><?php previous_posts_link(__('« Newer','example')) ?></span>
-                <span class="older"><?php next_posts_link(__('Older »','example')) ?></span>
-            </div><!-- /.navigation -->
-            <?php else: ?>
-            <div id="post-404" class="noposts">
-                <p><?php _e('Sorry, no results were found.');?></p>
-            </div><!-- /#post-404 -->
-            <?php endif;?>
-        </div>
+        <?php get_template_part('parts/blog-content'); ?>
         <?php get_template_part('parts/blog-sidebar-r'); ?>
     </div>
     <?php get_footer(); ?>
diff --git a/root/assets/logo.png b/root/assets/logo.png
deleted file mode 100644
index 2779936b69cc76c38e17c82b49702c4488fcf3c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 537
zcmV+!0_OckNk%v~VU_@v0OJ4v%*@P|mX^N0zMPz#v9YnEqoc*e#kaS&s;a6000000
z00000000000000000000EC2ui0G0rj000F35XecZy*TU5yZ>M)j$~<`XsWJk>%MR-
z&vb3yc&_h!@BhG{a7Zi~kI1BQ$!t2G(5Q4uty-_xtai)odcWYXcuX#v&*-#z&2GEj
z@VI<VuiNkVynfH``~QG}f`f#GhKGoWii?bmj*pO$l9QB`mY0~Bnwy-Ro}Zw10s{jR
z0jH-269NSR1qLRgr4p#AtF5nR1gEnArwG6T5(WdV0lgx-$EE?m2*Low#>is3t-Z??
zy959T0jkN<rqlr2-QQ&fs@cBet*`>kBkJwr7ViM@2x#ob1kV$S4RdATlz?~vH1r$r
z4;lc0(FmUDR}0!g3*Laq%Rmv8MQqRH#IQr~>cGZ}_ed4kFtX%Hko-bsLs<c#Lk#RF
z%!D~HBt(b?BvuF-0G2|Z2_Gg6y0Yg4a7rcM(|17`x1&!3CY`#`Og59;m`X6`4XVxp
z1w!ha1vX++vgpd7J=L^W+PKoLU1)W{WPyG6T1m893|!uvV`?qEc2&YCS4JzGqBXf-
ztznEQJkAxWv**vCLyI0wy0q!js8g$6&APSg*RW&Do=v;9?c2C>>)y?~x9{J;g9{%{
bytwh>$dfBy&b+zv=g^}|pH98{iwFQa?JEdo

diff --git a/root/assets/search_button.jpg b/root/assets/search_button.jpg
deleted file mode 100644
index b788c5e6d412c0484a79bf3f56feaca112d6c9b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1470
zcma)5e@q)y9Dmnd+k=$Sb3|N>dK@tsN_)Md9rUClr9WabOBj-XL?Y#SgR|@1<$AS+
zWzooD)R}A<l0~Bl&MdlB&BAnyiAn;~_@^5K6xlLx%w!-x5_B$VeXSHo9L7&_FYkTt
z^ZEXI-<O_B-vAHzlEQuf0)fW>1~!pi0Jt~KMY;e2P-yl8kiMa%I#pF>DN2l4Lt&|%
zw{lXHN`_>Lw%RCAU6YhUT!dGNcD_RpUF6c|Uy+0mc9Bhvpe-nS_)g);ZiRokyRMPz
zj&RN}S+j?zPO{0U9Ocyzk&GS?V{FnzW}UNepD|M;k)@~+7wOJKC7Ofvghx_%!eMn-
zI2%I~l};<|a8y<@<pg7+?UaqC=n4z%WbJm=W+T=?!e~l(KilB-ug8KX7r9<kB9X8r
zDy)*yLD5d9ld>@s!&o5066+GxP|_mCN^>5(e2h~BSrsIa$aoC3OL5gj!c6}uAu4aU
zy=Sks5QD-0rbeTg24vmF)CPVt-+MZaHFn87)xgK3xWe&}UYZfhtViKPs-!eZ(t%tT
z>pLY?igijd;qhd<M(k=5#ITfzm1Q--AR7>4YDnbxfY(JrFIGVav$a0IhuQ6~aC<A<
zH0`t3dTXnERh1sM-R)%<UsX=)mAH767uB3Lys3rEZM2zjh{`asmsf-r_^@A*qC~cA
zR@goldRu?%+VJ+dFxzS=m<*M<+%1=#Gr<YUY&S+19yW%b7vaP!aJ19E08@5gL3ji{
zAtXHw4g*x10bEf%3O|DmMRf*DuQ%xRSU#2qf#v5LGk|MBfzgO(P_zLA)#)$;R+yh(
zSY$GpHthd<lO6#$28scpMR1_O5iO3S#{dt2Mx)(){{R>;fM|7k1Y)Zh)}b*24WdOM
zKlcaGppXji`wTmZO6YwggW>;{;prcM5lS?;76&!p#ZNVL(~GyieB|K3+OIn9+1`Ow
zd-rm5?fGQ8@3p6nT@IfmmS>v5&cy8X!4dQm>(Y;{Gvk*RC+ilzDQ~cqT|MnRap=;+
z&qU%aw|JrGX2rQ(cdHu<M|YepH7WxaQ}65jAf>%P{ApHwKNnw{JvV<rif~`teswB!
zQ!Z&a!wo(9y1Bqn;^;WmH`lLwx2LiC<(@x|_U|ogd+x8pOFIv}HPO2=EMeca&90@q
zr~7_t+RN?xKyS&jpIPxWwOw_dT%8#QyMMnPFMnm)ba8HSxaB)#Z2r{fL#g|ZPoKIX
zhCaMf{}TO#dGu(pQL9JIrZ)!P&g;MQ_{3W3;IL~?!9v&hmE`&Aq18KcgV*jNCxW5Y
z)+6s6zcv2b*w7T!TQ<=v^~mqZpSk-2%>!SzJb35G$G-WG7MINhZz3lr)8GFMN94%C

diff --git a/root/header.php b/root/header.php
index 19101de..5e3e46d 100644
--- a/root/header.php
+++ b/root/header.php
@@ -6,7 +6,6 @@
     <title><?php wp_title(); ?></title>
     <link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri() ; ?>/css/app.css">
     <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,700' rel='stylesheet' type='text/css'>
-    <link href='http://fonts.googleapis.com/css?family=Crimson+Text:600italic' rel='stylesheet' type='text/css'>
     <?php wp_head(); ?>
   </head>
   <body>
diff --git a/root/home.php b/root/home.php
index f4104f5..165c080 100644
--- a/root/home.php
+++ b/root/home.php
@@ -4,45 +4,7 @@
         <?php // GLM_get_header(); ?>
     </article> -->
     <div class="row">
-        <div id="blog-posts-over" class="small-12 medium-9 columns">
-            <?php if(have_posts()) : while(have_posts()): the_post();?>
-            <div class="row content blog-posts-container">
-              <!--  <div class="small-11 small-centered columns"> -->
-                <?php $thumbnail = get_the_post_thumbnail($post->ID, 'blog-feed-front'); ?>
-                <?php if ($thumbnail) { ?>
-                <div class="small-12 medium-4 columns text-center blog-feed-imgs">
-                    <?php echo $thumbnail; ?>
-                </div>
-                <div class="small-12 medium-8 columns blog-feed-contents">
-                    <?php } else { ?>
-                    <div class="small-12 columns blog-feed-content">
-                        <?php } ?>
-
-                        <article id="<?php the_ID()?>" <?php post_class()?>>
-          
-                        <header class="entry-header">
-                            <h1 class="entry-title"><a href="<?php the_permalink(); ?>"><?php the_title();?></a></h1>
-                            <span class="meta date">Posted on <?php the_time('F jS, Y') ?></span>
-                        </header>
-                        <?php echo the_advanced_excerpt('length=250&length_type=characters&no_custom=1&ellipsis=%26hellip;&exclude_tags=a,img,p,div,h1,h2,h3,h4,h5,h6'); ?>
-                        <!--the_advanced_excerpt('length=200&length_type=words&no_custom=1&ellipsis=%26hellip;');-->
-                        <!-- This could be wrapped in php tags and be functional,
-                                but it is easier to change this in admin side-->
-                        
-                    </article>
-                </div>
-            </div>
-            <?php endwhile; ?>
-            <div class="navigation">
-                <span class="newer"><?php previous_posts_link(__('« Newer','example')) ?></span>
-                <span class="older"><?php next_posts_link(__('Older »','example')) ?></span>
-            </div><!-- /.navigation -->
-            <?php else: ?>
-            <div id="post-404" class="noposts">
-                <p><?php _e('Sorry, no results were found.');?></p>
-            </div><!-- /#post-404 -->
-            <?php endif;?>
-        </div>
+        <?php get_template_part('parts/blog-content'); ?>
         <?php get_template_part('parts/blog-sidebar-r'); ?>
     </div>
     <?php get_footer(); ?>
diff --git a/root/index.php b/root/index.php
index 535fb23..62bcd1e 100644
--- a/root/index.php
+++ b/root/index.php
@@ -1,9 +1,5 @@
 <?php get_header(); ?>
 <main class="page-inside">
-        <?php if (is_page("kitchensink")) {
-            get_template_part('parts/glm-kitchen-sink');
-        } else { ?>
-    <!-- kitchensink check - delete me before going live -->
         <div id="content-wrapper">
             <div class="row">
                 <?php
@@ -25,5 +21,4 @@
 -->
             </div>
         </div>
-        <?php } ?> <!-- end kitchensink check - delete me before going live -->
 <?php get_footer(); ?>
diff --git a/root/parts/blog-content.php b/root/parts/blog-content.php
new file mode 100644
index 0000000..88d71bc
--- /dev/null
+++ b/root/parts/blog-content.php
@@ -0,0 +1,39 @@
+        <div id="blog-posts-over" class="small-12 medium-9 columns">
+            <?php if(have_posts()) : while(have_posts()): the_post();?>
+            <div class="row content blog-posts-container">
+              <!--  <div class="small-11 small-centered columns"> -->
+                <?php $thumbnail = get_the_post_thumbnail($post->ID, 'blog-feed-front'); ?>
+                <?php if ($thumbnail) { ?>
+                <div class="small-12 medium-4 columns text-center blog-feed-imgs">
+                    <?php echo $thumbnail; ?>
+                </div>
+                <div class="small-12 medium-8 columns blog-feed-contents">
+                    <?php } else { ?>
+                    <div class="small-12 columns blog-feed-content">
+                        <?php } ?>
+
+                        <article id="<?php the_ID()?>" <?php post_class()?>>
+          
+                        <header class="entry-header">
+                            <h1 class="entry-title"><a href="<?php the_permalink(); ?>"><?php the_title();?></a></h1>
+                            <span class="meta date">Posted on <?php the_time('F jS, Y') ?></span>
+                        </header>
+                        <?php echo the_advanced_excerpt('length=250&length_type=characters&no_custom=1&ellipsis=%26hellip;&exclude_tags=a,img,p,div,h1,h2,h3,h4,h5,h6'); ?>
+                        <!--the_advanced_excerpt('length=200&length_type=words&no_custom=1&ellipsis=%26hellip;');-->
+                        <!-- This could be wrapped in php tags and be functional,
+                                but it is easier to change this in admin side-->
+                        
+                    </article>
+                </div>
+            </div>
+            <?php endwhile; ?>
+            <div class="navigation">
+                <span class="newer"><?php previous_posts_link(__('« Newer','example')) ?></span>
+                <span class="older"><?php next_posts_link(__('Older »','example')) ?></span>
+            </div><!-- /.navigation -->
+            <?php else: ?>
+            <div id="post-404" class="noposts">
+                <p><?php _e('Sorry, no results were found.');?></p>
+            </div><!-- /#post-404 -->
+            <?php endif;?>
+        </div>
\ No newline at end of file
diff --git a/root/parts/client-info-footer.php b/root/parts/client-info-footer.php
index a6bc9ef..a9f8562 100644
--- a/root/parts/client-info-footer.php
+++ b/root/parts/client-info-footer.php
@@ -17,6 +17,9 @@
     <?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;?>
diff --git a/root/parts/client-info-offcanvas.php b/root/parts/client-info-offcanvas.php
index 9012a20..51938c3 100644
--- a/root/parts/client-info-offcanvas.php
+++ b/root/parts/client-info-offcanvas.php
@@ -14,6 +14,9 @@
     <?php if (glm_get_clientinfo_option('phone')) :?>
         <li><?php echo glm_get_clientinfo_option('phone');?></li>
     <?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;?>
diff --git a/root/parts/search.php b/root/parts/search.php
index 425110f..b2c22f4 100644
--- a/root/parts/search.php
+++ b/root/parts/search.php
@@ -1,4 +1,4 @@
 <form role="search" method="get" class="searchform" action="<?php echo home_url('/'); ?>">
      <input class="search-input" type="text" placeholder="Search" value="" name="s">
-     <input class="search-button" type="submit" value="" name="submit">
+     <input class="search-button button" type="submit" value="" name="submit">
 </form>
\ No newline at end of file
diff --git a/root/sidebar.php b/root/sidebar.php
index cd1ead7..03ba537 100644
--- a/root/sidebar.php
+++ b/root/sidebar.php
@@ -1,5 +1,5 @@
 <!--
-                        <div id="side-nav" class="large-3 columns show-for-large-up" data-equalizer-watch>
+                        <div id="side-nav" class="show-for-large-up" data-equalizer-watch>
                             <div class="row collapse">
                                 <?php //glm_side_menu(); ?>
                             </div>
diff --git a/root/single.php b/root/single.php
index bef202d..305452c 100644
--- a/root/single.php
+++ b/root/single.php
@@ -1,38 +1,7 @@
 <?php get_header(); ?>
 <main class="blog-single">
     <div class="row">
-        <div id="blog-posts-over" class="small-12 medium-9 columns">
-            <?php if(have_posts()) : while(have_posts()): the_post();?>
-            <div class="row blog-post-container">
-                <div class="small-11 small-centered columns">
-                    <div class="row">
-                        <div class="small-12 columns">
-                            <article id="<?php the_ID()?>" <?php post_class()?>>
-                                <header class="entry-header">
-                                    <h2 class="entry-title"><a href="<?php the_permalink(); ?>"><?php the_title();?></a></h2>
-                                    <?php if ( has_post_thumbnail() ):?>
-                                             <?php if (get_post_type( $post ) != "ai1ec_event") { ?>
-                                    <div class="featured-image-wrap"><?php the_post_thumbnail("large"); ?></div>
-                                    <?php } ?>
-                                    <?php endif; ?>
-                                    <span class="meta date">Posted on <?php the_time('F jS, Y') ?></span>
-                                </header>
-                                <?php echo the_content(); ?>
-                            </article>
-                            <?php if ( comments_open() || get_comments_number() ) :
-                            comments_template();
-                            endif; ?>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <?php endwhile; ?>
-            <?php else: ?>
-            <div id="post-404" class="noposts">
-                <p><?php _e('Sorry, no results were found.');?></p>
-            </div><!-- /#post-404 -->
-            <?php endif;?>
-        </div>
+        <?php get_template_part('parts/blog-content'); ?>
         <?php get_template_part('parts/blog-sidebar-r'); ?>
     </div>
     <?php get_footer(); ?>
-- 
2.17.1