diff --git a/app/views/courses/feedback.html.erb b/app/views/courses/feedback.html.erb index 0a8458a22..d115f1703 100644 --- a/app/views/courses/feedback.html.erb +++ b/app/views/courses/feedback.html.erb @@ -42,7 +42,7 @@ function checkMaxLength() { if (currentLength > maxLength) this.relatedElement.className = 'toomuch'; else - this.relatedElement.className = ''; + this.relatedElement.className = ''; this.relatedElement.firstChild.nodeValue = currentLength; } diff --git a/app/views/projects/_history.html.erb b/app/views/projects/_history.html.erb index d02b561b0..3633ed7b5 100644 --- a/app/views/projects/_history.html.erb +++ b/app/views/projects/_history.html.erb @@ -1,21 +1,18 @@ <% reply_allow = JournalsForMessage.create_by_user? User.current %> - -
-
- <% if journals.size > 0 %> +<% if journals.size > 0 %> <% for journal in journals %>
- -
+
<%= link_to image_tag(url_to_avatar(journal.user),:width => '46',:height => '46'), user_path(journal.user) %>
+
- <%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%><%= format_time(journal.created_on) %> + <%= link_to journal.user, user_path(journal.user), :class => 'c_blue fb fl mb10', :target => "_blank" %> + <%= format_time(journal.created_on) %>

<%= textilizable journal.notes%>

<% ids = 'project_respond_form_'+ journal.id.to_s%> - <% if journal.user == User.current|| User.current.admin? %> <%= link_to(l(:label_bid_respond_delete), {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user}, @@ -28,20 +25,15 @@ <% end %> - - <%= l(:label_bids_published) %>  - <%= time_tag(journal.created_on,:style => "float:initial").html_safe %>  - <%= l(:label_bids_published_ago) %> -
-
+
<% ids = 'project_respond_form_'+ journal.id.to_s%> <% if reply_allow %>
- <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal,:show_name => true} %> + <%= render :partial => 'words/new_respond_project', :locals => {:journal => journal, :m_reply_id => journal,:show_name => true} %>
<% end %> -
+
<%= render :partial => "words/journal_reply", :locals => {:journal => journal, :show_name => true} %>
@@ -50,9 +42,6 @@
<% end %> <% end %> -
-
- diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb index b05ffe2cc..5b1e3c065 100644 --- a/app/views/projects/_project_jours.html.erb +++ b/app/views/projects/_project_jours.html.erb @@ -1,9 +1,6 @@ -
<% reply_allow = JournalsForMessage.create_by_user? User.current %> - -

<%= l(:label_user_response) %>

- +

<%= l(:label_user_response) %>

<% if !User.current.logged?%>
<%= l(:label_user_login_tips) %> @@ -11,16 +8,14 @@
<% else %> -
+ <%= 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)}", - :style => "resize: none; width: 98%", - :class => 'noline',:maxlength => 250%> - <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right; margin-right: 1%; margin-top: 1px;"%> + :placeholder => "#{l(:label_welcome_my_respond)}" %> + <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "blue_btn fr" %> <% end %> -
+ <% end %>
@@ -28,4 +23,4 @@ <%= render :partial => 'history',:locals => { :journals => @jour, :state => false} %>
-
+ diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb index 2f9e9b866..ad1d4c619 100644 --- a/app/views/projects/feedback.html.erb +++ b/app/views/projects/feedback.html.erb @@ -2,7 +2,7 @@

用户反馈

<% reply_allow = JournalsForMessage.create_by_user? User.current %> -<%= stylesheet_link_tag 'css', :media => 'all' %> +<%#= stylesheet_link_tag 'css', :media => 'all' %> <%= render :partial => 'project_jours', :locals => { :contest => @contest, :journals => @jour, :state => false} diff --git a/app/views/words/_new_respond_project.html.erb b/app/views/words/_new_respond_project.html.erb new file mode 100644 index 000000000..e705b7fd3 --- /dev/null +++ b/app/views/words/_new_respond_project.html.erb @@ -0,0 +1,15 @@ +<%= 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 %> + <%= 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