From 79a00bcd37f6a1aa066077f2238c0b0bc5f69e45 Mon Sep 17 00:00:00 2001
From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 22 Oct 2015 16:09:03 -0400
Subject: [PATCH] enews tweak and blog tweaks

---
 archive.php | 2 +-
 header.php  | 6 +++---
 home.php    | 3 ++-
 search.php  | 4 ++--
 sidebar.php | 6 +++---
 single.php  | 2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/archive.php b/archive.php
index 475c243..b067ed6 100644
--- a/archive.php
+++ b/archive.php
@@ -36,6 +36,7 @@
                         </footer>
                     </article>
                 </div>
+                <?php get_template_part('parts/blog-sidebar-r'); ?>
             </div>
             <?php endwhile; ?>
             <div class="navigation">
@@ -46,7 +47,6 @@
                 <p><?php _e('Sorry, no results were found.');?></p>
             </div><!-- /#post-404 -->
             <?php endif;?>
-            <?php get_template_part('parts/blog-sidebar-r'); ?>
         </div>
         
     </div>
diff --git a/header.php b/header.php
index 34077f0..a69f740 100644
--- a/header.php
+++ b/header.php
@@ -32,9 +32,9 @@
                                             <?php if($donationsPage):?>
                                             <li><a href="<?php echo get_page_link($donationsPage->ID);?>">Donate</a></li>
                                             <?php endif;?>
-                                            <?php $newsPage = get_page_by_title('News');?>
-                                            <?php if($newsPage):?>
-                                            <li><a href="<?php echo get_page_link($newsPage->ID);?>">Enews</a></li>
+                                            <?php $enewsPage = get_page_by_title('E-News Sign-up');?>
+                                            <?php if($enewsPage):?>
+                                            <li><a href="<?php echo get_page_link($enewsPage->ID);?>">Enews</a></li>
                                             <?php endif;?>
                                             <?php $aboutPage = get_page_by_title('About Us');?>
                                             <?php if($aboutPage):?>
diff --git a/home.php b/home.php
index db414a6..1001564 100644
--- a/home.php
+++ b/home.php
@@ -39,6 +39,7 @@
                         </footer>
                     </article>
                 </div>
+                <?php get_template_part('parts/blog-sidebar-r'); ?>
             </div>
             <?php endwhile; ?>
             <div class="navigation">
@@ -49,7 +50,7 @@
                 <p><?php _e('Sorry, no results were found.');?></p>
             </div><!-- /#post-404 -->
             <?php endif;?>
-            <?php get_template_part('parts/blog-sidebar-r'); ?>
+            
         </div>
     </div>
     <?php get_footer(); ?>
diff --git a/search.php b/search.php
index e566698..de229e3 100644
--- a/search.php
+++ b/search.php
@@ -2,11 +2,11 @@
 <main class="search-results">
     <?php if (get_search_query() == "") { ?>
     <div class="row">
-        <br><h1 class="search-result-header small-12 large-9 columns">Please enter a query in the search box. </h1>
+        <br><h1 class="search-result-header small-12 columns">Please enter a query in the search box. </h1>
     </div>
     <?php } else { ?>
     <div class="row">
-        <br><h1 class="search-result-header small-12 large-9 columns">Search Results for "<?php echo get_search_query(); ?>"</h1>
+        <br><h1 class="search-result-header small-12 columns">Search Results for "<?php echo get_search_query(); ?>"</h1>
     </div>
     <div class="row">
         <div id="blog-posts-over" class="small-12 columns">
diff --git a/sidebar.php b/sidebar.php
index 8aa29b0..1ca7c1b 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -12,9 +12,9 @@
         <?php endif;?>
     </div>
     <div class="small-3 large-12 columns">
-        <?php $newsPage = get_page_by_title('News');?>
-        <?php if($newsPage):?>
-        <a class="action-block" href="<?php echo get_page_link($newsPage->ID);?>"><img src="<?php echo get_template_directory_uri(); ?>/assets/action-item-enews.jpg"></a>
+        <?php $enewsPage = get_page_by_title('E-News Sign-up');?>
+        <?php if($enewsPage):?>
+        <a class="action-block" href="<?php echo get_page_link($enewsPage->ID);?>"><img src="<?php echo get_template_directory_uri(); ?>/assets/action-item-enews.jpg"></a>
         <?php endif;?>
     </div>
     <div class="small-3 large-12 columns">
diff --git a/single.php b/single.php
index 8a26e52..5bad5d7 100644
--- a/single.php
+++ b/single.php
@@ -48,6 +48,7 @@
                             </div>
                         </div>
                     </div>
+                    <?php get_template_part('parts/blog-sidebar-r'); ?>
                 </div>
                 <?php endwhile; ?>
                 <?php else: ?>
@@ -56,6 +57,5 @@
                 </div><!-- /#post-404 -->
                 <?php endif;?>
             </div>
-            <?php get_template_part('parts/blog-sidebar-r'); ?>
         </div>
         <?php get_footer(); ?>
-- 
2.17.1