Update theme for accommodations

going live

diff --git a/glm-member-db/views/front/members/detail.html b/glm-member-db/views/front/members/detail.html
index c5a0999..4f544ad 100644 (file)
--- a/glm-member-db/views/front/members/detail.html
+++ b/glm-member-db/views/front/members/detail.html
@@ -214,12 +214,32 @@
                                 {$member.descr|nl2br}
                                 {apply_filters('glm-member-db-front-members-detail-descriptionBottom', '', $member.id)}
                             </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>
                         </div>
+<<<<<<< Updated upstream
                         {/if}
+=======
+{if $settings.profile_accommodation && $member.accommodations}
+                        <div id="glm-member-detail-accommodations-toggle" class="glm-member-detail-content-toggle">Accommodations Info</div>
+                        <div id="glm-member-detail-accommodations-container" class="glm-member-detail-content-data">
+                            <div id="glm-member-detail-accommodations" >
+                                <ul>
+                                    {if $member.num_rooms}<li>{$member.num_rooms} Rooms/Cabins</li>{/if}
+                                    {if $member.year_round}<li>Open Year Round</li>{/if}
+                                </ul>
+                            </div>
+
+                            <div class="glm-member-detail-sub-data-links glma-row">
+                                <a class="glm-member-detail-content-toggle glma-columns glma-small-6">Collapse</a>
+                                <a class="glm-member-detail-link-to-top glma-columns glma-small-6">Back to top</a>
+                            </div>
+                        </div>
+                    {/if}
+>>>>>>> Stashed changes
                         
                         {apply_filters('glm-member-db-front-members-detail-events', '', $member.id)}