From 68a0f72f6f6a13937e5d69a7762c5e549f66c782 Mon Sep 17 00:00:00 2001
From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 26 Jul 2016 15:22:52 -0400
Subject: [PATCH] Mass rework of the glmTheme in an attempt to make it a one
 file wonder

---
 root/header.php                               |  1 +
 root/index.php                                | 15 ++++++++++++++-
 root/{ => parts}/archive.php                  |  2 --
 root/{front-page.php => parts/front-view.php} | 10 ++++------
 root/parts/glm-kitchen-sink.php               |  2 +-
 root/{ => parts}/home.php                     |  2 --
 root/{search.php => parts/search-result.php}  |  3 +--
 root/{ => parts}/single.php                   |  2 --
 root/parts/top-bar.php                        |  2 +-
 9 files changed, 22 insertions(+), 17 deletions(-)
 rename root/{ => parts}/archive.php (78%)
 rename root/{front-page.php => parts/front-view.php} (83%)
 rename root/{ => parts}/home.php (85%)
 rename root/{search.php => parts/search-result.php} (99%)
 rename root/{ => parts}/single.php (97%)
diff --git a/root/header.php b/root/header.php
index 5e3e46d..b5c4af7 100644
--- a/root/header.php
+++ b/root/header.php
@@ -1,3 +1,4 @@
+<?php get_template_part('parts/php-refs');?>
 <!doctype html>
 <html class="no-js" lang="en">
   <head>
diff --git a/root/index.php b/root/index.php
index cfeba0c..d2cf1e7 100644
--- a/root/index.php
+++ b/root/index.php
@@ -1,5 +1,16 @@
 <?php get_header(); ?>
-<main class="page-inside">
+<?php if (is_front_page()) { ?>
+    <?php get_template_part('parts/front-view'); ?>
+<?php } elseif (is_home()) { ?>
+    <?php get_template_part('parts/home'); ?>
+<?php } elseif (is_archive()) { ?>
+    <?php get_template_part('parts/archive'); ?>
+<?php } elseif (is_single()) { ?>
+    <?php get_template_part('parts/single'); ?>
+<?php } elseif (is_search()) { ?>
+    <?php get_template_part('parts/search-results'); ?>
+<?php } else { ?>
+    <main class="page-inside">
         <div id="content-wrapper">
             <div class="row">
                 <?php
@@ -15,4 +26,6 @@
 -->
             </div>
         </div>
+<?php } ?>
+
 <?php get_footer(); ?>
diff --git a/root/archive.php b/root/parts/archive.php
similarity index 78%
rename from root/archive.php
rename to root/parts/archive.php
index 38c6c45..ef2c76b 100644
--- a/root/archive.php
+++ b/root/parts/archive.php
@@ -1,7 +1,5 @@
-<?php get_header(); ?>
 <main class="blog-archive">
     <div class="row">
         <?php get_template_part('parts/blog-content-area'); ?>
         <?php get_template_part('parts/blog-sidebar-r'); ?>
     </div>
-    <?php get_footer(); ?>
diff --git a/root/front-page.php b/root/parts/front-view.php
similarity index 83%
rename from root/front-page.php
rename to root/parts/front-view.php
index 859a190..c732b9f 100644
--- a/root/front-page.php
+++ b/root/parts/front-view.php
@@ -1,4 +1,3 @@
-<?php get_header(); ?>
 <main class="page-front">
     <div class="row">
         <?php get_template_part('parts/slide-show');?>
@@ -11,11 +10,10 @@
         </div>
         <div class="row">
             <?php get_template_part('parts/main-content');?>
-<!--
+
             <div class="small-12 medium-6 large-4 columns small-text-center medium-text-left">
-                <?php //get_sidebar(); ?>
+                <?php get_sidebar(); ?>
             </div>
--->
+
         </div>
-    </div>
-<?php get_footer(); ?>
+    </div>
\ No newline at end of file
diff --git a/root/parts/glm-kitchen-sink.php b/root/parts/glm-kitchen-sink.php
index 57633a7..9fde46a 100644
--- a/root/parts/glm-kitchen-sink.php
+++ b/root/parts/glm-kitchen-sink.php
@@ -285,7 +285,7 @@
         
         <br><a name="copyright">copyright</a> 
 <div id="copyright" class="row">
-    <span>&copy; <?php echo date('Y');?> {%= title %}</span>
+    <span>&copy; <?php echo date('Y');?> </span>
     <span class="bullet"> &#8226; </span>
     <span> All Rights Reserved.</span>
     <span class="bullet"> &#8226; </span>
diff --git a/root/home.php b/root/parts/home.php
similarity index 85%
rename from root/home.php
rename to root/parts/home.php
index a02e1c0..3dccb05 100644
--- a/root/home.php
+++ b/root/parts/home.php
@@ -1,4 +1,3 @@
-<?php get_header(); ?>
 <main class="blog-home">
 <!--    <article <?php // post_class() ?> id="interior-featured">
         <?php // GLM_get_header(); ?>
@@ -7,7 +6,6 @@
         <?php get_template_part('parts/blog-content-area'); ?>
         <?php get_template_part('parts/blog-sidebar-r'); ?>
     </div>
-    <?php get_footer(); ?>
 
 
 
diff --git a/root/search.php b/root/parts/search-result.php
similarity index 99%
rename from root/search.php
rename to root/parts/search-result.php
index b7e5d7e..9faa65f 100644
--- a/root/search.php
+++ b/root/parts/search-result.php
@@ -1,4 +1,4 @@
-<?php get_header(); ?>
+
 <main class="search-results">
     <div class="row">
         <?php if (get_search_query() == "") { ?>
@@ -109,4 +109,3 @@
             <?php } ?> <!-- end empty query check -->
         </div>
     
-    <?php get_footer(); ?>
diff --git a/root/single.php b/root/parts/single.php
similarity index 97%
rename from root/single.php
rename to root/parts/single.php
index bef202d..cd85b7d 100644
--- a/root/single.php
+++ b/root/parts/single.php
@@ -1,4 +1,3 @@
-<?php get_header(); ?>
 <main class="blog-single">
     <div class="row">
         <div id="blog-posts-over" class="small-12 medium-9 columns">
@@ -35,4 +34,3 @@
         </div>
         <?php get_template_part('parts/blog-sidebar-r'); ?>
     </div>
-    <?php get_footer(); ?>
diff --git a/root/parts/top-bar.php b/root/parts/top-bar.php
index d34aeb2..34350ba 100644
--- a/root/parts/top-bar.php
+++ b/root/parts/top-bar.php
@@ -1,4 +1,4 @@
-<nav class="top-bar show-for-large-up" data-topbar role="navigation">
+<nav class="top-bar text-center show-for-large-up" data-topbar role="navigation">
     <section class="top-bar-section">
         <?php glm_theme_top_bar(); ?>
     </section>
-- 
2.17.1

