IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Use no_ember styling for omniauth error page

Browse Source
This commit is contained in:
Robin Ward 2017-11-15 14:04:26 -05:00
parent 9e03b5c69a
commit cef64e8f03
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/users/omniauth_callbacks_controller.rb
View File

@ -16,7 +16,7 @@ class Users::OmniauthCallbacksController < ApplicationController
skip_before_action :redirect_to_login_if_required skip_before_action :redirect_to_login_if_required
layout false layout 'no_ember'
def self.types def self.types
@types ||= Enum.new(:facebook, :instagram, :twitter, :google, :yahoo, :github, :persona, :cas) @types ||= Enum.new(:facebook, :instagram, :twitter, :google, :yahoo, :github, :persona, :cas)
@ -80,7 +80,7 @@ class Users::OmniauthCallbacksController < ApplicationController
def failure def failure
flash[:error] = I18n.t("login.omniauth_error") flash[:error] = I18n.t("login.omniauth_error")
render layout: 'no_ember' render 'failure'
end end
def self.find_authenticator(name) def self.find_authenticator(name)

29
app/views/users/omniauth_callbacks/failure.html.erb
View File

@ -1,20 +1,11 @@
<html> <div id="simple-container">
<head> <%if flash[:error].present? %>
<%= render partial: "layouts/head" %> <div class='alert alert-error'>
<%= render partial: "common/special_font_face" %> <%=flash[:error]%>
<%= render partial: "common/discourse_stylesheet" %>
</head>
<body>
<div id="simple-container">
<%if flash[:error].present? %>
<div class='alert alert-error'>
<%=flash[:error]%>
</div>
<%else%>
<div class='alert alert-error'>
<%= t 'login.omniauth_error_unknown' %>
</div>
<%end%>
</div> </div>
</body> <%else%>
</html> <div class='alert alert-error'>
<%= t 'login.omniauth_error_unknown' %>
</div>
<%end%>
</div>