From c4c07cad8ffb6a65b2e7eacac7c732fa5fe2af53 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 11 Jan 2019 15:44:56 -0500
Subject: [PATCH] bring in dev updates

updating from main plugin
---
 glm-member-db/views/front/members/list.html   | 152 ++++++++++--------
 .../views/front/members/listContainer.html    |  32 ++--
 2 files changed, 100 insertions(+), 84 deletions(-)

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index e0345c9..638010f 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -91,20 +91,22 @@
                                 {/if}
                             {/if}
 
-                            {if $cities|@count gt 0}
-                                <div>
-                                    By Cities:
-                                    <select name="cityUserSearch[]">
-                                        {if $cities|@count gt 1}
-                                            <option value"">(all)</option>
-                                        {/if}
-                                        {foreach from=$cities item=v}
-                                            <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
-                                                {$v.name}
-                                            </option>
-                                        {/foreach}
-                                    </select>
-                                </div>
+                            {if $settings.list_show_search_city}
+                                {if $cities|@count gt 0}
+                                    <div>
+                                        By Cities:
+                                        <select name="cityUserSearch[]">
+                                            {if $cities|@count gt 1}
+                                                <option value"">(all)</option>
+                                            {/if}
+                                            {foreach from=$cities item=v}
+                                                <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
+                                                    {$v.name}
+                                                </option>
+                                            {/foreach}
+                                        </select>
+                                    </div>
+                                {/if}
                             {/if}
 
 
@@ -278,42 +280,55 @@
                 <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 isset($smarty.request.s) && $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>
+                        <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if isset($smarty.request.s) && $smarty.request.s}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}#glm-member-list-filters-button" 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 isset($smarty.request.s) && $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>
+                        <a href="{$thisUrl}?glm_action=list&alpha={$a.alpha}&textSearch={$textSearch}{if isset($smarty.request.s) && $smarty.request.s}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}#glm-member-list-filters-button" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
                 {/foreach}
                 </div>
                 {/if}
 
-                    {if $paging}
+                {if $paging}
+                    {if ( $prevStart || $nextStart ) && !$settings.list_ajax_pagination}
                         <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>
-                        -->
+                        <div class="paging-container">
+                            <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}#glm-member-list-filters-button" 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}#glm-member-list-filters-button" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page ></a>
+                        </div>
                         <br>
-                        showing <span class="aStart">{$start}</span> through <span class="aLastDisplayed">{$lastDisplayed}</span> of <span class="aTotal">{$filteredMembersFound}</span>
                     {/if}
+                    <br>
+                    <div class="glm-members-found">
+                    showing <span class="aStart">{$start}</span> through <span class="aLastDisplayed">{$lastDisplayed}</span> of <span class="aTotal">{$filteredMembersFound}</span>
+                    </div>
+                {/if}
 
 
                     {* Loading members with ajax *}
+                    {if $settings.list_ajax_pagination}
                     <div id="glm-ajax-list">
                         loading...
                     </div>
+                    {else}
+                        {include file='front/members/listContainer.html'}
+                    {/if}
 
 
                     {if $paging}
+                        {if ( $prevStart || $nextStart ) && !$settings.list_ajax_pagination}
+                        <br>
+                        <div class="paging-container">
+                            <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}#glm-member-list-filters-button" 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}#glm-member-list-filters-button" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page ></a>
+                        </div>
                         <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}
+                        {if $nextStart && $settings.list_ajax_pagination}
+                            <a href="#" class="glm-show-more test" data-next="{$nextStart}">[ Load More ]</a>
                         {/if}
                         <br>
-                        showing <span class="aStart">{$start}</span> through <span class="aLastDisplayed">{$lastDisplayed}</span> of <span class="aTotal">{$filteredMembersFound}</span>
+                        <div class="glm-members-found">
+                            showing <span class="aStart">{$start}</span> through <span class="aLastDisplayed">{$lastDisplayed}</span> of <span class="aTotal">{$filteredMembersFound}</span>
+                        </div>
                     {/if}
 
                         {apply_filters('glm-member-db-front-members-list-pageBottom', '')}
