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

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

Browse Source
This commit is contained in:
Godwin
2016-12-11 20:02:24 -08:00
parent 08244444b0
commit 1dc608bf58
175 changed files with 12225 additions and 11806 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/user_mailer/conference_registration_confirmed_email.html.haml
+10 -10
View File
@@ -1,10 +1,10 @@
%img{src: "#{@conference.poster.full.url}", style: "max-width: 100%;"}
%div{style: 'padding: 25px'}
%h1=_'register.email.registration_confirmed.thank_you',"Hi #{@data[:user][:username]}, thank you for completing your registration. We'll see you at Bike!Bike!"
%h2=_'register.email.registration_confirmed.please_pay',"If you have not already done so, we ask that you pay the registration donation as soon as you can. At your convenience please visit the link below."
%div{style: 'text-align:center'}
%h1{style: 'background-color:#F11845;text-align:center;display:inline-block;padding: 5px 20px 10px;'}
%a{href: @confirmation_url, style: 'color:#FFF;text-decoration:none;'}
=_'register.email.registration_confirmed.pay_now',"Pay Registration Fees"
%p=(_'register.email.registration_confirmed.info',"We'll have housing, loaner bikes, and food arranged for your arrival. If you have any other questions or concerns, please email bikebike2014columbus@gmail.com").gsub(/(\w+@\w+\.\w{2,3})/, '<a href="mailto:\1">\1</a>').html_safe
%p=_'register.email.registration_confirmed.contact',"For urgent/emergency matters, you can reach our Outreach Coordinator, Reda, at 503-984-9191 or Jason at 614-364-3636."
%img{src: "#{@conference.poster.full.url}", style: "max-width: 100%;"}
%div{style: 'padding: 25px'}
%h1=_'register.email.registration_confirmed.thank_you',"Hi #{@data[:user][:username]}, thank you for completing your registration. We'll see you at Bike!Bike!"
%h2=_'register.email.registration_confirmed.please_pay',"If you have not already done so, we ask that you pay the registration donation as soon as you can. At your convenience please visit the link below."
%div{style: 'text-align:center'}
%h1{style: 'background-color:#F11845;text-align:center;display:inline-block;padding: 5px 20px 10px;'}
%a{href: @confirmation_url, style: 'color:#FFF;text-decoration:none;'}
=_'register.email.registration_confirmed.pay_now',"Pay Registration Fees"
%p=(_'register.email.registration_confirmed.info',"We'll have housing, loaner bikes, and food arranged for your arrival. If you have any other questions or concerns, please email bikebike2014columbus@gmail.com").gsub(/(\w+@\w+\.\w{2,3})/, '<a href="mailto:\1">\1</a>').html_safe
%p=_'register.email.registration_confirmed.contact',"For urgent/emergency matters, you can reach our Outreach Coordinator, Reda, at 503-984-9191 or Jason at 614-364-3636."
app/views/user_mailer/conference_registration_email.html.haml
+7 -7
View File
@@ -1,7 +1,7 @@
%img{src: "#{@conference.poster.full.url}", style: "max-width: 100%;"}
%div{style: 'padding: 25px'}
%h1=_'register.email.registration.please_confirm',"Hi #{@data[:user][:username]}, please confirm your registration for #{@conference.title}", vars: {:username => @data[:user][:username]}
%div{style: 'text-align:center'}
%h1{style: 'background-color:#F11845;text-align:center;display:inline-block;padding: 5px 20px 10px;'}
%a{href: @confirmation_url, style: 'color:#FFF;text-decoration:none;'}
=_'register.email.registration.confirm_button',"Yes I'm Really Coming!"
%img{src: "#{@conference.poster.full.url}", style: "max-width: 100%;"}
%div{style: 'padding: 25px'}
%h1=_'register.email.registration.please_confirm',"Hi #{@data[:user][:username]}, please confirm your registration for #{@conference.title}", vars: {:username => @data[:user][:username]}
%div{style: 'text-align:center'}
%h1{style: 'background-color:#F11845;text-align:center;display:inline-block;padding: 5px 20px 10px;'}
%a{href: @confirmation_url, style: 'color:#FFF;text-decoration:none;'}
=_'register.email.registration.confirm_button',"Yes I'm Really Coming!"
app/views/user_mailer/contact_details.html.haml
+35 -35
View File
@@ -1,46 +1,46 @@
%h1 From
%table.error-report
%tr
%th Key
%th Value
%tr
%td User ID
%td=@from.is_a?(User) ? @from.id : ''
%tr
%td User Name
%td=@from.is_a?(User) ? @from.name : ''
%tr
%td User Email
%td=@from.is_a?(User) ? @from.email : @from
%tr
%td IP Address
%td=@request['remote_ip']
%tr
%td UUID
%td=@request['uuid']
%tr
%td URL
%td=@request['original_url']
%tr
%th Key
%th Value
%tr
%td User ID
%td=@from.is_a?(User) ? @from.id : ''
%tr
%td User Name
%td=@from.is_a?(User) ? @from.name : ''
%tr
%td User Email
%td=@from.is_a?(User) ? @from.email : @from
%tr
%td IP Address
%td=@request['remote_ip']
%tr
%td UUID
%td=@request['uuid']
%tr
%td URL
%td=@request['original_url']
%h1 Message
%blockquote=markdown(@message)
%h1 Params
%table.error-report
%tr
%th Key
%th Value
- @params.each do | key, value |
%tr
%td=key
%td=value
%tr
%th Key
%th Value
- @params.each do | key, value |
%tr
%td=key
%td=value
%h1 Request Environment
%table.error-report
%tr
%th Key
%th Value
- @request['env'].each do | key, value |
%tr
%td=key
%td=value
%tr
%th Key
%th Value
- @request['env'].each do | key, value |
%tr
%td=key
%td=value
app/views/user_mailer/email_confirmation.html.haml
+3 -3
View File
@@ -1,6 +1,6 @@
%p=_'email.confirmation.paragraph.please_confirm','Hello! To gain access to registration and other features of Bike!Bike!, please confirm your email address by clicking on following link:'
- link = "#{@host}/confirm/#{@confirmation.token}"
%p
%h3
%b
%a{href: link}=_'email.confirmation.link.please_confirm'
%h3
%b
%a{href: link}=_'email.confirmation.link.please_confirm'
app/views/user_mailer/error_report.html.haml
+40 -40
View File
@@ -2,52 +2,52 @@
%pre=@report
- if @exception.present?
%h1 Backtrace
%pre=@exception
%h1 Backtrace
%pre=@exception
%h1 Details
%table.error-report
%tr
%th Key
%th Value
%tr
%td User ID
%td=@user.present? ? @user.id : ''
%tr
%td User Name
%td=@user.present? ? @user.name : ''
%tr
%td User Email
%td=@user.present? ? @user.email : ''
%tr
%td IP Address
%td=@request['remote_ip']
%tr
%td UUID
%td=@request['uuid']
%tr
%td URL
%td=@request['original_url']
%tr
%td Time
%td=@time
%tr
%th Key
%th Value
%tr
%td User ID
%td=@user.present? ? @user.id : ''
%tr
%td User Name
%td=@user.present? ? @user.name : ''
%tr
%td User Email
%td=@user.present? ? @user.email : ''
%tr
%td IP Address
%td=@request['remote_ip']
%tr
%td UUID
%td=@request['uuid']
%tr
%td URL
%td=@request['original_url']
%tr
%td Time
%td=@time
%h1 Params
%table.error-report
%tr
%th Key
%th Value
- @params.each do | key, value |
%tr
%td=key
%td=value
%tr
%th Key
%th Value
- @params.each do | key, value |
%tr
%td=key
%td=value
%h1 Request Environment
%table.error-report
%tr
%th Key
%th Value
- @request['env'].each do | key, value |
%tr
%td=key
%td=value
%tr
%th Key
%th Value
- @request['env'].each do | key, value |
%tr
%td=key
%td=value
app/views/user_mailer/registration_confirmation.html.haml
+3 -3
View File
@@ -1,8 +1,8 @@
%p=_'email.general.paragraph.thank_you', "Thank you #{@user.firstname},", :vars => {:name => @user.firstname}
- if @conference.registration_status.to_sym == :pre
%p=_'email.registration.paragraph.pre_registered', :vars => {:conference_title => @conference.title}
%p=_'email.registration.paragraph.pre_registered', :vars => {:conference_title => @conference.title}
- else
%p=_'email.registration.paragraph.confirmed', :vars => {:conference_title => @conference.title}
%p=_'email.registration.paragraph.confirmed', :vars => {:conference_title => @conference.title}
%p=_'email.general.paragraph.see_you', :vars => {:conference_location => @conference.location.city}
%p=_'email.general.paragraph.see_you', :vars => {:conference_location => @conference.location.city}
app/views/user_mailer/registration_confirmation.text.haml
+8
View File
@@ -0,0 +1,8 @@
=_'email.general.paragraph.thank_you', "Thank you #{@user.firstname},", :vars => {:name => @user.firstname}
- if @conference.registration_status.to_sym == :pre
=_'email.general.paragraph.pre_registered', "You have successfully pre-registered for #{@conference.title}. We will let you know when registration is fully open and if there is any important news about the conference that you should know about. We encourage you to create or volunteer to facilitate workshops soon. You can do that, or change your registration details at any time by clicking on the pre-register link again.", :vars => {:conference_title => @conference.title}
- else
=_'email.registration.paragraph.confirmed', :vars => {:conference_title => @conference.title}
=_'email.general.paragraph.see_you', :vars => {:conference_location => @conference.location.city}
app/views/user_mailer/workshop_comment.html.haml
+9 -9
View File
@@ -1,15 +1,15 @@
%p=_('email.workshop_comment.paragraph.user_said', vars: {user_name: @comment.user.name})
%blockquote
=_!@comment.comment
=_!@comment.comment
- if @comment.reply?
- original_comment = @comment.comment_object
%p=_('email.workshop_comment.paragraph.user_said', vars: {user_name: original_comment.user.name})
%blockquote
=_!original_comment.comment
- if @comment.reply?
- original_comment = @comment.comment_object
%p=_('email.workshop_comment.paragraph.user_said', vars: {user_name: original_comment.user.name})
%blockquote
=_!original_comment.comment
%p
=_'email.workshop.paragraph.view_workshop'
- workshop_link = @host + view_workshop_path(@workshop.conference.slug, @workshop.id)
%a{href: workshop_link}=workshop_link
=_'email.workshop.paragraph.view_workshop'
- workshop_link = @host + view_workshop_path(@workshop.conference.slug, @workshop.id)
%a{href: workshop_link}=workshop_link
app/views/user_mailer/workshop_facilitator_request.html.haml
+3 -3
View File
@@ -3,8 +3,8 @@
%blockquote=CGI::escapeHTML(@message || '').gsub(/\n/, '<br>').html_safe
%p
=_'email.workshop.paragraph.request_instructions',"You can approve or deny this request on your workshop page: "
- workshop_link = @host + view_workshop_path(@conference.slug, @workshop.id)
%a{href: workshop_link}=workshop_link
=_'email.workshop.paragraph.request_instructions',"You can approve or deny this request on your workshop page: "
- workshop_link = @host + view_workshop_path(@conference.slug, @workshop.id)
%a{href: workshop_link}=workshop_link
%p=_'email.workshop.paragraph.request_reply_instructions',"You can also reply directly to this email to ask follow-up questions."
app/views/user_mailer/workshop_original_content_changed.html.haml
+9 -9
View File
@@ -1,14 +1,14 @@
%p=_('email.translations.paragraph.workshop_original_content_changed', "#{@translator.name} has modified the original content for #{@workshop.title}. Translations may need to be updated.", vars: {user_name: @translator.firstname, workshop_title: @workshop.title})
- @data.each do |field, values|
%h2=_"forms.labels.generic.#{field.to_s}"
%b=_'email.translations.headings.new_value'
%blockquote=_!values[:new].html_safe
%b=_'email.translations.headings.old_value'
- if values[:old].present?
%blockquote=_!values[:old].html_safe
%h2=_"forms.labels.generic.#{field.to_s}"
%b=_'email.translations.headings.new_value'
%blockquote=_!values[:new].html_safe
%b=_'email.translations.headings.old_value'
- if values[:old].present?
%blockquote=_!values[:old].html_safe
%p
=_'email.workshop.paragraph.view_workshop',"You can view the workshop here: "
- workshop_link = @host + view_workshop_path(@workshop.conference.slug, @workshop.id)
%a{href: workshop_link}=workshop_link
=_'email.workshop.paragraph.view_workshop',"You can view the workshop here: "
- workshop_link = @host + view_workshop_path(@workshop.conference.slug, @workshop.id)
%a{href: workshop_link}=workshop_link
app/views/user_mailer/workshop_translated.html.haml
+9 -9
View File
@@ -1,14 +1,14 @@
%p=_('email.translations.paragraph.workshop_translated', "#{@translator.name} has modified the #{@locale_name} translation for #{@workshop.title}.", vars: {user_name: @translator.firstname, language: @locale_name, workshop_title: @workshop.title})
- @data.each do |field, values|
%h2=_"forms.labels.generic.#{field.to_s}"
%b=_'email.translations.headings.new_value'
%blockquote=_!values[:new].html_safe
%b=_'email.translations.headings.old_value'
- if values[:old].present?
%blockquote=_!values[:old].html_safe
%h2=_"forms.labels.generic.#{field.to_s}"
%b=_'email.translations.headings.new_value'
%blockquote=_!values[:new].html_safe
%b=_'email.translations.headings.old_value'
- if values[:old].present?
%blockquote=_!values[:old].html_safe
%p
=_'email.workshop.paragraph.view_workshop',"You can view the workshop here: "
- workshop_link = @host + view_workshop_path(@workshop.conference.slug, @workshop.id)
%a{href: workshop_link}=workshop_link
=_'email.workshop.paragraph.view_workshop',"You can view the workshop here: "
- workshop_link = @host + view_workshop_path(@workshop.conference.slug, @workshop.id)
%a{href: workshop_link}=workshop_link
app/views/user_mailer/workshop_translated.text.haml
+25
View File
@@ -0,0 +1,25 @@
=_('email.translations.paragraph.workshop_translated', "#{@translator.firstname} has modified the #{@locale_name} translation for #{@workshop.title}.", vars: {user_name: @translator.firstname, language: @locale_name, workshop_title: @workshop.title})
- @data.each do |field, values|
=(_!'** ') + (_"forms.labels.generic.#{field.to_s}")
=(_!' - ') + (_'email.translations.headings.new_value')
=(_!' ------------------------------ ')
=_!values[:new]
=(_!' ------------------------------ ')
=(_!' - ') + (_'email.translations.headings.old_value')
=(_!' ------------------------------ ')
=_!values[:old]
=(_!' ------------------------------ ')
=(_!' - ') + (_'email.translations.headings.diff')
=(_!' ------------------------------ ')
=(_!values[:diff][:text])
=(_!' ------------------------------ ')
=_'email.workshop.paragraph.view_workshop',"You can view the workshop here: "
= view_workshop_path(@workshop.conference.slug, @workshop.id)