From f161de1cc936a97313d6f98f0e442a469a2cbe75 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 3 Jul 2018 15:22:44 -0400
Subject: [PATCH] List and detail viewfiles are foundation-free, using glmgrid
 framework

---
 css/front.css                   |  32 ++++--
 views/front/members/detail.html | 114 ++++++++++---------
 views/front/members/list.html   | 190 ++++++++++++++++----------------
 3 files changed, 171 insertions(+), 165 deletions(-)

diff --git a/css/front.css b/css/front.css
index eeb9439f..cc025e51 100644
--- a/css/front.css
+++ b/css/front.css
@@ -338,6 +338,11 @@
 .glm-member-db-list .glm-member-list-listing-container {
     padding: 0 20px;
 }
+@media (max-width: 640px) {
+    .glm-member-db-list .glm-member-list-listing-container {
+        padding: 0;
+    }
+}
 #glm-directions,
 .glm-member-db-list .glm-member-entry-container.glm-member-search {
     margin-top: 0;
@@ -379,8 +384,6 @@ glm-member-db-list.glm-member-db-grid-view .glm-member-list-image {
     background-position: center center;
     width: 100%;
 }
-.testclass {
-}
 .glm-member-detail-image .visible-img {
 
 }
@@ -546,11 +549,11 @@ glm-member-db-list.glm-member-db-grid-view .glm-member-list-image {
 #glm-member-detail-website-link {
     font-size: 24px;
     margin: 0;
-    text-align: center;
     padding: 15px;
+    text-align: center;
+    width: 100%;
 }
 #glm-member-detail-website-link:before {
-    //content: url("../assets/offsite-link_wht.png");
     background-image: url("../assets/offsite-link_wht.png");
     background-repeat: no-repeat;
     background-size: contain;
@@ -613,20 +616,21 @@ glm-member-db-list.glm-member-db-grid-view .glm-member-list-image {
     text-transform: uppercase;
     z-index: 1;
 }
-.glm-member-detail-featured-image-wrapper {
-    padding: 0;
-    overflow: hidden;
-    clear: both;
-    max-height: 360px;
+#glm-member-detail-featured-image-wrapper {
     border-radius: 4px;
+    clear: both;
+    overflow: hidden;
+    padding: 0;
     margin-bottom: 10px;
+    max-height: 360px;
     text-align: center;
+    width: 100%;
 }
-.glm-member-detail-featured-image-wrapper img {
+#glm-member-detail-featured-image-wrapper img {
     float: none;
     margin: 0 auto;
 }
-.glm-package-detail-featured-image-wrapper img {
+#glm-package-detail-featured-image-wrapper img {
     float: right;
 }
 #glm-member-detail-images-container ul {
@@ -764,8 +768,9 @@ input[type="submit"].glm-member-button {
     cursor: pointer;
 }
 #glm-member-detail-data-container {
-    display: block;
     clear: both;
+    display: block;
+    overflow: hidden;
 }
 #glm-member-detail-data-container > .glm-member-detail-content-toggle {
     width: 100%;
@@ -807,6 +812,9 @@ input[type="submit"].glm-member-button {
 .glm-member-detail-sub-data-links {
     padding: 10px;
 }
+.glm-member-detail-link-to-top {
+    text-align: right;
+}
 #glm-member-detail-container .glm-map {
     height: 250px;
 }
diff --git a/views/front/members/detail.html b/views/front/members/detail.html
index 666ec70a..98dda3e0 100644
--- a/views/front/members/detail.html
+++ b/views/front/members/detail.html
@@ -1,14 +1,12 @@
 {include file='front/members/header.html'}
 
-
-
 {apply_filters('glm-member-db-front-members-detail-pageTop', '', $member.id)}
 
 {if $haveMember}
 <!--        <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>-->
     {if $settings.detail_show_map}
 <!--        <div id="glm-locationMap-container" class="row">
-            <div id="glm-locationMap" class="glm-map small-12 columns">(map loads here)</div>
+            <div id="glm-locationMap" class="glm-map glmgrid-small-12 glmgrid-columns">(map loads here)</div>
         </div>-->
     {/if}
     {if $settings.detail_show_directions}
@@ -18,9 +16,9 @@
         </div>
 
         <div class="row">
