WIP setup theme view files for ajax display of members.
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Nov 2018 13:49:59 +0000 (08:49 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Nov 2018 13:49:59 +0000 (08:49 -0500)
Show 6 members and load more link to grab next 6.

glm-member-db-events/views/front/events/agenda.html
glm-member-db/views/front/members/list.html
glm-member-db/views/front/members/listContainer.html [new file with mode: 0644]
inc/custom.php

index b852bc7..eda73d7 100644 (file)
@@ -2,7 +2,7 @@
         <div class="row">
         {if $smarty.request.s || apply_filters("is_page", 'search')}
                 <hr>
-                <h1 class="page-title event-search-result-title">Related Events for: {$smarty.request.s}</h1>
+                <h1 class="page-title event-search-result-title">Related Events for: {$smarty.request.s|escape}</h1>
         {else}
             {include file='front/events/searchForm.html'}
         {/if}
index 035f379..6d9dc93 100644 (file)
@@ -3,29 +3,31 @@
 {if $settings.list_show_search_filters_opened}filters-opened {else}filters-closed {/if}
 ">
 
-            {if $settings.selected_map_interface == 1}
-                <!--  Leaflet Map -->
-                <link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.3/dist/leaflet.css" integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ==" crossorigin=""/>
-                <script src="https://unpkg.com/leaflet@1.3.3/dist/leaflet.js" integrity="sha512-tAGcCfR4Sc5ZP5ZoVz0quoZDYX5aCtEm/eu1KhSLj2c9eFrylXZknQYmxUssFaVJKvvc0dJQixhGjG2yXWiV9Q==" crossorigin=""></script>
-                <link rel="stylesheet" href="{$jsUrl}/LeafletMarkerCluster/dist/MarkerCluster.Default.css" />
-                <script src="{$jsUrl}/LeafletMarkerCluster/dist/leaflet.markercluster-src.js"></script>
-                <link rel="stylesheet" href="{$jsUrl}/Leaflet.loading/src/Control.Loading.css" />
-                <script src="{$jsUrl}/Leaflet.loading/src/Control.Loading.js"></script>
-            {/if}
+    {if $settings.selected_map_interface == 1}
+        <!--  Leaflet Map -->
+        <link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.3/dist/leaflet.css" integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ==" crossorigin=""/>
+        <script src="https://unpkg.com/leaflet@1.3.3/dist/leaflet.js" integrity="sha512-tAGcCfR4Sc5ZP5ZoVz0quoZDYX5aCtEm/eu1KhSLj2c9eFrylXZknQYmxUssFaVJKvvc0dJQixhGjG2yXWiV9Q==" crossorigin=""></script>
+        <link rel="stylesheet" href="{$jsUrl}/LeafletMarkerCluster/dist/MarkerCluster.Default.css" />
+        <script src="{$jsUrl}/LeafletMarkerCluster/dist/leaflet.markercluster-src.js"></script>
+        <link rel="stylesheet" href="{$jsUrl}/Leaflet.loading/src/Control.Loading.css" />
+        <script src="{$jsUrl}/Leaflet.loading/src/Control.Loading.js"></script>
+    {/if}
+
+    {if $settings.selected_map_interface == 2}
+        <!-- Google Map -->
+        <script src="//maps.googleapis.com/maps/api/js?&key={$settings.google_maps_api_key}"></script>
+    {/if}
 
-            {if $settings.selected_map_interface == 2}
-                <!-- Google Map -->
-                <script src="//maps.googleapis.com/maps/api/js?&key={$settings.google_maps_api_key}"></script>
-            {/if}
 
 
+    {include file='front/members/header.html'}
 
-{include file='front/members/header.html'}
     {apply_filters('glm-member-db-front-members-list-pageTop', '')}
-<div class="glm-member-list-inner-wrapper">
-{if $settings.list_show_map}
-    <div id="glm-member-list-map-toggle" class="button glm-button">Map</div>
-{/if}
+    <div class="glm-member-list-inner-wrapper">
+    {if $settings.list_show_map}
+        <div id="glm-member-list-map-toggle" class="button glm-button">Map</div>
+    {/if}
+
 {if $settings.list_show_search}
 <div id="glm-member-list-filters-wrapper">
     <div id="glm-member-list-filters-button" class="button glm-button glm-member-list-filters-toggle">
     </div> <!-- glm-member-list-filters-box -->
 </div> <!-- glm-member-list-wrapper -->
 {/if} {*list_show_search*}
+
 {if $settings.list_show_map}
 
-        {apply_filters('glm-member-db-front-members-list-mapTop', '')}
+    {apply_filters('glm-member-db-front-members-list-mapTop', '')}
         <div id="glm-locationMap-container">
 
             {if $settings.selected_map_interface == 1}
             {/if}
 
         </div>
-        {apply_filters('glm-member-db-front-members-list-mapBottom', '')}
-    {/if}
-    {apply_filters('glm-member-db-front-members-list-listHeaderTop', '')}
+    {apply_filters('glm-member-db-front-members-list-mapBottom', '')}
+{/if}
+
+{apply_filters('glm-member-db-front-members-list-listHeaderTop', '')}
 
 
      <!-- Member information displayed in map bubbles -->
     </div>
 
 {if $settings.list_show_list && !$blankStart}
-{if $settings.list_header_text}
-    <h3 class="glm-member-db-list-header-title">{$settings.list_header_text}</h3>
-{elseif apply_filters('is_page', 'search')}
-    <h1 class="glm-member-db-list-header-title member-search-page-title">List of {$terms.term_member_plur_cap}</h1>
-{/if}
-
-{if $haveMembers}
-
-    <div id="glm-member-list-terms">{$terms.term_member_plur_cap} found: {$membersFound}<br></div>
+    {if $settings.list_header_text}
+        <h3 class="glm-member-db-list-header-title">{$settings.list_header_text}</h3>
+    {elseif apply_filters('is_page', 'search')}
+        <h1 class="glm-member-db-list-header-title member-search-page-title">List of {$terms.term_member_plur_cap}</h1>
+    {/if}
 
-    {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')}
+    <div>
+        {if $haveMembers}
 
<!-- Member information displayed in list -->
       <div id="glm-member-list-terms">{$terms.term_member_plur_cap} found: {$membersFound}<br></div>
 
-<div class="glm-member-list-listing-container">
-{if $settings.list_show_search_alpha && !apply_filters("is_page", 'search')}
-    <div class="glm-alpha-links">
-        <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if $smarty.request.s}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}" class="glm-alpha-link{if !$alphaSelected} glm-alpha-link-selected{/if}">All</a>
-  {foreach $alphaList as $a}
-        <a href="{$thisUrl}?glm_action=list&alpha={$a.alpha}&textSearch={$textSearch}{if $smarty.request.s}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
-  {/foreach}
-   </div>
-{/if}
+        {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')}
 
-{if $paging}
-    <br>
-    <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if isset($smarty.request.s)}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&citySearch={$citySearchSelected}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
-    <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if isset($smarty.request.s)}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&citySearch={$citySearchSelected}&pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
-    <br>
-    showing {$start} through {$lastDisplayed} of {$filteredMembersFound}
-{/if}
+        <!-- Member information displayed in list -->
 
