mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-01-31 12:09:17 +08:00
remove already_authenticated alert flash
This commit is contained in:
parent
51abd8907c
commit
beae54e278
3 changed files with 4 additions and 3 deletions
|
@ -56,7 +56,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<% if alert or flash[:error]%>
|
||||
<% if alert and !alert.empty? or flash[:error]%>
|
||||
<div class="alert alert-danger alert-dismissable alert-floating">
|
||||
<div class="container">
|
||||
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
|
|
|
@ -169,7 +169,7 @@ Devise.setup do |config|
|
|||
# initial account confirmation) to be applied. Requires additional unconfirmed_email
|
||||
# db field (see migrations). Until confirmed, new email is stored in
|
||||
# unconfirmed_email column, and copied to email column on successful confirmation.
|
||||
config.reconfirmable = true
|
||||
config.reconfirmable = Rails.configuration.x.enable_email_confirmations
|
||||
|
||||
# Defines which key will be used when confirming an account
|
||||
# config.confirmation_keys = [:email]
|
||||
|
|
|
@ -7,7 +7,8 @@ en:
|
|||
send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
|
||||
send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
|
||||
failure:
|
||||
already_authenticated: "You are already logged in."
|
||||
# already_authenticated: "You are already logged in."
|
||||
already_authenticated: ""
|
||||
inactive: "Your account is not activated yet."
|
||||
invalid: "Invalid %{authentication_keys} or password."
|
||||
locked: "Your account is locked."
|
||||
|
|
Loading…
Reference in a new issue