From 79bf5f6e7721c823fd149947b041d1da6d414059 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 25 Feb 2019 11:49:46 -0500
Subject: [PATCH] Updating theme view files

Also get rid of some of the errors in theme inc/custom.php
---
 .../members/{list.html => list-old.html}      |   0
 .../views/front/members/listTypeList.html     | 162 ++++++++++++++++++
 .../views/front/members/old-listTypeGrid.html |  70 ++++++++
 inc/custom.php                                |   2 +-
 4 files changed, 233 insertions(+), 1 deletion(-)
 rename glm-member-db/views/front/members/{list.html => list-old.html} (100%)
 create mode 100644 glm-member-db/views/front/members/listTypeList.html
 create mode 100644 glm-member-db/views/front/members/old-listTypeGrid.html

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list-old.html
similarity index 100%
rename from glm-member-db/views/front/members/list.html
rename to glm-member-db/views/front/members/list-old.html
diff --git a/glm-member-db/views/front/members/listTypeList.html b/glm-member-db/views/front/members/listTypeList.html
new file mode 100644
index 0000000..c1a475c
--- /dev/null
+++ b/glm-member-db/views/front/members/listTypeList.html
@@ -0,0 +1,162 @@
+{* List Type View *}
+
+{foreach $members as $member}
+
+    {apply_filters('glm-member-db-front-members-list-memberAbove', '', $member.member_pointer)}
+    <div class="glm-member-list-container glm-member-container glma-small-12 glma-columns {if $member.featured}featured{/if}">
+
+        {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
+        {if $member.featured}
+            <div class="glm-member-list-featured-tag">
+                featured
+            </div>
+        {/if}
+
+        {* Member Logo - Medium and up *}
+
+        <div class="glm-member-list-data glma-small-12 glma-columns">
+            {if $member.logo && $showSettings.list_show_logo}
+                <div class="glm-member-list-image-wrapper glma-right glma-small-12 glma-medium-4 glma-columns {if !$settings.list_logo_for_mobile}mobile-hide{/if}">
+                    <div class="glm-member-list-image-border clearfix">
+                        <img src="{$glmPluginMediaUrl}/images/{$settings.list_logo_size}/{$member.logo}">
+                    </div>
+               </div>
+            {/if}
+            <div class="glm-member-list-active-info glma-small-12 glma-medium-8 glma-columns glma-small-right glma-medium-left ">
+
+                {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $member.member_pointer)}
+
+                <h4 class="glm-member-title">
+                    {if $showSettings.list_show_detail_link && !$member.has_no_profile.value}
+                        <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">{$member.member}</a>
+                    {else}
+                        {$member.member}
+                    {/if}
+                </h4>
+                {if $showSettings.list_show_address}
+                    <div class="glm-member-list-address-wrapper">
+
+                        {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $member.member_pointer)}
+
+                        {if $showSettings.list_show_street}
+                            {if $member.addr1 && $showSettings.list_show_address}<div>{$member.addr1}</div>{/if}
+                            {if $member.addr2 && $showSettings.list_show_address}<div>{$member.addr2}</div>{/if}
+                        {/if}
+                        {if $settings.memb_info_location && $showSettings.list_show_citystatezip}
+                            <div>
+                                {if $member.city}
+                                    <span>{$member.city}{if $member.state.value}, {/if}</span>
+                                {/if}
+                                {if $member.state.value}
+                                    <span>{$member.state.value}</span>
+                                {/if}
+                                {if $member.zip}
+                                    {$member.zip}
+                                {/if}
+                            </div>
+                        {/if}
+                        {if $member.country.name && $showSettings.list_show_country}
+                            <div>{$member.country.name}</div>
+                        {/if}
+
+                        {apply_filters('glm-member-db-front-members-list-memberAddressBottom', '', $member.member_pointer)}
+
+                    </div>
+                {/if}
+
+                {apply_filters('glm-member-db-front-members-list-memberDetailTop', '', $member.member_pointer)}
+
+                {if ($settings.memb_info_contact && $member.phone && $showSettings.list_show_phone) || ($settings.memb_info_contact && $member.toll_free && $showSettings.list_show_tollfree)}
+                    <div>
+                        {if $member.phone && $showSettings.list_show_phone}<span class="glm-member-db-phone">Phone: {apply_filters('glm_associate_phone_filter', $member.phone)} </span>{/if}
+                        {if $member.toll_free && $showSettings.list_show_tollfree}<span class="glm-member-db-phone-tollfree">{apply_filters('glm_associate_phone_filter', $member.toll_free)}</span>{/if}
+                    </div>
+                {/if}
+                {if $settings.memb_info_location && $member.region && $showSettings.list_show_region}<div><b>Region:</b> {$member.region}</div>{/if}
+
+                <div class="glm-member-list-links">
+
+                    {apply_filters('glm-member-db-front-members-list-memberLinksTop', '', $member.member_pointer)}
+
+                    {if $member.url && $showSettings.list_show_url}<a class='glm-member-list-website-link' data-member-id="{$member.member_pointer}" data-member-slug="{$member.member_slug}" href="{$member.url}"{if $showSettings.list_show_url_newtarget} target="_blank"{/if} >Visit Website</a>{/if}
+                    {if $member.email && $showSettings.list_show_email}<a href="mailto:{$member.email}">Email</a>{/if}
+                    {if $member.reservation_url}<a target="_blank" href="{$member.reservation_url}">Reserve Now</a>{/if}
+                    {if $settings.list_show_live_cam}
+                        {if $member.live_cam_type.name == "Web Page" && $member.live_cam_url && $settings.list_show_live_cam}
+                            <a target="_blank" href="{$member.live_cam_url}">{$terms.term_webcam_cap}</a>
+                        {else if $member.live_cam_type.name == "Camera Image"}
+                            <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?expanded=live-cam">{$terms.term_webcam_cap}</a>
+                        {/if}
+                    {/if}
+
+                    {apply_filters('glm-member-db-front-members-list-linksBottom', '', $member.member_pointer)}
+
+                </div>
+                <div class="glm-member-db-socials">
+
+                   {apply_filters('glm-member-db-front-members-social-list', '', $member.member_pointer)}
+
+                </div>
+
+                <div class="glm-member-list-description glma-small-12 glma-columns">
+                    <div>
+
+                    {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $member.member_pointer)}
+
+                    {if $member.short_descr && $showSettings.list_show_short_descr}
+                        {$member.short_descr|nl2br}
+                        {if $showSettings.list_show_detail_link && !$member.has_no_profile.value}
+                            <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">More</a>
+                        {/if}
+                    {/if}
+
+                    {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $member.member_pointer)}
+
+                    </div>
+                    <div class="glm-member-list-items">
+                        {if isset($member.categories) && $member.categories && $showSettings.list_show_categories}
+                            <b>{$terms.term_member_cap} Categories</b>
+                            <ul>
+                                {foreach $member.categories as $c}
+                                    <li>
+                                        {if $c.parent_name}{$c.parent_name}: {/if}{$c.name}
+                                    </li>
+                                {/foreach}
+                            </ul>
+                        {/if}
+                        {if $member.cc_type && $showSettings.list_show_creditcards}
+                            <b>Credit Cards Accepted:</b>
+                            <ul>
+                                {foreach $member.cc_type.names as $c}
+                                    <li>{$c}</li>
+                                {/foreach}
+                            </ul>
+                        {/if}
+                        {if isset($member.categories) && $member.amenities && $showSettings.list_show_amenities}
+                            <b>{$terms.term_member_cap} Amenities</b>
+                            <ul>
+                                {foreach $member.amenities as $A}
+                                    <li>
+                                        {$A.name}
+                                    </li>
+                                {/foreach}
+                            </ul>
+                        {/if}
+                    </div>
+                </div>
+
+                {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $member.member_pointer)}
+
+            </div>
+
+            {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $member.member_pointer)}
+
+        </div>
+
+        {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
+
+    </div>
+
+{/foreach} {* members *}
+
+{apply_filters('glm-member-db-front-members-list-memberBottom', '', $member.member_pointer)}
diff --git a/glm-member-db/views/front/members/old-listTypeGrid.html b/glm-member-db/views/front/members/old-listTypeGrid.html
new file mode 100644
index 0000000..aef1387
--- /dev/null
+++ b/glm-member-db/views/front/members/old-listTypeGrid.html
@@ -0,0 +1,70 @@
+{* List Type Grid *}
+
+<ul class="glma-small-block-grid-1 glma-medium-block-grid-2 glma-large-block-grid-3">
+    {foreach $members as $member}
+        <li class="glm-member-list-record">
+            {apply_filters('glm-member-db-front-members-list-memberAbove', '', $member.member_pointer)}
+            <div class="glm-member-db-border-wrap">
+                {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
+
+                {if $showSettings.list_show_detail_link && !$member.has_no_profile.value}
+                <a class="glm-member-list-image-wrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/">
+                {/if}
+
+                {if $member.featured}
+                <div class="glm-member-list-featured-tag">
+                    featured
+                </div>
+                {/if}
+
+                {if $member.logo && $showSettings.list_show_logo}
+                    <div class="glm-member-list-has-image">
+                        <img class="glm-member-list-image" src="{$glmPluginMediaUrl}/images/grid/{$member.logo}">
+                    </div>
+                {elseif $showSettings.list_show_logo_filler}
+                    <div class="glm-member-list-has-image">
+                        <img class="glm-member-list-image-filler" src="{$assetsUrl}/filler_s.gif">
+                    </div>
+                {else}
+                    <div class="glm-member-list-missing-image"></div>
+                {/if}
+                {if $set$showSettingst_show_detail_link && !$member.has_no_profile.value}
+                </a>
+                {/if}
+                <div class="glm-member-list-info-wrapper">
+                    <h4 class="glm-member-title">
+                        {if $showSettings.list_show_detail_link && !$member.has_no_profile.value}
+                            <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">
+                                {$member.member}
+                            </a>
+                        {else}
+                            {$member.member}
+                        {/if}
+
+                    </h4>
+
+                    <div class="glm-member-list-sub-links">
+                        <ul>
+                            {if $member.url && $showSettings.list_show_url}<li><a href="{$member.url}"{if $showSettings.list_show_url_newtarget} target="_blank"{/if}>Website</a></li>{/if}
+                            {* {if $member.phone && $showSettings.list_map_show_phone}<a href="tel:+{$member.phone}">Phone</a>{/if} *}
+                            {$packageLink = apply_filters('glm-member-db-front-members-list-linksBottom', '', $member.member_pointer)}
+                            {if $packageLink}<li>{$packageLink}</li>{/if}
+                            {if $member.reservation_url}<li><a target="_blank" href="{$member.reservation_url}">Reserve Now</a></li>{/if}
+
+                            {if $settings.list_show_live_cam}
+                                {if $member.live_cam_type.name == "Web Page" && $member.live_cam_url && $settings.list_show_live_cam}
+                                    <li><a target="_blank" href="{$member.live_cam_url}">{$terms.term_webcam_cap}</a></li>
+                                {else if $member.live_cam_type.name == "Camera Image"}
+                                    <li><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?expanded=live-cam">{$terms.term_webcam_cap}</a></li>
+                                {/if}
+                            {/if}
+
+                            <li><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">View&nbsp;More</a></li>
+                            {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
+                        </ul>
+                    </div>
+                </div>
+            </div> <!-- End of glm-member-db-border-wrap -->
+        </li> <!-- end of li.glm-member-list-record -->
+    {/foreach} {*$members*}
+</ul>
diff --git a/inc/custom.php b/inc/custom.php
index e265bc2..5274b93 100644
--- a/inc/custom.php
+++ b/inc/custom.php
@@ -130,7 +130,7 @@ function display_memberfindme_directory() {
     $_REQUEST['textSearch'] = $_REQUEST['s'];
     $_REQUEST['action'] = 'list';
     $_REQUEST['event_name'] = $_REQUEST['s'];
-    echo do_shortcode('[glm-members-list view="grid" limit=6 text-search="'.stripslashes($_REQUEST['s']).'"]');
+    echo do_shortcode('[glm-members-list view="grid" text-search="'.stripslashes($_REQUEST['s']).'"]');
     if( isset($_REQUEST['event_name']) && !empty($_REQUEST['event_name'])){
         echo do_shortcode('[glm-members-event-list limit="10"]');
         echo '<a href="' . get_permalink( 31026 ) . '">View All Events</a>';
-- 
2.17.1