-{if $view == grid}
-    <ul class="row">
-    {foreach $members as $member}
-        <li class="glm-member-list-record columns small-12 medium-6 large-4">
-            <a class="anchorWrapper"{if $settings.list_show_detail_link && !$member.has_no_profile.value} href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/"{else} style="cursor: default;"{/if}>
-                {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)}
+        <div class="glm-member-list-listing-container">
 
-                    <div class="glm-member-list-image-wrapper"{if $settings.list_show_detail_link && !$member.has_no_profile.value} href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/"{/if}>
+            {if $settings.list_show_search_alpha && !apply_filters("is_page", 'search')}
+                <div class="glm-alpha-links">
+                    <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if $smarty.request.s}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}" class="glm-alpha-link{if !$alphaSelected} glm-alpha-link-selected{/if}">All</a>
+              {foreach $alphaList as $a}
+                    <a href="{$thisUrl}?glm_action=list&alpha={$a.alpha}&textSearch={$textSearch}{if $smarty.request.s}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
+              {/foreach}
+               </div>
+            {/if}
 
-                    {if $member.featured}
-                    <div class="glm-member-list-featured-tag">
-                        featured
-                    </div>
-                    {/if}
+            {if $paging}
+                <br>
+                <!--
+                <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if isset($smarty.request.s)}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&citySearch={$citySearchSelected}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
+                <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if isset($smarty.request.s)}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&citySearch={$citySearchSelected}&pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
+                -->
+                <br>
+                showing <span class="aStart">{$start}</span> through <span class="aLastDisplayed">{$lastDisplayed}</span> of <span class="aTotal">{$filteredMembersFound}</span>
+            {/if}
 