-            <div id="glm-directions" class="small-12 columns glm-member-entry-container">
+            <div id="glm-directions" class="small-12 glmgrid-columns glm-member-entry-container">
                 <div class="row">
-                    <div class="small-12 medium-4 columns">
+                    <div class="small-12 glmgrid-medium-4 glmgrid-columns">
                         Directions type:
                         <select id="directionsType" name="directionsType">
                             <option value="DRIVING">Driving</option>
@@ -29,7 +27,7 @@
                              <option value="TRANSIT">Transit Services</option> - Doesn't seem to work
                         </select>
                     </div>
-                    <div class="small-12 medium-8 columns">
+                    <div class="small-12 glmgrid-medium-8 glmgrid-columns">
                         Enter address to show directions ...
                         <input id="glm-startLocation" type="text" name="startLocation" class="glm-form-text-input" placeholder=""><br>
                     </div>
@@ -46,19 +44,19 @@
 <a id="topAnchor"></a>
 
 <!--    <h3>{$terms.term_member_cap} Detail</h3>-->
-    <div class="row">
+    <div class="glmgrid-row">
         <script>//document.write('<a id="glm-member-detail-takeback-mini" class="button glm-member-button" href="' + document.referrer + '"><span>Back to listing</span></a>');</script>
         <a id="glm-member-detail-takeback-mini" class="glm-member-db-takeback-mini button glm-member-button" href="javascript:history.go(-1)"><span>Back to listing</span></a>
-        <div id="glm-member-detail-container" class="small-12 columns glm-member-container">
-            <h4 class="glm-member-title">  {$member.member}</h4>
-            <div id="glm-member-detail-side-box" class="small-12 medium-4 columns">
+        <div id="glm-member-detail-container" class="glmgrid-small-12 glmgrid-columns glmgrid-row glm-member-container">
+            <h4 class="glm-member-title glmgrid-small-12 glmgrid-columns">{$member.member}</h4>
+            <div id="glm-member-detail-side-box" class="glmgrid-small-12 glmgrid-medium-4 glmgrid-columns">
                 {if $member.logo && $settings.detail_show_logo}
                     <div class="glm-member-detail-logo-wrapper">
                         <img class="glm-member-list-image-left" src="{$glmPluginMediaUrl}/images/{$settings.detail_logo_size}/{$member.logo}">
                     </div>
                 {/if}
                 {if $member.url && $settings.detail_show_url}
-                    <a id="glm-member-detail-website-link" class="small-12 button glm-button" data-member-id="{$member.member_pointer}" data-member-slug="{$member.member_slug}" href="{$member.url}"{if $settings.detail_show_url_newtarget} target="_blank"{/if}>Visit Website</a>
+                    <a id="glm-member-detail-website-link" class="button glm-button" data-member-id="{$member.member_pointer}" data-member-slug="{$member.member_slug}" href="{$member.url}"{if $settings.detail_show_url_newtarget} target="_blank"{/if}>Visit Website</a>
                     <input type="hidden" id="glm-member-detail-click-logged" value="0">
                 {/if}
 
@@ -138,7 +136,7 @@
                 {if $settings.detail_show_map}
                 <script src="//maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
                 <div id="glm-locationMap-container">
-                    <div id="glm-locationMap" class="glm-map small-12 columns">(map loads here)</div>
+                    <div id="glm-locationMap" class="glm-map glmgrid-small-12 glmgrid-columns">(map loads here)</div>
                 </div>
                 <div id="glm-member-detail-map-button" class="button map-button">view map</div>
 
@@ -156,10 +154,10 @@
 
 
 <!-- Attributes: amenitities, credit cards, etc -->
-            <div id="glm-member-detail-descr-row" class="small-12 medium-8 columns">
+            <div id="glm-member-detail-descr-row" class="glmgrid-small-12 glmgrid-medium-8 glmgrid-columns">
                 {apply_filters('glm-member-db-front-members-detail-attributesTop', '', $member.id)}
                 {if $featuredImage}
-                <div class="glm-member-detail-featured-image-wrapper small-12 columns">
+                <div id="glm-member-detail-featured-image-wrapper">
                     <img src="{$glmPluginMediaUrl}/images/large/{$featuredImage}">
                     {if $featuredImageCaption}
                     <div class="glm-member-detail-featured-image-caption">
