From e99206ff4a0a0213f860be92c70bad5a89e8a423 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Thu, 11 Jun 2015 17:31:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=95=99=E8=A8=80=E6=8D=A2?=
=?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/projects/_history.html.erb | 2 +-
app/views/projects/_project_jours.html.erb | 174 +++++++++++++++++-
app/views/words/_new_respond_course.html.erb | 5 +-
app/views/words/_new_respond_project.html.erb | 9 +-
4 files changed, 181 insertions(+), 9 deletions(-)
diff --git a/app/views/projects/_history.html.erb b/app/views/projects/_history.html.erb
index 3633ed7b5..4c29552e9 100644
--- a/app/views/projects/_history.html.erb
+++ b/app/views/projects/_history.html.erb
@@ -21,7 +21,7 @@
<% end %>
<% if reply_allow %>
<%= link_to l(:label_bid_respond_quote),'',
- {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
+ {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
<% end %>
diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb
index 5b1e3c065..e7aebac43 100644
--- a/app/views/projects/_project_jours.html.erb
+++ b/app/views/projects/_project_jours.html.erb
@@ -1,4 +1,18 @@
-
+
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+
<% reply_allow = JournalsForMessage.create_by_user? User.current %>
<%= l(:label_user_response) %>
<% if !User.current.logged?%>
@@ -12,8 +26,10 @@
<%= form_for('new_form', :method => :post,
:url => {:controller => 'words', :action => 'leave_project_message'}) do |f|%>
<%= f.text_area 'project_message', :rows => 3, :cols => 65,
- :placeholder => "#{l(:label_welcome_my_respond)}" %>
- <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "blue_btn fr" %>
+ :placeholder => "#{l(:label_welcome_my_respond)}",:nhname=>'new_message_textarea' %>
+
+
+ <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "blue_btn fr mt10 mb10" %>
<% end %>
<% end %>
@@ -24,3 +40,155 @@
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+
+
\ No newline at end of file
diff --git a/app/views/words/_new_respond_course.html.erb b/app/views/words/_new_respond_course.html.erb
index 5b27fd21f..a939a55d4 100644
--- a/app/views/words/_new_respond_course.html.erb
+++ b/app/views/words/_new_respond_course.html.erb
@@ -1,9 +1,10 @@
<%= form_tag(words_create_reply_path, :remote => true) do %>
<%= text_area_tag 'user_notes', "", :class => 'w520 h50 mb5',
:style => "resize: none;overflow: hidden;",:rows => 4,
- :placeholder => l(:label_feedback_respond_content),
+ :placeholder => l(:label_feedback_respond_content)#,
- :maxlength => 250 %>
+ #:maxlength => 250
+ %>
<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
<%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %>
diff --git a/app/views/words/_new_respond_project.html.erb b/app/views/words/_new_respond_project.html.erb
index e705b7fd3..c3ff241b3 100644
--- a/app/views/words/_new_respond_project.html.erb
+++ b/app/views/words/_new_respond_project.html.erb
@@ -1,15 +1,18 @@
<%= form_tag(words_create_reply_path, :remote => true) do %>
<%= text_area_tag 'user_notes', "", :class => 'w520 h50 mb5',
:style => "resize: none;overflow: hidden;",:rows => 4,
- :placeholder => l(:label_feedback_respond_content),
-
- :maxlength => 250 %>
+ :placeholder => l(:label_feedback_respond_content)
+ #,:maxlength => 250
+ %>
+
<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
<%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %>
<%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %>
<%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %>
+
<%= submit_tag l(:button_feedback_respond), :name => nil ,
:class => "reply_btn"%>
+
<% end %>
\ No newline at end of file