-                    {if $member.logo && $settings.list_show_logo}
-                        <div class="glm-member-list-has-image">
-                            <img class="glm-member-list-image" src="{$glmPluginMediaUrl}/images/grid/{$member.logo}">
-                        </div>
-                    {elseif $settings.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}
-                    </div>
-                    <div class="glm-member-list-info-wrapper">
-                        <h4 class="glm-member-title"> {$member.member} </h4>
-                        <div class="glm-member-list-description small-12 columns">
-                            <div>
-                            {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $member.member_pointer)}
-                            {if $member.short_descr && $settings.list_show_short_descr}
-                                {$member.short_descr|nl2br}
-                            {/if}
-                            {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $member.member_pointer)}
-                            </div>
-                        </div>
-                        {if $member.city}
-                            <div class="glm-member-list-address-container">
-                                <span class="member-city">{$member.city}{if $member.state.value}{/if}</span><br>
-                            </div>
-                        {/if}
-                        {if $settings.memb_info_location && $member.region && $settings.list_show_region}
-                            <div class="glm-member-list-region-container">
-                                Region: {$member.region}
-                            </div>
-                        {/if}
-                        {if ($settings.memb_info_contact && $member.phone && $settings.list_show_phone) || ($settings.memb_info_contact && $member.toll_free && $settings.list_show_tollfree)}
-                            <div class="glm-member-list-phone-container">
-                                {if $member.phone && $settings.list_show_phone}<span class="glm-member-db-phone">{apply_filters('glm_associate_phone_filter', $member.phone)} </span>{/if}
-                            </div>
-                        {/if}
 
+            {* Loading members with ajax *}
+            <div id="glm-ajax-list">
+                loading...
+            </div>
 
-                    </div>
-                </div> <!-- End of glm-member-db-border-wrap -->
-            </a>
-            <div class="glm-member-list-sub-links">
-                <ul>
-                    {if $member.url && $settings.list_show_url}<li><a href="{$member.url}"{if $settings.list_show_url_newtarget} target="_blank"{/if}>Visit Website</a></li>{/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}
 
-                    {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
-                </ul>
-            </div>
-        </li> <!-- end of li.glm-member-list-record -->
-    {/foreach} {*$members*}
-    </ul>
-    <!-- Grid view above -->
-
-    {else}
-
-    <!-- List view below -->
-        {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 small-12 columns">
-                {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
-                 <!-- Member Logo - Medium and up-->
-
-                <div class="glm-member-list-data small-12 columns">
-                {if $member.logo && $settings.list_show_logo}
-                    <div class="glm-member-list-image-wrapper right small-12 medium-4 columns {if !$settings.list_logo_for_mobile}mobile-hide{/if}">
-                        <div class="glm-member-list-image-border">
-
-                            {if $member.featured}
-                            <div class="glm-member-list-featured-tag">
-                                featured
-                            </div>
-                            {/if}
-                            <img src="{$glmPluginMediaUrl}/images/{$settings.list_logo_size}/{$member.logo}">
-                        </div>
-                   </div>
+            {if $paging}
+                <br>
+                <!--
+                <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if isset($smarty.request.s)}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&citySearch={$citySearchSelected}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
+                <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if isset($smarty.request.s)}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&citySearch={$citySearchSelected}&pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}"
+                    class="glm-show-more" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>[ Show More ]</a>
+                -->
+                {if $nextStart}
+                <a href="#" class="glm-show-more test" data-next="{$nextStart}">[ Load More ]</a>
                 {/if}
