projects / web / GruntInit / glmTheme.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ee02b6f)
cleaning up adding a new partial for the blog
authorIan Weller <ian@gaslightmedia.com>
Mon, 25 Jul 2016 19:18:22 +0000 (15:18 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 25 Jul 2016 19:18:22 +0000 (15:18 -0400)
12 files changed:
root/archive.php patch | blob | history
root/assets/logo.png [deleted file] patch | blob | history
root/assets/search_button.jpg [deleted file] patch | blob | history
root/header.php patch | blob | history
root/home.php patch | blob | history
root/index.php patch | blob | history
root/parts/blog-content.php [new file with mode: 0644] patch | blob
root/parts/client-info-footer.php patch | blob | history
root/parts/client-info-offcanvas.php patch | blob | history
root/parts/search.php patch | blob | history
root/sidebar.php patch | blob | history
root/single.php patch | blob | history

diff --git a/root/archive.php b/root/archive.php
index 0651451..525dd4d 100644 (file)
--- 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 (file)
index 2779936..0000000
Binary files a/root/assets/logo.png and /dev/null differ
diff --git a/root/assets/search_button.jpg b/root/assets/search_button.jpg
deleted file mode 100644 (file)
index b788c5e..0000000
Binary files a/root/assets/search_button.jpg and /dev/null differ
diff --git a/root/header.php b/root/header.php
index 19101de..5e3e46d 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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(); ?>