Bring in updates from wmta theme

For search (wmta)

diff --git a/views/front/members/list.html b/views/front/members/list.html
index 65857cf..1efcd35 100755 (executable)
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -1,7 +1,7 @@
 {include file='front/members/header.html'}
 
 <div class="glm-member-db-list glm-member-db-{$view}-view
-    {if $settings.list_map_show_opened || $view == 'map'}map-opened{else}map-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}
 ">
 
@@ -24,8 +24,8 @@
     {/if}
 
 {/if}
-{apply_filters('glm-member-db-front-members-list-pageTop', '')}
-<div class="glm-member-list-inner-wrapper">
+    {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}
@@ -37,6 +37,7 @@
             <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>
@@ -242,6 +243,8 @@
         {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}
@@ -254,7 +257,7 @@
                 <!-- Member information displayed in list -->
 
                 <div class="glm-member-list-listing-container">
-                {if $settings.list_show_search_alpha}
+                {if $settings.list_show_search_alpha && !apply_filters("is_page", 'search')}
                     <div class="glm-alpha-links">
                         <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&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}
@@ -555,7 +558,7 @@
                     });
             {/if} // settings.list_show_search
 
-            {if $settings.list_show_map}
+    {if $settings.list_show_map}
 
             /*
              * Map operations
@@ -574,8 +577,6 @@
 
             function initMap() {
 
-                console.log("e - ");
-
                 var leafletMap = L.map('LeafletMapContainer', {
                     gestureHandling: true
                 });
@@ -652,7 +653,7 @@
                     leafletMap.panTo(leafletMap.unproject(px),{ animate: true });
                 });
 
-                console.log("r - ");
+
             }
 
       {/if}