Various small fixes for the participant UI

app/views/conference/_conference_details.html.haml

@@ -10,25 +10,26 @@
             %small
               %b
               = date_string(conference.start_date, conference.end_date)
+          - if conference.venue
+            %p
+              = "#{conference.venue.city}/#{conference.venue.country_name}"
         .col-md-2
           .btn-group-vertical
-            - if current_user.nil? || !current_user.subscribed?(conference)
-              = link_to 'Subscribe', conference_subscriptions_path(conference.short_title), method: :post, class: 'btn btn-info btn-group-vertical'
-            - else
-              = link_to 'Unsubscribe', conference_subscriptions_path(conference.short_title), method: :delete, class: 'btn btn-danger btn-group-vertical'
-
             - if !@conference || @conference != conference
               - if conference.splashpage && conference.splashpage.public
                 = link_to "View Conference", conference_path(conference.short_title), :class =>"btn btn-default"
+            - if conference.call_for_paper and conference.call_for_paper.schedule_public
+              = link_to "Schedule", schedule_conference_path(conference.short_title), :class =>"btn btn-default"
             - if conference.registration_open?
               - if conference.user_registered?(current_user)
-                = link_to "Modify Registration", edit_conference_conference_registrations_path(conference.short_title), :class =>"btn btn-default"
+                = link_to "My Registration", conference_conference_registrations_path(conference.short_title), :class =>"btn btn-default"
               - else
-                = link_to "Register", new_conference_conference_registrations_path(conference.short_title), :class =>"btn btn-success"
-            = link_to "Schedule", schedule_conference_path(conference.short_title), :class =>"btn btn-default" if conference.call_for_paper and conference.call_for_paper.schedule_public
+                = link_to "Register", new_conference_conference_registrations_path(conference.short_title), :class =>"btn btn-default"
             - if !current_user.nil? && current_user.proposal_count(conference) > 0
-              = link_to "View My Proposals", conference_proposal_index_path(conference.short_title), :class =>"btn btn-default"
+              = link_to "My Proposals", conference_proposal_index_path(conference.short_title), :class =>"btn btn-default"
             - elsif conference.cfp_open?
               = link_to "Submit Proposal", conference_proposal_index_path(conference.short_title), :class =>"btn btn-default"
-            - if !current_user.nil? && conference.tickets.any?
-              = link_to 'Support', conference_tickets_path(conference.short_title), class: 'btn btn-default'
+            - if current_user.nil? || !current_user.subscribed?(conference)
+              = link_to 'Subscribe', conference_subscriptions_path(conference.short_title), method: :post, class: 'btn btn-default'
+            - else
+              = link_to 'Unsubscribe', conference_subscriptions_path(conference.short_title), method: :delete, class: 'btn btn-default'

app/views/conference/_lodging.html.haml

@@ -1,9 +1,13 @@
 .container
   .row
     .col-md-12.text-center
-      %h2 Accommodation Deals
+      %h2
+        Where to stay
+        - if @conference.venue
+          in
+          = @conference.venue.city
       %p.lead
-        We have prepared affordable accommodation deals for your visit.
+        We recommend these affordable lodging accommodations for your visit.
   - @conference.lodgings.each_slice(3) do |slice|
     .row.row-centered
       - slice.each do |lodging|

app/views/conference/index.html.haml

@@ -18,12 +18,13 @@
       - @antiquated.each do |conference|
         = render :partial => "conference_details", :locals => {:conference => conference}
 
-:javascript
-  $('#antiquated').on('hidden.bs.collapse', function () {
-    $( ".fa-chevron-down" ).hide();
-    $( ".fa-chevron-right" ).show();
-  })
-  $('#antiquated').on('shown.bs.collapse', function () {
-    $( ".fa-chevron-down" ).show();
-    $( ".fa-chevron-right" ).hide();
-  })
+-content_for :script_body do
+  :javascript
+    $('#antiquated').on('hidden.bs.collapse', function () {
+      $( ".fa-chevron-down" ).hide();
+      $( ".fa-chevron-right" ).show();
+    })
+    $('#antiquated').on('shown.bs.collapse', function () {
+      $( ".fa-chevron-down" ).show();
+      $( ".fa-chevron-right" ).hide();
+    })

app/views/conference/photos.js.haml

@@ -1,4 +0,0 @@
-$('#gallery .carousel-inner').append("#{escape_javascript(render('gallery_photo', photos: @photos)) }");
-$('#gallery .modal-body').children('.fa').remove();
-$('#gallery #carousel-example-generic').css('visibility','visible');
-

app/views/conference/show.html.haml

@@ -45,7 +45,7 @@
       %section#lodging
         = render 'lodging'
 
-    - if @conference.tickets.any? and @conference.splashpage.include_tickets
+    - if @conference.tickets.any? and @conference.splashpage.include_tickets and @conference.pending?
       %section#tickets
         = render 'tickets'