From e13bff1c7635b340ef5a7585e28c1763501cd843 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 14 Oct 2014 13:52:25 -0400
Subject: [PATCH] Separate vcarrd stuff into new template file.

adding in plugin for the vcard information.
---
 footer.php    | 14 +-------------
 functions.php |  5 +++++
 index.php~    | 25 -------------------------
 sidebar.php   | 28 ++--------------------------
 style.css     |  4 +---
 vcard.php     | 31 +++++++++++++++++++++++++++++++
 6 files changed, 40 insertions(+), 67 deletions(-)
 delete mode 100755 index.php~
 create mode 100644 vcard.php

diff --git a/footer.php b/footer.php
index 64a5a93..093d3d0 100644
--- a/footer.php
+++ b/footer.php
@@ -9,19 +9,7 @@
                     </div><!-- /#main -->
 
                     <footer class="small-6 show-for-small-only small-centered columns">
-                        <div class="vcard">
-                            <h2 class="fn org"><?php bloginfo('name');?></h2>
-                            <p class="street-address">8110 W. Hazel Rd</p>
-                            <p>
-                                <span flexy:if="city" class="locality">Mears,</span>
-                                <abbr class="region" title="Michigan">MI</abbr>
-                                <span class="postal-code">49436</span>
-                            </p>
-                            <p class="tel">
-                                <span class="type">Phone</span>:
-                                <span class="value">231-873-8400</span>
-                            </p>
-                        </div><!-- /#address -->
+                        <?php get_template_part('vcard');?>
                     </footer>
                     <div id="copyright">
                         Copyright&copy;<?php echo date('Y');?> <?php bloginfo('name');?> - Produced by <a href="http://www.gaslightmedia.com">Gaslight Media</a>, All Rights Reserved.
diff --git a/functions.php b/functions.php
index d0ca581..dfcca2e 100644
--- a/functions.php
+++ b/functions.php
@@ -3,6 +3,11 @@ if (!function_exists('glmAddSubs')) {
     $ancestorId   = null;
     $includePages = array();
     $frontPageId  = get_option('page_on_front');
+    function glm_get_quicksite_option($name)
+    {
+        $settings = get_option('glmQuickSite_settings');
+        return ($settings[$name]) ? $settings[$name]: null;
+    }
     function glm_wp_list_pages()
     {
         global $ancestorId, $includePages, $post;
diff --git a/index.php~ b/index.php~
deleted file mode 100755
index b947999..0000000
--- a/index.php~
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php get_header();?>
-
-        <?php get_sidebar();?>
-        <div id="main" class="small-12 medium-10 columns">
-            <?php if(function_exists('bcn_display') && !is_front_page())
-                {
-                    echo "<div class=\"breadcrumbs\">";
-                    bcn_display();
-                    echo "</div>";
-                }?>
-            <div id="toolbox">
-                <?php if(have_posts()) : while(have_posts()): the_post();?>
-                        <?php the_content();?>
-                <?php endwhile; else:?>
-                <p><?php _e('Sorry, no posts yet');?></p>
-                <?php endif;?>
-<?php 
-$pages = get_pages();
-echo '<pre>'.print_r($pages, true).'</pre>';
-$ancestors = get_post_ancestors($post->ID);
-echo '<pre>'.print_r($ancestors, true).'</pre>';	
-?>
-            </div><!-- /#toolbox -->
-<?php get_footer();?>
-
diff --git a/sidebar.php b/sidebar.php
index 18a2af3..e4dc9a7 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -15,36 +15,12 @@
                            <?php glm_wp_list_pages();?>
                         </ul>
                         </div>
-                        <div id="address" class="vcard">
-                            <h2 class="fn org"><?php bloginfo('name');?></h2>
-                            <p class="street-address">8110 W. Hazel Rd</p>
-                            <p>
-                                <span flexy:if="city" class="locality">Mears,</span>
-                                <abbr class="region" title="Michigan">MI</abbr>
-                                <span class="postal-code">49436</span>
-                            </p>
-                            <p class="tel">
-                                <span class="type">Phone</span>:
-                                <span class="value">231-873-8400</span>
-                            </p>
-                        </div><!-- /#address -->
+                        <?php get_template_part('vcard');?>
                     </div><!-- /#column -->
                     <aside class="left-off-canvas-menu">
                         <ul class="off-canvas-list">
                             <?php wp_nav_menu(array('ParrotsLanding' => 'header-menu', 'menu_class' => ''));?>
                         </ul>
-                        <div class="vcard">
-                            <h2 class="fn org"><?php bloginfo('name');?></h2>
-                            <p class="street-address">8110 W. Hazel Rd</p>
-                            <p>
-                                <span flexy:if="city" class="locality">Mears,</span>
-                                <abbr class="region" title="Michigan">MI</abbr>
-                                <span class="postal-code">49436</span>
-                            </p>
-                            <p class="tel">
-                                <span class="type">Phone</span>:
-                                <span class="value">231-873-8400</span>
-                            </p>
-                        </div><!-- /#address -->
+                        <?php get_template_part('vcard');?>
                     </aside> <!-- left-off-canvas-menu -->
 
diff --git a/style.css b/style.css
index 3806fa7..d43114f 100644
--- a/style.css
+++ b/style.css
@@ -1,13 +1,11 @@
 /*
 Theme Name:         Wild Bill's ATVs
-Theme URI:          
 Description:        QuickSite WordPress theme
 Version:            1.0
 Author:             Steve Sutton
 Author URI:         http://www.gaslightmedia.com/
 
-License:            MIT License
-License URI:        http://www.opensource.org/licenses/mit-license.php
+License:            All Rights Reserved
 */
 body {
     margin: 0;
diff --git a/vcard.php b/vcard.php
new file mode 100644
index 0000000..7f4bbe9
--- /dev/null
+++ b/vcard.php
@@ -0,0 +1,31 @@
+<div class="vcard">
+<h2 class="fn org"><?php echo glm_get_quicksite_option('businessName');?></h2>
+<p class="street-address"><?php echo glm_get_quicksite_option('address');?></p>
+<p>
+    <span flexy:if="city" class="locality"><?php echo glm_get_quicksite_option('city');?>,</span>
+    <abbr class="region"><?php echo glm_get_quicksite_option('state');?></abbr>
+    <span class="postal-code"><?php echo glm_get_quicksite_option('zip');?></span>
+</p>
+
+<?php if (glm_get_quicksite_option('address2')):?>
+<p class="street-address"><?php echo glm_get_quicksite_option('address2');?></p>
+<p>
+    <span flexy:if="city" class="locality"><?php echo glm_get_quicksite_option('city2');?>,</span>
+    <abbr class="region"><?php echo glm_get_quicksite_option('state2');?></abbr>
+    <span class="postal-code"><?php echo glm_get_quicksite_option('zip2');?></span>
+</p>
+<?php endif;?>
+
+<?php if (glm_get_quicksite_option('phone')):?>
+<p class="tel">
+    <span class="type">phone</span>:
+    <span class="value"><?php echo glm_get_quicksite_option('phone');?></span>
+</p>
+<?php endif;?>
+<?php if (glm_get_quicksite_option('fax')):?>
+<p class="tel">
+    <span class="type">fax</span>:
+    <span class="value"><?php echo glm_get_quicksite_option('fax');?></span>
+</p>
+<?php endif;?>
+</div><!-- /#address -->
-- 
2.17.1