diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 03d71e7f0..3ca11c719 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -419,7 +419,8 @@ class ProjectsController < ApplicationController
# 发送邮件邀请新用户页面对应方法
def invite_members_by_mail
if User.current.member_of?(@project) || User.current.admin?
- @inviter_lists = InviteList.where(project_id:@project.id)
+ @inviter_lists = InviteList.where(project_id:@project.id).order("created_at desc")
+
# @inviters = []
# @waiters = []
# unless @inviter_lists.blank?
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 05f28d286..4c7abb72d 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -32,7 +32,7 @@
-<% if @message_alls.count >0 %>
+<% if @message_alls.count >0 || @user_system_messages.count >0 %>
<% if params[:type].nil? || params[:type] == "unviewed" %>
有
<%= unviewed_message(@user) %> 条未读
@@ -46,17 +46,13 @@
<% @user_system_messages.each do |usm| %>
-
-
-
- <%= image_tag("/images/logo.png", width: "30px", height: "30px", class: "mt3") %>
-
-
+ <%= image_tag("/images/logo.png", width: "30px", height: "30px", class: "mt3") %>
-
Trustie平台发布新消息:
-
- <%= link_to usm.content.nil? ? usm.description.html_safe : usm.content.html_safe, user_message_path(User.current, :type => "system_messages"),
+ <%= link_to usm.content.nil? ? ("【系统消息】"+usm.description).html_safe : ("【系统消息】"+usm.content).html_safe, user_message_path(User.current, :type => "system_messages"),
:class => "newsRed",
:onmouseover => "message_titile_show($(this),event);",
:onmouseout => "message_titile_hide($(this));"
@@ -381,8 +377,7 @@
- Trustie平台发布新消息:
-
- <%= link_to ma.content.nil? ? ma.description.html_safe : ma.content.html_safe, user_message_path(User.current, :type => "system_messages"),
- :class => "#{params[:type]=="unviewed" ? "newsBlack" : "newsRed"}",
+ 【系统消息】<%= link_to ma.content.nil? ? ma.description.html_safe : ma.content.html_safe, user_message_path(User.current, :type => "system_messages"),
:id => "content_link_#{ma.id}",
:onmouseover =>"message_titile_show($(this),event);",
:onmouseout => "message_titile_hide($(this));"
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index faa5f8ea3..d70dcaa72 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -983,8 +983,8 @@ img.ui-datepicker-trigger {
text-overflow: ellipsis;
margin-bottom: 3px;
}
-.message_title{border: 1px solid #D4D4D4;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #E8E8E8; max-width:400px;word-wrap:break-word; word-break:break-all;}
-.message_title_red{border: 1px solid #D4D4D4;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #E8E8E8;color: red}
+.message_title{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;}
+.message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);}
.description{display: none !important;}
.ispublic-label{display: none !important;}