From 0121871183dded1fbb4b7a254b3c56eb16324459 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 13 Oct 2014 16:41:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E9=A1=B5=E9=9D=A2=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_course_show.html.erb | 39 +++++++++++++-----------
 app/views/messages/_form.html.erb        | 18 ++++++++---
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 43a467154..41f2e4736 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -58,7 +58,6 @@
         /*border-radius: 10px;*/
     }
 </style>
-
 <div class="lz">
   <!-- 在这里添加赞和踩-->
   <span id="praise_tread" style="float: right"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @topic,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> </span>
@@ -132,24 +131,24 @@
               <td>
                 <div class="contextual-borad">
                   <%= link_to(
-                              "引用",
-                              {:action => 'quote', :id => message},
-                              :remote => true,
-                              :method => 'get',
-                              :title => l(:button_quote)) if !@topic.locked? && authorize_for('messages', 'reply') %>
+                      l(:button_quote),
+                      {:action => 'quote', :id => message},
+                      :remote => true,
+                      :method => 'get',
+                      :title => l(:button_quote)) if !@topic.locked? && authorize_for('messages', 'reply') %>
                   <%= link_to(
-                              #image_tag('edit.png'),
-                              "编辑",
-                              {:action => 'edit', :id => message},
-                              :title => l(:button_edit)
+                      #image_tag('edit.png'),
+                      l(:button_edit),
+                      {:action => 'edit', :id => message},
+                      :title => l(:button_edit)
                       ) if message.course_editable_by?(User.current) %>
                   <%= link_to(
-                              #image_tag('delete.png'),
-                              "删除",
-                              {:action => 'destroy', :id => message},
-                              :method => :post,
-                              :data => {:confirm => l(:text_are_you_sure)},
-                              :title => l(:button_delete)
+                      #image_tag('delete.png'),
+                      l(:button_delete),
+                      {:action => 'destroy', :id => message},
+                      :method => :post,
+                      :data => {:confirm => l(:text_are_you_sure)},
+                      :title => l(:button_delete)
                       ) if message.course_destroyable_by?(User.current) %>
                 </div></td>
             </tr>
@@ -175,10 +174,11 @@
 <% end %>
 <% if !@topic.locked? && authorize_for_course('messages', 'reply') %>
     <div id="reply" style="display:none;">
+
       <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
           <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
           <%= submit_tag l(:button_submit) %>
-          <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %>
+          <%#= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %>
       <% end %>
       <div id="preview" class="wiki"></div>
     </div>
@@ -190,4 +190,9 @@
     jQuery(document).ready(function($) {
         transpotUrl('#content');
     });
+//    function regexContent()
+//    {
+//        var content = trim($("#message_content").val());
+//        alert(content);
+//    }
 </script>
\ No newline at end of file
diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index 4eab5658c..d906efea9 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -5,12 +5,22 @@
 <div class="box ph10_5">
   <!--[form:message]-->
   <% unless replying %>
-      <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
+      <p>
+        <label for="message_subject">
+          <%= l(:field_subject) %>
+          <span class="required"> *&nbsp;&nbsp;</span>
+        </label>
+        <br/>
         <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :maxlength => 254 %><!--by young-->
       </p>
   <% else %>
-      <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
-        <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :readonly => true     %>
+      <p>
+        <label for="message_subject">
+          <%= l(:field_subject) %>
+          <span class="required"> *&nbsp;&nbsp;</span>
+        </label>
+        <br/>
+        <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :readonly => true %>
       </p>
   <% end %>
   <p>
@@ -31,7 +41,7 @@
   </p>
   <p>
     <%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %>
-    <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content' %>
+    <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content', :onblur => "regexContent();" %>
   </p>
 
   <!--[eoform:message]-->