From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 22 Oct 2015 19:47:22 +0000 (-0400)
Subject: updates to blog php and search
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f2a887b506ae1afafada8f4d357d37cfbc887f79;p=WP-Themes%2Fglmthemes%2Fshipwreck-theme.git

updates to blog php and search
---

diff --git a/archive.php b/archive.php
index 921f21b..475c243 100644
--- a/archive.php
+++ b/archive.php
@@ -4,10 +4,15 @@
         <?php // GLM_get_header(); ?>
     </article> -->
     <div class="row">
-        <div id="blog-posts-over" class="small-12 medium-9 columns">
+        <div class="small-12 columns">
+            <div class="headline">
+                <h1>Great Lakes Shipwreck Museum</h1>
+            </div>
+        </div>
+        <div id="blog-posts-over" class="small-12 columns">
             <?php if(have_posts()) : while(have_posts()): the_post();?>
             <div class="row content blog-posts-container">
-                <div class="small-11 small-centered columns">
+                <div class="small-11 small-centered medium-uncentered medium-9 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>
@@ -41,7 +46,8 @@
                 <p><?php _e('Sorry, no results were found.');?></p>
             </div><!-- /#post-404 -->
             <?php endif;?>
+            <?php get_template_part('parts/blog-sidebar-r'); ?>
         </div>
-        <?php get_template_part('parts/blog-sidebar-r'); ?>
+        
     </div>
     <?php get_footer(); ?>
diff --git a/home.php b/home.php
index 713cd78..db414a6 100644
--- a/home.php
+++ b/home.php
@@ -4,10 +4,15 @@
         <?php // GLM_get_header(); ?>
     </article> -->
     <div class="row">
-        <div id="blog-posts-over" class="small-12 medium-9 columns">
+        <div class="small-12 columns">
+            <div class="headline">
+                <h1>Great Lakes Shipwreck Museum</h1>
+            </div>
+        </div>
+        <div id="blog-posts-over" class="small-12 columns">
             <?php if(have_posts()) : while(have_posts()): the_post();?>
             <div class="row content blog-posts-container">
-                <div class="small-11 small-centered columns">
+                <div class="small-11 small-centered medium-uncentered medium-9 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>
@@ -44,8 +49,8 @@
                 <p><?php _e('Sorry, no results were found.');?></p>
             </div><!-- /#post-404 -->
             <?php endif;?>
+            <?php get_template_part('parts/blog-sidebar-r'); ?>
         </div>
-        <?php get_template_part('parts/blog-sidebar-r'); ?>
     </div>
     <?php get_footer(); ?>
 
diff --git a/search.php b/search.php
index 7781bf6..e566698 100644
--- a/search.php
+++ b/search.php
@@ -2,14 +2,14 @@
 <main class="search-results">
     <?php if (get_search_query() == "") { ?>
     <div class="row">
-        <br><h1 class="search-result-header small-12 columns">Please enter a query in the search box. </h1>
+        <br><h1 class="search-result-header small-12 large-9 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>
     </div>
     <div class="row">
-        <div id="blog-posts-over" class="small-12 medium-9 columns">
+        <div id="blog-posts-over" class="small-12 columns">
             <?php if(have_posts()) : while(have_posts()): the_post();?>
                 <?php if (is_search() && (isset($_GET['searchType']) && $_GET['searchType'] == 'blog') && ($post->post_type=='page')) continue; ?>
             <div class="row content search-result-container">
@@ -107,39 +107,6 @@
             </div><!-- /#post-404 -->
             <?php endif;?>
         </div>
-        <div id="blog-side-info-wrapper" class="small-11 small-only-text-center medium-3 columns">
-            <div id="blog-side-info">
-                <form id="searchform" action="<?php bloginfo('url'); ?>" method="get">
-                    <div><input id="s" class="text" type="text" name="s" value="" />
-                    <input class="submit blogbutton" type="submit" name="submit" value="Search" />
-                    <input type="hidden" name="searchType" value="blog" /> </div>
-                </form>
-                <p>Recent Posts</p>
-                <ul>
-                <?php
-                        $args = array( 'numberposts' => '5' );
-                        $recent_posts = wp_get_recent_posts( $args );
-                        foreach( $recent_posts as $recent ){
-                                echo '<li><a href="' . get_permalink($recent["ID"]) . '">' .   $recent["post_title"].'</a> </li> ';
-                        }
-                ?>
-                </ul>
-                <p>Archive</p>
-                <ul><?php wp_get_archives( array( 'type' => 'monthly', 'limit' => 12 ) ); ?></ul>
-                <p>Categories</p>
-                <ul>
-                    <?php
-                    $args = array(
-                    'orderby' => 'name',
-                    'order' => 'ASC'
-                    );
-                  $categories = get_categories($args);
-                    foreach($categories as $category) {
-                      echo '<li><a href="' . get_category_link( $category->term_id ) . '" title="' . sprintf( __( "View all posts in %s" ), $category->name ) . '" ' . '>' . $category->name.'</a> </li> ';  }
-                    ?>
-                </ul>
-            </div>
-        </div>
     </div>    
             <?php } ?>
         
diff --git a/single.php b/single.php
index a0e8a72..8a26e52 100644
--- a/single.php
+++ b/single.php
@@ -1,10 +1,15 @@
 <?php get_header(); ?>
     <main class="blog-single">    
         <div class="row">
+            <div class="small-12 columns">
+                <div class="headline">
+                    <h1>Great Lakes Shipwreck Museum</h1>
+                </div>
+            </div>
             <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="small-11 small-centered medium-uncentered medium-9 columns">
                         <div class="row">
                             <div class="small-12 columns">
                                 <article id="<?php the_ID()?>" <?php post_class()?>>