Added conference list page, administration tools, and re-designed conference administration

app/views/application/_header.html.haml

@@ -1,20 +1,20 @@
 - content_for :banner do
-	- image = image_path(image_file || 'empty-racks.jpg')
-	- style = nil
-	- cover = nil
-	- figure = nil
-	- if capable_of(:css_mixblendmode)
-		- cover = "<div class=\"cover\" style=\"background-image: url(#{image})\"></div>"
-	- else
-		- style = "background-image: url(#{image})"
-	#header-title.short{style: style}
-		= (render banner_image, {:image => image}) if defined?(banner_image) == "local-variable"
-		= cover.html_safe if cover
-		- if @page_title.present? || defined?(page_group)
-			- content_for :title do
-				=@page_title.present? ? I18n.t(@page_title, @page_title_vars) : I18n.t("page_titles.#{page_group.to_s}.#{page_key.to_s}")
-			= row do
-				= columns do
-					%h1=_(@main_title || "page_titles.#{page_group.to_s}.#{page_key.to_s}", :t, @main_title_vars)
-	- content_for :og_image do
-		= image
+  - image = image_path(image_file || 'empty-racks.jpg')
+  - style = nil
+  - cover = nil
+  - figure = nil
+  - if capable_of(:css_mixblendmode)
+    - cover = "<div class=\"cover\" style=\"background-image: url(#{image})\"></div>"
+  - else
+    - style = "background-image: url(#{image})"
+  #header-title.short{style: style}
+    = (render banner_image, {:image => image}) if defined?(banner_image) == "local-variable"
+    = cover.html_safe if cover
+    - if @page_title.present? || defined?(page_group)
+      - content_for :title do
+        = I18n.t(@page_title || "page_titles.#{page_group.to_s}.#{page_key.to_s}", @page_title_vars)
+      = row do
+        = columns do
+          %h1=_(@main_title || "page_titles.#{page_group.to_s}.#{page_key.to_s}", :t, @main_title_vars || (@page_title_vars.present? && @page_title.blank? ? { vars: @page_title_vars } : nil))
+  - content_for :og_image do
+    = image

app/views/application/home.html.haml

@@ -1,17 +1,5 @@
-- this_is_the_front_page
-- if @conference
-	= render 'conferences/header'
-	%article
-		= row do
-			= columns(medium: 10, push: {medium: 1}) do
-				%h2=_!@conference.title
-				= richtext @conference.info
-				- if @conference.registration_status == :open
-					- if @conference.workshop_schedule_published
-						- add_inline_script :home_schedule
-						%h3=_'articles.workshops.headings.Schedule'
-						= render 'conferences/admin/schedule'
-					- else
-						%h3=_'articles.workshops.headings.Proposed_Workshops'
-						%p=_'articles.workshops.paragraphs.Proposed_Workshops'
-						= render 'workshops/workshop_previews', :workshops => (@conference.workshops.sort { |a, b| a.title.downcase <=> b.title.downcase })
+- content_for :og_image do
+  = @conference.poster.full.url || image_path('default_poster.jpg')
+- if @conferences
+  - @conferences.each do | conference |
+    = render 'conferences/conference', conference: conference, links: [ :read_more, :register ]

app/views/application/user_settings.html.haml

@@ -1,25 +1,25 @@
 = render :partial => 'application/header', :locals => {:image_file => @banner_image || 'grafitti.jpg'}
 %article
-	= row do
-		= columns do
-			- if logged_in?
-				%h2=_'articles.user_settings.headings.Your_Account'
-				- if @conference.present? && (@conference.registration_status == :pre || @conference.registration_status == :open)
-					%p=_'articles.user_settings.paragraphs.conference_registration', :t
-					= link_to (_'actions.conference.edit_registration'), register_path(@conference.slug), class: :button
-				- if @conferences.present?
-					%h3=_'articles.user_settings.headings.Your_Conferences'
-					.link-dump
-						- @conferences.each do | conference |
-							= link_to (_!conference.title), administration_step_path(conference.slug, :edit), class: :button
+  = row do
+    = columns do
+      - if logged_in?
+        %h2=_'articles.user_settings.headings.Your_Account'
+        - if @conference.present? && (@conference.registration_status == :pre || @conference.registration_status == :open)
+          %p=_'articles.user_settings.paragraphs.conference_registration', :t
+          = link_to (_'actions.conference.edit_registration'), register_path(@conference.slug), class: :button
+        - if @conferences.present?
+          %h3=_'articles.user_settings.headings.Your_Conferences'
+          .link-dump
+            - @conferences.each do | conference |
+              = link_to (_!conference.title), administration_step_path(conference.slug, :edit), class: :button
 
-				= form_tag update_settings_path do
-					= textfield :name, current_user.name, required: true, heading: 'articles.conference_registration.headings.name', big: true
-					= checkboxes :languages, User.AVAILABLE_LANGUAGES, current_user.languages || [I18n.locale], 'languages', heading: 'articles.conference_registration.headings.languages'
-					= radiobuttons :preferred_language, I18n.backend.enabled_locales, current_user.locale || I18n.locale, 'languages', heading: 'articles.conference_registration.headings.preferred_language'
-					= checkbox :email_subscribe, current_user.is_subscribed != false, 'articles.user_settings.email_subscribe', heading: 'articles.user_settings.headings.email_subscribe', help: 'articles.user_settings.paragraphs.email_subscribe', inline: true, right_help: true
-					.actions
-						= button_tag :save, value: :save
-			- else
-				%h2=_'forms.actions.generic.login'
-				= render 'login'
+        = form_tag update_settings_path do
+          = textfield :name, current_user.name, required: true, heading: 'articles.conference_registration.headings.name', big: true
+          = checkboxes :languages, User.AVAILABLE_LANGUAGES, current_user.languages || [I18n.locale], 'languages', heading: 'articles.conference_registration.headings.languages'
+          = radiobuttons :preferred_language, I18n.backend.enabled_locales, current_user.locale || I18n.locale, 'languages', heading: 'articles.conference_registration.headings.preferred_language'
+          = checkbox :email_subscribe, current_user.is_subscribed != false, 'articles.user_settings.email_subscribe', heading: 'articles.user_settings.headings.email_subscribe', help: 'articles.user_settings.paragraphs.email_subscribe', inline: true, right_help: true
+          .actions
+            = button_tag :save, value: :save
+      - else
+        %h2=_'forms.actions.generic.login'
+        = render 'login'