From ba743c120be84f89958b7ac9ab9b18cd6570a5bf Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 8 Apr 2015 17:58:53 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A1=86=E5=A4=A7=E5=B0=8F=202=E3=80=81?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80=E6=9C=89html=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/courses/_courses_jours.html.erb | 12 ++++---
 app/views/courses/_history.html.erb       |  7 +----
 app/views/courses/feedback.html.erb       | 38 -----------------------
 3 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index e79dac59b..ef1d25bd4 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -12,11 +12,13 @@
   <% else %>
         <%= form_for('new_form', :method => :post,
                      :url => {:controller => 'words', :action => 'leave_course_message'},:html => {:id=>'leave_message_form'}) do |f|%>
-          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-            <%= f.kindeditor 'course_message',:editor_id => 'leave_message_editor',:input_html=>{:id => "leave_meassge",:style => "resize: none;",
-                            :placeholder => "#{l(:label_welcome_my_respond)}",:maxlength => 250}%>
-            <a href="#" class="grey_btn fr ml10">取&nbsp;&nbsp;消</a>
-            <a href="#"  onclick='leave_message_editor.sync();$("#leave_message_form").submit();' class="blue_btn fr"> <%= l(:button_leave_meassge)%></a>
+            <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+            <%= f.kindeditor 'course_message',:height => '140px;',:editor_id => 'leave_message_editor',:input_html=>{:id => "leave_meassge",:style => "resize: none;",
+                 :placeholder => "#{l(:label_welcome_my_respond)}",:maxlength => 250}%>
+            <a href="javascript:void(0)" class="grey_btn fr ml10 mt10">取&nbsp;&nbsp;消</a>
+            <a href="javascript:void(0)"  onclick='leave_message_editor.sync();$("#leave_message_form").submit();' class="blue_btn fr mt10">
+              <%= l(:button_leave_meassge)%>
+            </a>
         <% end %>
   <% end %>
 </div>
diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb
index 01990602d..a302d0981 100644
--- a/app/views/courses/_history.html.erb
+++ b/app/views/courses/_history.html.erb
@@ -16,7 +16,7 @@
                   </span>
                   <div class="cl"></div>
                   <p>
-                    <%= textilizable journal.notes%>
+                    <%= journal.notes.html_safe %>
                   </p>
                 </div>
                 <div class="ping_disfoot">
@@ -35,11 +35,6 @@
                     <% end %>
                 </div>
                   <div class="cl"></div>
-                <!--<span class="font_lighter" style="float: right">
-                  <#%= l(:label_bids_published) %>&nbsp;
-                  <#%= time_tag(journal.created_on).html_safe %>&nbsp;
-                  <#%= l(:label_bids_published_ago) %>
-                </span>-->
                 <% ids = 'project_respond_form_'+ journal.id.to_s%>
                 <% if reply_allow %>
                     <div id='<%= ids %>' class="respond-form">
diff --git a/app/views/courses/feedback.html.erb b/app/views/courses/feedback.html.erb
index 0a8458a22..c45259efd 100644
--- a/app/views/courses/feedback.html.erb
+++ b/app/views/courses/feedback.html.erb
@@ -9,42 +9,4 @@
            :locals => { :contest => @contest, :journals => @jour, :state => false}
 %>
 
-<% html_title(l(:label_user_response)) -%>
-<script>
-var W3CDOM = document.createElement && document.getElementsByTagName;
-
-//window.onload = setMaxLength;
-
-function setMaxLength() {
-    if (!W3CDOM) return;
-    var textareas = document.getElementsByTagName('textarea');
-    for (var i=0;i<textareas.length;i++) {
-    	var textarea = textareas[i];
-    	setMaxLengthItem(textareas[i]);
-    }
-}
-function setMaxLengthItem(textarea){
-	if (textarea.getAttribute('maxlength')) {
-    var counter = document.createElement('span');
-    counter.className = 'counter';
-		var counterClone = counter.cloneNode(true);
-		counterClone.innerHTML = '<span>0</span>/'+textarea.getAttribute('maxlength');
-		textarea.parentNode.insertBefore(counterClone,textarea.nextSibling);
-		textarea.relatedElement = counterClone.getElementsByTagName('span')[0];
-		textarea.onkeyup = textarea.onchange = checkMaxLength;
-		textarea.onkeyup();
-	}
-}
-
-function checkMaxLength() {
-    var maxLength = this.getAttribute('maxlength');
-    var currentLength = this.value.length;
-    if (currentLength > maxLength)
-        this.relatedElement.className = 'toomuch';
-    else
-        this.relatedElement.className = '';	
-    this.relatedElement.firstChild.nodeValue = currentLength;
-}
-
-</script>
 <% html_title(l(:label_course_feedback)) -%>
\ No newline at end of file