From 5f75abf4554165c7a63b8d5587ebf5ebfc7a1cb5 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 8 Oct 2018 14:21:27 -0400
Subject: [PATCH] Block files converged into one

---
 parts/glm-blocks-front.php  | 40 ---------------------------------
 parts/glm-blocks-owners.php | 40 ---------------------------------
 parts/glm-blocks.php        | 44 +++++++++++++++++++++++++++++++++++++
 sections/front-page.php     |  2 +-
 sections/owners-home.php    |  2 +-
 5 files changed, 46 insertions(+), 82 deletions(-)
 delete mode 100644 parts/glm-blocks-front.php
 delete mode 100644 parts/glm-blocks-owners.php
 create mode 100644 parts/glm-blocks.php

diff --git a/parts/glm-blocks-front.php b/parts/glm-blocks-front.php
deleted file mode 100644
index 45cfbef..0000000
--- a/parts/glm-blocks-front.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php if(function_exists('fetch_all_glm_blocks')):?>
-<?php $blocks = fetch_all_glm_blocks(MAIN_FRONTPAGE_BLOCKS_ID);?>
-<ul class="blocks small-block-grid-1 medium-block-grid-1 large-block-grid-3">
-    <?php $count = 1; ?>
-    <?php foreach ($blocks as $block):?>
-        <li id="block-<?php echo $count; ?>" class="block">
-            <div class="block-background" style="background-image: url('<?php echo get_the_post_thumbnail_url($block->ID, $size);?>')">
-                <!-- link if url for image is set in admin-->
-                
-
-                    <!-- block image-->
-                    <?php $size = ($count == 1 | $count == 4) ? 'glm-block-large' : 'glm-block-small'; ?>
-
-                    <!-- end link wrapper around block title-->
-                    <?php if($block->url):?> </a> <?php endif;?>
-                <?php if($block->url):?>
-                <a href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target="_blank"';}?>>
-                <?php endif;?>
-                    <div class="block-overlay">
-                        <!-- block content-->
-                        <div class="block-overlay-center">
-                            <!-- block title-->
-                            <h1 class="block-title-center"><?php echo $block->post_title;?></h1>
-                            <div class="block-content">
-                                <?php echo apply_filters('the_content', $block->post_content) . $block->post_excerpt;?>
-                            </div>
-                        </div>
-                    </div>
-
-                <?php if($block->url):?>
-                    </a>
-                <?php endif;?>
-            </div>
-        </li>
-        
-        <?php $count++; ?>
-    <?php endforeach;?>
-</ul>
-<!--<div class="separator"><hr></div>-->
-<?php endif;?>
diff --git a/parts/glm-blocks-owners.php b/parts/glm-blocks-owners.php
deleted file mode 100644
index 3ec359f..0000000
--- a/parts/glm-blocks-owners.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php if(function_exists('fetch_all_glm_blocks')):?>
-<?php $blocks = fetch_all_glm_blocks(OWNERS_FRONTPAGE_BLOCKS_ID);?>
-<ul class="blocks small-block-grid-1 medium-block-grid-1 large-block-grid-3">
-    <?php $count = 1; ?>
-    <?php foreach ($blocks as $block):?>
-        <li id="block-<?php echo $count; ?>" class="block">
-            <div class="block-background" style="background-image: url('<?php echo get_the_post_thumbnail_url($block->ID, $size);?>')">
-                <!-- link if url for image is set in admin-->
-                
-
-                    <!-- block image-->
-                    <?php $size = ($count == 1 | $count == 4) ? 'glm-block-large' : 'glm-block-small'; ?>
-
-                    <!-- end link wrapper around block title-->
-                    <?php if($block->url):?> </a> <?php endif;?>
-                <?php if($block->url):?>
-                <a href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target="_blank"';}?>>
-                <?php endif;?>
-                    <div class="block-overlay">
-                        <!-- block content-->
-                        <div class="block-overlay-center">
-                            <!-- block title-->
-                            <h1 class="block-title-center"><?php echo $block->post_title;?></h1>
-                            <div class="block-content">
-                                <?php echo apply_filters('the_content', $block->post_content) . $block->post_excerpt;?>
-                            </div>
-                        </div>
-                    </div>
-
-                <?php if($block->url):?>
-                    </a>
-                <?php endif;?>
-            </div>
-        </li>
-        
-        <?php $count++; ?>
-    <?php endforeach;?>
-</ul>
-<!--<div class="separator"><hr></div>-->
-<?php endif;?>
diff --git a/parts/glm-blocks.php b/parts/glm-blocks.php
new file mode 100644
index 0000000..3569950
--- /dev/null
+++ b/parts/glm-blocks.php
@@ -0,0 +1,44 @@
+<?php if(function_exists('fetch_all_glm_blocks')):?>
+    <?php if (is_page(OWNERS_FRONTPAGE_ID)) {
+        $blocks = fetch_all_glm_blocks(OWNERS_FRONTPAGE_BLOCKS_ID);
+    } else {
+        $blocks = fetch_all_glm_blocks(MAIN_FRONTPAGE_BLOCKS_ID);
+    } ?>
+    <ul class="blocks small-block-grid-1 medium-block-grid-1 large-block-grid-3">
+        <?php $count = 1; ?>
+        <?php foreach ($blocks as $block):?>
+            <li id="block-<?php echo $count; ?>" class="block">
+                <div class="block-background" style="background-image: url('<?php echo get_the_post_thumbnail_url($block->ID, $size);?>')">
+                    <!-- link if url for image is set in admin-->
+                    
+
+                        <!-- block image-->
+                        <?php $size = ($count == 1 | $count == 4) ? 'glm-block-large' : 'glm-block-small'; ?>
+
+                        <!-- end link wrapper around block title-->
+                        <?php if($block->url):?> </a> <?php endif;?>
+                    <?php if($block->url):?>
+                    <a href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target="_blank"';}?>>
+                    <?php endif;?>
+                        <div class="block-overlay">
+                            <!-- block content-->
+                            <div class="block-overlay-center">
+                                <!-- block title-->
+                                <h1 class="block-title-center"><?php echo $block->post_title;?></h1>
+                                <div class="block-content">
+                                    <?php echo apply_filters('the_content', $block->post_content) . $block->post_excerpt;?>
+                                </div>
+                            </div>
+                        </div>
+
+                    <?php if($block->url):?>
+                        </a>
+                    <?php endif;?>
+                </div>
+            </li>
+            
+            <?php $count++; ?>
+        <?php endforeach;?>
+    </ul>
+    <!--<div class="separator"><hr></div>-->
+<?php endif;?>
diff --git a/sections/front-page.php b/sections/front-page.php
index e42dfdd..dfa9d00 100644
--- a/sections/front-page.php
+++ b/sections/front-page.php
@@ -5,7 +5,7 @@
             <?php get_template_part('parts/main-content');?>
         </div>
         <div class="row blocks-row" data-equalizer data-options="equalize_on_stack: false">
-            <?php get_template_part('parts/glm-blocks-front'); ?>
+            <?php get_template_part('parts/glm-blocks'); ?>
         </div>
         
         <div id="front-blog-container">
diff --git a/sections/owners-home.php b/sections/owners-home.php
index 6787aa6..baa01e5 100644
--- a/sections/owners-home.php
+++ b/sections/owners-home.php
@@ -7,7 +7,7 @@
             <?php get_template_part('parts/main-content');?>
         </div>
         <div class="row blocks-row" data-equalizer data-options="equalize_on_stack: false">
-            <?php get_template_part('parts/glm-blocks-owners'); ?>
+            <?php get_template_part('parts/glm-blocks'); ?>
         </div>
         
         <div id="front-blog-container">
-- 
2.17.1