Merge branch 'master' into ticket-turnover-bug

Dockerfile

@@ -38,7 +38,10 @@ RUN chown -R osem.root /osem/ && \
 # data directory is used to cache the secret key in a file
 ENV DATA_DIR /data
 RUN install -d -m 0770 -o osem -g root $DATA_DIR
-VOLUME ["$DATA_DIR"]
+# data persistence for uploaded files (logos, other pictures, etc)
+RUN mkdir 0775 -p /osem/tmp/cache /osem/tmp/uploads/ && \
+       chown -R  osem.osem /osem/tmp/
+VOLUME ["$DATA_DIR", "/osem/tmp/uploads/", "/osem/public/system/"]
 
 USER osem
 EXPOSE 9292

app/assets/fonts/mastodon.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Copyright (C) 2017 by original authors @ fontello.com</metadata>
+<defs>
+<font id="mastodon" horiz-adv-x="1000" >
+<font-face font-family="mastodon" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
+<missing-glyph horiz-adv-x="1000" />
+<glyph glyph-name="logo" unicode="&#xe800;" d="M947 251c-14-71-123-148-248-163-66-8-130-15-199-12-112 5-200 27-200 27 0-11 0-21 2-31 14-111 109-118 200-121 91-3 172 23 172 23l3-83c0 0-63-34-177-40-62-3-140 2-230 25-197 52-230 262-235 474-2 63-1 122-1 172 0 217 142 280 142 280 72 33 195 47 323 48l3 0c128-1 251-15 322-48 0 0 142-63 142-280 0 0 2-160-19-271m-148 254l0-263-104 0 0 255c0 54-23 81-68 81-50 0-75-32-75-96l0-140-104 0 0 140c0 64-25 96-75 96-45 0-68-27-68-81l0-255-104 0 0 263c0 54 14 96 41 128 29 31 66 48 112 48 53 0 93-21 120-62l26-43 26 43c27 41 67 62 120 62 46 0 83-17 112-48 27-32 41-74 41-128" horiz-adv-x="1000" />
+
+<glyph glyph-name="logo_alt" unicode="&#xe801;" d="M945 251c-14-71-122-148-247-163-65-8-129-15-198-12-112 5-200 27-200 27 0-11 1-22 2-31 15-111 110-118 199-121 91-3 172 23 172 23l4-83c0 0-64-34-177-40-62-4-139 1-230 25-195 52-229 262-234 474-1 63 0 122 0 172 0 217 141 280 141 280 72 33 194 47 322 48l3 0c127-1 250-15 321-48 0 0 142-63 142-280 0 0 2-160-20-271m-628 183c0-39-31-70-70-70-38 0-70 31-70 70 0 39 32 71 70 71 39 0 70-32 70-71m253 0c0-39-31-70-70-70-39 0-70 31-70 70 0 39 31 71 70 71 39 0 70-32 70-71m253 0c0-39-32-70-70-70-39 0-70 31-70 70 0 39 31 71 70 71 38 0 70-32 70-71" horiz-adv-x="1000" />
+</font>
+</defs>
+</svg>

app/assets/stylesheets/application.css

@@ -18,4 +18,5 @@
  *= require osem-navbar
  *= require selectize
  *= require selectize.bootstrap3
+ *= require mastodon
 */

app/assets/stylesheets/mastodon.scss

