Theme updates
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 4 Jan 2019 19:21:23 +0000 (14:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 4 Jan 2019 19:21:23 +0000 (14:21 -0500)
Updating theme to get rid of some php notices.
Updating theme member list view files to get it more like the main
plugin version. Planning on merging everything in to main plugin.

glm-member-db/views/front/members/list.html
inc/custom.php
inc/menu-walker.php
template-parts/search-overlay.php

index bedf082..e0345c9 100644 (file)
@@ -1,8 +1,11 @@
+{include file='front/members/header.html'}
+
 <div class="glm-member-db-list glm-member-db-{$view}-view
-{if $settings.list_map_show_opened}map-opened {else}map-closed {/if}
-{if $settings.list_show_search_filters_opened}filters-opened {else}filters-closed {/if}
+    {if $settings.list_map_show_opened || $view == 'map'}map-opened {else}map-closed {/if}
+    {if $settings.list_show_search_filters_opened}filters-opened{else}filters-closed{/if}
 ">
 
+{if $view != 'no-map'}
     {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=""/>
@@ -11,6 +14,8 @@
         <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>
+        <link rel="stylesheet" href="//unpkg.com/leaflet-gesture-handling/dist/leaflet-gesture-handling.min.css" type="text/css">
+        <script src="//unpkg.com/leaflet-gesture-handling"></script>
     {/if}
 
     {if $settings.selected_map_interface == 2}
         <script src="//maps.googleapis.com/maps/api/js?&key={$settings.google_maps_api_key}"></script>
     {/if}
 
-
-
-    {include file='front/members/header.html'}
-
+{/if}
     {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}
+    {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">
+                FILTERS
+            </div>
+            <div id="glm-member-list-filters-box">
+                <div id="glm-member-list-filters-close" class="button glm-button glm-member-list-filters-toggle">Close</div>
+                    <form action="{$thisUrl}?glm_action=list#glm-member-list-filters-button" method="post" enctype="multipart/form-data">
+                        {if isset($smarty.request.s)}<input type="hidden" name="s" value="{$smarty.request.s|escape}">{/if}
+                        <div class="glma-small-12 glma-columns glm-member-search glm-member-entry-container glm-member-container">
+                            {apply_filters('glm-member-db-front-members-list-searchFormTop', '')}
+                            <div>
+                                <h3>Refine Search</h3>
+                            </div>
+                            {if $settings.list_show_search_category}
+                                <div>
+                                    By Category:
+
+                                    <select name="categorySearch" id="categorySelect">
+                                    {if !$singleCategory}
+                                        <option value="">(all)</option>
+                                    {/if}
+                                    {foreach from=$categories item=v}
+                                        <option value="{$v.id}"{if $v.default} selected="selected"{/if}>
+                                            {if $v.parent}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
+                                        </option>
+                                    {/foreach}
+                                    </select>
+                                </div>
+                            {/if}
+                            {if $settings.list_show_search_amenities}
+                                {if $amenities|@count gt 0}
+                                <div>
+                                    By Amenities:
+                                    <select name="amenitySearch[]" id="amenitySelect" title="Click to Select Amenities" multiple="multiple">
+                                        {foreach from=$amenities item=v}
+                                            <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
+                                                {$v.name}
+                                            </option>
+                                        {/foreach}
+                                    </select>
+                                </div>
+                                {/if}
+                            {/if}
+                            {if $settings.list_show_search_region}
+                                {if $regions|@count gt 0}
+                                <div>
+                                    By Regions:
+                                    <select name="regionUserSearch[]">
+                                        {if $regions|@count gt 1}
+                                            <option value"">(all)</option>
+                                        {/if}
+                                        {foreach from=$regions item=v}
+                                            <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
+                                                {$v.name}
+                                            </option>
+                                        {/foreach}
+                                        </select>
+                                    </div>
+                                {/if}
+                            {/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">
-        FILTERS
-    </div>
-    <div id="glm-member-list-filters-box">
-        <div id="glm-member-list-filters-close" class="button glm-button glm-member-list-filters-toggle">Close</div>
-        <form action="{$thisUrl}?glm_action=list" method="post" enctype="multipart/form-data">
-            {if isset($smarty.request.s)}
-            <input type="hidden" name="s" value="{$smarty.request.s|escape}">
-            {/if}
-            <div class="small-12 columns glm-member-search glm-member-entry-container glm-member-container">
-                {apply_filters('glm-member-db-front-members-list-searchFormTop', '')}
-                <div>
-                    <h3>Refine Search</h3>
-                </div>
-                {if $settings.list_show_search_category}
-                    <div>
-                    By Category:
-<!-- To enable multi-select, use this code for the category search instead of the code below
-                        <select name="categorySearchMultiple[]" id="categorySelect" multiple>
-                        {if !$singleCategory}
-                            <option value="">(all)</option>
-                        {/if}
-                        {foreach from=$categories item=v}
-                            <option value="{$v.id}"{if $v.default} selected="selected"{/if}>
-                                {if $v.parent}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
-                            </option>
-                        {/foreach}
-                        </select>
--->
-                        <select name="categorySearch" id="categorySelect">
-                        {if !$singleCategory}
-                            <option value="">(all)</option>
-                        {/if}
-                        {foreach from=$categories item=v}
-                            <option value="{$v.id}"{if $v.default} selected="selected"{/if}>
-                                {if $v.parent}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
-                            </option>
-                        {/foreach}
-                        </select>
+                            {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}
 
-                    </div>
-                {/if}
-                {if $settings.list_show_search_amenities}
-                    {if $amenities|@count gt 0}
-                    <div>
-                        By Amenities:
-                        <select name="amenitySearch[]" id="amenitySelect" title="Click to Select Amenities" multiple="multiple">
-                            {foreach from=$amenities item=v}
-                                <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
-                                    {$v.name}
-                                </option>
-                            {/foreach}
-                        </select>
-                    </div>
-                    {/if}
-                {/if}
-                {if $settings.list_show_search_region}
-                    {if $regions|@count gt 0}
-                    <div>
-                        By Regions:
-                        <select name="regionUserSearch[]">
-                            {if $regions|@count gt 1}
-                                <option value"">(all)</option>
+
+                            {if $settings.list_show_search_text}
+                                <div>
+                                    By Name: <input type="text" name="textSearch" value="{$textSearch}" class="glm-form-text-input">
+                                </div>
                             {/if}
-                            {foreach from=$regions item=v}
-                                <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
-                                    {$v.name}
-                                </option>
-                            {/foreach}
-                        </select>
+                        <div><input class="button glm-member-button centered" type="submit" value="Search"></div>
+                        {apply_filters('glm-member-db-front-members-list-searchFormBottom', '')}
                     </div>
-                    {/if}
+                </form>
+            </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', '')}
+            <div id="glm-locationMap-container">
+
+                {if $settings.selected_map_interface == 1}
+                    <!--  Leaflet Map -->
+                    <div id="LeafletMapContainer" style="height: 400px; width: 100%; border: 1px black solid; z-index: +0; margin: 0 auto;"></div>
                 {/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.selected_map_interface == 2}
+                    <!-- Google Map -->
+                    <div id="glm-locationMap" class="glm-map">(map loads here)</div>
                 {/if}
 
-
-                {if $settings.list_show_search_text}
-                    <div>
-                        By Name: <input type="text" name="textSearch" value="{$textSearch}" class="glm-form-text-input">
-                    </div>
-                {/if}
-                <div><input class="button glm-member-button centered" type="submit" value="Search"></div>
-                {apply_filters('glm-member-db-front-members-list-searchFormBottom', '')}
             </div>
-        </form>
-    </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', '')}
-        <div id="glm-locationMap-container">
-
-            {if $settings.selected_map_interface == 1}
-                <!--  Leaflet Map -->
-                <div id="LeafletMapContainer" style="height: 400px; width: 90%; border: 1px black solid; z-index: +0; margin: 0 auto;"></div>
-            {/if}
-
-            {if $settings.selected_map_interface == 2}
-                <!-- Google Map -->
-                <div id="glm-locationMap" class="glm-map">(map loads here)</div>
-            {/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 id="glm-map-bubbles-container"> <!-- endless map bubbles -->
+        <!-- Member information displayed in map bubbles -->
+        <div id="glm-map-bubbles-container"> {* endless map bubbles *}
         {foreach $mapItems as $m}
             <div id="map_info_{$m.id}" class="glm-hidden">
                 {apply_filters('glm-member-db-front-members-list-mapBubbleTop', '', $m.member)}
                         {if $m.region && $settings.list_map_show_region}<b>Region:</b> {$m.region}<br>{/if}
                         {if $m.url && $settings.list_map_show_url}<a href="{$m.url}"{if $settings.list_map_show_url_newtarget} target="_blank"{/if}>Website</a><br>{/if}
                     </p>
-    <!-- Not using Description for now - Use short descr for maps {literal}
-                    {if $m.descr && $settings.list_map_show_descr}{$m.descr|nl2br}<br>{/if}
-    {/literal} -->
+                    {if isset($m.descr) && $settings.list_map_show_descr}{$m.descr|nl2br}<br>{/if}
                     {if $m.short_descr && $settings.list_map_show_short_descr}{$m.short_descr|truncate:200}<br>{/if}
                     {if $settings.list_map_show_detaillink && !$m.has_no_profile}
                         <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/{if $settings.enable_multiple_profiles}{$m.id}/{/if}">More Info</a>
                     {/if}
-                    {if $m.categories && $settings.list_map_show_categories}
+                    {if isset($m.categories) && $settings.list_map_show_categories}
                         <div class="glm-member-list-items">
                             <b>{$terms.term_member_cap} Categories</b>
                             <ul>
                 {apply_filters('glm-member-db-front-members-list-mapBubbleBottom', '', $m.member)}
             </div> <!-- End of information displayed in map bubbles -->
         {/foreach}
-    </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}
-
-    <div>
-        {if $haveMembers}
+        {if $haveFeaturedMembers}
+
+            <h3 id="glm-featured-members-title">Featured</h3>
+
+            <ul id="glm-featured-members-grid" class="featured-grid glma-small-block-grid-1 glma-medium-block-grid-2 glma-large-block-grid-3">
+                {foreach $featuredMembers as $fm}
+                    <li class="featured-grid-item-wrapper">
+                        <a class="featured-grid-item" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$fm.member_slug}/">
+                            {if $fm.logo && $settings.list_show_logo}
+                                <div class="glm-member-list-has-image">
+                                    <img class="glm-member-list-image" src="{$glmPluginMediaUrl}/images/grid/{$fm.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 class="featured-grid-item-info">
+                                <h4 class="featured-member-title">{$fm.member_name}</h4>
+
+                                {if $fm.short_descr && $settings.list_show_short_descr}
+                                    <div class="featured-member-description">
+                                        {$fm.short_descr|nl2br}
+                                    </div>
+                                {/if}
+                            </div>
+                        </a>
+                    </li>
+                {/foreach}
+            </ul>
+        {/if}
+        </div>{* endless map bubbles *}
 
-        <div id="glm-member-list-terms">{$terms.term_member_plur_cap} found: {$membersFound}<br></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>
+            {else}
+                <h3 class="glm-member-db-list-header-title">List of {$terms.term_member_plur_cap}</h3>
+            {/if}
+            <div>{* maybe a bad div? *}
+            {if $haveMembers}
 
-        {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')}
+                <div id="glm-member-list-terms">{$terms.term_member_plur_cap} found: {$membersFound}<br></div>
 
-        <!-- Member information displayed in list -->
+                {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')}
 
-        <div class="glm-member-list-listing-container">
+                <!-- Member information displayed in list -->
 
-            {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}
+                <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>
+                {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>
+                {/foreach}
+                </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 $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}
 
 
-            {* Loading members with ajax *}
-            <div id="glm-ajax-list">
-                loading...
-            </div>
+                    {* Loading members with ajax *}
+                    <div id="glm-ajax-list">
+                        loading...
+                    </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}
-                <br>
-                showing <span class="aStart">{$start}</span> through <span class="aLastDisplayed">{$lastDisplayed}</span> of <span class="aTotal">{$filteredMembersFound}</span>
-            {/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-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}
+                        <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', '')}
+                        {apply_filters('glm-member-db-front-members-list-pageBottom', '')}
 
-            {else}
-                <div>(no {$terms.term_member_plur} listed)</div>
-            {/if}
+                    {else}
+                        <div>(no {$terms.term_member_plur} listed)</div>
+                    {/if}
 
-        </div>
-    </div>
+                </div>
+            </div>
 
-{/if} {*list_show_list*}
+        {/if} {*list_show_list*}
 
     <script>
         jQuery(document).ready(function($) {
 
             function initMap() {
 
-                var leafletMap = L.map('LeafletMapContainer').setView([{$settings.maps_default_lat}, {$settings.maps_default_lon}], defZoom);
+                var leafletMap = L.map('LeafletMapContainer', {
+                    gestureHandling: true
+                });
+                leafletMap.setView([{$settings.maps_default_lat}, {$settings.maps_default_lon}], defZoom);
                 var leafletTileServer = '{$settings.leaflet_tile_server}/{$settings.leaflet_tile_server_key}/' + {literal}'{z}/{x}/{y}.png'{/literal};
                 var leafletMinZoom = 3;
                 var leafletMaxZoom = 19;
                     })
                     .addTo(markerGroup);
 
-            {/if}
+                {/if}
               {/foreach}
 
                 leafletMap.addLayer(markerGroup);
              *  API reference: https://developers.google.com/maps/documentation/javascript/reference
              */
 
-             function initMap() {
+            function initMap() {
 
                 // Create a Google Map object
                 var map = new google.maps.Map(document.getElementById('glm-locationMap'), {
                 //}
 
 
-            {if $mapItems}
-                var markers = [];
-                {foreach $mapItems as $m}
-                  {if $m.lat != 0 && $m.lon != 0}
-
-                    // Create a marker for this member
-                    var marker = new google.maps.Marker({
-                        map: map,
-                        position: new google.maps.LatLng({$m.lat}, {$m.lon}),
-                        draggable: false,
-                        animation: google.maps.Animation.DROP,
-                        title: '{$m.member_name|escape:quotes}',
-                        descr: $('#map_info_' + {$m.id}).html(),
-                        memberID: {$m.member}
-                    });
+                {if $mapItems}
+                    var markers = [];
+                    {foreach $mapItems as $m}
+                        {if $m.lat != 0 && $m.lon != 0}
+
+                            // Create a marker for this member
+                            var marker = new google.maps.Marker({
+                                map: map,
+                                position: new google.maps.LatLng({$m.lat}, {$m.lon}),
+                                draggable: false,
+                                animation: google.maps.Animation.DROP,
+                                title: '{$m.member_name|escape:quotes}',
+                                descr: $('#map_info_' + {$m.id}).html(),
+                                memberID: {$m.member}
+                            });
 
-                    // Add a click listener for this marker
-                    marker.addListener('click', function() {
-                            infowindow.setOptions({
-                                    content: this.descr
+                            // Add a click listener for this marker
+                            marker.addListener('click', function() {
+                                    infowindow.setOptions({
+                                            content: this.descr
+                                    });
+                                infowindow.open(map,this);
                             });
-                        infowindow.open(map,this);
-                    });
 
-                    markers.push(marker);
+                            markers.push(marker);
 
-                    // Extend the map bounds to include this marker
-                    bounds.extend(marker.position);
+                            // Extend the map bounds to include this marker
+                            bounds.extend(marker.position);
 
-                 {/if}
-                {/foreach}
-
-                {if $settings.use_cluster_markers}
-                    var markerCluster = new MarkerClusterer(map, markers,
-                    {
-                        imagePath: '{$baseUrl}/js/googleMapsMarkerClusterer/images/m',
-                        gridSize: 30,
-                        maxZoom: 14,
-                        minimunClusterSize: 3
-                    });
-                {/if}
+                        {/if}
+                    {/foreach}
+
+                    {if $settings.use_cluster_markers}
+                        var markerCluster = new MarkerClusterer(map, markers,
+                        {
+                            imagePath: '{$baseUrl}/js/googleMapsMarkerClusterer/images/m',
+                            gridSize: 30,
+                            maxZoom: 14,
+                            minimunClusterSize: 3
+                        });
+                    {/if}
 
                     // Fit map to bounds of all markers
                     map.fitBounds(bounds);
                         google.maps.event.removeListener(mapLoadedListener);
                     });
 
-             } // initMap
+            } // initMap
 
         {else}
 
 
     {/if}   // settings.list_show_map
 
-            // Handle Map View/Hide
-            var mapInitialized = false;
+         // Handle Map View/Hide
+         var mapInitialized = false;
             $("#glm-member-list-map-toggle").click( function() {
                 $(".glm-member-db-{$view}-view").toggleClass("map-opened");
                 $(".glm-member-db-{$view}-view").toggleClass("map-closed");
                     initMap();
                     mapInitialized = true;
                 }
-                var currentScroll = $(window).scrollTop(); // get current position
-                var mapTop = $("#glm-locationMap-container").offset().top-10;
-                {if $settings.list_show_search}fixmeTop = $('#glm-member-list-filters-button').offset().top;{/if}
-                if (currentScroll >= mapTop) {
-                    $('body,html').animate({
-                    scrollTop: $("#glm-locationMap-container").offset().top-100
-                    }, 50);
-                } else {
-                    $('body,html').animate({
-                        scrollTop: $("#glm-locationMap-container").offset().top-100
-                    }, 400);
-               }
             });
-        {if $settings.list_map_show_opened}
-            // Start with map opened
-            initMap();
-            mapInitialized = true;
-        {/if}
+            {if $view != 'no-map'}
+                {if $settings.list_map_show_opened || $view == 'map'}
+                    // Start with map opened
+                    initMap();
+                    mapInitialized = true;
+                {/if}
+            {/if}
 
             // Processes click-through counts for website links
             $('.glm-member-list-website-link').on('click', function() {
         });
             </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'}
index 85c2724..e265bc2 100644 (file)
@@ -689,14 +689,14 @@ function select_dropdown_cities() {
 wp_reset_postdata();
 
 
-add_filter('admin_footer_text', remove_admin_footer_text, 1000);
-
-function remove_admin_footer_text($footer_text =''){
-    return '';
-}
-
-add_filter('update_footer', remove_admin_footer_upgrade, 1000);
-
-function remove_admin_footer_upgrade($footer_text =''){
-    return '';
-}
+// add_filter('admin_footer_text', remove_admin_footer_text, 1000);
+//
+// function remove_admin_footer_text($footer_text =''){
+//     return '';
+// }
+//
+// add_filter('update_footer', remove_admin_footer_upgrade, 1000);
+//
+// function remove_admin_footer_upgrade($footer_text =''){
+//     return '';
+// }
index 9c40c60..7dccfc6 100644 (file)
@@ -11,16 +11,16 @@ class Glm_Theme_Top_Bar_Walker extends Walker_Nav_Menu {
             $hasThumb = has_post_thumbnail($element->object_id);
             $hasExcerpt = has_excerpt($element->object_id);
         }
-        
-        $numChildren = count( $children_elements[ $element->ID ] );
-        
+
+        $numChildren = ( isset( $children_elements[$element->ID] ) ) ? count( $children_elements[$element->ID] ): 0;
+
         $element->has_children = ! empty( $children_elements[ $element->ID ] );
         $element->classes[] = "object-id-" . $element->object_id;
         $element->classes[] = ( $element->current || $element->current_item_ancestor ) ? 'active' : '';
         $element->classes[] = ( $element->has_children && 1 !== $max_depth ) ? '' : '';
         $element->classes[] = ( $element->post_parent == 0 && $mainLevelCounter < 6 ) ? '' : 'drop-left';
-        $element->classes[] = ( $hasThumb) ? 'dropdown-image' : 'no-dropdown-image';   
-        $element->classes[] = ( $hasExcerpt) ? 'has-excerpt' : 'no-excerpt';   
+        $element->classes[] = ( isset( $hasThumb ) && $hasThumb) ? 'dropdown-image' : 'no-dropdown-image';
+        $element->classes[] = ( isset( $hasExcerpt ) && $hasExcerpt ) ? 'has-excerpt' : 'no-excerpt';
         $element->classes[] = ( $numChildren > 9 ) ? 'three-col' : 'one-col';
         parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output );
     }
@@ -33,7 +33,7 @@ class Glm_Theme_Top_Bar_Walker extends Walker_Nav_Menu {
         $item_style = '';
 
         if ($depth == 0 && has_post_thumbnail((int)$object->object_id)) {
-           
+
             $thumbnail = wp_get_attachment_image_src(get_post_thumbnail_id((int)$object->object_id), 'dropdown-image');
             // $item_style .= "<style>#menu-item-".$object->ID." > .sub-menu:before { background-image: url('".$thumbnail[0]."'); min-height: 130px;} #menu-item-".$object->ID." > .sub-menu { padding-top: 155px;}</style>";
 
@@ -51,7 +51,7 @@ class Glm_Theme_Top_Bar_Walker extends Walker_Nav_Menu {
             // border: 2px solid white;
             // }
             // </style>";
-            
+
         } else {
             // $item_style .= "<style>#menu-item-".$object->ID." > .sub-menu:before { background-image: none; } #menu-item-".$object->ID." > .sub-menu { padding-top: 21px;}</style>";
         }
index 9197871..9dd9560 100644 (file)
@@ -38,7 +38,7 @@ $cities = $decode_array['cities'];
                     <option value="">Search All Locations</option>
                         <?php foreach($cities as $city){ ?>
                             <?php $city_id = str_replace("'", "", $city['city']); ?>
-                            <?php if( $selected_city == $city['city']) { ?>
+                            <?php if( isset( $selected_city ) && $selected_city == $city['city']) { ?>
                             <option selected value="<?php echo $city_id; ?>"><?php echo $city['name']; ?></option>
                               <?php } else { ?>
                                   <option value="<?php echo $city_id; ?>"><?php echo $city['name']; ?></option>
@@ -54,7 +54,7 @@ $cities = $decode_array['cities'];
                          <option value="">Search All Regions</option>
 
                             <?php foreach($regions as $region){ ?>
-                            <?php if( $selected_region == $region['region']) { ?>
+                            <?php if( isset( $selected_region ) && $selected_region == $region['region']) { ?>
                                 <option selected value="<?php echo $region['region']; ?>"><?php echo $region['name']; ?></option>
                                 <?php } else { ?>
                                      <option value="<?php echo $region['region']; ?>"><?php echo $region['name']; ?></option>