From: Steve Sutton <steve@gaslightmedia.com>
Date: Sat, 16 Feb 2019 11:24:09 +0000 (-0500)
Subject: Merge tag 'v2.11.2' into develop
X-Git-Tag: v2.12.0^2~36
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=8ce79d7244a239c51e24683c5a05dbc025b93899;p=WP-Plugins%2Fglm-member-db.git

Merge tag 'v2.11.2' into develop

Version 2.11.2
---

8ce79d7244a239c51e24683c5a05dbc025b93899
diff --cc index.php
index ac9daf23,6041d8d9..d9416dae
--- a/index.php
+++ b/index.php
@@@ -47,8 -47,8 +47,8 @@@ if (!defined('ABSPATH')) 
   *
   */
  
- define('GLM_MEMBERS_PLUGIN_VERSION', '2.11.1');
+ define('GLM_MEMBERS_PLUGIN_VERSION', '2.11.2');
 -define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.46');
 +define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.49');
  
  // Check if plugin version is not current in WordPress option and if needed updated it
  if (GLM_MEMBERS_PLUGIN_VERSION != get_option('glmMembersDatabasePluginVersion')) {
diff --cc views/front/members/list.html
index e528f331,9ed553a8..cb1fd9b6
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@@ -301,43 -301,71 +301,53 @@@
  
      {/if} {* haveFeaturedMembers *}
  
+     {$isSearchPage = is_page('search')}
+ 
      {if $showSettings.list_show_list && !$blankStart}
 -        {if $settings.list_header_text}
 -        <h3 class="glm-member-db-list-header-title">{$settings.list_header_text}</h3>
 -        {elseif $isSearchPage}
 -        <h1 class="glm-member-db-list-header-title member-search-page-title">List of {$terms.term_member_plur_cap}</h1>
 -        {else}
 -        <h3 class="glm-member-db-list-header-title">List of {$terms.term_member_plur_cap}</h3>
 +        {if $showSettings.list_show_sidebar_area}
 +            <div id="listing-wrapper" class="row">
 +                <div class="glm-member-list-listing-container small-12 large-8 columns">
          {/if}
 -        {if $haveMembers}
 -
 -            <div id="glm-member-list-terms">{$terms.term_member_plur_cap} found: {$membersFound}<br></div>
 -
 -            {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')}
 -
 -            <!-- Member information displayed in list -->
 +            {if $showSettings.list_show_header_text}
 +                {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>
++                    <h3 class="glm-member-db-list-header-title">{$settings.list_header_text}</h3>
++                {elseif $isSearchPage}
++                    <h1 class="glm-member-db-list-header-title member-search-page-title">List of {$terms.term_member_plur_cap}</h1>
 +                {else}
-                 <h3 class="glm-member-db-list-header-title">List of {$terms.term_member_plur_cap}</h3>
++                    <h3 class="glm-member-db-list-header-title">List of {$terms.term_member_plur_cap}</h3>
 +                {/if}
 +            {/if}
 +            {if $haveMembers}
 +                {if $showSettings.list_show_entities_found}
 +                <div id="glm-member-list-terms">{$terms.term_member_plur_cap} found: {$membersFound}<br></div>
 +                {/if}
  
 +                {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')}
  
 -            {* Alpha List *}
 +                <!-- Member information displayed in list -->
  
+             {if $showSettings.list_show_search_alpha && !$isSearchPage}
+                 <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}#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}#glm-member-list-filters-button" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
+                     {/foreach}
+                 </div>
+             {/if}
  
 -            {* Page selection top *}
 +                {* Alpha List *}
  
 -            {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>
 +                {if $showSettings.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}#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}#glm-member-list-filters-button" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
 +                        {/foreach}
                      </div>
 -                    <br>
                  {/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}
  
 -            {* Members List *}
 +                {* Page selection top *}
  
 -            {if $settings.list_ajax_pagination}
 -                <div id="glm-ajax-list">
 -                    loading...
 -                </div>
 -            {else}
 -                {if $view == list || $view == map}
 -                    {include file='front/members/listTypeList.html'}
 -                {/if}
 -                {if $view == grid}
 -                    {include file='front/members/listTypeGrid.html'}
 -                {/if}
 -            {/if}
 -
 -            {* Page selection bottom *}
 -
 -            <div class="paging-container">
                  {if $paging}
                      {if ( $prevStart || $nextStart ) && !$settings.list_ajax_pagination}
                          <br>