From 36e9c20e59c2faf4e34307053123bada3225e9ba Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 11 Sep 2015 10:30:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/messages.html.erb      | 23 +++++++++++++++++------
 app/views/users/user_messages.html.erb |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb
index 03fa80e75..9f7784c67 100644
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@@ -1,9 +1,10 @@
+# encoding: utf-8
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <h3 style="float: left">
   <%=l(:label_system_message)%>
 </h3><br/>
 <div style="padding-top: 20px; padding-left: 5px;">
-  <%= form_for(@admin_messages, :html => {:id =>'system_message', :multipart => true}) do |f| %>
+  <%= form_for(@admin_messages, :html => {:id =>'system_message_form', :multipart => true}) do |f| %>
       <div class="field">
         <%= f.kindeditor :content, :edit_id => 'system_message',
                          :width => '87%',
@@ -20,23 +21,33 @@
   <% end %>
 </div>
 <script>
-  function system_message_length(obj)
+  function system_message_length()
   {
+      var obj = $("#system_message").value;
       if (obj.length == 0) {
-          $("#content_notice_span").text("内容不能为空");
+          $("#content_notice_span").text("鍐呭涓嶈兘涓虹┖");
           $("#content_notice_span").css('color', '#ff0000');
           $("#content_notice_span").focus();
+          return false;
       }
       else if (obj.length > 255) {
-          $("#content_notice_span").text("内容过长，超过255个字符");
+          $("#content_notice_span").text("鍐呭杩囬暱锛岃秴杩�255涓瓧绗�");
           $("#content_notice_span").css('color', '#ff0000');
           $("#content_notice_span").focus();
+          return false;
       }
       else {
-          $("#content_notice_span").text("填写正确");
+          $("#content_notice_span").text("濉啓姝ｇ‘");
           $("#content_notice_span").css('color', '#008000');
-          $("#system_message").submit();
+          return true;
       }
   }
+        function submit_message()
+        {
+            if (system_message_length())
+            {
+                $("#system_message_form").submit();
+            }
+        }
 </script>
 
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index fdfa1eaf7..03e9f487d 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -60,7 +60,7 @@
           %>
           </li>
           <div style="display:none;" class="message_title">
-            <%= ma.content.html_safe%>
+            <%= usm.content.html_safe%>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
         </ul>