bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Fixed broken workshop links and fixed awkward styles

Browse Source
This commit is contained in:
Godwin 2016-06-03 17:23:32 -07:00
parent 2220ecaf53
commit dfdb44b5ae
7 changed files with 561 additions and 499 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

971
app/assets/stylesheets/_application.scss
View File

File diff suppressed because it is too large Load Diff

3
app/controllers/conferences_controller.rb
View File

@ -1037,6 +1037,9 @@ class ConferencesController < ApplicationController
workshop.notes = params[:notes]
workshop.needs_facilitators = params[:needs_facilitators].present?
workshop.save
# Rouge nil facilitators have been know to be created, just destroy them here now
WorkshopFacilitator.where(:user_id => nil).destroy_all
else
return do_403
end

54
app/helpers/application_helper.rb
View File

@ -680,14 +680,14 @@ module ApplicationHelper
description_id = nil
html = label_tag(name, nil, id: label_id)
if options[:warning].present?
description_id = "#{name.to_s}-label" unless options[:help].present?
html += content_tag(:div, _(options[:warning], :s, 2), id: description_id, class: 'warning-info')
if options[:help].present?
description_id ||= "#{name.to_s}-desc"
html += content_tag(:div, _(options[:help], :s, 2), id: description_id, class: 'input-field-help')
end
if options[:help].present?
description_id = "#{name.to_s}-label"
html += content_tag(:div, _(options[:help], :s, 2), id: description_id, class: 'input-field-help')
if options[:warning].present?
description_id ||= "#{name.to_s}-desc"
html += content_tag(:div, _(options[:warning], :s, 2), id: description_id, class: 'warning-info')
end
html += content_tag(:div, value.present? ? value.html_safe : '',
@ -698,10 +698,50 @@ module ApplicationHelper
aria: { labeledby: label_id, describedby: description_id }
)
return content_tag(:div, html, class: ['text-area-field', 'input-field']).html_safe
html = content_tag(:div, html, class: ['text-area-field', 'input-field']).html_safe
html += _original_content(options[:original_value], options[:original_lang]) if options[:original_value].present?
return html.html_safe
end
def textfield(name, value, options = {})
html = ''
description_id = nil
if options[:heading].present?
description_id ||= "#{name.to_s}-desc"
html += content_tag(:h3, _(options[:heading]), id: description_id)
end
html += show_errors name
html += label_tag name
html += text_field_tag(name, value,
required: options[:required],
lang: options[:lang],
aria: { describedby: description_id }
)
html = content_tag(:div, html.html_safe,
class: [
'text-field',
'input-field',
options[:big] ? 'big' : nil,
(@errors || {})[name].present? ? 'has-error' : nil
])
html += _original_content(options[:original_value], options[:original_lang]) if options[:original_value].present?
return html.html_safe
end
private
def _original_content(value, lang)
content_tag(:div, (
content_tag(:h4, _('translate.content.Translation_of')) +
content_tag(:div, value, class: 'value', lang: lang)
).html_safe, class: 'original-text')
end
def _form_field(type, name, value, options)
if type == 'check_box'
self.send(type + '_tag', name, "1", value, options)

4
app/models/workshop.rb
View File

@ -31,7 +31,7 @@ class Workshop < ActiveRecord::Base
def active_facilitators
users = []
workshop_facilitators.each do |u|
users << User.find(u.user_id) unless u.role.to_sym == :requested
users << User.find(u.user_id) unless u.role.to_sym == :requested || u.user.nil?
end
return users
end
@ -78,7 +78,7 @@ class Workshop < ActiveRecord::Base
return 0 unless id
collaborators = []
workshop_facilitators.each do |f|
collaborators << f.user_id unless f.role.to_sym == :requested
collaborators << f.user_id unless f.role.to_sym == :requested || f.user_id.nil?
end
return 10 unless collaborators.present?
interested = WorkshopInterest.where("workshop_id=#{id} AND user_id NOT IN (#{collaborators.join ','})") || []

2
app/views/application/about.html.haml
View File

@ -14,7 +14,7 @@
= columns(medium: 12) do
%h3=_'articles.about_bikebike.headings.Who_is_Invited', :t
%p=_'articles.about_bikebike.paragraphs.Who_is_Invited', :p
= columns(medium: 12) do
= columns(medium: 12, class: 'featured-image-container') do
%h3=_'articles.about_bikebike.headings.Types_of_Workshops', :t
%figure{style: "background-image: url(#{image_path('columbus_people.jpg')})"}
%p=_'articles.about_bikebike.paragraphs.Types_of_Workshops', :p

12
app/views/conferences/_contact_info.html.haml
View File

@ -3,16 +3,8 @@
%p=_'articles.conference_registration.paragraphs.Contact_Info', :s, 2
= columns(medium: 12) do
= form_tag register_path(@this_conference.slug) do
%h3=_'articles.conference_registration.headings.name','What is your name?'
.text-field.input-field{class: @errors[:name].present? ? 'has-error' : nil}
= show_errors :name
= label_tag :name
= text_field_tag :name, @name, required: true
%h3=_'articles.conference_registration.headings.location','Where are you coming from?'
.text-field.input-field{class: @errors[:location].present? ? 'has-error' : nil}
= show_errors :location
= label_tag :location
= text_field_tag :location, @registration.city || location(lookup_ip_location), required: true
= textfield :name, @name, required: true, heading: 'articles.conference_registration.headings.name'
= textfield :location, (@registration.city || location(lookup_ip_location)), required: true, heading: 'articles.conference_registration.headings.location'
%h3=_'articles.conference_registration.headings.languages','Which languages do you speak?'
- puts @errors.to_json.to_s
.check-box-field.input-field{class: @errors[:languages].present? ? 'has-error' : nil}

14
app/views/workshops/new.html.haml
View File

@ -19,18 +19,8 @@
%h2=_@page_title, :t
- else
%h2=_@page_title, :t
.text-field.input-field.big
= label_tag :title
= text_field_tag :title, @title, required: true, lang: @translation
- if @is_translating
.original-text
%h4=_'translate.content.Translation_of'
.value=@workshop.title!
= textarea :info, @info, help: 'articles.workshops.paragraphs.info', lang: @translation
- if @is_translating
.original-text
%h4=_'translate.content.Translation_of'
.value=(@workshop.info! || '').html_safe
= textfield :title, @title, required: true, lang: @translation, big: true, original_value: @is_translating ? @workshop.title! : nil, original_lang: @workshop.locale
= textarea :info, @info, help: 'articles.workshops.paragraphs.info', lang: @translation, original_value: @is_translating ? richtext(@workshop.info!, 4).html_safe : nil, original_lang: @workshop.locale
- if !@is_translating && (@workshop.id.blank? || @can_edit)
= columns(medium: 6) do
%h3=_'articles.workshops.headings.languages','Workshop Language'