From 22e16ba7757ced6989dd943c5d1e947c91681d81 Mon Sep 17 00:00:00 2001
From: James Mason <jmason@suse.com>
Date: Thu, 27 Dec 2018 21:16:24 -0800
Subject: [PATCH] Move splashpage logdgings descriptions to a modal

---
 app/views/conferences/_lodging.haml           | 31 ++++++++-----------
 app/views/conferences/_modal_description.haml | 25 ++++++++-------
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/app/views/conferences/_lodging.haml b/app/views/conferences/_lodging.haml
index 724e78ca..3938dd64 100644
--- a/app/views/conferences/_lodging.haml
+++ b/app/views/conferences/_lodging.haml
@@ -18,24 +18,19 @@
       .row.row-centered
         - lodgings.each do |lodging|
           .col-md-4.col-sm-4.col-centered.col-top
-            .thumbnail
-              - if lodging.picture?
-                - if lodging.website_link.present?
-                  = link_to(lodging.website_link, class: 'thumbnail') do
-                    = image_tag lodging.picture.large.url,
-                      class: 'img-responsive img-lodging'
-                - else
+            %a{ href: '#', data: { toggle: 'modal',
+              target: "#modal-lodging-#{lodging.id}" } }
+              .thumbnail
+                - if lodging.picture?
                   = image_tag lodging.picture.large.url,
                     class: 'img-responsive img-lodging'
-              - else
-                %p.text-center
-                  - if lodging.website_link.present?
-                    = link_to(lodging.website_link, class: 'thumbnail') do
-                      %i.fa.fa-home.fa-5x
-                  - else
+                - else
+                  %p.text-center
                     %i.fa.fa-home.fa-5x
-              .caption
-                %h3.text-center
-                  = lodging.name
-                - if lodging.description.present?
-                  = markdown(lodging.description)
+                .caption
+                  %h3.text-center
+                    = lodging.name
+
+- lodgings.each do |lodging|
+  - content_for :modals do
+    = render 'modal_description', object: lodging
diff --git a/app/views/conferences/_modal_description.haml b/app/views/conferences/_modal_description.haml
index 7fe4173b..62c98408 100644
--- a/app/views/conferences/_modal_description.haml
+++ b/app/views/conferences/_modal_description.haml
@@ -1,5 +1,8 @@
 - content_for :modals do
   - cache [object, '#modal'] do
+    :ruby
+      title = object.try(:title) || object.try(:name)
+      link = object.try(:website_url) || object.try(:website_link)
     .modal.fade{ id: "modal-#{object.class.name.downcase}-#{object.id}" }
       .modal-dialog
         .modal-content
@@ -7,17 +10,17 @@
             %button.close{ data: { dismiss: 'modal' } }
               %i.fa.fa-close
             %h3.modal-title
-              = object.try(:title) || object.try(:name)
+              = title
           .modal-body
             %p.logo
-              = link_to object.website_url || '#', target: '_blank' do
-                - img_classes = ['img-responsive center-block']
-                - if object.is_a? Sponsor
-                  - img_classes << ['img-sponsor',
-                    "img-sponsor-#{object.sponsorship_level.position}"]
-                - if object.picture?
-                  = image_tag get_logo(object), class: img_classes
+              - img_classes = ['img-responsive center-block']
+              - if object.is_a? Sponsor
+                - img_classes << ['img-sponsor',
+                  "img-sponsor-#{object.sponsorship_level.position}"]
+              - if object.picture?
+                = image_tag get_logo(object), class: img_classes
             %p.description
-              = object.description
-          .modal-footer
-            = link_to nil, object.website_url, target: '_blank'
+              = markdown(object.description)
+          - if link
+            .modal-footer
+              = link_to nil, link, target: '_blank'