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

Fix for focus and error reporting

Browse Source
This commit is contained in:
Godwin 2016-06-13 23:03:29 -07:00
parent a099059f2e
commit 6781b41e04
3 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2340,14 +2340,9 @@ html[data-lingua-franca-example="html"] {
.select-field select:focus, .select-field select:focus,
.workshop-link:focus .title, .workshop-link:focus .title,
#main-nav .nav a:focus .title { #main-nav .nav a:focus .title {
html & {
outline: 0.25rem solid rgba($colour-2, 0);
outline-offset: 0.2rem;
@include _(transition, outline 150ms ease-in-out);
}
html[data-input="kb"] & { html[data-input="kb"] & {
outline: 0.25rem solid rgba($colour-2, 0.5); outline: 0.25rem solid rgba($colour-2, 0.5);
outline-offset: 0.2rem;
z-index: 1; z-index: 1;
} }
} }

8
app/controllers/application_controller.rb
View File

@ -160,9 +160,15 @@ class ApplicationController < LinguaFrancaApplicationController
current_user, current_user,
).deliver_now if Rails.env.preview? || Rails.env.production? ).deliver_now if Rails.env.preview? || Rails.env.production?
# log the error
logger.info exception.to_s
logger.info exception.backtrace.join("\n")
# show the error page # show the error page
error_500 exception error_500 exception
raise exception
# raise the error if we are in development so that we can debug it
raise exception if Rails.env.development?
end end
def generate_confirmation(user, url, expiry = nil) def generate_confirmation(user, url, expiry = nil)

45
app/views/shared/_navbar.html.haml
View File

@ -1,23 +1,26 @@
%nav %nav
#main-nav #main-nav
= row(class: 'inner-nav') do - begin
- if logged_in? = row(class: 'inner-nav') do
= columns(medium: 12, class: 'user-nav') do - if logged_in?
.user-nav-bar = columns(medium: 12, class: 'user-nav') do
=link_to (_!current_user.name), register_step_path(@conference.slug, :contact_info), class: 'my-account' .user-nav-bar
=link_to (_'forms.actions.generic.Log_out'), logout_path =link_to (_!current_user.name), register_step_path(@conference.slug, :contact_info), class: 'my-account'
= columns(medium: 4, class: 'inner-nav') do =link_to (_'forms.actions.generic.Log_out'), logout_path
= link_to home_path, :class => 'logo' do = columns(medium: 4, class: 'inner-nav') do
= svg_sprite('icons', "bb-icon-logo", "Logo") = link_to home_path, :class => 'logo' do
= svg_sprite('icons', "bb-icon-logo-text", "Logo Text") = svg_sprite('icons', "bb-icon-logo", "Logo")
= off_screen _!'Bike Bike' = svg_sprite('icons', "bb-icon-logo-text", "Logo Text")
= columns(medium: 8, class: 'nav') do = off_screen _!'Bike Bike'
= nav_link :about = columns(medium: 8, class: 'nav') do
= nav_link :policy = nav_link :about
- case (@conference ? @conference.registration_status.to_sym : :closed) = nav_link :policy
- when :pre - case (@conference && @conference.registration_status ? @conference.registration_status.to_sym : :closed)
= nav_link register_path(@conference.slug), :pre_register, :register - when :pre
- when :open = nav_link register_path(@conference.slug), :pre_register, :register
= nav_link register_path(@conference.slug), :register - when :open
- else = nav_link register_path(@conference.slug), :register
= render 'shared/donate_button', :email_address => (@conference.paypal_email_address || @conference.email_address || @conference.organizations.first.email_address) - else
= render 'shared/donate_button', :email_address => (@conference.paypal_email_address || @conference.email_address || (@conference.organizations.present? && @conference.organizations.first.present? ? @conference.organizations.first.email_address : nil))
- rescue