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

Multiple fixes for prod

Browse Source
This commit is contained in:
Godwin
2017-07-01 16:02:38 -07:00
parent c5143ddb0e
commit c28566e210
13 changed files with 137 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/stylesheets/_application.scss
+27 -6
View File
@@ -530,10 +530,6 @@ button,
#main &[type="submit"] {
background-color: $colour-5;
&[value="send"] {
background-color: $colour-4;
}
}
&.register {
@@ -553,6 +549,11 @@ button,
background-color: $red;
}
&.warning,
#main &.warning {
background-color: $orange;
}
&.subdued, #main &.subdued {
background-color: #888;
}
@@ -647,7 +648,7 @@ button,
display: flex;
text-align: right;
justify-content: center;
flex-wrap: wrap;
@include _(flex-wrap, wrap);
button, .button {
margin: 0.333em;
@@ -2418,8 +2419,9 @@ a.logo {
margin: 0;
.title {
@include _(flex, 1);
font-size: 5vw;
margin: 1em auto 0;
margin: 0;
h1, h2 {
margin: 0;
@@ -2439,6 +2441,19 @@ a.logo {
max-width: 100%;
margin-top: 2em;
}
figure {
margin: 0;
}
.register-link {
font-size: 1.25em;
margin: 0.5em;
.button {
@include _(animation, radiate 2s linear infinite alternate);
}
}
}
.conference-details {
@@ -2941,6 +2956,10 @@ body {
to { background-position: 60px 30px; }
}
@include keyframes(radiate) {
to { background-color: $green; }
}
html :focus {
outline: 0;
}
@@ -3608,6 +3627,8 @@ body.policy .policy-agreement ul {
}
.conference-banner {
@include _-(display, flex);
@include _(flex-wrap, wrap);
margin: 0 auto;
width: 100%;
app/controllers/application_controller.rb
+22 -19
View File
@@ -96,26 +96,29 @@ class ApplicationController < BaseController
logger.info "A JavaScript error has occurred on #{params[:location]}:#{params[:lineNumber]}: #{params[:message]}"
if Rails.env.preview? || Rails.env.production?
request_info = {
'remote_ip' => request.remote_ip,
'uuid' => request.uuid,
'original_url' => request.original_url,
'env' => Hash.new
}
request.env.each do |key, value|
request_info['env'][key.to_s] = value.to_s
end
# don't worry about bots
unless request.user_agent =~ /Googlebot/
request_info = {
'remote_ip' => request.remote_ip,
'uuid' => request.uuid,
'original_url' => request.original_url,
'env' => Hash.new
}
request.env.each do |key, value|
request_info['env'][key.to_s] = value.to_s
end
send_mail(:error_report,
"A JavaScript error has occurred",
report,
params[:message],
nil,
request_info,
params,
current_user,
Time.now.strftime("%d/%m/%Y %H:%M")
)
send_mail(:error_report,
"A JavaScript error has occurred",
report,
params[:message],
nil,
request_info,
params,
current_user,
Time.now.strftime("%d/%m/%Y %H:%M")
)
end
end
rescue Exception => exception2
logger.info exception2.to_s
app/controllers/conference_administration_controller.rb
+3 -3
View File
@@ -1095,7 +1095,7 @@ class ConferenceAdministrationController < ApplicationController
do_404
end
return true
return nil
end
def admin_update_housing
@@ -1155,7 +1155,7 @@ class ConferenceAdministrationController < ApplicationController
)
end
redirect_to administration_step_path(@this_conference.slug, :broadcast_sent)
return true
return nil
elsif params[:button] == 'preview'
@send_to_count = view_context.broadcast_to(@send_to).size
@broadcast_step = :preview
@@ -1170,7 +1170,7 @@ class ConferenceAdministrationController < ApplicationController
)
@send_to_count = view_context.broadcast_to(@send_to).size
end
return false
return true
end
def admin_update_locations
app/helpers/admin_helper.rb
+2 -1
View File
@@ -50,7 +50,8 @@ module AdminHelper
def administration_sub_steps
{
location_edit: :locations,
event_edit: :events
event_edit: :events,
broadcast_sent: :broadcast
}
end
app/views/application/user_settings.html.haml
+2 -2
View File
@@ -1,4 +1,4 @@
= render :partial => 'application/header', :locals => {:image_file => @banner_image || 'grafitti.jpg'}
= render partial: 'application/header', locals: {image_file: @banner_image || 'grafitti.jpg'}
%article
= row do
= columns do
@@ -18,7 +18,7 @@
= checkboxes :languages, User.AVAILABLE_LANGUAGES, (current_user.languages || [I18n.locale]).map(&:to_sym), '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
.actions.center
= button :save, value: :save
- else
%h2=_'forms.actions.generic.login'
app/views/conference_administration/_administrators.html.haml
+15 -15
View File
@@ -1,4 +1,19 @@
= columns(large: 8, push: { large: 2}) do
%h3=_'articles.admin.info.headings.External_Administrators'
%p=_'articles.admin.info.descriptions.External_Administrators'
- if @this_conference.administrators.present?
.details.org-members
- @this_conference.administrators.each do | user |
= raw_data_set(:h5, user.name) do
= user.email
- unless user.id == current_user.id && !current_user.administrator?
= admin_update_form class: [:inline, :right] do
= hidden_field_tag :user_id, user.id
= button :remove_member, value: :remove_administrator, class: [:small, :delete]
= admin_update_form class: 'mini-flex-form' do
= userfield :email, nil, required: true
= button :add_member, value: :add_administrator, class: :small
%h3=_'articles.admin.info.headings.Host_Organizations'
%p=_'articles.admin.info.descriptions.Host_Organizations', vars: { city_name: @this_conference.city.city }
= admin_update_form do
@@ -22,20 +37,5 @@
= emailfield :email, nil, required: true
= button :add_member, value: :add_org_member, class: :small
%h3=_'articles.admin.info.headings.External_Administrators'
%p=_'articles.admin.info.descriptions.External_Administrators'
- if @this_conference.administrators.present?
.details.org-members
- @this_conference.administrators.each do | user |
= raw_data_set(:h5, user.name) do
= user.email
- unless user.id == current_user.id && !current_user.administrator?
= admin_update_form class: [:inline, :right] do
= hidden_field_tag :user_id, user.id
= button :remove_member, value: :remove_administrator, class: [:small, :delete]
= admin_update_form class: 'mini-flex-form' do
= userfield :email, nil, required: true
-#= emailfield :email, nil, required: true
= button :add_member, value: :add_administrator, class: :small
= columns(large: 2) do
&nbsp;
app/views/conference_administration/_broadcast.html.haml
+16 -13
View File
@@ -1,23 +1,26 @@
= columns(medium: 12) do
= admin_update_form do
- if @broadcast_step == :preview || @broadcast_step == :test
= hidden_field_tag :subject, @subject
= hidden_field_tag :body, @body
= hidden_field_tag :send_to, @send_to
= admin_update_form do
- if @broadcast_step == :preview || @broadcast_step == :test
= hidden_field_tag :subject, @subject
= hidden_field_tag :body, @body
= hidden_field_tag :send_to, @send_to
= columns(medium: 12) do
- if @broadcast_step == :preview
%p= _'articles.conference_registration.paragraphs.admin.broadcast.test', vars: { send_to_count: "<strong>#{(@send_to_count || 0)}</strong>".html_safe }
%p= (_'articles.conference_registration.paragraphs.admin.broadcast.test', vars: { send_to_count: "<strong>#{(@send_to_count || 0)}</strong>".html_safe }).html_safe
- else
.warning-info.make-room= _'articles.conference_registration.paragraphs.admin.broadcast.preview', vars: { send_to_count: "<strong>#{(@send_to_count || 0)}</strong>".html_safe }
.warning-info.make-room=(_'articles.conference_registration.paragraphs.admin.broadcast.preview', vars: { send_to_count: "<strong>#{(@send_to_count || 0)}</strong>".html_safe }).html_safe
= columns(medium: 10, push: { medium: 1 }) do
.test-preview
%h3=@subject
= richtext @body, 4
.actions.right
= button :test, value: :test, class: :secondary if @broadcast_step == :preview
= button_with_confirmation :send, (_'modals.admin.broadcast.confirm', vars: { number: "<strong>#{(@send_to_count || 0)}</strong>".html_safe }), value: :send, class: :delete if @broadcast_step == :test
= columns(medium: 12) do
.actions.center
= button :test, value: :test, class: :warning if @broadcast_step == :preview
= button_with_confirmation :send, (_'modals.admin.broadcast.confirm', vars: { number: "<strong>#{(@send_to_count || 0)}</strong>".html_safe }).html_safe, value: :send, class: :delete if @broadcast_step == :test
= button :edit, value: :edit
- else
- else
= columns(medium: 12) do
= selectfield :send_to, nil, broadcast_options, full: true
= textfield :subject, @subject, required: true, big: true
= textarea :body, @body, lang: @this_conference.locale, edit_on: :focus
.actions.right
.actions.center
= button :preview, value: :preview
app/views/conference_administration/_publish_schedule.html.haml
+2 -2
View File
@@ -2,7 +2,7 @@
= form_tag administration_update_path(@this_conference.slug, @admin_step) do
- if @this_conference.workshop_schedule_published
%p=_'articles.conference_registration.paragraphs.admin.schedule.published', :p
.actions= button :un_publish, value: :publish, class: :delete
.actions.center= button :un_publish, value: :publish, class: :delete
- else
%p=_'articles.conference_registration.paragraphs.admin.schedule.un_published', :p
.actions= button :publish, value: :publish
.actions.center= button :publish, value: :publish
app/views/conferences/_conference.html.haml
+14 -7
View File
@@ -1,5 +1,6 @@
- links ||= [ :register ]
- sections ||= [ :info ]
- is_registered = conference.registered?(current_user)
= row(tag: :header) do
= columns(class: 'conference-banner') do
.title
@@ -9,8 +10,11 @@
- if conference.start_date.present? && conference.end_date.present?
.secondary
= date_span(conference.start_date.to_date, conference.end_date.to_date)
.register-link
= (link_to (_'forms.actions.generic.register'), register_path(conference.slug), class: [:button, :register]) if links.include?(:register) && conference.can_register?
- if conference.poster.present?
%img{src: conference.poster.full.url, role: :presentation, alt: (_'images.conference.poster', vars: { conference_title: conference.title })}
%figure
%img{src: conference.poster.full.url, role: :presentation, alt: (_'images.conference.poster', vars: { conference_title: conference.title })}
%article
= row(class: 'conference-details') do
= columns(medium: 10, push: {medium: 1}) do
@@ -19,8 +23,14 @@
- conference.extended_details.each do |section|
- if sections.include?(section) && conference.copy_data[section][:show]
%h3=(_ conference.copy_data[section][:heading], vars: conference.copy_data[section][:vars]) unless conference.copy_data[section][:heading] == false
= richtext conference.copy_data[section][:value]
= richtext conference.copy_data[section][:value], (conference.copy_data[section][:heading] == false ? 2 : 3)
.links
= (link_to (_(is_registered ? 'actions.conference.edit_registration' : 'forms.actions.generic.register')), register_path(conference.slug), class: [:button, :register]) if links.include?(:register) && conference.can_register?
= (link_to (_'articles.workshops.info.read_more'), conference_path(conference.slug), class: :button) if links.include?(:read_more)
= (link_to (_'forms.actions.generic.administrate'), administrate_conference_path(conference.slug), class: [:button]) if links.include?(:administrate)
= (link_to (_'forms.actions.generic.edit'), edit_conference_path(conference.slug), class: [:button, :subdued]) if links.include?(:edit)
- if conference.registration_status == :open && sections.include?(:workshops)
- if conference.workshop_schedule_published
- add_inline_script :home_schedule
@@ -30,9 +40,6 @@
%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 })
.links
= (link_to (_'forms.actions.generic.register'), register_path(conference.slug), class: [:button, :register]) if links.include?(:register) && conference.can_register?
= (link_to (_'articles.workshops.info.read_more'), conference_path(conference.slug), class: :button) if links.include?(:read_more)
= (link_to (_'forms.actions.generic.administrate'), administrate_conference_path(conference.slug), class: [:button]) if links.include?(:administrate)
= (link_to (_'forms.actions.generic.edit'), edit_conference_path(conference.slug), class: [:button, :subdued]) if links.include?(:edit)
.actions.center
= link_to (_'actions.workshops.create'), create_workshop_path(conference.slug), class: [:button, :modify]
app/views/conferences/view.html.haml
+1 -1
View File
@@ -2,4 +2,4 @@
= @this_conference.poster.full.url || image_path('default_poster.jpg')
- content_for :title do
=@this_conference.title
= render 'conferences/conference', conference: @this_conference, links: @links, sections: [:info] + @this_conference.extended_details + [:workshops]
= render 'conferences/conference', conference: @this_conference, links: @links, sections: [:info] + @this_conference.extended_details