-                    <div class="glm-member-list-active-info small-12 medium-8 columns">
-     <!-- Member name, address, and basic information -->
-                    {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $member.member_pointer)}
-                    <h4 class="glm-member-title">
-                        {if $settings.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 $settings.list_show_address}
-                    <div class="glm-member-list-address-wrapper">
-                        {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $member.member_pointer)}
-                        {if $settings.list_show_street}
-                        {if $member.addr1 && $settings.list_show_address}<div>{$member.addr1}</div>{/if}
-                        {if $member.addr2 && $settings.list_show_address}<div>{$member.addr2}</div>{/if}
-                        {/if}
-                        {if $settings.memb_info_location && $settings.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 && $settings.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 && $settings.list_show_phone) || ($settings.memb_info_contact && $member.toll_free && $settings.list_show_tollfree)}
-                    <div>
-                        {if $member.phone && $settings.list_show_phone}<span class="glm-member-db-phone">Phone: {apply_filters('glm_associate_phone_filter', $member.phone)} </span>{/if}
-                        {if $member.toll_free && $settings.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 && $settings.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 && $settings.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 $settings.list_show_url_newtarget} target="_blank"{/if} >Visit Website</a>{/if}
-                        {if $member.email && $settings.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 small-12 columns">
-                        <div>
-                        {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $member.member_pointer)}
-                        {if $member.short_descr && $settings.list_show_short_descr}
-                            {$member.short_descr|nl2br}
-                            {if $settings.list_show_detail_link}
-                                <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>
-                        {if $member.categories && $settings.list_show_categories}
-                        <div class="glm-member-list-items">
-                            <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 && $settings.list_show_creditcards}
-                            <b>Credit Cards Accepted:</b>
-                            <ul>
-                                {foreach $member.cc_type.names as $c}
-                                    <li>{$c}</li>
-                                {/foreach}
-                            </ul>
-                        {/if}
-                        {if $member.amenities && $settings.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>
+                <br>
+                showing <span class="aStart">{$start}</span> through <span class="aLastDisplayed">{$lastDisplayed}</span> of <span class="aTotal">{$filteredMembersFound}</span>
+            {/if}
 
+                {apply_filters('glm-member-db-front-members-list-pageBottom', '')}
 
-                        <!-- Laury - This is the one that should go underneath all the address and description area -->
-            {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $member.member_pointer)}
-            {apply_filters('glm-member-db-front-members-list-memberBottom', '', $member.member_pointer)}
-            </div>
-            {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
-    <!-- Member Description -->
+            {else}
+                <div>(no {$terms.term_member_plur} listed)</div>
+            {/if}
 
-         {/foreach} {*$members*}
         </div>
+    </div>
 
- {/if} {*end grid view check*}
+{/if} {*list_show_list*}
 
-    {if $paging}
-        <br>
-        <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if isset($smarty.request.s)}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&citySearch={$citySearchSelected}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
-        <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if isset($smarty.request.s)}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&citySearch={$citySearchSelected}&pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
-        <br>
-        showing {$start} through {$lastDisplayed} of {$filteredMembersFound}
-    {/if}
+    <script>
+        jQuery(document).ready(function($) {
 
-        {apply_filters('glm-member-db-front-members-list-pageBottom', '')}
- {else}
-        <div>(no {$terms.term_member_plur} listed)</div>
- {/if}
+            var nextStart    = {$nextStart};
+            var numberShown  = 0;
+            var totalMembers = {$filteredMembersFound};
+
+            jQuery.ajax({
+                url: '{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=membersList&limit=6{$ajaxRequest}',
+                cache: false,
+                async: true,
+                dataType: 'html',
+                success: function( html ){
+                    $('#glm-ajax-list').html( html );
+                    numberShown += 6;
+                },
+            });
 
-    {/if} {*list_show_list*}
-    <script type="text/javascript">
-        jQuery(document).ready(function($) {
+            // Show More link
+            $(document).on('click', 'a.glm-show-more', function(e){
+                e.preventDefault();
+                // var nextStart = $(this).data('next');
+                var showMoreButton = $(this);
+                jQuery.ajax({
+                    url: '{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=membersList&limit=6{$ajaxRequest}&pageSelect=Next&nextStart=' + nextStart + '&ajaxNext=1',
+                    cache: false,
+                    async: true,
+                    dataType: 'html',
+                    success: function( html ){
+                        $('#glm-ajax-list').append( html );
+                        // $('.aStart').html(nextStart + 1);
+                        nextStart += 6;
+                        if ( nextStart > totalMembers ) {
+                            nextStart = totalMembers;
+                            $('.aLastDisplayed').html(nextStart);
+                        } else {
+                            $('.aLastDisplayed').html(nextStart - 1);
+                        }
+                        numberShown += 6;
+                        console.log('shown: ', numberShown);
+                        console.log( 'nextStart', nextStart);
+                        console.log( 'totalMembers', totalMembers);
+                        if ( numberShown >= totalMembers ) {
+                            showMoreButton.remove();
+                        }
+                    },
+                });
+            });
 
             jQuery('select[multiple]').asmSelect();
 
         });
             </script>
 
-        </div><!-- glm-member-list-inner-wrapper-->
-    </div><!-- glm-member-db-list-view -->
+    </div><!-- glm-member-list-inner-wrapper-->
+</div><!-- glm-member-db-list-view -->
+
 {include file='front/footer.html'}
diff --git a/glm-member-db/views/front/members/listContainer.html b/glm-member-db/views/front/members/listContainer.html
new file mode 100644 (file)
index 0000000..af517ec
--- /dev/null
@@ -0,0 +1,227 @@
+{if $view == grid}
+    <ul class="row">
+    {foreach $members as $member}
+        <li class="glm-member-list-record columns small-12 medium-6 large-4">
+            <a class="anchorWrapper"{if $settings.list_show_detail_link && !$member.has_no_profile.value} href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/"{else} style="cursor: default;"{/if}>
+                {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)}
+
+                    <div class="glm-member-list-image-wrapper"{if $settings.list_show_detail_link && !$member.has_no_profile.value} 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 && $settings.list_show_logo}
+                        <div class="glm-member-list-has-image">
+                            <img class="glm-member-list-image" src="{$glmPluginMediaUrl}/images/grid/{$member.logo}">
+                        </div>
+                    {elseif $settings.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}
+                    </div>
+                    <div class="glm-member-list-info-wrapper">
+                        <h4 class="glm-member-title"> {$member.member} </h4>
+                        <div class="glm-member-list-description small-12 columns">
+                            <div>
+                            {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $member.member_pointer)}
+                            {if $member.short_descr && $settings.list_show_short_descr}
+                                {$member.short_descr|nl2br}
+                            {/if}
+                            {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $member.member_pointer)}
+                            </div>
+                        </div>
+                        {if $member.city}
+                            <div class="glm-member-list-address-container">
+                                <span class="member-city">{$member.city}{if $member.state.value}{/if}</span><br>
+                            </div>
+                        {/if}
+                        {if $settings.memb_info_location && $member.region && $settings.list_show_region}
+                            <div class="glm-member-list-region-container">
+                                Region: {$member.region}
+                            </div>
+                        {/if}
+                        {if ($settings.memb_info_contact && $member.phone && $settings.list_show_phone) || ($settings.memb_info_contact && $member.toll_free && $settings.list_show_tollfree)}
+                            <div class="glm-member-list-phone-container">
+                                {if $member.phone && $settings.list_show_phone}<span class="glm-member-db-phone">{apply_filters('glm_associate_phone_filter', $member.phone)} </span>{/if}
+                            </div>
+                        {/if}
+
+
+                    </div>
+                </div> <!-- End of glm-member-db-border-wrap -->
+            </a>
+            <div class="glm-member-list-sub-links">
+                <ul>
+                    {if $member.url && $settings.list_show_url}<li><a href="{$member.url}"{if $settings.list_show_url_newtarget} target="_blank"{/if}>Visit Website</a></li>{/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}
+
+                    {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
+                </ul>
+            </div>
+        </li> <!-- end of li.glm-member-list-record -->
+    {/foreach} {*$members*}
+    </ul>
+    <!-- Grid view above -->
+
+    {else}
+
+    <!-- List view below -->
+        {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 small-12 columns">
+                {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
+                 <!-- Member Logo - Medium and up-->
+
+                <div class="glm-member-list-data small-12 columns">
+                {if $member.logo && $settings.list_show_logo}
+                    <div class="glm-member-list-image-wrapper right small-12 medium-4 columns {if !$settings.list_logo_for_mobile}mobile-hide{/if}">
+                        <div class="glm-member-list-image-border">
+
+                            {if $member.featured}
+                            <div class="glm-member-list-featured-tag">
+                                featured
+                            </div>
+                            {/if}
+                            <img src="{$glmPluginMediaUrl}/images/{$settings.list_logo_size}/{$member.logo}">
+                        </div>
+                   </div>
+                {/if}
+                    <div class="glm-member-list-active-info small-12 medium-8 columns">
+     <!-- Member name, address, and basic information -->
+                    {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $member.member_pointer)}
+                    <h4 class="glm-member-title">
+                        {if $settings.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 $settings.list_show_address}
+                    <div class="glm-member-list-address-wrapper">
+                        {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $member.member_pointer)}
+                        {if $settings.list_show_street}
+                        {if $member.addr1 && $settings.list_show_address}<div>{$member.addr1}</div>{/if}
+                        {if $member.addr2 && $settings.list_show_address}<div>{$member.addr2}</div>{/if}
+                        {/if}
+                        {if $settings.memb_info_location && $settings.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 && $settings.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 && $settings.list_show_phone) || ($settings.memb_info_contact && $member.toll_free && $settings.list_show_tollfree)}
+                    <div>
+                        {if $member.phone && $settings.list_show_phone}<span class="glm-member-db-phone">Phone: {apply_filters('glm_associate_phone_filter', $member.phone)} </span>{/if}
+                        {if $member.toll_free && $settings.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 && $settings.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 && $settings.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 $settings.list_show_url_newtarget} target="_blank"{/if} >Visit Website</a>{/if}
+                        {if $member.email && $settings.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 small-12 columns">
+                        <div>
+                        {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $member.member_pointer)}
+                        {if $member.short_descr && $settings.list_show_short_descr}
+                            {$member.short_descr|nl2br}
+                            {if $settings.list_show_detail_link}
+                                <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>
+                        {if $member.categories && $settings.list_show_categories}
+                        <div class="glm-member-list-items">
+                            <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 && $settings.list_show_creditcards}
+                            <b>Credit Cards Accepted:</b>
+                            <ul>
+                                {foreach $member.cc_type.names as $c}
+                                    <li>{$c}</li>
+                                {/foreach}
+                            </ul>
+                        {/if}
+                        {if $member.amenities && $settings.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>
+
+
+                        <!-- Laury - This is the one that should go underneath all the address and description area -->
+            {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $member.member_pointer)}
+            {apply_filters('glm-member-db-front-members-list-memberBottom', '', $member.member_pointer)}
+            </div>
+            {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
+    <!-- Member Description -->
+
+         {/foreach} {*$members*}
+        </div>
+
+ {/if} {*end grid view check*}
+
index b9ad0be..85c2724 100644 (file)
@@ -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" text-search="'.stripslashes($_REQUEST['s']).'"]');
+    echo do_shortcode('[glm-members-list view="grid" limit=6 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>';