jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

This commit is contained in:
huang 2015-09-18 15:26:34 +08:00
parent cfea5e9c89 9c74ff0b34
commit 17bf74bdfd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/users/user_messages.html.erb
View File

@ -54,7 +54,7 @@
<span style="color: red;float: left">【系统消息】</span><li class="homepageSystenMessageContent fl" id="content_<%= usm.id %>">
<li class="homepageSystenMessageContent fl">
<%= link_to usm.content.nil? ? usm.description.html_safe : usm.content.html_safe, user_system_messages_path(User.current),
<%= link_to usm.subject.nil? ? (usm.content.nil? ? usm.description.html_safe : usm.content.html_safe) : usm.subject, user_system_messages_path(User.current),
:id => "content_link_#{usm.id}",
:onmouseover =>"message_titile_show($(this),event);",
:onmouseout => "message_titile_hide($(this));"

2
app/views/users/user_system_messages.html.erb
View File

@ -39,7 +39,7 @@
</div>
<div class="homepagePostDes">
<div class="homepagePostTo break_word">
<span class="fl"> Trustie平台 发布了系统消息:</span>
<span class="fl"> Trustie平台 发布了系统消息：</span>
<span style="color:#0781b4; max-width:470px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;vertical-align: top;"><%= system_message.subject %></span>
</div>
<div class="cl"></div>