From 9ba0d3293ef0f00e54e37f78a7279cb68227eb49 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 14 Sep 2015 16:05:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=8F=90=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/messages.html.erb      | 2 +-
 app/views/users/user_messages.html.erb | 4 ++--
 public/stylesheets/new_user.css        | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb
index cd28b09a8..2ccb34f68 100644
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@@ -26,7 +26,7 @@
             return false;
         }
         else if (obj.length > 10000) {
-            $("#content_notice_span").text("内容过长，超过255个字符");
+            $("#content_notice_span").text("内容过长，超过10000个字符");
             $("#content_notice_span").css('color', '#ff0000');
             $("#content_notice_span").focus();
             return false;
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index b713c7152..90463a318 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -62,7 +62,7 @@
                               :onmouseout => "message_titile_hide($(this));"
                   %>
                 </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 %>
                 </div>
                 <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
@@ -356,7 +356,7 @@
                                   :onmouseout => "message_titile_hide($(this));"
                    %>
                     </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 %>
                     </div>
                     <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index bd71ef270..1a8e34f2f 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1114,3 +1114,4 @@ a:hover.tijiao{ background:#0f99a9;}
 #cboxPrevious{position:absolute; bottom:0px; left:0; color:#444;}
 #cboxNext{position:absolute; bottom:0px; left:63px; color:#444;}
 #cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;}
+.system_message_style {line-height: 19.1px; max-width: 300px;work-wrap: break-word; word-break: break-all;}