diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index 5de5d67c1..f1a90e837 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -1,5 +1,5 @@ -
<%= link_to '首页', home_path %> @@ -7,8 +7,8 @@ <%= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168" %>
登录
@@ -36,7 +36,7 @@ 立即注册 - <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %> + <%= form_tag(signin_path, :id => 'main_login_form', :method => 'post') do %> <%= back_url_hidden_field_tag %><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe %>
-<%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe %>
+<% if Setting.autologin? %> diff --git a/app/views/account/user_join.html.erb b/app/views/account/user_join.html.erb index d62310d51..3c72114bc 100644 --- a/app/views/account/user_join.html.erb +++ b/app/views/account/user_join.html.erb @@ -1,5 +1,5 @@ -
<%= link_to '首页', home_path %> @@ -7,8 +7,8 @@ <%= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168" %>
已有账号?直接登录
- <%= form_for :user, :url => register_path,:method=>'post', :html => {:id=>'main_reg_form'} do |f| %> + <%= form_for :user, :url => register_path, :method => 'post', :html => { :id => 'main_reg_form' } do |f| %> <%= error_messages_for 'user' %> diff --git a/app/views/layouts/login_bigdata.html.erb b/app/views/layouts/login_bigdata.html.erb index 3da89e41b..065644268 100644 --- a/app/views/layouts/login_bigdata.html.erb +++ b/app/views/layouts/login_bigdata.html.erb @@ -21,9 +21,7 @@