@@ -329,52 +344,53 @@
 
     <script>
         jQuery(document).ready(function($) {
+            {if $settings.list_ajax_pagination}
+                var nextStart    = {if $nextStart}{$nextStart}{else}0{/if};
+                var numberShown  = 0;
+                var totalMembers = {$filteredMembersFound};
 
-            var nextStart    = {if $nextStart}{$nextStart}{else}0{/if};
-            var numberShown  = 0;
-            var totalMembers = {$filteredMembersFound};
-
-            jQuery.ajax({
-                url: '{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=membersList&limit=6{$ajaxRequest}&alpha={$alphaSelected}',
-                cache: false,
-                async: true,
-                dataType: 'html',
-                success: function( html ){
-                    $('#glm-ajax-list').html( html );
-                    numberShown += 6;
-                },
-            });
-
-            // 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&alpha={$alphaSelected}',
+                    url: '{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=membersList&limit={$settings.list_pagination_count}{$ajaxRequest}&alpha={$alphaSelected}',
                     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();
-                        }
+                        $('#glm-ajax-list').html( html );
+                        numberShown += {$settings.list_pagination_count};
                     },
                 });
-            });
+
+                // 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={$settings.list_pagination_count}{$ajaxRequest}&pageSelect=Next&nextStart=' + nextStart + '&ajaxNext=1&alpha={$alphaSelected}',
+                        cache: false,
+                        async: true,
+                        dataType: 'html',
+                        success: function( html ){
+                            $('#glm-ajax-list').append( html );
+                            // $('.aStart').html(nextStart + 1);
+                            nextStart += {$settings.list_pagination_count};
+                            if ( nextStart > totalMembers ) {
+                                nextStart = totalMembers;
+                                $('.aLastDisplayed').html(nextStart);
+                            } else {
+                                $('.aLastDisplayed').html(nextStart - 1);
+                            }
+                            numberShown += {$settings.list_pagination_count};
+                            console.log('shown: ', numberShown);
+                            console.log( 'nextStart', nextStart);
+                            console.log( 'totalMembers', totalMembers);
+                            if ( numberShown >= totalMembers ) {
+                                showMoreButton.remove();
+                            }
+                        },
+                    });
+                });
+            {/if}
 
             jQuery('select[multiple]').asmSelect();
 
diff --git a/glm-member-db/views/front/members/listContainer.html b/glm-member-db/views/front/members/listContainer.html
index af517ec..4e11ce3 100644
--- a/glm-member-db/views/front/members/listContainer.html
+++ b/glm-member-db/views/front/members/listContainer.html
@@ -86,25 +86,26 @@
     <!-- 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">
+         <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)}
-                 <!-- 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}
 
-                            {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 && $settings.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 small-12 medium-8 columns">
+            <div class="glm-member-list-active-info glma-small-12 glma-medium-8 glma-columns glma-small-right glma-medium-left ">
      <!-- Member name, address, and basic information -->
                     {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $member.member_pointer)}
                     <h4 class="glm-member-title">
@@ -167,12 +168,12 @@
                        {apply_filters('glm-member-db-front-members-social-list', '', $member.member_pointer)}
                     </div>
 
-                    <div class="glm-member-list-description small-12 columns">
+                <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 && $settings.list_show_short_descr}
                             {$member.short_descr|nl2br}
-                            {if $settings.list_show_detail_link}
+                        {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}">More</a>
                             {/if}
                         {/if}
@@ -220,8 +221,7 @@
             {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
     <!-- Member Description -->
 
-         {/foreach} {*$members*}
         </div>
+         {/foreach} {*$members*}
 
  {/if} {*end grid view check*}
-
-- 
2.17.1