From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 7 Sep 2018 21:46:05 +0000 (-0400)
Subject: Removed glmgrid from the member listing, fixed file formatting
X-Git-Tag: v2.10.45^2~23
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e44a9eedb61db64f5d49bf9068cf884dabb69949;p=WP-Plugins%2Fglm-member-db.git

Removed glmgrid from the member listing, fixed file formatting
---

diff --git a/views/front/members/list.html b/views/front/members/list.html
index 8cfc329e..3c58c2ba 100755
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -1,5 +1,5 @@
 <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_map_show_opened || $view == 'map'}map-opened{else}map-closed{/if}
     {if $settings.list_show_search_filters_opened}filters-opened{else}filters-closed{/if}
 ">
 
@@ -21,120 +21,121 @@
 
 
 {include file='front/members/header.html'}
-        {apply_filters('glm-member-db-front-members-list-pageTop', '')}
+{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-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">
-                    <div class="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}
+                    <form action="{$thisUrl}?glm_action=list#glm-member-list-filters-button" method="post" enctype="multipart/form-data">
+                        <div class="glm-member-search glm-member-entry-container glm-member-container">
+                            {apply_filters('glm-member-db-front-members-list-searchFormTop', '')}
                             <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>
-
+                                <h3>Refine Search</h3>
                             </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}
