Fixed companions heading, time_select bug, and emails on comments

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

@@ -31,7 +31,7 @@
 		.flex-inputs
 			= location_select @event.event_location_id, small: true, stretch: true
 			= day_select @day, small: true, format: :weekday
-			= time_select @time, small: true
+			= hour_select @time, small: true
 			= length_select @length, small: true
 		- I18n.backend.enabled_locales.each do | locale |
 			- if locale.to_s != @event.locale.to_s

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

@@ -25,7 +25,7 @@
 		.flex-inputs
 			= location_select nil, small: true, stretch: true
 			= day_select nil, small: true, format: :weekday
-			= time_select nil, small: true
+			= hour_select nil, small: true
 		= textfield :title, nil, required: true, big: true, help: 'articles.admin.locations.paragraphs.meal_title'
 		= textfield :info, nil, help: 'articles.admin.locations.paragraphs.meal_info'
 		.actions.next-prev

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

@@ -1,3 +1,4 @@
+- add_inline_script :schedule
 - conference = @this_conference || @conference
 - if conference.event_locations.blank? && @entire_page
 	.warning-info=_'articles.admin.schedule.no_locations_warning'
@@ -14,7 +15,7 @@
 	#schedule-preview
 		- @schedule.each do | day, data |
 			%h4=date(day, :weekday)
-			%table.schedule{class: [data[:locations].present? ? 'has-locations' : 'no-locations', "locations-#{data[:locations].size}"]}
+			%table.schedule{class: [data[:locations].present? ? 'has-locations' : 'no-locations', "locations-#{data[:num_locations]}"]}
 				- if data[:locations].present?
 					%thead
 						%tr
@@ -35,7 +36,7 @@
 											- status = time_data[:item][:workshops][id][:status]
 										- else
 											- workshop = status = nil
-										%td{class: [time_data[:type], workshop.present? ? :filled : nil], rowspan: rowspan}
+										%td{class: [time_data[:type], workshop.present? ? :filled : :open], rowspan: rowspan, data: workshop.present? ? nil : { block: (time_data[:item][:block] + 1), day: day }}
 											- if workshop.present? && workshop.event_location.present?
 												= link_to off_screen(workshop.title), view_workshop_path(@conference.slug, workshop.id), class: 'event-detail-link'
 												%template.event-details{data: { href: view_workshop_path(@conference.slug, workshop.id) }}
@@ -60,7 +61,7 @@
 											- elsif @can_edit
 												.title="Block #{time_data[:item][:block] + 1}"
 								- else
-									%td{class: time_data[:type], rowspan: rowspan, colspan: data[:locations].present? ? data[:locations].size : 1}
+									%td{class: [time_data[:type], :open], rowspan: rowspan, colspan: data[:locations].present? ? data[:locations].size : 1, data: { block: (time_data[:item][:block] + 1), day: day }}
 										- if @can_edit
 											.title="Block #{time_data[:item][:block] + 1}"
 								%td.status{rowspan: rowspan}

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

@@ -19,7 +19,7 @@
 		%th=_'forms.labels.generic.city'
 		%th=_'forms.labels.generic.housing'
 		%th=_'articles.admin.housing.headings.arrival_departure'
-		%th=_'forms.labels.generic.companion'
+		%th=_'articles.conference_registration.headings.companion'
 		%th=_'forms.labels.generic.food'
 		%th=_'forms.labels.generic.allergies'
 		%th=_'forms.labels.generic.other'

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

@@ -9,7 +9,7 @@
 		- is_new = info['time'].blank?
 		= form_tag administration_update_path(@this_conference.slug, :workshop_times), class: ['table-tr', is_new ? 'new' : 'saved'] do
 			.table-th.center.big= is_new ? '' : (block + 1)
-			.table-td=time_select info['time'], small: true, label: false
+			.table-td=hour_select info['time'], small: true, label: false
 			.table-td=length_select info['length'], {small: true, label: false}, 0.5, 2
 			.table-td=checkboxes :days, @block_days, info['days'].map(&:to_i), 'date.day_names', vertical: true, small: true
 			.table-td.form