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' %>

<%=l(:label_system_message)%>


- <%= 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| %>
<%= f.kindeditor :content, :edit_id => 'system_message', :width => '87%', @@ -20,23 +21,33 @@ <% end %>
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index a9984f929..ec2e4b748 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -60,7 +60,7 @@ %>
  • <%= time_tag(usm.created_at).html_safe %>