github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-23 18:19:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename no_js layout to no_ember

Browse Source 
While *sometimes* `no_js` was used for visitors without js (for example
disabling it on your browser) it was also used for some pages that were
disabled to JS capable browsers, including the 404 page.

Even worse, sometimes it was used on pages that *had* Javascript, such
as our `/activate-account` route. It has been renamed to `no_ember` to
indicate what it really is, a layout for the site that doesn't load our
Ember.js application.
This commit is contained in:
Robin Ward 2015-01-15 15:56:53 -05:00
parent e4e239c159
commit 987504c6ab
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -126,7 +126,7 @@ class ApplicationController < ActionController::Base
# from the above rescue_from blocks will fail because that isn't valid json. # from the above rescue_from blocks will fail because that isn't valid json.
render status: error, layout: false, text: (error == 404) ? build_not_found_page(error) : message render status: error, layout: false, text: (error == 404) ? build_not_found_page(error) : message
else else
render text: build_not_found_page(error, include_ember ? 'application' : 'no_js') render text: build_not_found_page(error, include_ember ? 'application' : 'no_ember')
end end
end end

2
app/controllers/email_controller.rb
View File

@ -1,6 +1,6 @@
class EmailController < ApplicationController class EmailController < ApplicationController
skip_before_filter :check_xhr skip_before_filter :check_xhr
layout 'no_js' layout 'no_ember'
before_filter :ensure_logged_in, only: :preferences_redirect before_filter :ensure_logged_in, only: :preferences_redirect
skip_before_filter :redirect_to_login_if_required skip_before_filter :redirect_to_login_if_required

2
app/controllers/invites_controller.rb
View File

@ -163,7 +163,7 @@ class InvitesController < ApplicationController
def ensure_new_registrations_allowed def ensure_new_registrations_allowed
unless SiteSetting.allow_new_registrations unless SiteSetting.allow_new_registrations
flash[:error] = I18n.t('login.new_registrations_disabled') flash[:error] = I18n.t('login.new_registrations_disabled')
render layout: 'no_js' render layout: 'no_ember'
false false
end end
end end

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

@ -48,7 +48,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_js' render layout: 'no_ember'
end end

10
app/controllers/users_controller.rb
View File

@ -312,7 +312,7 @@ class UsersController < ApplicationController
end end
end end
end end
render layout: 'no_js' render layout: 'no_ember'
end end
def logon_after_password_reset def logon_after_password_reset
@ -363,18 +363,18 @@ class UsersController < ApplicationController
else else
flash[:error] = I18n.t('change_email.error') flash[:error] = I18n.t('change_email.error')
end end
render layout: 'no_js' render layout: 'no_ember'
end end
def account_created def account_created
@message = session['user_created_message'] @message = session['user_created_message']
expires_now expires_now
render layout: 'no_js' render layout: 'no_ember'
end end
def activate_account def activate_account
expires_now expires_now
render layout: 'no_js' render layout: 'no_ember'
end end
def perform_account_activation def perform_account_activation
@ -392,7 +392,7 @@ class UsersController < ApplicationController
else else
flash[:error] = I18n.t('activation.already_done') flash[:error] = I18n.t('activation.already_done')
end end
render layout: 'no_js' render layout: 'no_ember'
end end
def send_activation_email def send_activation_email

2
app/views/layouts/no_js.html.erb → app/views/layouts/no_ember.html.erb
View File

@ -12,7 +12,7 @@
<%- unless customization_disabled? %> <%- unless customization_disabled? %>
<%= raw SiteCustomization.custom_head_tag(session[:preview_style]) %> <%= raw SiteCustomization.custom_head_tag(session[:preview_style]) %>
<%- end %> <%- end %>
<%= yield(:no_js_head) %> <%= yield(:no_ember_head) %>
</head> </head>
<body> <body>
<%- unless customization_disabled? %> <%- unless customization_disabled? %>

2
app/views/users/activate_account.html.erb
View File

@ -9,7 +9,7 @@
<% end %> <% end %>
</div> </div>
<%- content_for(:no_js_head) do %> <%- content_for(:no_ember_head) do %>
<%= script "vendor" %> <%= script "vendor" %>
<%- end %> <%- end %>