@@ -182,22 +180,22 @@
                                 {apply_filters('glm-member-db-front-members-detail-descriptionBottom', '', $member.id)}
                             {/if}
                         </div>
-                        <div class="glm-member-detail-sub-data-links row">
-                            <a class="glm-member-detail-content-toggle">Collapse</a>
-                            <a class="glm-member-detail-link-to-top">Back to top</a>
+                        <div class="glm-member-detail-sub-data-links glmgrid-row">
+                            <a class="glm-member-detail-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
+                            <a class="glm-member-detail-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
                         </div>
                     </div>
                     {apply_filters('glm-member-db-front-members-detail-descriptionAfter', '', $member.id)}
                     {apply_filters('glm-member-db-front-members-detail-imageGalleryBefore', '', $member.id)}
                     {if $settings.detail_show_imagegallery && $haveImageGallery}
                     <div id="glm-member-detail-images-toggle" class="glm-member-detail-content-toggle">Photos</div>
-                    <div id="glm-member-detail-images-container" class="glm-member-detail-content-data small-12">
+                    <div id="glm-member-detail-images-container" class="glm-member-detail-content-data">
                         {apply_filters('glm-member-db-front-members-detail-galleryTop', '', $member.id)}
 <!--                        <h2>Photo Gallery</h2>-->
 
-                            <ul class="small-block-grid-1 medium-block-grid-2 large-block-grid-3">
+                            <ul class="glmgrid-row">
                         {foreach $imageGallery as $i}
-                                <li>
+                                <li class="glmgrid-small-12 glmgrid-medium-6 glmgrid-large-4 glmgrid-columns">
                                     <a class="glm-member-detail-images-thumb fancybox" data-fancybox="images" rel="gallery1" href="{$glmPluginMediaUrl}/images/large/{$i.file_name}" style="background-image: url('{$glmPluginMediaUrl}/images/small/{$i.file_name}')">
                                         <img class="glm-member-filler-image" src="{$assetsUrl}/filler_s.gif" alt="{$i.caption}">
                                     </a>
@@ -205,9 +203,9 @@
                         {/foreach}
                             </ul>
                         {apply_filters('glm-member-db-front-members-detail-galleryBottom', '', $member.id)}
-                        <div class="glm-member-detail-sub-data-links row">
-                            <a class="glm-member-detail-content-toggle">Collapse</a>
-                            <a class="glm-member-detail-link-to-top">Back to top</a>
+                        <div class="glm-member-detail-sub-data-links glmgrid-row">
+                            <a class="glm-member-detail-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
+                            <a class="glm-member-detail-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
                         </div>
                     </div>
                     {/if}
@@ -215,11 +213,11 @@
                     {apply_filters('glm-member-db-front-members-detail-couponsBefore', '', $member.id)}
                     {if $settings.detail_show_coupons && $coupons}
                     <div id="glm-member-detail-coupons-toggle" class="glm-member-detail-content-toggle">Coupons</div>
-                    <div id="glm-member-detail-coupons-container" class="glm-member-detail-content-data small-12">
+                    <div id="glm-member-detail-coupons-container" class="glm-member-detail-content-data">
                         <a name="glm-member-detail-coupons"></a>
-                        <div class="glm-member-detail-sub-data-links row">
-                            <a class="glm-member-detail-content-toggle">Collapse</a>
-                            <a class="glm-member-detail-link-to-top">Back to top</a>
+                        <div class="glm-member-detail-sub-data-links glmgrid-row">
+                            <a class="glm-member-detail-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
+                            <a class="glm-member-detail-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
                         </div>
                     </div>
                     {/if}
@@ -227,7 +225,7 @@
                     {apply_filters('glm-member-db-front-members-detail-amenitiesBefore', '', $member.id)}
                     {if $member.amenities && $settings.detail_show_amenities}
                     <div id="glm-member-detail-amenities-toggle" class="glm-member-detail-content-toggle">Amenities & Services</div>
-                    <div id="glm-member-detail-amenities-container" class="glm-member-detail-content-data small-12">
+                    <div id="glm-member-detail-amenities-container" class="glm-member-detail-content-data">
                         <table class="glm-member-detail-table">
                             {foreach $member.amenities as $a}
                             <tr>
@@ -237,9 +235,9 @@
                             </tr>
                             {/foreach}
                         </table>
