From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 17 Oct 2014 13:30:49 +0000 (-0400)
Subject: Changes for allowing GlmQuickSite plugin
X-Git-Tag: v1.0.0~11
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=2bac635b19a0b69df14b72ceedf9df813aed27c2;p=WP-Themes%2FParrotsLanding.git

Changes for allowing GlmQuickSite plugin

Which is the plugin that allows us to
edit client information.
---

diff --git a/footer.php b/footer.php
index 708d225..d7841b7 100755
--- a/footer.php
+++ b/footer.php
@@ -1,16 +1,6 @@
                         
                          <div id="footer-address" class="vcard medium-2 columns sidebar">
-                                <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>
+                                <?php get_template_part('vcard');?>
                         </div><!-- /#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.
@@ -31,10 +21,8 @@
     jQuery(window).resize( function() {
         if(jQuery(window).width() <= 640) {
             jQuery("#logo").attr("src","<?php echo get_template_directory_uri();?>/assets/logo-small2.jpg");
-    //        jQuery("#logo").hide();
         } else {
             jQuery("#logo").attr("src","<?php echo get_template_directory_uri();?>/assets/logo.gif");
-    //        jQuery("#logo").show();
         }
     });
     jQuery(document).foundation();
diff --git a/functions.php b/functions.php
index 5682692..fd1ff50 100644
--- a/functions.php
+++ b/functions.php
@@ -5,6 +5,18 @@ 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');
+        $states   = get_option('glmQuickSite_states');
+        if ($name == 'stateFull' && $settings['state']) {
+            return $states[$settings['state']];
+        }
+        if ($name == 'state2Full' && $settings['state2']) {
+            return $states[$settings['state2']];
+        }
+        return ($settings && $settings[$name]) ? $settings[$name]: null;
+    }
     function glm_wp_list_pages()
     {
         global $ancestorId, $includePages, $post;
@@ -72,34 +84,6 @@ add_action( 'after_setup_theme', 'woocommerce_support' );
     function woocommerce_support() {
 add_theme_support( 'woocommerce' );
 }
-
-// This theme only works in WP version 3.6 or higher.
-//if ( version_compare( $GLOBALS['wp_version'], '3.6', '<' ) ) {
-//	require get_template_directory() . '/inc/back-compat.php';
-//}
-// Register all navigation menus
-//require_once('navigation.php');
-
-
-//function register_my_menu() {
-//  register_nav_menu('sidenav',__( 'sidenav' ));
-//}
-//add_action( 'init', 'register_my_menu' );
-
-
-//function register_my_menus() {
-//  register_nav_menus(
-//    array(
-//      'sidenav' => __( 'sidenav' )
-//   )
-//  );
-//}
-//add_action( 'init', 'register_my_menus' );
-
-//wp_nav_menu( array( 'theme_location' => 'header-menu' ) ); 
-//
-//wp_nav_menu( array( 'theme_location' => 'extra-menu', 'container_class' => 'my_extra_menu_class' ) );
-
 // Register Navigation Menus
 function custom_navigation_menus() {
 
diff --git a/index.php b/index.php
index b34e72d..15cab4b 100644
--- a/index.php
+++ b/index.php
@@ -1,26 +1,7 @@
                     
                     <?php get_header();?>
 
-                    <?php get_sidebar();?>  
-                    <aside class="left-off-canvas-menu"> 
-                        <ul class="off-canvas-list"> 
-                            <?php wp_nav_menu( array( 'theme_location' => 'sidenav' ) ); ?>
-                            <?php // wp_nav_menu(array('ParrotsLanding' => 'sidenav', 'menu_class' => 'left'));?>
-                        </ul> 
-                        <div id="off-canvas-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 -->
-                    </aside> <!-- left-off-canvas-menu -->
+                    <?php get_sidebar();?>
                     <div id="main" class="small-12 medium-9 columns">
                         <br> <br>
                         <?php if(function_exists('bcn_display') && !is_front_page())
diff --git a/page-38.php b/page-38.php
index ce942e4..3b4d500 100644
--- a/page-38.php
+++ b/page-38.php
@@ -3,21 +3,10 @@
                     <?php get_sidebar();?>  
                     <aside class="left-off-canvas-menu"> 
                         <ul class="off-canvas-list"> 
-                            <?php wp_nav_menu( array( 'theme_location' => 'sidenav' ) ); ?>
-                            <?php // wp_nav_menu(array('ParrotsLanding' => 'sidenav', 'menu_class' => 'left'));?>
+                            <?php wp_nav_menu(array('ParrotsLanding' => 'sidenav', 'menu_class' => 'left'));?>
                         </ul> 
                         <div id="off-canvas-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>
+                            <?php get_template_part('vcard');?>
                         </div><!-- /#address -->
                     </aside> <!-- left-off-canvas-menu -->
                     <div id="main" class="small-12 medium-9 columns">
diff --git a/sidebar.php b/sidebar.php
index dcc8f9c..d5a6a0e 100755
--- a/sidebar.php
+++ b/sidebar.php
@@ -2,20 +2,14 @@
                     <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' ) ); ?>
                         </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 -->
                     </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
diff --git a/template.html b/template.html
index 7ea7cb1..6120aea 100755
--- a/template.html
+++ b/template.html
@@ -2,16 +2,16 @@
 "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
-<title>{title:h}</title>
-<meta http-equiv="content-type" content="text/html;charset=utf-8">
-<meta name="description" content="{metaTags:h}">
-<meta http-equiv="imagetoolbar" content="no">
-<meta http-equiv="imagetoolbar" content="false">
-{styles:h}
-{topScripts:h}
-{if:googleAnalyticsCode}
-{googleAnalyticsCode:h}
-{end:}
+    <title>{title:h}</title>
+    <meta http-equiv="content-type" content="text/html;charset=utf-8">
+    <meta name="description" content="{metaTags:h}">
+    <meta http-equiv="imagetoolbar" content="no">
+    <meta http-equiv="imagetoolbar" content="false">
+    {styles:h}
+    {topScripts:h}
+    {if:googleAnalyticsCode}
+    {googleAnalyticsCode:h}
+    {end:}
 </head>
 <body>
 <div id="wrapper">
@@ -53,9 +53,9 @@
 						<span class="type">Fax</span>:
 						<span class="value">{fax:h}</span>
 					</p>
-<div style="margin-left:10px;" flexy:if="MOBILE_SITE">
-<a href="{MOBILE_SITE_URL:h}">View Mobile Site</a>
-</div>
+                                    <div style="margin-left:10px;" flexy:if="MOBILE_SITE">
+                                    <a href="{MOBILE_SITE_URL:h}">View Mobile Site</a>
+                                    </div>
 
 				</div>
 			</div><!-- /#address -->
diff --git a/vcard.php b/vcard.php
new file mode 100755
index 0000000..e9038a8
--- /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" 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 -->