Trying again to update theme list view

working on the member map
Should show map marker even if no search.

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index 637e826..e684907 100644 (file)
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -7,92 +7,75 @@
     {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" method="post" enctype="multipart/form-data">
-                {if $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 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" method="post" enctype="multipart/form-data">
+            {if $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>
-                        <h3>Refine Search</h3>
-                    </div>
-                    {if $settings.list_show_search_category}
-                        <div>
-                        By Category:
+                    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="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}
+                        <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 $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}
+                        </select>
+                    </div>
                     {/if}
-
-                    {if $cities|@count gt 0}
+                {/if}
+                {if $settings.list_show_search_region}
+                    {if $regions|@count gt 0}
                     <div>
-                        By Cities:
-                        <select name="cityUserSearch[]">
-                            {if $cities|@count gt 1}
+                        By Regions:
+                        <select name="regionUserSearch[]">
+                            {if $regions|@count gt 1}
                                 <option value"">(all)</option>
                             {/if}
-                            {foreach from=$cities item=v}
+                            {foreach from=$regions item=v}
                                 <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
                                     {$v.name}
                                 </option>
@@ -100,20 +83,37 @@
                         </select>
                     </div>
                     {/if}
+                {/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', '')}
+                {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>
-            </form>
-        </div> <!-- glm-member-list-filters-box -->
-    </div> <!-- glm-member-list-wrapper -->
-    {/if} {*list_show_search*}
+                {/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}
     <script src="//maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
     {apply_filters('glm-member-db-front-members-list-mapTop', '')}
@@ -125,13 +125,6 @@
 {apply_filters('glm-member-db-front-members-list-listHeaderTop', '')}
 
 
-{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}
-
  <!-- Member information displayed in map bubbles -->
     <div id="glm-map-bubbles-container"> <!-- endless map bubbles -->
     {foreach $mapItems as $m}
@@ -212,6 +205,12 @@
         </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}
 
 {if $haveMembers}
     <div id="glm-member-list-terms">{$terms.term_member_plur_cap} found: {$membersFound}<br></div>