diff --git a/app/models/sponsor.rb b/app/models/sponsor.rb index 0981f24a..8b360c6d 100644 --- a/app/models/sponsor.rb +++ b/app/models/sponsor.rb @@ -6,6 +6,8 @@ class Sponsor < ActiveRecord::Base validates_attachment_content_type :logo, content_type: [/jpg/, /jpeg/, /png/, /gif/], - size: { in: 0..500.kilobytes } + size: { in: 0..500.kilobytes }, + presence: true + validates_presence_of :name, :website_url, :sponsorship_level end diff --git a/app/views/conference/_sponsors.html.haml b/app/views/conference/_sponsors.html.haml index 6ce4bc84..22db2916 100644 --- a/app/views/conference/_sponsors.html.haml +++ b/app/views/conference/_sponsors.html.haml @@ -6,28 +6,17 @@ .row .col-md-12 %h2 Sponsors - %p.lead - whom without, - %span.notranslate - = @conference.short_title - wouldn't be possible! - @conference.sponsorship_levels.each do |sponsorship_level| -if sponsorship_level.sponsors.any? + %h4 + = sponsorship_level.title - sponsorship_level.sponsors.each_slice(3) do |slice| - .row.row-centered + .row - slice.each do |sponsor| - .col-md-4.col-sm-4.col-centered.col-top - .thumbnail - - if sponsor.logo.blank? - %h3.text-center - = link_to(sponsor.website_url, title: "#{sponsor.name}") do - = sponsor.name - - else - = link_to(sponsor.website_url, class: 'thumbnail') do - = image_tag sponsor.logo, class: "img-responsive img-sponsor img-sponsor-#{sponsorship_level.position}", title: "#{sponsor.name}" - .caption - -if sponsor.description.present? - = markdown(sponsor.description) + .col-md-4.col-sm-4.col-top + - if sponsor.logo.present? + = link_to(sponsor.website_url, class: 'thumbnail') do + = image_tag sponsor.logo, class: "img-responsive img-sponsor img-sponsor-#{sponsorship_level.position}", title: "#{sponsor.description}" -if @conference.contact and !@conference.contact.sponsor_email.blank? .row .col-md-12 diff --git a/spec/views/conference/show.html.haml_spec.rb b/spec/views/conference/show.html.haml_spec.rb index 31b1cdea..04951b64 100644 --- a/spec/views/conference/show.html.haml_spec.rb +++ b/spec/views/conference/show.html.haml_spec.rb @@ -58,7 +58,6 @@ describe 'conference/show.html.haml' do it 'renders sponsors partial' do expect(view).to render_template(partial: 'conference/_sponsors') expect(rendered).to match(/example@example.com/) - expect(rendered).to match(/Example sponsor/) expect(rendered).to match(/www.example.com/) expect(rendered).to match(/Lorem Ipsum Dolor/) expect(rendered).to match(/rails.jpg/)