diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index f6b083b4d..2935d018a 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -68,8 +68,14 @@ module UsersHelper '课程讨论' when 'course_news' '课程通知' + when 'poll' + '课程问卷' when 'issue' '项目任务' + when 'forge_message' + '项目讨论' + when 'forge_news' + '项目新闻' when 'forum' '贴吧帖子' when 'user_feedback' diff --git a/app/views/users/_selector_for_messages.html.erb b/app/views/users/_selector_for_messages.html.erb new file mode 100644 index 000000000..b0f867e18 --- /dev/null +++ b/app/views/users/_selector_for_messages.html.erb @@ -0,0 +1,34 @@ +
+
<%= title_for_message(params[:type]) %>
+ +
\ No newline at end of file diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 6f583f76d..f83e5617c 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -1,37 +1,4 @@ -
-
<%= title_for_message(params[:type]) %>
- -
+<%= render :partial => 'users/selector_for_messages'%>
<% if (!@message_alls.nil? && @message_alls.count >0) %> diff --git a/app/views/users/user_system_messages.html.erb b/app/views/users/user_system_messages.html.erb index 899cd7a8f..64b0dff0c 100644 --- a/app/views/users/user_system_messages.html.erb +++ b/app/views/users/user_system_messages.html.erb @@ -1,35 +1,4 @@ -
-
系统消息
-
    -
  • -
      -
    • <%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %>
    • -
    • <%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %>
    • -
    • <%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %>
    • - <%# 课程相关消息 %> -
    • <%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %>
    • -
    • <%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey" %>
    • -
    • <%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey" %>
    • - - - - - <%# 项目相关消息 %> -
    • <%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey" %>
    • - - - - - <%# 项目相关消息 %> -
    • <%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey" %>
    • - <%# 系统贴吧 %> -
    • <%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey" %>
    • - <%# 系统消息 %> -
    • <%= link_to "系统消息", user_system_messages_path(User.current), :class => "resourcesGrey" %>
    • -
    -
  • -
-
+<%= render :partial => 'users/selector_for_messages'%> <% @sytem_messages.each do |system_message| %>