From ceae2e1a80ee1d5c6ef41051d1a179ce02427154 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 1 Nov 2016 17:25:21 -0400
Subject: [PATCH] Update the blocks for theme

Updating the block section so it can be used to call as a function.
---
 functions.php           |  1 +
 parts/glm-blocks.php    | 69 +++++++++++++++++++----------------------
 sections/footer.php     | 10 +++---
 sections/front-page.php |  6 ++--
 4 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/functions.php b/functions.php
index 5b98ff4..9e27dc5 100644
--- a/functions.php
+++ b/functions.php
@@ -1,6 +1,7 @@
 <?php
 require_once 'lib/menu-walker.php';
 require_once 'lib/navigation.php';
+require_once 'parts/glm-blocks.php';
 
 $ancestorId   = null;
 $includePages = array();
diff --git a/parts/glm-blocks.php b/parts/glm-blocks.php
index 2f8cd0c..369826a 100644
--- a/parts/glm-blocks.php
+++ b/parts/glm-blocks.php
@@ -1,39 +1,34 @@
-<?php if(function_exists('fetch_all_glm_blocks')):?>
 <?php
-$post_id = ($post->ID);
-switch ($post_id) {
-case 'partners':
-    $defaultBlockGroup = PARTNERS_BLOCKS;
-    break;
-default:
-    $defaultBlockGroup = DEFAULT_BLOCKS;
-    break;
+if ( !function_exists( 'glm_blocks_per_section' ) ) {
+    function glm_blocks_per_section( $section ) {
+        if ( function_exists( 'fetch_all_glm_blocks' ) ) {
+            $blocks = fetch_all_glm_blocks( $section );
+            ?>
+            <div class="blocks">
+                <?php foreach ($blocks as $block):?>
+                <div class="text-center small-12 medium-4 columns large-text-left block">
+                        <?php if($block->url):?>
+                        <a href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target="_blank"';}?>>
+                        <?php endif;?>
+                        <?php echo get_the_post_thumbnail($block->ID, 'glm-block-image');?>
+                        <?php if($block->url):?>
+                        </a>
+                        <?php endif;?>
+                        <?php if($block->url):?>
+                        <a class="title-posts" href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target="_blank"';}?>>
+                        <?php endif;?>
+                            <h3><?php echo $block->post_title;?></h3>
+                        <?php if($block->url):?>
+                        </a>
+                         <?php endif;?>
+                    <p><?php echo apply_filters('the_content', $block->post_content) . $block->post_excerpt;?></p>
+                    <?php if($block->url):?>
+                    <a class="blocks-readmore" href="<?php echo $block->url;?>"></a>
+                    <?php endif;?>
+                </div>
+                <?php endforeach;?>
+            </div>
+            <?php
+        }
+    }
 }
-?>
-<?php $blocks = fetch_all_glm_blocks($defaultBlockGroup);?>
-<div class="blocks">
-    <?php foreach ($blocks as $block):?>
-    <div class="text-center small-12 medium-4 columns large-text-left block">
-            <?php if($block->url):?>
-            <a href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target="_blank"';}?>>
-            <?php endif;?>
-            <?php echo get_the_post_thumbnail($block->ID, 'glm-block-image');?>
-            <?php if($block->url):?>
-            </a>
-            <?php endif;?>
-            <?php if($block->url):?>
-            <a class="title-posts" href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target="_blank"';}?>>
-            <?php endif;?>
-                <h3><?php echo $block->post_title;?></h3>
-            <?php if($block->url):?>
-            </a>
-             <?php endif;?>
-        <p><?php echo apply_filters('the_content', $block->post_content) . $block->post_excerpt;?></p>
-        <?php if($block->url):?>
-        <a class="blocks-readmore" href="<?php echo $block->url;?>"></a>
-        <?php endif;?>
-    </div>
-    <?php endforeach;?>
-</div>
-<!--<div class="separator"><hr></div>-->
-<?php endif;?>
diff --git a/sections/footer.php b/sections/footer.php
index 9607795..1594e78 100644
--- a/sections/footer.php
+++ b/sections/footer.php
@@ -1,9 +1,7 @@
                         <div id="partners">
                             <div class="row">
                                 <h2>Discover The Possibilities</h2>
-                                <?php
-                                get_template_part('parts/glm-blocks');
-                                ?>
+                                <?php glm_blocks_per_section( PARTNERS_BLOCKS ); ?>
                             </div>
                         </div>
                         <div id="background-bottom">
@@ -75,7 +73,7 @@
                                                     <?php endif;?>
                                                 </div>
                                             </div>
-                                            
+
                                         </div>
                                         <div class="medium-2 columns show-for-medium-up">
                                             <ul class="social">
@@ -85,6 +83,6 @@
                                         </div>
                                     </div>
                                 </div>
-                                
+
                             </div>
-                        </footer>
\ No newline at end of file
+                        </footer>
diff --git a/sections/front-page.php b/sections/front-page.php
index 5edadc3..dd48432 100644
--- a/sections/front-page.php
+++ b/sections/front-page.php
@@ -3,9 +3,7 @@
                         <div id="content-wrapper">
                             <div id="blocks-row">
                                 <div class="row">
-                                    <?php
-                                    get_template_part('parts/glm-blocks');
-                                    ?>
+                                    <?php glm_blocks_per_section( DEFAULT_BLOCKS ); ?>
                                 </div>
                             </div>
                             <div class="row">
@@ -17,4 +15,4 @@
 
                             </div>
                         </div>
-                    </main>
\ No newline at end of file
+                    </main>
-- 
2.17.1