From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 10 Nov 2014 16:50:05 +0000 (-0500)
Subject: GlmClientInfo compatible, remove vcard.
X-Git-Tag: v1.0.0~6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=0110bc84fdc62790322cb19e4f3f5a54dacab2f1;p=WP-Themes%2FParrotsLanding.git

GlmClientInfo compatible, remove vcard.
---

diff --git a/footer.php b/footer.php
index 7949f1c..4f0183c 100755
--- a/footer.php
+++ b/footer.php
@@ -1,7 +1,8 @@
-                        
-                         <div id="footer-address" class="vcard medium-2 columns sidebar">
-                                <?php get_template_part('vcard');?>
-                        </div><!-- /#address -->
+                        <footer id="footer-address" class="vcard medium-2 show-for-small-only small-centered">
+                            <?php if (is_active_sidebar('sidebar-f')) :?>
+                            	<?php dynamic_sidebar('sidebar-f');?>
+                        	<?php endif;?>
+                        </footer><!-- /#address -->
                         <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.
                         </div><!-- /#copyright -->
diff --git a/functions.php b/functions.php
index fd1ff50..be4ff71 100644
--- a/functions.php
+++ b/functions.php
@@ -1,10 +1,9 @@
-
 <?php
 
-if (!function_exists('glmAddSubs')) {
     $ancestorId   = null;
     $includePages = array();
     $frontPageId  = get_option('page_on_front');
+	add_action('widgets_init', 'glm_quicksite_widget_init');
     function glm_get_quicksite_option($name)
     {
         $settings = get_option('glmQuickSite_settings');
@@ -17,6 +16,29 @@ if (!function_exists('glmAddSubs')) {
         }
         return ($settings && $settings[$name]) ? $settings[$name]: null;
     }
+
+if (!function_exists('glm_quicksite_widget_init')) {
+
+    function glm_quicksite_widget_init()
+    {
+        register_sidebar(array(
+            'name'        => __('Left Sidebar'),
+            'id'          => 'sidebar-l',
+            'description' => __('Appears in Left Sidebar')
+        ));
+        register_sidebar(array(
+            'name'        => __('Footer'),
+            'id'          => 'sidebar-f',
+            'description' => __('Appears in Footer Area')
+        ));
+    }
+
+}	
+
+
+
+if (!function_exists('glm_wp_list_pages')) {
+
     function glm_wp_list_pages()
     {
         global $ancestorId, $includePages, $post;
@@ -35,6 +57,10 @@ if (!function_exists('glmAddSubs')) {
             )
         );
     }
+
+}
+if (!function_exists('glmAddSubs')) {
+
     function glmAddSubs()
     {
         global $includePages, $post;
@@ -43,6 +69,10 @@ if (!function_exists('glmAddSubs')) {
             $includePages[] = $page->ID;
         }
     }
+
+}
+if (!function_exists('glmAddDescendants')) {
+
     function glmAddDescendants($glmPost)
     {
         global $includePages, $frontPageId, $ancestorId;
@@ -64,6 +94,10 @@ if (!function_exists('glmAddSubs')) {
             }
         }
     }
+
+}
+if (!function_exists('glmAddParent')) {
+
     function glmAddParent($glmPost)
     {
         global $includePages, $frontPageId, $ancestorId;
@@ -73,6 +107,10 @@ if (!function_exists('glmAddSubs')) {
             $includePages[] = $page;
         }
     }
+
+}
+if (!function_exists('glmAddSiblings')) {
+
     function glmAddSiblings($glmPost)
     {
         global $includePages, $frontPageId, $ancestorId;
diff --git a/sidebar.php b/sidebar.php
index b3ce8cd..2cf2a96 100755
--- a/sidebar.php
+++ b/sidebar.php
@@ -1,16 +1,18 @@
                    
                     <div id="column" class="show-for-medium-up medium-2 columns sidebar">
                         <div id="nav">
-                            <?php glm_wp_list_pages();?>
-                            <?php // wp_nav_menu( array( 'theme_location' => 'sidenav' ) ); ?>
+                           <?php glm_wp_list_pages();?>
                         </div>
+                        <?php if (is_active_sidebar('sidebar-l')) :?>
+                            <?php dynamic_sidebar('sidebar-l');?>
+                        <?php endif;?>
                     </div><!-- /#column -->
-                    
-                    <aside class="left-off-canvas-menu"> 
-                        <ul class="off-canvas-list"> 
-                            <?php wp_nav_menu( array( 'theme_location' => 'sidenav' ) ); ?>
-                        </ul> 
-                        <div id="off-canvas-address" class="vcard">
-                            <?php get_template_part('vcard');?>
-                        </div><!-- /#address -->
-                    </aside> <!-- left-off-canvas-menu -->
\ No newline at end of file
+                    <aside class="left-off-canvas-menu">
+                        <ul class="off-canvas-list">
+                            <?php wp_nav_menu(array('menu_class' => ''));?>
+                        </ul>
+                        <?php if (is_active_sidebar('sidebar-l')) :?>
+                            <?php dynamic_sidebar('sidebar-l');?>
+                        <?php endif;?>
+                    </aside> <!-- left-off-canvas-menu -->
+
diff --git a/style.css b/style.css
index 9b98994..0997acb 100755
--- a/style.css
+++ b/style.css
@@ -149,6 +149,7 @@ img {
 .vcard {
         padding: 0px;
         border: none;
+        margin-left: 10px;
         }
 .vcard p {
         line-height: 110%;    
diff --git a/vcard.php b/vcard.php
deleted file mode 100755
index e9038a8..0000000
--- a/vcard.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<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" title="<?php echo glm_get_quicksite_option('stateFull');?>"><?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" title="<?php echo glm_get_quicksite_option('state2Full');?>"><?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 -->