diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 97d84d6a6..6dbcc2178 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -80,7 +80,7 @@ class ProjectsController < ApplicationController helper :documents helper :watchers # helper :watcherlist - + helper :words ### added by william include ActsAsTaggableOn::TagsHelper diff --git a/app/views/projects/_new_respond.html.erb b/app/views/projects/_new_respond.html.erb index a8a3e3a6f..511d90db6 100644 --- a/app/views/projects/_new_respond.html.erb +++ b/app/views/projects/_new_respond.html.erb @@ -1,13 +1,13 @@ <%= form_tag({:controller => 'projects', :action => 'project_respond'}) do %> <%= text_area_tag 'project_respond', "", :class => 'noline', :required => true, - :style => "resize: none;", :rows => 6, + :style => "resize: none;", :rows => 3, :placeholder => l(:label_projects_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 %> -<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "bid_btn"%> +<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "enterprise"%> <%end%> diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb index e32d75670..ec630aee2 100644 --- a/app/views/projects/feedback.html.erb +++ b/app/views/projects/feedback.html.erb @@ -1,57 +1,47 @@

<%= l(:label_user_response) %>

- +
<%= 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;", :class => 'noline'%>
- - - - -
- <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn" %> -
+ <%= f.text_area 'project_message', :rows => 3, :cols => 65, + :placeholder => "#{l(:label_welcome_my_respond)}", + :style => "resize: none; width: 98%", + :class => 'noline'%> + <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right; margin-right: 1%; margin-top: 1px;"%> <% end %> - +
+
<% if @jour.size >0 %> - -<% for journal in @jour%> - - - - - -
<%= image_tag(url_to_avatar(journal.user), :class => "avatar") %> - - - - - - - - - - - - - - -
<%= link_to journal.user, user_path(journal.user)%><%= l(:label_projects_feedback) %>
-
- <%= textilizable journal.notes%> -
<%= l :label_update_time %>: <%= format_time journal.created_on %> - <% ids = 'project_respond_form_'+journal.id.to_s%> - <%= toggle_link l(:label_projects_feedback_respond), ids, {:focus => 'project_respond'} %>
-
style="display: none"> - <%= render :partial => 'new_respond', :locals => {:journal => journal, :m_reply_id => journal} %> -
-
-<% end %> + <% end %>