From: Steve Sutton Date: Fri, 11 Jan 2019 20:43:33 +0000 (-0500) Subject: Merging view flies for ajax pagination X-Git-Tag: v2.11.0^2~8^2~5 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c7abac7f468a0d0afad683b4c76d2da12d68f259;p=WP-Plugins%2Fglm-member-db.git Merging view flies for ajax pagination Bring in develop stuff --- diff --git a/views/front/members/list.html b/views/front/members/list.html index 363ae9e4..60022f13 100755 --- a/views/front/members/list.html +++ b/views/front/members/list.html @@ -278,266 +278,112 @@
{if $settings.list_show_search_alpha && !apply_filters("is_page", 'search')}
- All + All {foreach $alphaList as $a} - {$a.alpha} + {$a.alpha} {/foreach}
{/if} {if $paging} - {if $prevStart || $nextStart} + {if ( $prevStart || $nextStart ) && !$settings.list_ajax_pagination}
- < Previous page - Next page > + < Previous page + Next page >

{/if}
- showing {$start} through {$lastDisplayed} of {$filteredMembersFound} + showing {$start} through {$lastDisplayed} of {$filteredMembersFound}
{/if} - {if $view == grid} - - - - {else} - - - {foreach $members as $member} - {apply_filters('glm-member-db-front-members-list-memberAbove', '', $member.member_pointer)} -
- {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)} - - {if $member.featured} -
- featured + {* Loading members with ajax *} + {if $settings.list_ajax_pagination} +
+ loading...
+ {else} + {include file='front/members/listContainer.html'} {/if} - -
- {if $member.logo && $settings.list_show_logo} -
-
- -
-
- {/if} -
- - {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $member.member_pointer)} -

- {if $settings.list_show_detail_link && !$member.has_no_profile.value} - {$member.member} - {else} - {$member.member} - {/if} -

- {if $settings.list_show_address} -
- {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $member.member_pointer)} - {if $settings.list_show_street} - {if $member.addr1 && $settings.list_show_address}
{$member.addr1}
{/if} - {if $member.addr2 && $settings.list_show_address}
{$member.addr2}
{/if} - {/if} - {if $settings.memb_info_location && $settings.list_show_citystatezip} -
- {if $member.city} - {$member.city}{if $member.state.value}, {/if} - {/if} - {if $member.state.value} - {$member.state.value} - {/if} - {if $member.zip} - {$member.zip} - {/if} -
- {/if} - {if $member.country.name && $settings.list_show_country} -
{$member.country.name}
- {/if} - {apply_filters('glm-member-db-front-members-list-memberAddressBottom', '', $member.member_pointer)} -
- {/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)} -
- {if $member.phone && $settings.list_show_phone}Phone: {apply_filters('glm_associate_phone_filter', $member.phone)} {/if} - {if $member.toll_free && $settings.list_show_tollfree}{apply_filters('glm_associate_phone_filter', $member.toll_free)}{/if} -
- {/if} - {if $settings.memb_info_location && $member.region && $settings.list_show_region}
Region: {$member.region}
{/if} - -
- {apply_filters('glm-member-db-front-members-list-memberLinksTop', '', $member.member_pointer)} - {if $member.url && $settings.list_show_url}Visit Website{/if} - {if $member.email && $settings.list_show_email}Email{/if} - {if $member.reservation_url}Reserve Now{/if} - {if $settings.list_show_live_cam} - {if $member.live_cam_type.name == "Web Page" && $member.live_cam_url && $settings.list_show_live_cam} - {$terms.term_webcam_cap} - {else if $member.live_cam_type.name == "Camera Image"} - {$terms.term_webcam_cap} - {/if} - {/if} - {apply_filters('glm-member-db-front-members-list-linksBottom', '', $member.member_pointer)} -
-
- {apply_filters('glm-member-db-front-members-social-list', '', $member.member_pointer)} -
- -
-
- {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 && !$member.has_no_profile.value} - More - {/if} - {/if} - {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $member.member_pointer)} -
- {if $member.categories && $settings.list_show_categories} -
- {$terms.term_member_cap} Categories -
    - {foreach $member.categories as $c} -
  • - {if $c.parent_name}{$c.parent_name}: {/if}{$c.name} -
    • - {/foreach} -
- {/if} - {if $member.cc_type && $settings.list_show_creditcards} - Credit Cards Accepted: -
    - {foreach $member.cc_type.names as $c} -
  • {$c}
    • - {/foreach} -
- {/if} - {if $member.amenities && $settings.list_show_amenities} - {$terms.term_member_cap} Amenities -
    - {foreach $member.amenities as $A} -
  • - {$A.name} -
    • - {/foreach} -
- {/if} -
-
- {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $member.member_pointer)} -
- - - {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $member.member_pointer)} - {apply_filters('glm-member-db-front-members-list-memberBottom', '', $member.member_pointer)} -
- {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)} - - - {/foreach} {*$members*} -
- - {/if} {*end grid view check*} -
{if $paging} - {if $prevStart || $nextStart} + {if ( $prevStart || $nextStart ) && !$settings.list_ajax_pagination}
- < Previous page - Next page > + < Previous page + Next page >

{/if} + {if $nextStart && $settings.list_ajax_pagination} + [ Load More ] + {/if}
- showing {$start} through {$lastDisplayed} of {$filteredMembersFound} + showing {$start} through {$lastDisplayed} of {$filteredMembersFound}
{/if} -
{apply_filters('glm-member-db-front-members-list-pageBottom', '')} {else}
(no {$terms.term_member_plur} listed)
{/if} {/if} {*list_show_list*} -