From e6763c6d0cff36ba9f9ffe24581189cfb14de72d Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 7 Dec 2016 09:00:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B6=88=E6=81=AF=E9=93=83?= =?UTF-8?q?=E9=93=9B=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 1 + app/helpers/users_helper.rb | 22 ++--- app/views/layouts/new_base_user.html.erb | 12 +-- .../users/_applied_project_content.html.erb | 6 +- .../_apply_homework_course_message.html.erb | 2 +- .../_apply_resource_course_message.html.erb | 2 +- ...ply_resource_course_message_reply.html.erb | 2 +- app/views/users/_new_user_message.html.erb | 27 ++++++ app/views/users/_user_at_message.html.erb | 2 +- .../_user_message_applide_action.html.erb | 14 +-- .../users/_user_message_applied.html.erb | 2 +- .../_user_message_applied_schools.html.erb | 2 +- app/views/users/_user_message_course.html.erb | 91 +++++++++--------- app/views/users/_user_message_forge.html.erb | 33 +++---- app/views/users/_user_message_org.html.erb | 15 +-- app/views/users/_user_message_system.html.erb | 6 +- .../_user_message_userfeedaback.html.erb | 4 +- app/views/users/user_messages.html.erb | 27 +----- public/images/user/home-user-left.png | Bin 0 -> 111449 bytes public/stylesheets/css/structure.css | 14 +-- public/stylesheets/css/user.css | 2 +- 21 files changed, 147 insertions(+), 139 deletions(-) create mode 100644 app/views/users/_new_user_message.html.erb create mode 100644 public/images/user/home-user-left.png diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 1ffc4f0d7..1da7355f4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -433,6 +433,7 @@ class UsersController < ApplicationController render_404 return end + @message_alls = paginateHelper @message_alls, 25 respond_to do |format| format.html{render :layout=>'new_base_user'} diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index e5dcfc2df..b0570bb24 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -56,12 +56,8 @@ module UsersHelper # 用户项目总数 def user_project_count - @my_projects = @user.projects.where("projects.user_id = #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC") - @my_projects_count = @my_projects.count - @my_joined_projects = @user.projects.where("projects.user_id != #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC") - @my_joined_projects_count = @my_joined_projects.count - - @my_project_total = @my_projects_count + @my_joined_projects_count + @my_projects = @user.projects.select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC") + @my_project_total = @my_projects.count end # 用户的课程总数 @@ -131,13 +127,13 @@ module UsersHelper def pull_request_message_status ma case ma.status when 1 - "创建了PullRequest:" + "创建了PullRequest：" when 2 - "接受了PullRequest:" + "接受了PullRequest：" when 3 - "重新打开了PullRequest:" + "重新打开了PullRequest：" when 4 - "关闭了PullRequest:" + "关闭了PullRequest：" end end @@ -172,11 +168,11 @@ module UsersHelper def applied_project_tip applied_message case applied_message.status when 4 - "拒绝申请加入项目:" + "拒绝申请加入：" when 5,3,2,1,7 - "申请加入项目:" + "申请加入：" when 6 - "同意申请加入项目" + "同意申请加入：" end end diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 906b0c6f5..af76ad8d6 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -164,7 +164,7 @@ <% if hidden_unproject_infos %> diff --git a/app/views/users/_applied_project_content.html.erb b/app/views/users/_applied_project_content.html.erb index 2d9c7b109..59d941a43 100644 --- a/app/views/users/_applied_project_content.html.erb +++ b/app/views/users/_applied_project_content.html.erb @@ -9,7 +9,9 @@ <%= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %> -
  • + +
  • <%= time_tag(ma.created_at).html_safe %>
    • + +
  • <%= render :partial => "users/user_message_applide_action", :locals =>{:ma => ma} %>
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • \ No newline at end of file diff --git a/app/views/users/_apply_homework_course_message.html.erb b/app/views/users/_apply_homework_course_message.html.erb index 12bf0f2a4..99a97ba7c 100644 --- a/app/views/users/_apply_homework_course_message.html.erb +++ b/app/views/users/_apply_homework_course_message.html.erb @@ -24,4 +24,4 @@ <%end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • \ No newline at end of file +
  • <%= time_tag(ma.created_at).html_safe %>
    • \ No newline at end of file diff --git a/app/views/users/_apply_resource_course_message.html.erb b/app/views/users/_apply_resource_course_message.html.erb index fd493daf2..9747fa193 100644 --- a/app/views/users/_apply_resource_course_message.html.erb +++ b/app/views/users/_apply_resource_course_message.html.erb @@ -35,4 +35,4 @@ <%end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • \ No newline at end of file +
  • <%= time_tag(ma.created_at).html_safe %>
    • \ No newline at end of file diff --git a/app/views/users/_apply_resource_course_message_reply.html.erb b/app/views/users/_apply_resource_course_message_reply.html.erb index 2aff99c17..85e252780 100644 --- a/app/views/users/_apply_resource_course_message_reply.html.erb +++ b/app/views/users/_apply_resource_course_message_reply.html.erb @@ -30,5 +30,5 @@ <%= link_to link_str, user_resource_user_path(User.current, :type => 2), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • \ No newline at end of file diff --git a/app/views/users/_new_user_message.html.erb b/app/views/users/_new_user_message.html.erb new file mode 100644 index 000000000..16f14733c --- /dev/null +++ b/app/views/users/_new_user_message.html.erb @@ -0,0 +1,27 @@ +<% message_alls.each do |ma| %> + <%# 系统消息 %> + <%= render :partial => 'users/user_message_system', :locals => {:ma => ma} %> + + <%= render :partial => 'users/user_at_message', :locals => {:ma => ma} %> + + <%# 课程消息 %> + <%= render :partial => 'users/user_message_course', :locals => {:ma => ma} %> + + + <%= render :partial => 'users/user_message_forge', :locals => {:ma => ma} %> + + + <%= render :partial => 'users/user_message_forum', :locals => {:ma => ma} %> + + + <%= render :partial => 'users/user_message_userfeedaback', :locals => {:ma => ma} %> + + <%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %> + + <%# 申请类消息 %> + <%= render :partial => 'users/user_message_applied', :locals => {:ma => ma} %> +<% end %> + + \ No newline at end of file diff --git a/app/views/users/_user_at_message.html.erb b/app/views/users/_user_at_message.html.erb index 024934471..89b702ded 100644 --- a/app/views/users/_user_at_message.html.erb +++ b/app/views/users/_user_at_message.html.erb @@ -23,6 +23,6 @@ <%= link_to ma.subject.html_safe, ma.url, :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %> <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> \ No newline at end of file diff --git a/app/views/users/_user_message_applide_action.html.erb b/app/views/users/_user_message_applide_action.html.erb index a8b5598fa..425c3f74d 100644 --- a/app/views/users/_user_message_applide_action.html.erb +++ b/app/views/users/_user_message_applide_action.html.erb @@ -1,13 +1,15 @@ <% ma = ma.nil? ? @applied_message : ma %> <% if allow_to_show(ma) %> - <%= link_to "同意", allow_to_join_project_project_memberships_path(:project_id => ma.project_id, :applied_message_id => ma.id), :remote => true, :method => :post, :class => "link-blue"%> | - <%= link_to "拒绝", refused_allow_to_join_project_project_memberships_path(:project_id => ma.project_id, :applied_message_id => ma.id), :remote => true, :method => :get, :class => "link-blue" %> + <%= link_to "同意", allow_to_join_project_project_memberships_path(:project_id => ma.project_id, :applied_message_id => ma.id), + :remote => true, :method => :post, :class => "link-blue", :style => "font-size: 14px;" %> | + <%= link_to "拒绝", refused_allow_to_join_project_project_memberships_path(:project_id => ma.project_id, :applied_message_id => ma.id), + :remote => true, :method => :get, :class => "link-blue",:style => "font-size: 14px;" %> <% elsif ma.status == 4 %> - 被拒绝 + 被拒绝 <% elsif ma.status == 5 %> - 您已拒绝 + 您已拒绝 <% elsif ma.status == 6 %> - 已通过 + 已通过 <% elsif ma.status == 7 %> - 您已同意 + 您已同意 <% end %> \ No newline at end of file diff --git a/app/views/users/_user_message_applied.html.erb b/app/views/users/_user_message_applied.html.erb index 89084d30b..b79f77a2d 100644 --- a/app/views/users/_user_message_applied.html.erb +++ b/app/views/users/_user_message_applied.html.erb @@ -17,7 +17,7 @@
  • <%= render :partial => "users/user_message_applied_school_action", :locals =>{:ma => ma} %>
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • diff --git a/app/views/users/_user_message_applied_schools.html.erb b/app/views/users/_user_message_applied_schools.html.erb index 1e2ff86ba..9e66d1bfb 100644 --- a/app/views/users/_user_message_applied_schools.html.erb +++ b/app/views/users/_user_message_applied_schools.html.erb @@ -4,4 +4,4 @@ <% else %> <%=link_to User.where("id=?", ma.applied_user_id).first.show_name, user_path(ma.applied_user_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> <% end %> -"><%= applied_school_tip(ma) %> \ No newline at end of file +<%= applied_school_tip(ma) %> \ No newline at end of file diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index 87d448944..189389444 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -8,7 +8,7 @@
  • <%=link_to ma.course_message.author.try(:show_name), user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - ">发布了通知： + 发布了通知：
  • <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id }, @@ -23,9 +23,10 @@
    <%= ma.course_message.description.html_safe %>
    <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> + <% if ma.course_message_type == "Comment" && ma.course_message %> <% end %> <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil? && ma.course_message %> @@ -62,7 +63,7 @@
  • <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - ">发布了班级作业： + 发布了班级作业：
  • <% if !User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil? %> @@ -114,7 +115,7 @@

    <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> <% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 && ma.course_message %> @@ -122,7 +123,7 @@
  • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
  • <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + '老师', user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :title => "#{ma.course_message.user.lastname + ma.course_message.user.firstname}老师", :target => '_blank' %> - ">发布的作业：
    • + 发布的作业：
  • <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> @@ -148,7 +149,7 @@ <% end %>
  •    截止时间快到啦
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -160,7 +161,7 @@
  • <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - ">启动了作业匿评： + 启动了作业匿评：
  • <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", @@ -183,7 +184,7 @@

    例如，您缺评了两份作品，则您的最终成绩将被扣除 <%= ma.course_message.homework_detail_manual.absence_penalty %> * 2 = <%= ma.course_message.homework_detail_manual.absence_penalty * 2 %>分

    <% end%> -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -192,7 +193,8 @@
  • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
  • <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", - user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>">关闭了作业匿评：
    • + user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> + 关闭了作业匿评：
  • <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> @@ -214,7 +216,7 @@

    祝您的教学活动高效、顺利、愉快！

    <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -226,7 +228,7 @@
  • <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - ">启动作业匿评失败 + 启动作业匿评失败：
  • <%= link_to truncate(ma.course_message.name,:length=>25)+'(失败原因：提交作品的人数低于2人)', student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "c_red" : "newsGrey "}", :target => '_blank' %> @@ -245,7 +247,7 @@
  • 提交截止：<%= ma.course_message.end_time%>  23:59
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> <% if ma.course_message_type == "HomeworkCommon" && ma.status == 5 %> @@ -293,7 +295,7 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> <% if ma.course_message_type == "Poll" && ma.course_message %> @@ -305,7 +307,7 @@
  • <%=link_to ma.course_message.user.try(:show_name), user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - ">发布了问卷： + 发布了问卷：
  • <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id), @@ -316,7 +318,7 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> <% if ma.course_message_type == "Message" && !ma.nil? && !ma.course_message.nil? %> @@ -328,7 +330,7 @@
  • <%=link_to ma.course_message.author.try(:show_name), user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - "> + <%= ma.course_message.parent_id.nil? ? "发布了班级帖子：" : "评论了班级帖子：" %>
    • <% if ma.course_message.parent_id.nil? %>
  • @@ -359,7 +361,7 @@ <% end %> <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -410,7 +412,7 @@

    <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> <% if ma.course_message_type == "JournalsForMessage" && ma.course_message %> @@ -424,7 +426,7 @@
  • <%= link_to ma.course_message.user.try(:show_name), user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - ">在班级中留言了： + 在班级中留言了：
  • <%= link_to message_content(ma.course_message.notes), course_feedback_path(:id => ma.course_id), @@ -436,7 +438,7 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> <% elsif ma.course_message.jour_type == 'HomeworkCommon' %> @@ -452,7 +454,7 @@ <% if ma.course_message.m_parent_id.nil? %> 回复了您的作业： <% else %> - 在作业中回复了您： + 在作业中回复了您： <% end %> @@ -466,7 +468,7 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% else %>     -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> <% end %> @@ -547,7 +549,7 @@
  • <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "同学", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - ">重新提交了作品： + 重新提交了作品：
  • <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id), @@ -556,7 +558,7 @@
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -568,7 +570,7 @@
  • <%= link_to ma.course_message.user.show_name+ "同学", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - ">追加新附件了： + 追加新附件了：
  • <%= link_to "作业标题：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id), @@ -576,7 +578,7 @@
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -587,7 +589,7 @@
  • 系统提示 - ">您成功创建了班级： + 您成功创建了班级：
  • <%= link_to "班级名称：" + ma.course_message.name, course_path(ma.course_message), @@ -612,7 +614,7 @@

    您的班级是私有的，非班级成员不能访问您的班级。如果想设置为公开，您可以在配置中设置。

    <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -650,7 +652,7 @@
    <%= Course.find(ma.course_id).description.nil? ? "" : Course.find(ma.course_id).description.html_safe %>

    申请职位：<%= ma.content == '9' ? "教师" : "教辅"%>

    -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -662,7 +664,7 @@
  • <%=link_to User.find(ma.course_message_id).show_name, user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - ">将您加入了班级： + 将您加入了班级：
  • <%= link_to ma.course.name, course_member_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> @@ -684,7 +686,7 @@

    <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -696,7 +698,7 @@
  • 系统提示 - ">您增加了新的班级成员： + 您增加了新的班级成员：
  • <%= link_to User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ? User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")", {:controller => 'courses', :action => 'settings', :id => ma.course_id, :tab=>'member'}, :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> @@ -718,7 +720,7 @@

    <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -730,7 +732,7 @@
  • <%=link_to User.find(ma.course_message_id).show_name, user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - ">将您移出了班级： + 将您移出了班级：
  • <%= link_to ma.course.name, member_course_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> @@ -753,7 +755,7 @@

    <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -763,7 +765,9 @@
  • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
  • <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", - user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>">发布了班级测验 ：
    • + user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> + 发布了班级测验： +
  • <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> @@ -790,7 +794,7 @@ <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -800,7 +804,8 @@
  • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
  • <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", - user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>">发布的测验：
    • + user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> + 发布的测验：
  • <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> @@ -823,7 +828,7 @@
  • 截止时间快到啦
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> <% end %> \ No newline at end of file diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb index 10a14ffa9..b3e058a82 100644 --- a/app/views/users/_user_message_forge.html.erb +++ b/app/views/users/_user_message_forge.html.erb @@ -3,11 +3,11 @@ <% if ma.forge_message_type == "AppliedProject" %> <% end %> @@ -27,7 +27,7 @@
  • <%=link_to User.find(ma.forge_message_id).show_name, user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - ">将您加入了项目： + 将您加入了项目：
  • <%= link_to ma.project, project_member_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> @@ -35,7 +35,7 @@
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> <% end %> @@ -48,7 +48,7 @@
  • <%=link_to User.find(ma.forge_message_id).show_name, user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - ">将您移出了项目： + 将您移出了项目：
  • <%= link_to ma.project, member_project_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> @@ -56,7 +56,7 @@
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> <% end %> @@ -123,7 +123,7 @@
  • <%=link_to User.find(ma.forge_message.author_id).show_name, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - "> + <%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%>
    • @@ -133,7 +133,7 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> <% end %> @@ -146,8 +146,7 @@
  • <%= link_to User.find(ma.forge_message.user_id).show_name, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - "> - 更新了问题状态： + 更新了问题状态：
  • <%= link_to ma.forge_message.journalized.subject, @@ -156,21 +155,21 @@
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> <% if ma.forge_message_type == "Message" %> <% end %> <% if ma.forge_message_type == "Comment" %> @@ -183,7 +182,7 @@
  • <%=link_to ma.forge_message.author.try(:show_name), user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - ">评论了新闻： + 评论了新闻：
  • <%= link_to "#{ma.forge_message.commented.title}", @@ -191,7 +190,7 @@
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -216,7 +215,7 @@ :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> <% end %> \ No newline at end of file diff --git a/app/views/users/_user_message_org.html.erb b/app/views/users/_user_message_org.html.erb index 13c62318f..3d56f4b4a 100644 --- a/app/views/users/_user_message_org.html.erb +++ b/app/views/users/_user_message_org.html.erb @@ -6,21 +6,22 @@
  • <%=link_to ma.organization.name, organization_path(ma.organization_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - '>申请子域名： + 申请子域名：
  • <%= ma.content %>
    • -
  • +
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%=link_to (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准", agree_apply_subdomain_organizations_path( :organization_id => ma.organization_id, :org_domain => ma.content, :user_id => ma.sender_id, :act_id => ma.id ), :id => "agree_apply_subdomain_#{ma.id}", :method => 'post', :remote => true, - :class => "green_btn_cir ml10", - :style => "color:#fff" %> + :class => 'link-blue fr' + %>
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • + <% end %> <% if ma.message_type == 'AgreeApplySubdomain'%> @@ -29,12 +30,12 @@
  • - '>管理员同意了您的子域名申请： + 管理员同意了您的子域名申请：
  • <%= ma.content %>
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> <% end %> \ No newline at end of file diff --git a/app/views/users/_user_message_system.html.erb b/app/views/users/_user_message_system.html.erb index 6bc8f28f3..46e83a4e1 100644 --- a/app/views/users/_user_message_system.html.erb +++ b/app/views/users/_user_message_system.html.erb @@ -5,9 +5,9 @@
  • - Trustie平台发布新消息： + 系统消息： +
    • - 【系统消息】
  • <%= link_to ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject, user_system_messages_path(User.current, :anchor => "position_#{ma.id}"), @@ -15,7 +15,7 @@
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <%# end %> <% end %> \ No newline at end of file diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb index 00fa78eeb..664058461 100644 --- a/app/views/users/_user_message_userfeedaback.html.erb +++ b/app/views/users/_user_message_userfeedaback.html.erb @@ -9,7 +9,7 @@
  • <%=link_to User.find(ma.journals_for_message.user_id).show_name, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> - "> + <%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %>
    • @@ -26,7 +26,7 @@
    <%= ma.journals_for_message.notes.html_safe %>
    <% end %> -
  • <%= time_tag(ma.journals_for_message.created_on).html_safe %>
    • +
  • <%= time_tag(ma.journals_for_message.created_on).html_safe %>
    • <% end %> <% end %> \ 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 7f5798c8e..73f0dfc0e 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -14,32 +14,7 @@ <% unless @message_alls.nil? %> - <% @message_alls.each do |ma| %> - <%# 系统消息 %> - <%= render :partial => 'users/user_message_system', :locals => {:ma => ma} %> - - <%= render :partial => 'users/user_at_message', :locals => {:ma => ma} %> - - <%# 课程消息 %> - <%= render :partial => 'users/user_message_course', :locals => {:ma => ma} %> - - - <%= render :partial => 'users/user_message_forge', :locals => {:ma => ma} %> - - - <%= render :partial => 'users/user_message_forum', :locals => {:ma => ma} %> - - - <%= render :partial => 'users/user_message_userfeedaback', :locals => {:ma => ma} %> - - <%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %> - - <%# 申请类消息 %> - <%= render :partial => 'users/user_message_applied', :locals => {:ma => ma} %> - <% end %> - + <%= render :partial => 'users/new_user_message', :locals => { :message_alls => @message_alls } %> <% end %> <% else %> diff --git a/public/images/user/home-user-left.png b/public/images/user/home-user-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f4968c0d786a739af90435eae7d6464159afd8a1 GIT binary patch literal 111449 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 E00@K2XaE2J literal 0 HcmV?d00001 diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css index b86068a33..7ab2bf3f3 100644 --- a/public/stylesheets/css/structure.css +++ b/public/stylesheets/css/structure.css @@ -97,13 +97,13 @@ div#menu ul ul ul li a{ width:185px; overflow:hidden; white-space: nowrap; text- .homepageNewsPublisher { max-width:100px; font-size:12px; color:#269ac9; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; } .homepageNewsType {padding-left: 5px; font-size:12px; color:#888888; display:block;} .homepageNewsTypeHomework {width:160px; padding-left: 5px; font-size:12px; color:#888888; display:block; overflow:hidden; height:49px;word-break:break-all; word-wrap:break-word; text-overflow:ellipsis;} -.homepageNewsPubType {width:230px; font-size:12px; color:#888888; display: block;} +.homepageNewsPubType {auto-width:230px; font-size:12px; color:#888888; display: block;} .homepageNewsPubTypeHomework {width:270px; font-size:12px; color:#888888; display: block; white-space:nowrap;} -.homepageNewsContent {width:355px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } -.homepageSystenMessageContent {width:281px; max-width:291px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden;text-overflow:ellipsis;max-height: 49px; } - -.homepageHomeworkContentWarn {width:110px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } -.homepageHomeworkContent {width:235px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } +.homepageNewsContent {width:355px; max-width:365px; margin-right:10px; font-size:14px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } +.homepageSystenMessageContent {width:281px; max-width:291px; margin-right:10px; font-size:14px; color:#4b4b4b; display:block; overflow:hidden;text-overflow:ellipsis;max-height: 49px; } +.homepageSystenMessageContent a:link{color:#1b1818;} +.homepageHomeworkContentWarn {width:110px; max-width:365px; margin-right:10px; font-size:14px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } +.homepageHomeworkContent {width:235px; max-width:365px; margin-right:10px; font-size:14px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } .homepageHomeworkContentWarn2 {width:60px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } .homepageHomeworkContent2 {width:285px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } @@ -355,7 +355,7 @@ a.replyGrey1 {color:#888888;} a.replyGrey1:hover {color:#4b4b4b;} a.newsBlue {color:#269ac9;} a.newsBlue:hover {color:#297fb8;} -a.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold} +a.newsBlack {color:#4b4b4b; font-size:14px; font-weight:bold} a.menuGrey {color:#808080;} a.menuGrey:hover {color:#fe7d68;} .navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;} diff --git a/public/stylesheets/css/user.css b/public/stylesheets/css/user.css index a46b46517..e718c88a5 100644 --- a/public/stylesheets/css/user.css +++ b/public/stylesheets/css/user.css @@ -21,7 +21,7 @@ .home-user-leftnav{ background:#fff; width: 238px; border:1px solid #ddd; margin-bottom: 10px;} .home-user-leftnav h3{ height: 40px; line-height: 40px; border-bottom:1px solid #ddd; color: #333; padding-left: 10px; font-weight: normal; } .h3-more{ font-size: 12px; color: #888;} -.home-user-leftnav-li{ height: 40px; line-height: 40px; padding-left: 25px; color: #666;background:url(/images/user/home-user-left.png) 5px 5px no-repeat; font-size: 14px; position: relative; } +.home-user-leftnav-li{ height: 45px; line-height: 40px; padding-left: 25px; color: #666;background:url(/images/user/home-user-left.png) 5px 5px no-repeat; font-size: 14px; position: relative; } .home-user-leftnav-li:hover{ background:#f4f4f4 url(/images/user/home-user-left.png) 5px -35px no-repeat;} .home-user-leftnav-li a:hover{color: #3b94d6;} .icons-class{background:url(/images/user/home-user-left.png) 5px 5px no-repeat; }