+                            {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>
-                            </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>
+                                    </select>
+    -->
+                                    <select name="categorySearch" id="categorySelect">
+                                    {if !$singleCategory}
+                                        <option value="">(all)</option>
                                     {/if}
-                                    {foreach from=$regions item=v}
-                                        <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
-                                            {$v.name}
+                                    {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>
+                                    </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}
 
-                        {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>
+                            {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}
+        {if $settings.list_show_map}
 
-        {apply_filters('glm-member-db-front-members-list-mapTop', '')}
-        <div id="glm-locationMap-container">
+            {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 == 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}
+                {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', '')}
+            </div>
+            {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 -->
+        <!-- Member information displayed in 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.logo && $settings.list_map_show_logo}
                     <div class="glm-member-list-image">
                         <img src="{$glmPluginMediaUrl}/images/{$settings.list_map_logo_size}/{$m.logo}">
@@ -169,9 +170,7 @@
                         {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 $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>
@@ -215,128 +214,129 @@
             </div> <!-- End of information displayed in map bubbles -->
         {/foreach}
 
- {if $settings.list_show_list && !$blankStart}
-    {if $settings.list_header_text}
-        <h3 class="glm-member-db-list-header-title">{$settings.list_header_text}</h3>
-    {else}
-        <h3 class="glm-member-db-list-header-title">List of {$terms.term_member_plur_cap}</h3>
-    {/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 $settings.list_show_list && !$blankStart}
+            {if $settings.list_header_text}
+                <h3 class="glm-member-db-list-header-title">{$settings.list_header_text}</h3>
+            {else}
+                <h3 class="glm-member-db-list-header-title">List of {$terms.term_member_plur_cap}</h3>
+            {/if}
+            {if $haveMembers}
 
-    <div class="glm-member-list-listing-container">
-    {if $settings.list_show_search_alpha}
-        <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}
-            <a href="{$thisUrl}?glm_action=list&alpha={$a.alpha}&textSearch={$textSearch}&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}
 
-    {if $paging}
-        {if !$prevStart || !$nextStart}
-            <br>
-            <div class="paging-container">
-                <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&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}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&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>
-            </div>
-        {/if}
-        <br>
-        showing {$start} through {$lastDisplayed} of {$filteredMembersFound}
-    {/if}
+                <div id="glm-member-list-terms">{$terms.term_member_plur_cap} found: {$membersFound}<br></div>
 
+                {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')}
 
-    {if $view == grid}
-        <div class="glmgrid-row">
-        {foreach $members as $member}
-            <div class="glm-member-list-record glmgrid-small-12 glmgrid-medium-6 glmgrid-large-4">
-                {apply_filters('glm-member-db-front-members-list-memberAbove', '', $member.member_pointer)}
-                <div class="glm-member-db-border-wrap">
-                    {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
+                <!-- Member information displayed in list -->
 
-                    {if $settings.list_show_detail_link && !$member.has_no_profile.value}
-                    <a class="glm-member-list-image-wrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/">
-                    {/if}
-
-                    {if $member.featured}
-                    <div class="glm-member-list-featured-tag">
-                        featured
-                    </div>
-                    {/if}
+                <div class="glm-member-list-listing-container">
+                {if $settings.list_show_search_alpha}
+                    <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}
+                        <a href="{$thisUrl}?glm_action=list&alpha={$a.alpha}&textSearch={$textSearch}&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}
 
-                    {if $member.logo && $settings.list_show_logo}
-                        <div class="glm-member-list-has-image">
-                            <img class="glm-member-list-image" src="{$glmPluginMediaUrl}/images/grid/{$member.logo}">
+                {if $paging}
+                    {if $prevStart || $nextStart}
+                        <br>
+                        <div class="paging-container">
+                            <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&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}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&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>
                         </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>
+                        <br>
                     {/if}
-                    {if $settings.list_show_detail_link && !$member.has_no_profile.value}
-                    </a>
-                    {/if}
-                    <div class="glm-member-list-info-wrapper">
-                        <h4 class="glm-member-title">
-                            {if $settings.list_show_detail_link && !$member.has_no_profile.value}
-                                <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">
-                                    {$member.member}
-                                </a>
-                            {else}
-                                {$member.member}
-                            {/if}
+                    <br>
+                    showing {$start} through {$lastDisplayed} of {$filteredMembersFound}
+                {/if}
 
-                        </h4>
 
-                        <div class="glm-member-list-sub-links">
-                            <ul>
-                                {if $member.url && $settings.list_show_url}<li><a href="{$member.url}"{if $settings.list_show_url_newtarget} target="_blank"{/if}>Website</a></li>{/if}
-        <!--                        {if $member.phone && $settings.list_map_show_phone}<a href="tel:+{$member.phone}">Phone</a>{/if}-->
-                                {$packageLink = apply_filters('glm-member-db-front-members-list-linksBottom', '', $member.member_pointer)}
-                                {if $packageLink}<li>{$packageLink}</li>{/if}
-                                {if $member.reservation_url}<li><a target="_blank" href="{$member.reservation_url}">Reserve Now</a></li>{/if}
-
-                                {if $settings.list_show_live_cam}
-                                    {if $member.live_cam_type.name == "Web Page" && $member.live_cam_url && $settings.list_show_live_cam}
-                                        <li><a target="_blank" href="{$member.live_cam_url}">{$terms.term_webcam_cap}</a></li>
-                                    {else if $member.live_cam_type.name == "Camera Image"}
-                                        <li><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?expanded=live-cam">{$terms.term_webcam_cap}</a></li>
-                                    {/if}
+                {if $view == grid}
+                    <ul class="small-block-grid-1 medium-block-grid-2 large-block-grid-3">
+                    {foreach $members as $member}
+                        <li class="glm-member-list-record">
+                            {apply_filters('glm-member-db-front-members-list-memberAbove', '', $member.member_pointer)}
+                            <div class="glm-member-db-border-wrap">
+                                {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
+
+                                {if $settings.list_show_detail_link && !$member.has_no_profile.value}
+                                <a class="glm-member-list-image-wrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/">
                                 {/if}
 
-                                <li><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">View&nbsp;More</a></li>
-                                {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
-                            </ul>
-                        </div>
-                    </div>
-                </div> <!-- End of glm-member-db-border-wrap -->
-            </div> <!-- end of li.glm-member-list-record -->
-        {/foreach} {*$members*}
-        </div>
-    <!-- Grid view above -->
+                                {if $member.featured}
+                                <div class="glm-member-list-featured-tag">
+                                    featured
+                                </div>
+                                {/if}
 
-    {else}
+                                {if $member.logo && $settings.list_show_logo}
+                                    <div class="glm-member-list-has-image">
+                                        <img class="glm-member-list-image" src="{$glmPluginMediaUrl}/images/grid/{$member.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}
+                                {if $settings.list_show_detail_link && !$member.has_no_profile.value}
+                                </a>
+                                {/if}
+                                <div class="glm-member-list-info-wrapper">
+                                    <h4 class="glm-member-title">
+                                        {if $settings.list_show_detail_link && !$member.has_no_profile.value}
+                                            <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">
+                                                {$member.member}
+                                            </a>
+                                        {else}
+                                            {$member.member}
+                                        {/if}
+
+                                    </h4>
+
+                                    <div class="glm-member-list-sub-links">
+                                        <ul>
+                                            {if $member.url && $settings.list_show_url}<li><a href="{$member.url}"{if $settings.list_show_url_newtarget} target="_blank"{/if}>Website</a></li>{/if}
+                    <!--                        {if $member.phone && $settings.list_map_show_phone}<a href="tel:+{$member.phone}">Phone</a>{/if}-->
+                                            {$packageLink = apply_filters('glm-member-db-front-members-list-linksBottom', '', $member.member_pointer)}
+                                            {if $packageLink}<li>{$packageLink}</li>{/if}
+                                            {if $member.reservation_url}<li><a target="_blank" href="{$member.reservation_url}">Reserve Now</a></li>{/if}
+
+                                            {if $settings.list_show_live_cam}
+                                                {if $member.live_cam_type.name == "Web Page" && $member.live_cam_url && $settings.list_show_live_cam}
+                                                    <li><a target="_blank" href="{$member.live_cam_url}">{$terms.term_webcam_cap}</a></li>
+                                                {else if $member.live_cam_type.name == "Camera Image"}
+                                                    <li><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?expanded=live-cam">{$terms.term_webcam_cap}</a></li>
+                                                {/if}
+                                            {/if}
+
+                                            <li><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">View&nbsp;More</a></li>
+                                            {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
+                                        </ul>
+                                    </div>
+                                </div>
+                            </div> <!-- End of glm-member-db-border-wrap -->
+                        </li> <!-- end of li.glm-member-list-record -->
+                    {/foreach} {*$members*}
+                    </ul>
+                <!-- Grid view above -->
+
+                {else}
 
     <!-- List view below -->
         {foreach $members as $member}
         {apply_filters('glm-member-db-front-members-list-memberAbove', '', $member.member_pointer)}
-            <div class="glm-member-list-container glm-member-container">
+             <div class="glm-member-list-container glm-member-container small-12 columns">
                 {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
                  <!-- Member Logo - Medium and up-->
 
-                <div class="glm-member-list-data glmgrid-row">
-                {if $member.logo && $settings.list_show_logo}
-                    <div class="glm-member-list-image-wrapper glmgrid-small-12 glmgrid-medium-4 glmgrid-columns glmgrid-small-order-1 glmgrid-medium-order-2 {if !$settings.list_logo_for_mobile}mobile-hide{/if}">
-                        <div class="glm-member-list-image-border">
+                    <div class="glm-member-list-data small-12 columns">
+                    {if $member.logo && $settings.list_show_logo}
+                        <div class="glm-member-list-image-wrapper right small-12 medium-4 columns {if !$settings.list_logo_for_mobile}mobile-hide{/if}">
+                            <div class="glm-member-list-image-border clearfix">
 
                             {if $member.featured}
                             <div class="glm-member-list-featured-tag">
@@ -347,7 +347,7 @@
                         </div>
                    </div>
                 {/if}
-                    <div class="glm-member-list-active-info glmgrid-small-12 glmgrid-medium-8 glmgrid-columns glmgrid-small-order-2 glmgrid-medium-order-1">
+                    <div class="glm-member-list-active-info small-12 medium-8 columns small-right medium-left ">
      <!-- Member name, address, and basic information -->
                     {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $member.member_pointer)}
                     <h4 class="glm-member-title">
@@ -385,10 +385,10 @@
                     {/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)}
-                    <div>
-                        {if $member.phone && $settings.list_show_phone}<span class="glm-member-db-phone">Phone: {apply_filters('glm_associate_phone_filter', $member.phone)} </span>{/if}
-                        {if $member.toll_free && $settings.list_show_tollfree}<span class="glm-member-db-phone-tollfree">{apply_filters('glm_associate_phone_filter', $member.toll_free)}</span>{/if}
-                    </div>
+                        <div>
+                            {if $member.phone && $settings.list_show_phone}<span class="glm-member-db-phone">Phone: {apply_filters('glm_associate_phone_filter', $member.phone)} </span>{/if}
+                            {if $member.toll_free && $settings.list_show_tollfree}<span class="glm-member-db-phone-tollfree">{apply_filters('glm_associate_phone_filter', $member.toll_free)}</span>{/if}
+                        </div>
                     {/if}
                     {if $settings.memb_info_location && $member.region && $settings.list_show_region}<div><b>Region:</b> {$member.region}</div>{/if}
 
@@ -410,50 +410,50 @@
                        {apply_filters('glm-member-db-front-members-social-list', '', $member.member_pointer)}
                     </div>
 
-                    <div class="glm-member-list-description glmgrid-small-12 glmgrid-columns">
-                        <div>
-                        {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}
-                                <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">More</a>
-                            {/if}
-                        {/if}
-                        {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $member.member_pointer)}
-                        </div>
-                        {if $member.categories && $settings.list_show_categories}
-                        <div class="glm-member-list-items">
-                            <b>{$terms.term_member_cap} Categories</b>
-                            <ul>
-                                {foreach $member.categories as $c}
-                                    <li>
-                                        {if $c.parent_name}{$c.parent_name}: {/if}{$c.name}
-                                    </li>
-                                {/foreach}
-                            </ul>
-                        {/if}
-                        {if $member.cc_type && $settings.list_show_creditcards}
-                            <b>Credit Cards Accepted:</b>
-                            <ul>
-                                {foreach $member.cc_type.names as $c}
-                                    <li>{$c}</li>
-                                {/foreach}
-                            </ul>
-                        {/if}
-                        {if $member.amenities && $settings.list_show_amenities}
-                            <b>{$terms.term_member_cap} Amenities</b>
-                            <ul>
-                                {foreach $member.amenities as $A}
-                                    <li>
-                                        {$A.name}
-                                    </li>
-                                {/foreach}
-                            </ul>
+                <div class="glm-member-list-description small-12 columns">
+                    <div>
+                    {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}
+                            <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">More</a>
                         {/if}
-                        </div>
+                    {/if}
+                    {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $member.member_pointer)}
+                    </div>
+                    {if $member.categories && $settings.list_show_categories}
+                    <div class="glm-member-list-items">
+                        <b>{$terms.term_member_cap} Categories</b>
+                        <ul>
+                            {foreach $member.categories as $c}
+                                <li>
+                                    {if $c.parent_name}{$c.parent_name}: {/if}{$c.name}
+                                </li>
+                            {/foreach}
+                        </ul>
+                    {/if}
+                    {if $member.cc_type && $settings.list_show_creditcards}
+                        <b>Credit Cards Accepted:</b>
+                        <ul>
+                            {foreach $member.cc_type.names as $c}
+                                <li>{$c}</li>
+                            {/foreach}
+                        </ul>
+                    {/if}
+                    {if $member.amenities && $settings.list_show_amenities}
+                        <b>{$terms.term_member_cap} Amenities</b>
+                        <ul>
+                            {foreach $member.amenities as $A}
+                                <li>
+                                    {$A.name}
+                                </li>
+                            {/foreach}
+                        </ul>
+                    {/if}
                     </div>
-                        {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $member.member_pointer)}
                 </div>
+                    {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $member.member_pointer)}
+                 </div>
 
 
                         <!-- Laury - This is the one that should go underneath all the address and description area -->
@@ -463,23 +463,24 @@
             {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
     <!-- Member Description -->
 
-         {/foreach} {*$members*}
-        </div>
+     {/foreach} {*$members*}
+         </div>
 
  {/if} {*end grid view check*}
-
-    {if $paging}
-        {if $prevStart || $nextStart}
-        <br>
-            <div class="paging-container">
-                <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&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}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&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>
-            </div>
+    <div class="paging-container">
+        {if $paging}
+            {if $prevStart || $nextStart}
+                <br>
+                <div class="paging-container">
+                    <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&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}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&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>
+                </div>
+                <br>
+            {/if}
+            <br>
+            showing {$start} through {$lastDisplayed} of {$filteredMembersFound}
         {/if}
-        <br>
-        showing {$start} through {$lastDisplayed} of {$filteredMembersFound}
-    {/if}
-
+    </div>
         {apply_filters('glm-member-db-front-members-list-pageBottom', '')}
  {else}
         <div>(no {$terms.term_member_plur} listed)</div>