-                        <div class="glm-member-detail-sub-data-links row">
-                            <a class="glm-member-detail-content-toggle">Collapse</a>
-                            <a class="glm-member-detail-link-to-top">Back to top</a>
+                        <div class="glm-member-detail-sub-data-links glmgrid-row">
+                            <a class="glm-member-detail-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
+                            <a class="glm-member-detail-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
                         </div>
                     </div>
                     {/if}
@@ -248,14 +246,14 @@
                     {apply_filters('glm-member-db-front-members-detail-creditcardsBefore', '', $member.id)}
                     {if $member.cc_type && $settings.detail_show_creditcards}
                     <div id="glm-member-detail-creditcards-toggle" class="glm-member-detail-content-toggle">Credit Cards</div>
-                    <div id="glm-member-detail-creditcards-container" class="glm-member-detail-content-data small-12">
+                    <div id="glm-member-detail-creditcards-container" class="glm-member-detail-content-data glmgrid-small-12">
                         <table class="glm-member-detail-table">
                             <tr><th>Credit Cards Accepted:</th></tr>
                         {foreach $member.cc_type.names as $c}
                             <tr><td>{$c}</td></tr>
                 {/foreach}
                         </table>
-                        <div class="glm-member-detail-sub-data-links row">
+                        <div class="glm-member-detail-sub-data-links glmgrid-row">
                             <a class="glm-member-detail-content-toggle">Collapse</a>
                             <a class="glm-member-detail-link-to-top">Back to top</a>
                         </div>
@@ -266,7 +264,7 @@
                     {apply_filters('glm-member-db-front-members-detail-categoriesBefore', '', $member.id)}
                     {if $member.categories && $settings.detail_show_categories}
                     <div id="glm-member-detail-categories-toggle" class="glm-member-detail-content-toggle">Categories</div>
-                    <div id="glm-member-detail-categories-container" class="glm-member-detail-content-data small-12">
+                    <div id="glm-member-detail-categories-container" class="glm-member-detail-content-data">
                         <table class="glm-member-detail-table">
 <!--                            <tr><th>{$terms.term_member_cap} Categories</th></tr>-->
                             {foreach $member.categories as $c}
@@ -277,9 +275,9 @@
                             </tr>
                             {/foreach}
                         </table>
-                        <div class="glm-member-detail-sub-data-links row">
-                            <a class="glm-member-detail-content-toggle">Collapse</a>
-                            <a class="glm-member-detail-link-to-top">Back to top</a>
+                        <div class="glm-member-detail-sub-data-links glmgrid-row">
+                            <a class="glm-member-detail-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
+                            <a class="glm-member-detail-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
                         </div>
                     </div>
                     {/if}
@@ -287,15 +285,15 @@
                     {apply_filters('glm-member-db-front-members-detail-videoBefore', '', $member.id)}
                     {if $member.video_url && $settings.detail_show_video}
                     <div id="glm-member-detail-video-toggle" class="glm-member-detail-content-toggle">Video</div>
-                    <div id="glm-member-detail-video-container" class="glm-member-detail-content-data small-12">
+                    <div id="glm-member-detail-video-container" class="glm-member-detail-content-data">
                         <table class="glm-member-detail-table">
                             <div><h3 class="glm-member-detail-video-title">{$member.video_title}</h3></div>
                             <div class="glm-member-detail-video-embed">{$member.video_embed}</div>
                             <div class="glm-member-detail-video-descr"><p>{$member.video_descr}</p></div>
                         </table>
-                        <div class="glm-member-detail-sub-data-links row">
-                            <a class="glm-member-detail-content-toggle">Collapse</a>
-                            <a class="glm-member-detail-link-to-top">Back to top</a>
+                        <div class="glm-member-detail-sub-data-links glmgrid-row">
+                            <a class="glm-member-detail-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
+                            <a class="glm-member-detail-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
                         </div>
                     </div>
                     {/if}
@@ -305,7 +303,7 @@
                     {apply_filters('glm-member-db-front-members-detail-liveCamBefore', '', $member.id)}
                     {if $member.live_cam_type.value!=1 && $member.live_cam_url && $settings.detail_show_live_cam}
                     <div id="glm-member-detail-live-cam-toggle" class="glm-member-detail-content-toggle">{$terms.term_webcam_cap}</div>
