From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 25 Sep 2015 18:02:31 +0000 (-0400)
Subject: Fixing some more markup issues.. maybe.
X-Git-Tag: v1.0.14^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=dd0d74672cf3f07cf0543c7e4ca831e4b3e1e272;p=WP-Plugins%2Fglm-member-db.git

Fixing some more markup issues.. maybe.
---

diff --git a/config/plugin.ini b/config/plugin.ini
index 356aa5d1..215cd50e 100644
--- a/config/plugin.ini
+++ b/config/plugin.ini
@@ -134,6 +134,8 @@ front-config['detail_show_categories'] = false
 front-config['detail_show_creditcards'] = true
 front-config['detail_show_amenities'] = true
 front-config['detail_show_imagegallery'] = true
+front-config['detail_show_coupons'] = false
+front-config['detail_show_packages'] = false
 
 ;
 ; End of site configuration options
diff --git a/views/front/members/detail.html b/views/front/members/detail.html
index fdc562ec..7fed1ea5 100644
--- a/views/front/members/detail.html
+++ b/views/front/members/detail.html
@@ -50,14 +50,16 @@
             </div>
 <!-- Member Logo - Small -->
             <div class="row">
-            {if $detail_show_logo}
+            {if $member.logo && $detail_show_logo}
                 <div class="glm-member-list-image-wrapper small-12 medium-5 columns">
                     <div class="glm-member-list-image-border">
 <!--                    <img CLASS="glm-member-list-image-left" src="{$glmPluginMediaURL}/images/{$detail_logo_size}/{$member.logo}">-->
                     <img class="glm-member-list-image-left" src="http://placehold.it/500x300"></div>
                 </div>
+                <div class="small-12 medium-7 glm-member-info columns">
+            {else}
+                <div class="small-12 glm-member-info columns">
             {/if} 
-                    <div class="small-12 medium-7 glm-member-info columns">
         <!-- Member name, address, and basic information -->                    
                         <h2>
                       {if $list_show_detaillink}
@@ -84,8 +86,8 @@
                                 {if $member.url && $list_show_url}<a href="{$member.url}"{if $list_show_url_newtarget} target="_blank"{/if}>Website</a>{/if}
                                 {if $member.email && $list_show_email}<a href="mailto:{$member.email}">Email</a>{/if}
                                 {if $detail_show_imagegallery}<a href="#glm-member-detail-photo-gallery">Photo Gallery</a>{/if}
-                                {if $detail_show_imagegallery}<a href="#glm-member-detail-photo-gallery">Coupons</a>{/if}
-                                {if $detail_show_imagegallery}<a href="#glm-member-detail-photo-gallery">Packages</a>{/if}
+                                {if $detail_show_coupons}<a href="#glm-member-detail-coupons">Coupons</a>{/if}
+                                {if $detail_show_packages}<a href="#glm-member-detail-packages">Packages</a>{/if}
                         </div>
                     </div>            
             </div>
@@ -95,7 +97,7 @@
                 <div id="glm-member-detail-amenities-container" class="small-12 medium-4 columns" >
                     <div class="glm-member-detail-border"data-equalizer-watch>
                     {if $member.amenities && $detail_show_amenities}
-                                <b>{$term_member_cap} Amenities & Services</b>
+                                <b>Amenities & Services</b>
                                 <ul>
                         {foreach $member.amenities as $a}
                                     <li>
@@ -140,7 +142,11 @@
 <!-- Image Gallery -->
     {if $detail_show_imagegallery}
     <a name="glm-member-detail-photo-gallery"></a>
-            <div class="row"><div class="small-12 columns"><b>Photo Gallery</b></div></div>
+            <div class="row">
+                <div class="small-12 columns">
+                    <b>Photo Gallery</b>
+                </div>
+            </div>
 
             <div class="row">
                 <div class="small-12 columns">
@@ -151,6 +157,12 @@
                     </ul>
                 </div>
             </div>    
+    {/if}
+    {if $detail_show_coupons}
+    <a name="glm-member-detail-coupons"></a>
+    {/if}
+    {if $detail_show_packages}
+    <a name="glm-member-detail-packages"></a>
     {/if}
         </div>
     </div>
diff --git a/views/front/members/list.html b/views/front/members/list.html
index c5142334..d9d13696 100644
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -77,23 +77,18 @@
         <div class="row">
             <div class="small-12 columns glm-member-list-container">
                 <div class="row">
-<!-- Member Logo - Small -->                    
+                <!-- Member Logo - Medium and up-->  
                 {if $m.logo && $list_show_logo}
-                    <div class="small-12 show-for-small-only columns">
-                        <img class="glm-member-list-image-left" src="{$glmPluginMediaURL}/images/{$list_logo_size}/{$m.logo}">
-                    </div>
-                {/if}
-                
-                <!-- Member Logo - Medium and up-->                    
-                {if $m.logo && $list_show_logo}
-                <div class="glm-member-list-image-border">
-                    <div class="glm-member-list-image-wrapper medium-3 show-for-medium-up columns">
-                        <img class="glm-member-list-image-left" src="{$glmPluginMediaURL}/images/{$list_logo_size}/{$m.logo}">
+                    <div class="glm-member-list-image-wrapper small-12 medium-3 columns">
+                        <div class="glm-member-list-image-border">
+                            <img class="glm-member-list-image-left" src="{$glmPluginMediaURL}/images/{$list_logo_size}/{$m.logo}">
+<!--                            <img class="glm-member-list-image-left" src="http://placehold.it/500x300">-->
+                        </div>
                     </div>
-                    <!--                        <img class="glm-member-list-image-left" src="http://placehold.it/500x300"></div>-->
-                </div>
-                {/if}
                     <div class="small-12 medium-9 glm-member-info columns">
+                {else}
+                    <div class="small-12 glm-member-info columns">    
+                {/if}
 <!-- Member name, address, and basic information -->                    
                         <h2>
               {if $list_show_detaillink}
@@ -171,8 +166,6 @@
                 {/if}
                     </div>
                 </div>
-                
-            </div>
         </div>
         
         
@@ -204,7 +197,7 @@
                     {if $m.toll_free && $list_map_show_tollfree}<b>Toll Free:</b> {$m.toll_free}<br>{/if}
                     {if $m.url && $list_map_show_url}<b>Web site:</b> <a href="{$m.url}"{if $list_map_show_url_newtarget} target="_blank"{/if}>{$m.url}</a><br>{/if}
                     {if $m.email && $list_map_show_email}<b>E-Mail Address:</b> <a href="mailto:{$m.email}">{$m.email}</a><br>{/if}
-                    {if $m.region.value && $list_map_show_region}<p><b>Region:</b> {$m.region.name}</p>{/if}
+                    {if $m.region.value && $list_map_show_region}<b>Region:</b> {$m.region.name}{/if}
                 </p>
                 {if $m.descr && $list_map_show_description}{$m.descr}<br>{/if}
                 {if $m.short_descr && $list_map_show_short_descr}{$m.short_descr}<br>{/if}