diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2d6e84762..72963c15c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -37,6 +37,13 @@ module ApplicationHelper
# super
# end
+ # 隐藏项目以外的信息
+ # return: true 显示,false 不显示
+ def hidden_unproject_infos
+ hidden_info = Setting.find_by_name("hidden_non_project")
+ (hidden_info && hidden_info.value == "1") ? true : false
+ end
+
# 通过系统外部邮箱查找用户,如果用户不存在则用邮箱替换
def get_user_by_mail mail
user = User.find_by_mail(mail)
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index a639e1203..e549473e7 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -4,7 +4,9 @@
<%= l(:label_about_us)%>|
服务协议|
<%= l(:label_recruitment_information)%>|
- <%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|
+ <% if hidden_unproject_infos %>
+ <%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|
+ <% end %>
<%= l(:label_forums)%>
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 753022d75..1f35c4728 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -10,12 +10,14 @@
-
-
+
+
+ <% end %>
+<% if hidden_unproject_infos %>
+ <%= render :partial => 'layouts/new_feedback' %>
+<% end %>
-123
-<%= render :partial => 'layouts/new_feedback' %>
<%= l(:label_loading) %>
diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index c1f6a5644..976de8235 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -298,6 +298,7 @@
+
<%= render :partial => 'layouts/new_feedback' %>
diff --git a/app/views/layouts/new_base.html.erb b/app/views/layouts/new_base.html.erb
index e9703a943..d28171f5f 100644
--- a/app/views/layouts/new_base.html.erb
+++ b/app/views/layouts/new_base.html.erb
@@ -59,7 +59,9 @@
<%= render :partial => 'layouts/footer' %>
-<%= render :partial => 'layouts/new_feedback' %>
+<% if hidden_unproject_infos %>
+ <%= render :partial => 'layouts/new_feedback' %>
+<% end %>
<%= l(:label_loading) %>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index d1084c794..20754b0ff 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -157,9 +157,7 @@
- <% hidden_courses = Setting.find_by_name("hidden_courses") %>
- <% unvisiable = hidden_courses && hidden_courses.value == "1"%>
- <% if !unvisiable %>
+ <% if hidden_unproject_infos %>
-
<%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user.id}, :id => "user_course_list" %>
@@ -220,7 +218,9 @@
<%= yield %>
- <%= render :partial => 'layouts/new_feedback' %>
+ <% if hidden_unproject_infos %>
+ <%= render :partial => 'layouts/new_feedback' %>
+ <% end %>
<%= render :partial => 'layouts/footer' %>
diff --git a/app/views/users/_selector_for_messages.html.erb b/app/views/users/_selector_for_messages.html.erb
index 3727e4a1d..14609f4fc 100644
--- a/app/views/users/_selector_for_messages.html.erb
+++ b/app/views/users/_selector_for_messages.html.erb
@@ -3,6 +3,7 @@
-
+ <% if hidden_unproject_infos %>
-
- 课程消息
@@ -12,7 +13,7 @@
- <%= link_to "班级问卷", user_message_path(User.current, :type => 'poll'), :class => "homepagePostTypeQuiz postTypeGrey" %>
-
+ <% end %>
-
- 项目消息
diff --git a/app/views/users/_user_resource_type_filter.html.erb b/app/views/users/_user_resource_type_filter.html.erb
index 633e52472..2322c87cb 100644
--- a/app/views/users/_user_resource_type_filter.html.erb
+++ b/app/views/users/_user_resource_type_filter.html.erb
@@ -4,10 +4,12 @@
-
全部
- -
- 班级资源
- <%#= link_to '课程资源' ,user_resource_user_path(:id => @user.id, :type => 2), id="resource_type_course", :remote => true, :method => 'get', :class=> 'homepagePostTypeAssignment postTypeGrey' %>
-
+ <% if hidden_unproject_infos %>
+ -
+ 班级资源
+ <%#= link_to '课程资源' ,user_resource_user_path(:id => @user.id, :type => 2), id="resource_type_course", :remote => true, :method => 'get', :class=> 'homepagePostTypeAssignment postTypeGrey' %>
+
+ <% end %>
-
项目资源
<%#= link_to '项目资源' ,user_resource_user_path(:id => @user.id, :type => 3), id="resource_type_project", :remote => true, :method => 'get', :class => 'homepagePostTypeQuiz postTypeGrey' %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 9acffce3d..e26113673 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -7,9 +7,7 @@
-
- <% hidden_courses = Setting.find_by_name("hidden_courses") %>
- <% unvisiable = hidden_courses && hidden_courses.value == "1"%>
- <% if !unvisiable %>
+ <% if hidden_unproject_infos %>
- 课程动态
- <%= link_to "作业动态", {:controller => "users", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 2baa9f2f2..578e97b9a 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -21,7 +21,9 @@
<%= render :partial => 'users/user_at_message', :locals => {:ma => ma} %>
<%# 课程消息 %>
- <%= render :partial => 'users/user_message_course', :locals => {:ma => ma} %>
+ <% if hidden_unproject_infos %>
+ <%= render :partial => 'users/user_message_course', :locals => {:ma => ma} %>
+ <% end %>
<%= render :partial => 'users/user_message_forge', :locals => {:ma => ma} %>