-                    <div id="glm-member-detail-live-cam-container" class="glm-member-detail-content-data small-12">
+                    <div id="glm-member-detail-live-cam-container" class="glm-member-detail-content-data">
                         <table class="glm-member-detail-table">
                             <div><h3 class="glm-member-detail-live-cam-title">{$member.live_cam_title}</h3></div>
                         {if $member.live_cam_type.value == 2}
@@ -313,22 +311,22 @@
                         {/if}
                             <div class="glm-member-detail-live-cam-descr"><p>{$member.live_cam_descr}</p></div>
                         </table>
-                        <div class="glm-member-detail-sub-data-links row">
-                            <a class="glm-member-detail-content-toggle">Collapse</a>
-                            <a class="glm-member-detail-link-to-top">Back to top</a>
+                        <div class="glm-member-detail-sub-data-links glmgrid-row">
+                            <a class="glm-member-detail-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
+                            <a class="glm-member-detail-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
                         </div>
                     </div>
                     {/if}
 
                    {if $haveFiles}
                     <div id='glm-member-detail-files-toggle' class='glm-member-detail-content-toggle'>Files</div>
-                    <div id='glm-member-detail-files-container' class='glm-member-detail-content-data small-12'>
+                    <div id='glm-member-detail-files-container' class='glm-member-detail-content-data'>
                         {foreach $files as $file}
                             <a class="glm-file-detail" href="{$glmPluginMediaUrl}/files/{$file.file_name}" target="_blank">{if $file.caption}{$file.caption}{else}{$file.name}{/if}</a>
                         {/foreach}
-                        <div class='glm-member-detail-sub-data-links row'>
-                            <a class='glm-member-detail-content-toggle'>Collapse</a>
-                            <a class='glm-member-detail-link-to-top'>Back to top</a>
+                        <div class="glm-member-detail-sub-data-links glmgrid-row">
+                            <a class="glm-member-detail-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
+                            <a class="glm-member-detail-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
                         </div>
                     </div>
                     {/if}
@@ -353,15 +351,15 @@
             // change the member detail photos grid structure depending
             var images_container = $("#glm-member-detail-images-container");
             // Check if Foundation exists first
-            if ( typeof window.Foundation != 'undefined' ) {
-                var foundation_version = window.Foundation.version;
-
-                if( foundation_version.charAt(0) === "6" ){
-                    images_container.children('ul').removeClass('small-block-grid-1 medium-block-grid-2 large-block-grid-3');
-                    images_container.children('ul').addClass('row small-up-1 medium-up-2 large-up-3');
-                    images_container.children('ul').find('li').addClass('column');
-                }
-            }
+//            if ( typeof window.Foundation != 'undefined' ) {
+//                var foundation_version = window.Foundation.version;
+//
+//                if( foundation_version.charAt(0) === "6" ){
+//                    images_container.children('ul').removeClass('small-block-grid-1 glmgrid-medium-block-grid-2 glmgrid-large-block-grid-3');
+//                    images_container.children('ul').addClass('row glmgrid-small-up-1 glmgrid-medium-up-2 glmgrid-large-up-3');
+//                    images_container.children('ul').find('li').addClass('column');
+//                }
+//            }
 
             // Replace all non-number special characters in a phone number with the designated infix
             {if $settings.phone_infix}
diff --git a/views/front/members/list.html b/views/front/members/list.html
index f8f03cce..60a3394d 100644
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -16,7 +16,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">
-                    <div class="small-12 columns glm-member-search glm-member-entry-container glm-member-container">
+                    <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>
@@ -200,7 +200,7 @@
         {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')}
 
      <!-- Member information displayed in list -->
-
+     
     <div class="glm-member-list-listing-container">
     {if $settings.list_show_search_alpha}
         <div class="glm-alpha-links">
@@ -221,9 +221,9 @@
 
 
     {if $view == grid}
-        <ul class="small-block-grid-1 medium-block-grid-2 large-block-grid-3">
+        <div class="glmgrid-row">
         {foreach $members as $member}
-            <li class="glm-member-list-record">
+            <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)}
@@ -286,9 +286,9 @@
                         </div>
                     </div>
                 </div> <!-- End of glm-member-db-border-wrap -->
-            </li> <!-- end of li.glm-member-list-record -->
+            </div> <!-- end of li.glm-member-list-record -->
         {/foreach} {*$members*}
