More rigorous smarty conditionals for displaying amenities box

diff --git a/config/plugin.ini b/config/plugin.ini
index 215cd50..66648c9 100644 (file)
--- a/config/plugin.ini
+++ b/config/plugin.ini
@@ -131,11 +131,11 @@ front-config['detail_show_url'] = true
 front-config['detail_show_url_newtarget'] = true
 front-config['detail_show_email'] = true
 front-config['detail_show_categories'] = false
-front-config['detail_show_creditcards'] = true
+front-config['detail_show_creditcards'] = false
 front-config['detail_show_amenities'] = true
 front-config['detail_show_imagegallery'] = true
 front-config['detail_show_coupons'] = false
-front-config['detail_show_packages'] = false
+front-config['detail_show_packages'] = true
 
 ;
 ; End of site configuration options

diff --git a/views/front/members/detail.html b/views/front/members/detail.html
index 6cfa2cd..7dbeaa0 100644 (file)
--- a/views/front/members/detail.html
+++ b/views/front/members/detail.html
@@ -94,9 +94,9 @@
 
 <!-- Member Description -->                
             <div id="glm-member-detail-descr-row" class="row" data-equalizer>
-                {if $detail_show_amenities || $detail_show_creditcards || $detail_show_categories}
+                {if ($member.amenities && $detail_show_amenities) || ($member.cc_type && $detail_show_creditcards) || ($member.categories && $detail_show_categories)}
                 <div id="glm-member-detail-amenities-container" class="small-12 medium-4 columns" >
-                    <div class="glm-member-detail-border"data-equalizer-watch>
+                    <div class="glm-member-detail-border" data-equalizer-watch>
                     {if $member.amenities && $detail_show_amenities}
                                 <b>Amenities & Services</b>
                                 <ul>
@@ -145,8 +145,9 @@
             
 <!-- Image Gallery -->
 
+
+    {if $detail_show_imagegallery && $imagegallery}
     <div id="glm-member-detail-photos" class="row">
-    {if $detail_show_imagegallery}
         <a name="glm-member-detail-photo-gallery"></a>
         <div class="small-12 columns">
             <b>Photo Gallery</b>
@@ -161,11 +162,15 @@
         </div>
     </div>    
     {/if}
-    {if $detail_show_coupons}
-    <a name="glm-member-detail-coupons"></a>
+    {if $detail_show_coupons && $coupons}
+    <div id="glm-member-detail-photos" class="row">
+        <a name="glm-member-detail-coupons"></a>
+    </div>
     {/if}
-    {if $detail_show_packages}
-    <a name="glm-member-detail-packages"></a>
+    {if $detail_show_packages && $packages}
+    <div id="glm-member-detail-photos" class="row">
+        <a name="glm-member-detail-packages"></a>
+    </div>
     {/if}
         </div>
     </div>