Only show member detail 'expand all' button if there are any content areas

diff --git a/glm-member-db/views/front/members/detail.html b/glm-member-db/views/front/members/detail.html
index 0033d0d..c5a0999 100644 (file)
--- a/glm-member-db/views/front/members/detail.html
+++ b/glm-member-db/views/front/members/detail.html
@@ -177,6 +177,7 @@
     <!-- Attributes: amenitities, credit cards, etc -->
                 <div id="glm-member-detail-descr-row" class="small-12 columns">
                     {apply_filters('glm-member-db-front-members-detail-attributesTop', '', $member.id)}
+                    {$customFields = apply_filters('get_glm_custom_fields','glm-member-db',$member.memberInfoId)}
     <!--                {if $featuredImage}
                     <div class="glm-member-detail-featured-image-wrapper small-12 columns">
                         <img src="{$glmPluginMediaUrl}/images/large/{$featuredImage}">
@@ -190,7 +191,19 @@
                     <div id="glm-member-detail-intro-desc">
                         {if $member.short_descr && $settings.detail_show_short_descr}{$member.short_descr|nl2br}{/if}
                     </div>
+                {if 
+                    $member.descr && $settings.detail_show_descr
+                    || $settings.detail_show_coupons && $coupons
+                    || $member.amenities && $settings.detail_show_amenities
+                    || $member.categories && $settings.detail_show_categories
+                    || $member.video_url && $settings.detail_show_video
+                    || $member.live_cam_type.value!=1 && $member.live_cam_url && $settings.detail_show_live_cam
+                    || $haveFiles
+                    || !empty($customFields[0].field_data)
+                    || $settings.detail_show_imagegallery && $haveImageGallery
+                }
                     <div id="glm-member-detail-fullprofile-toggle">Expand All</div>
+                {/if}
                     <div id="glm-member-detail-data-container">
                         {apply_filters('glm-member-db-front-members-detail-packages', '', $member.id)}
                         {if $member.descr && $settings.detail_show_descr}
@@ -319,22 +332,21 @@
                         </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'>
-                            {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>
+                        {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'>
+                                {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>
                             </div>
-                        </div>
                         {/if}
 
                         {apply_filters('glm-member-db-front-members-detail-liveCamAfter', '', $member.id)}
                         
-                        {$customFields = apply_filters('get_glm_custom_fields','glm-member-db',$member.memberInfoId)}
                         {if !empty($customFields[0].field_data)}
                             <div id="glm-member-detail-hours-toggle" class="glm-member-detail-content-toggle">Hours</div>
                             <div id="glm-member-detail-hours-container" class="glm-member-detail-content-data">