diff --git a/app/controllers/system_messages_controller.rb b/app/controllers/system_messages_controller.rb
index ae49b58a8..7b1fa33f8 100644
--- a/app/controllers/system_messages_controller.rb
+++ b/app/controllers/system_messages_controller.rb
@@ -44,6 +44,13 @@ class SystemMessagesController < ApplicationController
if @system_messages.save
format.html {redirect_to user_message_path(User.current, :type => "system_message")}
flash[:notice] = l(:notice_successful_message)
+ else
+ if params[:system_message][:content].empty?
+ flash[:error] = l(:label_content_blank_fail)
+ else
+ flash[:error] = l(:label_admin_message_fail)
+ end
+ format.html {redirect_to admin_messages_path}
end
end
end
diff --git a/app/models/system_message.rb b/app/models/system_message.rb
index 83e1ef615..92a989cb3 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 :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..918b09174 100644
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@@ -4,50 +4,16 @@
<%=l(:label_system_message)%>
- <%= form_for(@admin_messages, :html => {:id =>'system_message_form', :multipart => true}) do |f| %>
+ <%= form_for(@admin_messages) do |f| %>
- <%= f.kindeditor :content, :edit_id => 'system_message',
- :width => '87%',
- :resizeType => '0',
- :no_label => true
- %>
+ <%= f.kindeditor :content, :edit_id => 'system_message', :width => '87%', :resizeType => '0', :no_label => true %>
- <%= f.submit l(:label_submit),:class => "small", :onclick => "system_message.sync;" %>
+ <%= f.submit l(:label_submit),:class => "small" %>
<% end %>
-
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index cb75132f0..e01cd3d09 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -57,12 +57,12 @@
<%= link_to usm.content.html_safe, {:controller => 'system_messages', :action => 'index'},
- :class => "newsGrey",
+ :class => "newsRed",
:onmouseover => "message_titile_show($(this),event);",
:onmouseout => "message_titile_hide($(this));"
%>
-
+
<%= usm.content.html_safe %>
<%= time_tag(usm.created_at).html_safe %>
@@ -356,7 +356,7 @@
:onmouseout => "message_titile_hide($(this));"
%>
-
+
<%= ma.content.html_safe%>
<%= time_tag(ma.created_at).html_safe %>
diff --git a/config/locales/admins/zh.yml b/config/locales/admins/zh.yml
index 49abcfc8d..5d857efae 100644
--- a/config/locales/admins/zh.yml
+++ b/config/locales/admins/zh.yml
@@ -15,4 +15,6 @@ zh:
label_registration_automatic_activation: 自动激活帐号
label_system_message: 系统消息
+ label_admin_message_fail: 消息内容过长!
+ label_content_blank_fail: 消息内容不能为空!
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index acdb247d7..61809d742 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -931,6 +931,8 @@ img.ui-datepicker-trigger {
margin-bottom: 3px;
}
.message_title{border: 1px solid #D4D4D4;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #E8E8E8;}
+.message_title_red{border: 1px solid #D4D4D4;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #E8E8E8;color: red}
+
.description{display: none !important;}
.ispublic-label{display: none !important;}
.is_public_checkbox{display: none !important;}