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

Added an error message when no email address is used on login

Browse Source
This commit is contained in:
Godwin 2017-08-02 21:12:45 -07:00
parent 1cad5e99c8
commit 3da881bde4
6 changed files with 14 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/assets/stylesheets/_admin.scss
View File

@ -128,28 +128,6 @@ table, .table {
margin: 0;
width: 100%;
}
// tr:first-child {
// td, th {
// border-top: 0;
// }
// }
// tr:last-child {
// td, th {
// border-bottom: 0;
// }
// }
// td, th {
// &:first-child {
// border-left: 0
// }
// &:last-child {
// border-right: 0
// }
// }
}
&.bold {
@ -458,6 +436,7 @@ nav.sub-menu {
@include _(border-radius, 0.15em);
@include default-box-shadow(top, 2);
@include _(text-shadow, 0 0.05em 0.05em #FFF);
@include not-link-like;
&:hover, &:active, &:focus {
background-color: #D8D8D8;
@ -468,10 +447,6 @@ nav.sub-menu {
color: #666;
padding: 0.333em 0.75em 0.25em;
}
@include after {
display: none;
}
}
@include breakpoint(medium) {
@ -711,10 +686,7 @@ nav.sub-menu {
border: 0.1rem solid $light-gray;
border-top: 0;
border-right: 0;
@include after {
display: none;
}
@include not-link-like;
&:hover {
background-color: $light-gray;
@ -1566,6 +1538,7 @@ nav.sub-menu {
margin: 0.5em 0;
@include default-box-shadow(top, 2);
@include _(transition, transform 150ms ease-in-out);
@include not-link-like;
&:hover, &:focus, &:active {
z-index: $zindex-base + 2;
@ -1583,10 +1556,6 @@ nav.sub-menu {
cursor: pointer;
@include _(box-shadow, inset 0em -2em 2em -1em $white);
}
@include after {
display: none;
}
}
}
@ -1797,10 +1766,7 @@ html[data-ontop] {
a {
color: inherit;
@include after {
display: none;
}
@include not-link-like;
}
.name {

2
app/assets/stylesheets/user-mailer.scss
View File

@ -186,7 +186,7 @@ table#ecxbb_full_width {
code {
color: firebrick;
white-space: pre;
white-space: nowrap;
margin: 0 0 2em;
display: block;
max-width: $max-table-width;

2
app/mailers/user_mailer.rb
View File

@ -145,7 +145,7 @@ class UserMailer < ActionMailer::Base
@user = User.find(@request.data['user'].to_i) if @request.data['user'].present?
mail to: administrators, subject: clean_subject(subject)
mail to: administrators, subject: clean_subject(subject), reply_to: @user.present? ? @user.named_email : nil
end
def contact(from, subject, message, email_list)

11
app/views/application/_login.html.haml
View File

@ -1,6 +1,9 @@
- dest ||= nil
- if flash[:error].present?
#action-message.error
.message=_"articles.conference_registration.error.#{flash[:error]}"
= form_tag do_confirm_path, class: 'flex-form' do
= hidden_field_tag :dest, settings_path if dest.present?
= emailfield :email, nil, big: true
= button :continue, value: :confirm_email
= link_to (_'forms.actions.generic.facebook_sign_in','Facebook Sign In'), auth_at_provider_path(provider: :facebook, dest: dest), class: [:button, :facebook]
= hidden_field_tag :dest, settings_path if dest.present?
= emailfield :email, nil, big: true, required: true
= button :continue, value: :confirm_email
= link_to (_'forms.actions.generic.facebook_sign_in','Facebook Sign In'), auth_at_provider_path(provider: :facebook, dest: dest), class: [:button, :facebook]

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

@ -22,4 +22,4 @@
= button :save, value: :save
- else
%h2=_'forms.actions.generic.login'
= render 'login'
= render 'login'

3
config/environments/preview.rb
View File

@ -64,10 +64,7 @@ BikeBike::Application.configure do
# config.action_controller.asset_host = "http://assets.example.com"
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
# config.assets.precompile += %w( search.js )
config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif *.json *.ttf *.otf *.woff *.woff2 *.svg *.json)
#config.action_controller.asset_host = "https://preview-cdn.bikebike.org"
# Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors.