Merge branch 'master' into openshift_compatibility

app/controllers/users/omniauth_callbacks_controller.rb

@@ -11,13 +11,13 @@ module Users
 
     def handle(provider)
       auth_hash = request.env['omniauth.auth']
-      uid = auth_hash[:uid]
+      username = auth_hash.info.email.split('@')[0]
       openid = Openid.find_for_oauth(auth_hash) # Get or create openid
       # If openid exists and is associated with a user, sign in with associated user,
       # even if the email of the associated user and the email of the provided openid are different
       unless (user = openid.user)
         user = User.find_for_auth(auth_hash, current_user) # Get or create users
-        user.username = "#{uid}@#{provider}" if user.username.blank?
+        user.username = "#{username}@#{provider}" if user.username.blank?
       end
 
       begin

app/views/admin/tickets/_form.html.haml

@@ -12,7 +12,7 @@
       = f.input :title
       = f.input :description, input_html: { rows: 5, data: { provide: "markdown-editable" } }
       = f.input :price
-      = f.input :price_currency, as: :select, class: 'form-control', collection: ['USD', 'EUR', 'GBP', 'INR', 'CNY'], include_blank: false
+      = f.input :price_currency, as: :select, class: 'form-control', collection: ['USD', 'EUR', 'GBP', 'INR', 'CNY', 'CHF'], include_blank: false
       = f.input :registration_ticket, hint: 'A registration ticket is with which user register for the conference.'
       %p.text-right
         = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }

app/views/admin/venues/_form.html.haml

@@ -15,6 +15,12 @@
         = semantic_form_for(@venue, url: admin_conference_venue_path(@conference.short_title)) do |f|
           = f.inputs :name, :website
           = f.input :description, input_html: { rows: 5, cols: 20, data: { provide: 'markdown-editable' } }, hint: markdown_hint
+          = f.label 'Venue Logo'
+          %br
+          - if @venue.picture?
+            = image_tag @venue.picture.thumb.url
+          = f.input :picture, label: false, hint: 'This will be displayed on the venue are of the splash page.'
+          = f.hidden_field :picture_cache
           = f.inputs :street, :postalcode, :city, :country, :latitude, :longitude
           = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }
 

app/views/conferences/_venue_map.html.haml

@@ -1,5 +1,4 @@
 #map{style: "height: 500px;" }
-- popup = "<h3>#{@conference.venue.name}</h3><br>#{@conference.venue.street}<br>#{@conference.venue.city}<br>#{@conference.venue.country_name}"
 - content_for(:script_body) do
   :javascript
     // create a map in the "map" div, set the view to a given place and zoom
@@ -10,8 +9,8 @@
       maxZoom: 18
     }).addTo(map);
     // add a marker in the given location, attach some popup content to it and open the popup
-    L.marker([#{h(@conference.venue.latitude)}, #{h(@conference.venue.longitude)}]).addTo(map)
+    L.marker([#{h @conference.venue.latitude}, #{h @conference.venue.longitude}]).addTo(map)
-      .bindPopup("#{h(popup)}")
+      .bindPopup("#{escape_javascript(render '/conferences/venue_map_marker', venue: @conference.venue)}")
       .openPopup();
     // Turn scrollwheel on when user clicks
     map.on('focus', function(e) {

app/views/conferences/_venue_map_marker.html.haml

@@ -0,0 +1,13 @@
+- if venue.picture?
+  = image_tag venue.picture.thumb.url,
+    alt: venue.name,
+    class: 'img-responsive pull-right'
+%h3= venue.name
+%p
+  = venue.street
+  %br
+  = venue.city
+  %br
+  = venue.country_name
+- if venue.website
+  %p.text-center.clearfix= sanitize(link_to venue.website, venue.website)

app/views/proposals/index.html.haml

@@ -55,7 +55,7 @@
           %p
             Knowing the number of visitors for the conference helps the organizers plan better.
 
-        %table.table.table-striped
+        %table.table.table-striped#events
           - @events.each do |event|
             %tr
               %td{style: "padding:20px 8px 20px 8px;"}

config/routes.rb

@@ -165,7 +165,6 @@ Osem::Application.routes.draw do
         member do
           get :registrations
           patch '/withdraw' => 'proposals#withdraw'
-          get :registrations
           patch '/confirm' => 'proposals#confirm'
           patch '/restart' => 'proposals#restart'
         end

spec/features/versions_spec.rb

@@ -193,7 +193,9 @@ feature 'Version' do
     click_link 'Reject event'
 
     visit conference_program_proposals_path(conference_id: conference.short_title)
-    click_link 'Re-Submit'
+    within('#events') do
+      click_link 'Re-Submit'
+    end
 
     visit admin_conference_program_events_path(conference.short_title)
     click_button 'New'