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

Ready to merge

Browse Source
This commit is contained in:
Godwin
2015-08-21 19:29:43 -07:00
parent 8a05ac6e31
commit 43ab36071b
114 changed files with 27273 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/workshops/delete.html.haml
+10
View File
@@ -0,0 +1,10 @@
= render 'conferences/page_header', :page_key => 'Delete_Workshop'
%article
= row do
= columns(medium: 12) do
%h2=_'articles.workshops.headings.Delete_Workshop',"Are you sure you want to delete the workshop: <em>#{@workshop.title}</em>?", :vars => {:title => "<em>#{@workshop.title}</em>".html_safe}
= form_tag delete_workshop_path(@this_conference.slug, @workshop.id), class: 'composition' do
.actions
= button_tag :confirm, :value => :confirm, :class => :delete
= button_tag :cancel, :value => :cancel
app/views/workshops/index.html.haml
+3 -3
View File
@@ -2,11 +2,11 @@
%article
= row do
= columns(medium: 12) do
%h2=_'articles.conference_registration.headings.Workshops'
%h2=_'articles.workshops.headings.Workshops'
= columns(medium: 6) do
%p=_'articles.conference_registration.paragraphs.Workshops', :p
%p=_'articles.workshops.paragraphs.Workshops', :p
= columns(medium: 6) do
%h3=_'articles.conference_registration.headings.Your_Workshops'
%h3=_'articles.workshops.headings.Your_Workshops'
%ul.workshop-previews
- @my_workshops.each do |w|
- if w.title
app/views/workshops/new.html.haml
+30 -15
View File
@@ -4,7 +4,7 @@
= form_tag save_workshop_path(@this_conference.slug), class: 'composition' do
= (hidden_field_tag :workshop_id, @workshop.id) if @workshop
= columns(medium: 12) do
%p=(_'articles.workshops.paragraphs.info','Please accurately describe your workshop in detail. This will help hosts decide if they wish to add it to the schedule and when it should best be scheduled. Enter normal text but if you want to get fancy you can use <a href="http://daringfireball.net/projects/markdown/basics" target="_blank">Markdown</a>.').html_safe
=paragraph(_'articles.workshops.paragraphs.new_workshop','Please accurately describe your workshop in detail. This will help hosts decide if they wish to add it to the schedule and when it should best be scheduled. Enter normal text but if you want to get fancy you can use [Markdown](http://daringfireball.net/projects/markdown/basics).').html_safe
.text-field.input-field.big
= label_tag :title
= text_field_tag :title, @title, :required => true
@@ -13,32 +13,47 @@
= text_area_tag :info, @info, :required => true
= columns(medium: 6) do
%h3=_'articles.workshops.headings.languages','Workshop Language'
.check-box-field.input-field
- [:en, :es, :fr].each do |language|
= check_box_tag "languages[#{language}]", 1, @languages.include?(language)
- [:en, :es, :fr].each do |language|
.single-check-box-field.input-field
= label_tag "languages_#{language}" do
= check_box_tag "languages[#{language}]", 1, @languages && @languages.include?(language)
= _"languages.#{language}"
%h3=_'articles.workshops.headings.theme','Theme'
%p=_'articles.workshops.paragraphs.theme', :p
.check-box-field.input-field
- [:race_gender, :mechanics, :funding, :organization, :community, :other].each do |theme|
= radio_button_tag :theme, theme, @theme == theme
.input-field-help=_'articles.workshops.paragraphs.theme', :p
- theme_found = false
- [:race_gender, :mechanics, :funding, :organization, :community].each do |theme|
.single-radio-button-field.input-field
= label_tag "theme_#{theme}" do
- is_selected = (@theme == theme)
- theme_found ||= is_selected
= radio_button_tag :theme, theme, is_selected
= _"workshop.options.theme.#{theme}"
.single-radio-button-field.other-field.input-field
= label_tag "theme_other" do
= radio_button_tag :theme, :other, (@theme && !theme_found)
%div
= _"workshop.options.theme.other"
= text_field_tag :other_theme, (@theme && !theme_found ? @theme : nil)
= columns(medium: 6) do
%h3=_'articles.workshops.headings.needs','What do you need?'
.check-box-field.input-field
- [:sound, :projector, :tools].each do |need|
= check_box_tag "needs[#{need}]", 1, @needs.include?(need)
- [:sound, :projector, :tools].each do |need|
.single-check-box-field.input-field
= label_tag "needs_#{need}" do
= check_box_tag "needs[#{need}]", 1, @needs.include?(need)
= _"workshop.options.needs.#{need}"
%h3=_'articles.workshops.headings.space','Type of space'
%p=_'articles.workshops.paragraphs.space', :p
.check-box-field.input-field
- [:workshop, :meeting_room, :outdoor_meeting].each do |space|
= radio_button_tag :space, space, @space == space
.input-field-help=_'articles.workshops.paragraphs.space', :p
- [:meeting_room, :workshop, :outdoor_meeting].each do |space|
.single-radio-button-field.input-field
= label_tag "space_#{space}" do
= radio_button_tag :space, space, @space == space
= _"workshop.options.space.#{space}"
= columns(medium: 12) do
%h3=_'articles.workshops.headings.notes','Notes for Conference Organizers and Workshop Facilitators'
%p=_'articles.workshops.paragraphs.notes','Notes are only viewable by conference hosts and workshop facilitators'
.text-area-field.input-field
= label_tag :notes
= text_area_tag :notes, @notes
= columns(medium: 12) do
.actions.right
= button_tag :save, :value => :save
app/views/workshops/show.html.haml
+19
View File
@@ -4,6 +4,7 @@
= columns(medium: 12) do
%h2=_!@workshop.title
=paragraph _!(@workshop.info) || ''
= columns(medium: 6) do
%h3=_'articles.workshops.headings.facilitators'
.facilitators
- @workshop.workshop_facilitators.each do |f|
@@ -11,6 +12,24 @@
- u = User.find(f.user_id)
.name=_!(u.firstname || u.username || u.email)
.role=_"roles.workshops.facilitator.#{f.role}"
- if @workshop.languages
= columns(medium: 6) do
%h3=_'articles.workshops.headings.languages','Workshop Language'
%p= _!((JSON.parse(@workshop.languages || '[]').map { |x| _"languages.#{x}" }).join(', ').to_s.html_safe)
- if @workshop.theme
= columns(medium: 6) do
%h3=_'articles.workshops.headings.theme','Theme'
%p= [:race_gender, :mechanics, :funding, :organization, :community].include?((@workshop.theme || '').to_sym) ? (_"workshop.options.theme.#{@workshop.theme}") : @workshop.theme
- if @workshop.can_edit?(current_user) || @this_conference.host?(current_user)
- if @workshop.needs
= columns(medium: 6) do
%h3=_'articles.workshops.headings.needs','What do you need?'
%p= _!((JSON.parse(@workshop.needs || '[]').map { |x| _"workshop.options.needs.#{x}" }).join(', ').to_s.html_safe)
- if @workshop.notes
= columns(medium: 12) do
%h3=_'articles.workshops.headings.notes','Notes'
=paragraph _!(@workshop.notes)
= columns(medium: 12) do
.actions
= (link_to (_'actions.workshops.Edit'), edit_workshop_path(@this_conference.slug, @workshop.id), :class => 'button modify') if @workshop.can_edit?(current_user)
= (link_to (_'actions.workshops.Delete'), delete_workshop_path(@this_conference.slug, @workshop.id), :class => 'button delete') if @workshop.can_delete?(current_user)