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

---
 app/models/system_message.rb      |  4 +-
 app/views/admin/messages.html.erb | 64 ++++++++++++++-----------------
 2 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/app/models/system_message.rb b/app/models/system_message.rb
index 83e1ef615..daab37868 100644
--- a/app/models/system_message.rb
+++ b/app/models/system_message.rb
@@ -1,5 +1,7 @@
 class SystemMessage < ActiveRecord::Base
   attr_accessible :content, :id, :user_id
   belongs_to :user
-  validates_length_of :content, maximum: 255
+
+  validates :content, presence: true
+  validates_length_of :content, maximum:255
 end
diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb
index 9f7784c67..10169f30b 100644
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@@ -1,53 +1,47 @@
-# 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_form', :multipart => true}) do |f| %>
+  <%= form_for(@admin_messages, :html => {:id =>'system_message-form'}) do |f| %>
       <div class="field">
-        <%= f.kindeditor :content, :edit_id => 'system_message',
-                         :width => '87%',
-                         :resizeType => '0',
-                         :no_label => true
-        %>
+        <%= f.kindeditor :content,:width=>'87%',:editor_id=>'system_message_editor' %>
+        <p id="content_notice_span" class="ml55"></p>
       </div>
       <div>
         <p id="content_notice_span" class="ml55"></p>
       </div>
       <div class="actions">
-        <%= f.submit l(:label_submit),:class => "small", :onclick => "system_message.sync;" %>
+        <%= link_to l(:label_submit), "javascript:void(0)",:class => "small", :onclick => "system_message_editor.sync();submit_message();" %>
       </div>
   <% end %>
 </div>
 <script>
-  function system_message_length()
-  {
-      var obj = $("#system_message").value;
-      if (obj.length == 0) {
-          $("#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").css('color', '#ff0000');
-          $("#content_notice_span").focus();
-          return false;
-      }
-      else {
-          $("#content_notice_span").text("填写正确");
-          $("#content_notice_span").css('color', '#008000');
-          return true;
-      }
-  }
-        function submit_message()
-        {
-            if (system_message_length())
-            {
-                $("#system_message_form").submit();
-            }
+    function system_message_length() {
+        var obj = system_message_editor.html();
+        if (obj.length == 0) {
+            $("#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").css('color', '#ff0000');
+            $("#content_notice_span").focus();
+            return false;
+        }
+        else {
+            $("#content_notice_span").text("填写正确");
+            $("#content_notice_span").css('color', '#008000');
+            return true;
+        }
+    }
+    function submit_message() {
+
+        if (system_message_length()) {
+            $("#system_message-form").submit();
         }
+    }
 </script>