2016 design

This commit is contained in:
Godwin
2016-05-09 21:45:23 -07:00
parent 48ed91e24c
commit 5d25e09bc4
190 changed files with 4665 additions and 1289 deletions
+3 -7
View File
@@ -1,13 +1,9 @@
- content_for :banner do
- image = image_path(@banner_image || 'empty-racks.jpg')
#header-title.short{style: capable_of(:svg) ? nil : "background-image: url(#{image})"}
- if capable_of(:svg)
= render 'application/banner_image.svg', {:image => image}
%h1=_(@page_title || 'page_titles.404.Page_Not_Found')
- @page_title = 'page_titles.404.Page_Not_Found' unless @page_title.present?
= render :partial => 'application/header', :locals => {:image_file => nil}
= row do
= columns(medium: 12) do
%h1
=_'error.404.title','This page does not exist!'
%p
=_'error.404.description', :p
=p(_'error.404.description', :p)
+3 -1
View File
@@ -12,4 +12,6 @@
#header-title.short{style: style}
= (render banner_image, {:image => image}) if banner_image
= cover.html_safe if cover
%h1=_(@page_title || "page_titles.#{page_group.to_s}.#{page_key.to_s}")
= row do
= columns do
%h1=_(@page_title || "page_titles.#{page_group.to_s}.#{page_key.to_s}")
+21 -20
View File
@@ -1,23 +1,24 @@
- this_is_the_front_page
- if @conference
= render 'conferences/header'
%article
%h2=_!@conference.title
=@conference.info.html_safe
- if @conference.workshops
- if @schedule
%h3=_'articles.workshops.headings.Schedule'
= render 'schedule/programme', :schedule => @schedule, :conference => @conference, :workshops => @workshops, :events => @events, :locations => @locations, :show_interest => true, :day_parts => @day_parts, :show_previews => true
- else
%h3=_'articles.workshops.headings.Proposed_Workshops'
%p=_'articles.workshops.paragraphs.Proposed_Workshops', "Would you like to facilitate your own workshop? Simply register and visit the workshops page. If you have already registered you can access the page by restarting the registration process."
%ul.workshop-list
- @conference.workshops.sort_by{ |w| w.title.downcase }.each do |w|
%li
%h4=w.title
.workshop-interest
- if w.interested?(current_user)
=_'articles.workshops.info.you_are_interested_count', "You and #{w.interested_count - 1} others are interested in this workshop", :vars => {:count => (w.interested_count - 1)}
- elsif w.interested_count > 0
=_'articles.workshops.info.interested_count', "#{w.interested_count} people are interested in this workshop", :vars => {:count => w.interested_count}
.workshop-description=markdown w.info
= row do
= columns(tag: :article) do
%h2=_!@conference.title
= @conference.info.html_safe
- if @conference.workshops
- if @schedule
%h3=_'articles.workshops.headings.Schedule'
= render 'schedule/programme', :schedule => @schedule, :conference => @conference, :workshops => @workshops, :events => @events, :locations => @locations, :show_interest => true, :day_parts => @day_parts, :show_previews => true
- elsif @conference.registration_open
%h3=_'articles.workshops.headings.Proposed_Workshops'
%p=_'articles.workshops.paragraphs.Proposed_Workshops', "Would you like to facilitate your own workshop? Simply register and visit the workshops page. If you have already registered you can access the page by restarting the registration process."
%ul.workshop-list
- @conference.workshops.sort_by{ |w| w.title.downcase }.each do |w|
%li
%h4=w.title
.workshop-interest
- if w.interested?(current_user)
=_'articles.workshops.info.you_are_interested_count', "You and #{w.interested_count - 1} others are interested in this workshop", :vars => {:count => (w.interested_count - 1)}
- elsif w.interested_count > 0
=_'articles.workshops.info.interested_count', "#{w.interested_count} people are interested in this workshop", :vars => {:count => w.interested_count}
.workshop-description=markdown w.info
@@ -1,15 +1,7 @@
- content_for :banner do
- image = image_path(@banner_image || '403.jpg')
#header-title.short{style: capable_of(:svg) ? nil : "background-image: url(#{image})"}
- if capable_of(:svg)
= render 'application/banner_image.svg', {:image => image}
%h1=_(@page_title || 'page_titles.403.Permission_Denied')
= render :partial => 'application/header', :locals => {:image_file => @banner_image || '403.jpg'}
%article
- if @template
=render @template
- else
%h2
=_'articles.permission_denied.headings.main','Sorry, you currently don\'t have access to this page'
%p
=_'articles.permission_denied.paragraphs.main', :p
%h2=_'articles.permission_denied.headings.main','Sorry, you currently don\'t have access to this page'
%p=_'articles.permission_denied.paragraphs.main', :p