@@ -0,0 +1,45 @@
+@font-face {
+  font-family: 'mastodon';
+  src: font-url('mastodon.eot');
+  src: local('☺'),
+       font-url('mastodon.otf') format('opentype'),
+       font-url('mastodon.woff') format('woff'),
+       font-url('mastodon.ttf') format('truetype'),
+       font-url('mastodon.svg') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+ [class^="icon-"]:before, [class*=" icon-"]:before {
+  font-family: "mastodon";
+  font-style: normal;
+  font-weight: normal;
+  speak: none;
+
+  display: inline-block;
+  text-decoration: inherit;
+  width: 1em;
+  margin-right: .2em;
+  text-align: center;
+  /* opacity: .8; */
+
+  /* For safety - reset parent styles, that can break glyph codes*/
+  font-variant: normal;
+  text-transform: none;
+
+  /* fix buttons height, for twitter bootstrap */
+  line-height: 1em;
+
+  /* you can be more comfortable with increased icons size */
+  /* font-size: 120%; */
+
+  /* Font smoothing. That was taken from TWBS */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+  /* Uncomment for 3D effect */
+  /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
+}
+
+.icon-mastodon:before { content: '\e800'; } /* '' */
+.icon-mastodon_alt:before { content: '\e801'; } /* '' */

app/assets/stylesheets/osem-dashboard.scss

@@ -1,4 +1,4 @@
-@import "breakpoints.css.scss";
+@import "breakpoints.scss";
 
 .dashbox span.fa {
   line-height: 1.1em;

app/assets/stylesheets/osem-navbar.scss

@@ -1,4 +1,4 @@
-@import "breakpoints.css.scss";
+@import "breakpoints.scss";
 .nav-osem {
     border: none;
     @include breakpoint(xs) {

app/assets/stylesheets/osem-splash.scss

@@ -1,4 +1,4 @@
-@import "breakpoints.css.scss";
+@import "breakpoints.scss";
 
 #splash {
   // Counter the general padding for #content

app/controllers/admin/contacts_controller.rb

@@ -22,7 +22,7 @@ module Admin
 
     # Only allow a trusted parameter "white list" through.
     def contact_params
-      params.require(:contact).permit(:social_tag, :email, :facebook, :googleplus, :twitter, :instagram, :public, :sponsor_email)
+      params.require(:contact).permit(:social_tag, :email, :facebook, :googleplus, :twitter, :instagram, :mastodon, :public, :sponsor_email)
     end
   end
 end

app/controllers/conferences_controller.rb

@@ -20,6 +20,11 @@ class ConferencesController < ApplicationController
     authorize! :show, @conference # TODO: reduce the 10 queries performed here
 
     splashpage = @conference.splashpage
+
+    unless splashpage.present?
+      redirect_to admin_conference_splashpage_path(@conference.short_title) && return
+    end
+
     if splashpage.include_cfp
       cfps = @conference.program.cfps
       @call_for_events = cfps.find { |call| call.cfp_type == 'events' }

app/models/conference.rb

@@ -595,11 +595,11 @@ class Conference < ApplicationRecord
   # * +ActiveRecord+
   def self.get_active_conferences_for_dashboard
     result = Conference.where('start_date > ?', Time.now)
-        .select('id, short_title, color, start_date')
+        .select('id, short_title, color, start_date, organization_id')
 
     if result.empty?
       result = Conference
-          .select('id, short_title, color, start_date').limit(2)
+          .select('id, short_title, color, start_date, organization_id').limit(2)
           .order(start_date: :desc)
     end
     result
@@ -611,7 +611,7 @@ class Conference < ApplicationRecord
   # ====Returns
   # * +ActiveRecord+
   def self.get_conferences_without_active_for_dashboard(active_conferences)
-    result = Conference.select('id, short_title, color, start_date').order(start_date: :desc)
+    result = Conference.select('id, short_title, color, start_date, organization_id').order(start_date: :desc)
     result - active_conferences
   end
 
@@ -719,7 +719,7 @@ class Conference < ApplicationRecord
   # * +True+ -> If the registration limit has been reached or exceeded
   # * +False+ -> If the registration limit hasn't been exceeded
   def registration_limit_exceeded?
-    registration_limit > 0 && registrations.count + program.speakers.confirmed.count - program.speakers.confirmed.registered(program.conference).count >= registration_limit
+    registration_limit > 0 && registrations.count + program.speakers.confirmed.unregistered(program.conference).count >= registration_limit
   end
 
   # Returns an hexadecimal color given a collection. The returned color changed

app/models/contact.rb

@@ -5,11 +5,11 @@ class Contact < ApplicationRecord
 
   validates :conference, presence: true
   # Conferences only have one contact
-  validates :facebook, :twitter, :googleplus, :instagram,
+  validates :facebook, :twitter, :googleplus, :instagram, :mastodon,
             format: URI::regexp(%w(http https)), allow_blank: true
 
   def has_social_media?
-    return true if facebook.present? || twitter.present? || googleplus.present? || instagram.present? || email.present?
+    return true if facebook.present? || twitter.present? || googleplus.present? || instagram.present? || mastodon.present? || email.present?
     false
   end
 end

app/models/program.rb

@@ -51,6 +51,10 @@ class Program < ApplicationRecord
     def registered(conference)
       joins(:registrations).where('registrations.conference_id = ?', conference.id)
     end
+
+    def unregistered(conference)
+      self - registered(conference)
+    end
   end
 
   accepts_nested_attributes_for :event_types, allow_destroy: true

app/views/admin/booths/show.html.haml

@@ -1,7 +1,8 @@
 .row
   .col-md-12
     %h3
-      = image_tag(@booth.picture.thumb.url, size: '20%', alt: '')
+      - if @booth.logo_link
+        = image_tag( @booth.picture.thumb.url, size: '20%', alt: '')
       = @booth.title
       .btn-group.pull-right
         = link_to 'Edit', edit_admin_conference_booth_path(@conference.short_title, @booth), class: 'btn btn-mini btn-primary'

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

@@ -11,7 +11,7 @@
   .col-md-8
     = semantic_form_for(@campaign, url: (@campaign.new_record? ? admin_conference_campaigns_path : admin_conference_campaign_path(@conference.short_title, @campaign))) do |f|
       = f.inputs do
-        = f.input :name
+        = f.input :name, input_html: { autofocus: true }
         = f.inputs name: 'UTM Parameters' do
           = f.input :utm_campaign, label: 'Campaign', hint: 'Groups all of the content from one campaign. E.g. 20percentpromocode'
           = f.input :utm_source, label: 'Source', hint: 'Which website is sending you traffic. E.g. Facebook, google+, blog'

app/views/admin/cfps/index.html.haml

@@ -7,7 +7,7 @@
 - if @program.cfps
   .row
     .col-md-12
-      %table.table.table-hover.datatable#tickets
+      %table.table.table-hover#tickets
         %thead
           %th Type
           %th Start Date

app/views/admin/commercials/index.html.haml

@@ -14,7 +14,7 @@
   .row
     .col-md-6
       = semantic_form_for(@commercial, url: admin_conference_commercials_path(conference_id: @conference.short_title)) do |f|
-        = f.input :url, label: 'URL', as: :string, input_html: { required: 'required' },
+        = f.input :url, label: 'URL', as: :string, input_html: { required: 'required', autofocus: true },
         hint: 'Just paste the url of your video/photo provider. YouTube, Vimeo, SpeakerDeck, SlideShare, Instagram, Flickr.'
         = f.action :submit, as: :button, button_html: { class: 'btn btn-primary pull-right', disabled: true }
   %hr

app/views/admin/conferences/_doughnut_chart.html.haml

@@ -1,6 +1,6 @@
 .text-center
   %h4 #{title}
-  %canvas.doughnut_chart{ id: "dough_#{title}", 'data-chart' => data.to_json }
+  %canvas.doughnut_chart{ id: "dough_#{title.parameterize.underscore}", 'data-chart' => data.to_json }
 - if data
   - data.each do |key, value|
     %span{ 'style' => "border-bottom: 3px solid #{value['color']}" } #{key}: #{value['value']}
@@ -8,7 +8,7 @@
 :javascript
   $(document).ready( function(){
 
-   var d = $("#dough_#{title}");
+   var d = $("#dough_#{title.parameterize.underscore}");
    var dt = d.get(0).getContext('2d');
 
    $(window).resize( respondCanvas );

app/views/admin/contacts/edit.html.haml

@@ -8,7 +8,7 @@
   .col-md-8
     = semantic_form_for(@contact, url: admin_conference_contact_path(@conference.short_title), html: {multipart: true}) do |f|
       = f.inputs name: 'Mail' do
-        = f.input :email, hint: 'Contact email address for your conference. Will be used as reply-to address in emails sent out by the system.'
+        = f.input :email, input_html: { autofocus: true }, hint: 'Contact email address for your conference. Will be used as reply-to address in emails sent out by the system.'
         = f.input :sponsor_email, hint: 'This will appear in the sponsor segment of the splash for the sponsors to contact to the organizers'
       = f.inputs name: 'Social Media' do
         = f.input :social_tag, hint: "The hashtag you'll use on Twitter and Google+. Don't include the '#' sign!'"
@@ -16,4 +16,5 @@
         = f.input :googleplus, label: 'Google+ Url', hint: 'This will appear in the social media section as the link to the Google+ Page of your Conference'
         = f.input :twitter, hint: 'This will appear in the social media section as the link to the Twitter Page of your Conference'
         = f.input :instagram, hint: 'This will appear in the social media section as the link to the Instagram Page of your Conference'
+        = f.input :mastodon, hint: 'This will appear in the social media section as the link to the Mastodon Page of your Conference'
       = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }

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

@@ -9,7 +9,7 @@
 .row
   .col-md-8
     = semantic_form_for(@difficulty_level, url: (@difficulty_level.new_record? ? admin_conference_program_difficulty_levels_path : admin_conference_program_difficulty_level_path(@conference.short_title, @difficulty_level))) do |f|
-      = f.input :title, required: true
+      = f.input :title, input_html: { autofocus: true }, required: true
       = f.input :description, input_html: {rows: 3, class: 'span6'}
       = f.input :color, input_html: {size: 6, type: 'color'}
       %p.text-right

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

@@ -9,7 +9,7 @@
 .row
   .col-md-12
     = semantic_form_for(@event_type, url: (@event_type.new_record? ? admin_conference_program_event_types_path : admin_conference_program_event_type_path(@conference.short_title, @event_type))) do |f|
-      = f.input :title
+      = f.input :title, input_html: { autofocus: true }
       = f.input :length, input_html: {size: 3, type: 'number', step: @event_type.program.schedule_interval, min: @event_type.program.schedule_interval}
       = f.input :description
       = f.input :minimum_abstract_length, input_html: {size: 3}

app/views/admin/organizations/index.html.haml

@@ -2,8 +2,9 @@
   .col-md-12
     .page-header
       %h1 Organizations
-      .btn-group.pull-right
+      - if can? :manage, :all
-        = link_to 'Create Organization', new_admin_organization_path, class: 'btn btn-success pull-right'
+        .btn-group.pull-right
+          = link_to 'Create Organization', new_admin_organization_path, class: 'btn btn-success pull-right'
       %p.text-muted
         Manage organizations in OSEM
 .row

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

@@ -9,7 +9,7 @@
       = f.input :schedule_fluid, label: 'Allow submitters to change their event after it is scheduled'
       = f.input :rating, hint: 'Enter the number of different rating levels you want to have for voting on proposals. Enter 0 if you do not want to vote on proposals.'
       = f.input :languages, hint: "Enter the languages allowed for events as values of #{link_to('ISO 639-1', 'http://www.loc.gov/standards/iso639-2/php/code_list.php', target: "_blank")} language codes separated with commas. The first language would be the default language. Leave it blank if you do not want to specify languages.".html_safe
-      = f.input :schedule_interval, hint: "It is the minimal time interval of your schedule. The value should be 5, 6, 10, 12, 15, 20, 30 or 60. Warning! Some events could be unscheduled when changing this value."
+      = f.input :schedule_interval, input_html: { autofocus: true }, hint: "It is the minimal time interval of your schedule. The value should be 5, 6, 10, 12, 15, 20, 30 or 60. Warning! Some events could be unscheduled when changing this value."
       = f.input :blind_voting, hint: 'Enable this feature if you do not want to show voting results and voters prior to user submitting a vote. For the feature to work you need to set the voting dates below as well'
       = f.input :voting_start_date, as: :string, input_html: { id: 'datetimepicker-voting_start_date', readonly: true, value: (f.object.voting_start_date.to_formatted_s(:db_without_seconds) unless f.object.voting_start_date.nil?) }
       = f.input :voting_end_date, as: :string, input_html: { id: 'datetimepicker-voting_start_date', readonly: true, value: (f.object.voting_end_date.to_formatted_s(:db_without_seconds) unless f.object.voting_end_date.nil?) }

app/views/admin/reports/_all_events.html.haml

@@ -5,7 +5,7 @@
         All Events
         = "(#{@events.length})"
       %p.text-muted
-        All submissions and the information that they are mssing
+        All submissions and the information that they are missing
 
 .col-md-12
   %table.table.table-striped.table-bordered.table-hover.datatable

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

@@ -8,7 +8,7 @@
 .row
   .col-md-8
     = semantic_form_for(@resource, :url => (@resource.new_record? ? admin_conference_resources_path : admin_conference_resource_path(@conference.short_title, @resource))) do |f|
-      = f.input :name
+      = f.input :name, input_html: { autofocus: true }
       = f.input :description, input_html: { rows: 5, data: { provide: 'markdown-editable' } }
       = f.input :used
       = f.input :quantity

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

@@ -10,6 +10,6 @@
 = semantic_form_for @role, url: @url do |f|
   .row
     .col-md-5
-      = f.input :description
+      = f.input :description, input_html: { autofocus: true }
 
       = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }

app/views/admin/roles/show.html.haml

@@ -24,7 +24,7 @@
 
       = u.label 'Add user by email: '
       .input-group
-        = u.input :email, label: false, placeholder: "User's email"
+        = u.input :email, input_html: { autofocus: true }, label: false, placeholder: "User's email"
         .input-group-btn
           = u.submit 'Add', id: 'user-add', class: 'btn btn-primary'
 

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

@@ -9,7 +9,7 @@
 .row
   .col-md-8
     = semantic_form_for(@room, url: (@room.new_record? ? admin_conference_venue_rooms_path : admin_conference_venue_room_path(@conference.short_title, @room))) do |f|
-      = f.input :name, input_html: { autofocus: true}
+      = f.input :name, input_html: { autofocus: true }
       = f.input :size, label: 'Capacity', input_html: {size: 5}
       %p.text-right
         = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }

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

@@ -9,7 +9,7 @@
 .row
   .col-md-8
     = semantic_form_for(@sponsor, url: (@sponsor.new_record? ? admin_conference_sponsors_path : admin_conference_sponsor_path(@conference.short_title, @sponsor))) do |f|
-      = f.input :name
+      = f.input :name, input_html: { autofocus: true }
       = f.input :description
       = image_tag f.object.picture.thumb.url if f.object.picture?
       = f.input :picture

app/views/admin/sponsors/index.html.haml

@@ -19,7 +19,8 @@
           - @conference.sponsors.each do |sponsor|
             %tr
               %td
-                = image_tag(sponsor.picture.thumb.url, width: '20%')
+                - if sponsor.picture?
+                  = image_tag(sponsor.picture.thumb.url, width: '20%')
               %td
                 = sponsor.name
               %td

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

@@ -9,6 +9,6 @@
 .row
   .col-md-8
     = semantic_form_for(@sponsorship_level, url: (@sponsorship_level.new_record? ? admin_conference_sponsorship_levels_path : admin_conference_sponsorship_level_path(@conference.short_title, @sponsorship_level))) do |f|
-      = f.input :title
+      = f.input :title, input_html: { autofocus: true }
       %p.text-right
         = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }

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

@@ -9,7 +9,7 @@
   .col-md-8
     = semantic_form_for(@target, url: (@target.new_record? ? admin_conference_targets_path : admin_conference_target_path(@conference.short_title, @target))) do |f|
       = f.input :due_date, as: :string, input_html: { class: 'target-due-date-datepicker'}, label: 'Until when do you want to have '
-      = f.input :target_count, label: 'this amount of '
+      = f.input :target_count, input_html: { autofocus: true }, label: 'this amount of '
       = f.input :unit, as: :select, label: 'Unit', class: 'form-control', collection: Target.units.values, include_blank: false
       %p.text-right
         = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }

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

@@ -9,7 +9,7 @@
 .row
   .col-md-12
     = semantic_form_for(@track, url: (@track.new_record? ? admin_conference_program_tracks_path(@conference.short_title) : admin_conference_program_track_path(@conference.short_title, @track))) do |f|
-      = f.input :name
+      = f.input :name, input_html: { autofocus: true }
       = f.input :short_name, hint: "A short and unique handle for the track, using only letters, numbers, underscores, and dashes. This will be used to identify the track in URLs etc. Example: 'my_awesome_track'", input_html: { required: 'required', pattern: '[a-zA-Z0-9_-]+', title: 'Only letters, numbers, underscores, and dashes.' }
       = f.input :color, input_html: {size: 6, type: 'color'}, required: true
       = f.input :start_date, as: :string, input_html: { id: 'registration-period-start-datepicker', start_date: @conference.start_date, end_date: @conference.end_date, readonly: 'readonly', required: @track.self_organized_and_accepted_or_confirmed? }

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

@@ -8,7 +8,7 @@
   .row
     .col-md-6
       - if @conference.venue.location?
-        = render '/conferences/venue_map'
+        = render '/conferences/venue_map', venue: @conference.venue
       -else
         - if @venue.commercial.nil?
           .row

app/views/booths/_form.html.haml

@@ -2,7 +2,7 @@
   .row
     .col-md-8
       = semantic_form_for(@booth,  url: @url, html: { multipart: true }) do |f|
-        = f.input :title, as: :string, autofocus: true, required: true
+        = f.input :title, as: :string, input_html: { autofocus: true }, required: true
         = f.input :description, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, required: true,
           hint: 'This field becomes public upon request acceptance'
         = f.input :reasoning, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, required: true,

app/views/booths/show.html.haml

@@ -6,7 +6,7 @@
           = image_tag(@booth.picture.thumb.url, size: '20%', alt: '')
         = @booth.title
         .btn-group.pull-right
-          = link_to 'Edit', edit_admin_conference_booth_path(@conference.short_title, @booth), class: 'btn btn-mini btn-primary'
+          = link_to 'Edit', edit_conference_booth_path(@conference.short_title, @booth), class: 'btn btn-mini btn-primary'
 
   .row
     .col-md-12

app/views/conferences/_call_for_papers.haml

@@ -23,5 +23,5 @@
         left!
     %p.cta-button
       = link_to "Submit your proposal now",
-        conference_program_proposals_path(conference_id),
+        new_conference_program_proposal_path(conference_id),
         class: 'btn btn-success btn-lg text-center'

app/views/conferences/_call_for_tracks.haml

@@ -15,5 +15,5 @@
         left!
     %p.cta-button
       = link_to("Submit your request for track",
-        conference_program_tracks_path(conference_id),
+        new_conference_program_track_path(conference_id),
         class: 'btn btn-success btn-lg text-center')

app/views/conferences/_modal_description.haml

@@ -15,7 +15,8 @@
                 - if object.is_a? Sponsor
                   - img_classes << ['img-sponsor',
                     "img-sponsor-#{object.sponsorship_level.position}"]
-                = image_tag get_logo(object), class: img_classes
+                - if object.picture?
+                  = image_tag get_logo(object), class: img_classes
             %p.description
               = object.description
           .modal-footer

app/views/conferences/_social_media.html.haml

@@ -0,0 +1,21 @@
+.container
+  .row
+    .col-md-12.text-center
+      - unless @conference.contact.facebook.blank?
+        = link_to "#{ @conference.contact.facebook }" do
+          %i.fa.fa-facebook-square.fa-4x
+      - unless @conference.contact.twitter.blank?
+        = link_to "#{ @conference.contact.twitter }" do
+          %i.fa.fa-twitter.fa-4x
+      - unless @conference.contact.instagram.blank?
+        = link_to "#{ @conference.contact.instagram }" do
+          %i.fa.fa-instagram.fa-4x
+      - unless @conference.contact.googleplus.blank?
+        = link_to "#{ @conference.contact.googleplus }" do
+          %i.fa.fa-google-plus-square.fa-4x
+      - unless @conference.contact.mastodon.blank?
+        = link_to "#{ @conference.contact.mastodon }" do
+          %i.fa.icon-mastodon.fa-4x
+      - unless @conference.contact.email.blank?
+        = mail_to "#{ @conference.contact.email }" do
+          %i.fa.fa-envelope-o.fa-4x

app/views/conferences/show.html.haml

@@ -29,7 +29,7 @@
     - if @conference.registration_open?
       = render 'registration', conference: @conference,
         registration_period: @conference.registration_period,
-        tickets: @tickets, conference_id: @conference_id.short_title
+        tickets: @tickets, conference_id: @conference.short_title
   - if @conference.splashpage.include_tickets && @conference.tickets.any?
     = render 'tickets', conference: @conference, tickets: @tickets
 

app/views/proposals/_proposal_form.html.haml

@@ -1,6 +1,6 @@
 = semantic_form_for(@event, url: @url) do |f|
   = f.inputs name: 'Proposal Information' do
-    = f.input :title, as: :string, required: true
+    = f.input :title, as: :string, input_html: { autofocus: true }, required: true
 
     = f.input :subtitle, as: :string
 

config.ru

@@ -1,4 +1,5 @@
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
+use Rack::Deflater
 run Osem::Application

config/application.rb

@@ -60,6 +60,9 @@ module Osem
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
 
+    # Set cache headers
+    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=31536000' }
+
     config.active_job.queue_adapter = :delayed_job
   end
 end

config/environments/production.rb

@@ -25,6 +25,10 @@ Osem::Application.configure do
   # Generate digests for assets URLs
   config.assets.digest = true
 
+  config.assets.css_compressor = :sass
+  config.assets.js_compressor = :uglifier
+  config.assets.gzip = true
+
   # Defaults to nil and saved in location specified by config.assets.prefix
   # config.assets.manifest = YOUR_PATH
 

db/migrate/20171201163628_add_mastodon_to_contact.rb

@@ -0,0 +1,5 @@
+class AddMastodonToContact < ActiveRecord::Migration
+  def change
+    add_column :contacts, :mastodon, :string
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171130172334) do
+ActiveRecord::Schema.define(version: 20171201163628) do
 
   create_table "ahoy_events", force: :cascade do |t|
     t.integer  "visit_id"
@@ -145,6 +145,7 @@ ActiveRecord::Schema.define(version: 20171130172334) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "sponsor_email"
+    t.string   "mastodon"
   end
 
   create_table "delayed_jobs", force: :cascade do |t|

docker-compose.env.example

@@ -34,7 +34,7 @@ SECRET_KEY_BASE=changemechangemechangeme"
 OSEM_EMAIL_ADDRESS="osem@mailhog"
 OSEM_SMTP_AUTHENTICATION="login"
 OSEM_SMTP_ADDRESS="mailhog"
-OSEM_SMTP_PORT="1025"
+OSEM_SMTP_PORT=1025
 OSEM_SMTP_USERNAME="mailhog"
 OSEM_SMTP_PASSWORD="mailhog"