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-15 10:51:40 +08:00
parent 295921c89d 9ba89b3fe7
commit 9189ddd63b
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/messages.html.erb
View File

@ -26,7 +26,7 @@
return false; return false;
} }
else if (obj.length > 10000) { else if (obj.length > 10000) {
$("#content_notice_span").text("内容过长，超过255个字符"); $("#content_notice_span").text("内容过长，超过10000个字符");
$("#content_notice_span").css('color', '#ff0000'); $("#content_notice_span").css('color', '#ff0000');
$("#content_notice_span").focus(); $("#content_notice_span").focus();
return false; return false;

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

@ -62,7 +62,7 @@
:onmouseout => "message_titile_hide($(this));" :onmouseout => "message_titile_hide($(this));"
%> %>
</li> </li>
<div style="display:none;" class="message_title_red"> <div style="display:none;" class="message_title_red system_message_style">
<%= usm.content.nil? ? usm.description.html_safe : usm.content.html_safe %> <%= usm.content.nil? ? usm.description.html_safe : usm.content.html_safe %>
</div> </div>
<li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li> <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
@ -356,7 +356,7 @@
:onmouseout => "message_titile_hide($(this));" :onmouseout => "message_titile_hide($(this));"
%> %>
</li> </li>
<div style="display:none;" class="message_title_red"> <div style="display:none;" class="message_title_red system_message_style">
<%= ma.content.nil? ? ma.description.html_safe : ma.content.html_safe %> <%= ma.content.nil? ? ma.description.html_safe : ma.content.html_safe %>
</div> </div>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li> <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>

1
public/stylesheets/new_user.css
View File

@ -1114,3 +1114,4 @@ a:hover.tijiao{ background:#0f99a9;}
#cboxPrevious{position:absolute; bottom:0px; left:0; color:#444;} #cboxPrevious{position:absolute; bottom:0px; left:0; color:#444;}
#cboxNext{position:absolute; bottom:0px; left:63px; color:#444;} #cboxNext{position:absolute; bottom:0px; left:63px; color:#444;}
#cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;} #cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;}
.system_message_style {line-height: 19.1px; max-width: 400px;work-wrap: break-word; word-break: break-all;}