-        </ul>
+        </div>
     <!-- Grid view above -->
 
     {else}
@@ -296,26 +296,26 @@
     <!-- 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 small-12 columns">
+            <div class="glm-member-list-container glm-member-container">
                 {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
                  <!-- Member Logo - Medium and up-->
 
-                    <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">
+                <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">
 
-                                {if $member.featured}
-                                <div class="glm-member-list-featured-tag">
-                                    featured
-                                </div>
-                                {/if}
-                                <img src="{$glmPluginMediaUrl}/images/{$settings.list_logo_size}/{$member.logo}">
+                            {if $member.featured}
+                            <div class="glm-member-list-featured-tag">
+                                featured
                             </div>
-                       </div>
-                    {/if}
-                     <div class="glm-member-list-active-info small-12 medium-8 columns">
- <!-- Member name, address, and basic information -->
+                            {/if}
+                            <img src="{$glmPluginMediaUrl}/images/{$settings.list_logo_size}/{$member.logo}">
+                        </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">
+     <!-- Member name, address, and basic information -->
                     {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $member.member_pointer)}
                     <h4 class="glm-member-title">
                         {if $settings.list_show_detail_link && !$member.has_no_profile.value}
@@ -325,37 +325,37 @@
                         {/if}
                     </h4>
                     {if $settings.list_show_address}
-                        <div class="glm-member-list-address-wrapper">
-                            {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $member.member_pointer)}
-                            {if $settings.list_show_street}
-                            {if $member.addr1 && $settings.list_show_address}<div>{$member.addr1}</div>{/if}
-                            {if $member.addr2 && $settings.list_show_address}<div>{$member.addr2}</div>{/if}
+                    <div class="glm-member-list-address-wrapper">
+                        {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $member.member_pointer)}
+                        {if $settings.list_show_street}
+                        {if $member.addr1 && $settings.list_show_address}<div>{$member.addr1}</div>{/if}
+                        {if $member.addr2 && $settings.list_show_address}<div>{$member.addr2}</div>{/if}
+                        {/if}
+                        {if $settings.memb_info_location && $settings.list_show_citystatezip}
+                        <div>
+                            {if $member.city}
+                            <span>{$member.city}{if $member.state.value}, {/if}</span>
                             {/if}
-                            {if $settings.memb_info_location && $settings.list_show_citystatezip}
-                                <div>
-                                    {if $member.city}
-                                        <span>{$member.city}{if $member.state.value}, {/if}</span>
-                                    {/if}
-                                    {if $member.state.value}
-                                        <span>{$member.state.value}</span>
-                                    {/if}
-                                    {if $member.zip}
-                                        {$member.zip}
-                                    {/if}
-                                </div>
+                            {if $member.state.value}
+                            <span>{$member.state.value}</span>
                             {/if}
-                            {if $member.country.name && $settings.list_show_country}
-                                <div>{$member.country.name}</div>
+                            {if $member.zip}
+                                {$member.zip}
                             {/if}
-                            {apply_filters('glm-member-db-front-members-list-memberAddressBottom', '', $member.member_pointer)}
                         </div>
+                        {/if}
+                        {if $member.country.name && $settings.list_show_country}
+                        <div>{$member.country.name}</div>
+                        {/if}
+                        {apply_filters('glm-member-db-front-members-list-memberAddressBottom', '', $member.member_pointer)}
+                    </div>
                     {/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}
 
@@ -372,66 +372,66 @@
                             {/if}
                         {/if}
                         {apply_filters('glm-member-db-front-members-list-linksBottom', '', $member.member_pointer)}
-                     </div>
+                    </div>
                     <div class="glm-member-db-socials">
                        {apply_filters('glm-member-db-front-members-social-list', '', $member.member_pointer)}
                     </div>
 
-                <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>
+                    <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}
-                    {/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}
+                        {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>
                     </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 -->
-                {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $member.member_pointer)}
-                {apply_filters('glm-member-db-front-members-list-memberBottom', '', $member.member_pointer)}
-                </div>
-                 {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
-<!-- Member Description -->
+                        <!-- Laury - This is the one that should go underneath all the address and description area -->
+            {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $member.member_pointer)}
+            {apply_filters('glm-member-db-front-members-list-memberBottom', '', $member.member_pointer)}
+            </div>
+            {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*}
 
-- 
2.17.1