modified projects

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
 

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%>

app/views/projects/feedback.html.erb

@@ -1,57 +1,47 @@
 <!-- fq -->
 <h3><%= l(:label_user_response) %></h3>
-
+<div style="width: 80%; margin-left: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, 
-		<table border="0" width="525px" align="center" >
+						:placeholder => "#{l(:label_welcome_my_respond)}", 
-	        <tr>
+						:style => "resize: none;  width: 98%", 
-				<td><%= f.text_area 'project_message', :rows => 3, :cols => 65, :placeholder => "#{l(:label_welcome_my_respond)}", :style => "resize: none;", :class => 'noline'%></td>
+						:class => 'noline'%>
-			</tr>
+						<%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right; margin-right: 1%; margin-top: 1px;"%>
-		</table>
-		<table border="0" width="525px" align="center">
-			<tr>
-				<td align="right">
-					<%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn" %>
-				</td>
-			</tr>
-		</table>
 <% end %>
-
+</div>
+<div style="clear: both;"></div>
 <% if @jour.size >0 %>
-
+<ul class="message-for-user">
-<% for journal in @jour%>
+	<% for journal in @jour%>
-<table width="660px" border="0" align="center">
+	<li class="outer-message-for-user">
-	<tr>
+	    <span class="portrait"><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></span>
-		<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></td>
+	    <span class="body">
-		<td>
+			<span class="user"><%= link_to journal.user, user_path(journal.user)%></span>
-		<table width="580px" border="0">
+			<span class="font_lighter"><%= l(:label_projects_feedback) %></span>
-			<tr>
+			<p >
-				<td colspan="2" valign="top"><strong> <%= link_to journal.user, user_path(journal.user)%></strong><span class="font_lighter"><%= l(:label_projects_feedback) %></span></td>
+				<%= textilizable journal.notes%>
-			</tr>
+			</p>
-			<tr>
+		    <span class="font_lighter"> <%= l :label_update_time %>: <%= format_time journal.created_on %></span>
-				<td colspan="2" width="580px" >
+				<% id = 'project_respond_form_'+journal.id.to_s%>
-				<div class="font_description">
+			<span><%= link_to l(:label_projects_feedback_respond),'',
-					<%= textilizable journal.notes%>
+	                    	{:focus => 'project_respond', 
-				</div></td>
+	                    	:onclick => "toggleAndSettingWordsVal($('##{id}'), 
-			</tr>
+		                    $('##{id} textarea'), 
-			<tr>
+		                    '#{l(:label_reply_plural)} #{m_reply_id.user.show_name}: '); 
-				<td align="left"><span class="font_lighter"> <%= l :label_update_time %>: <%= format_time journal.created_on %></span></td>
+		                    return false;"} %></span> 
-				<td width="200" align="right" class="a"> 
+        </span>
-					<% ids = 'project_respond_form_'+journal.id.to_s%>
+        <div style="clear: both;"></div>
-					<%= toggle_link l(:label_projects_feedback_respond), ids, {:focus => 'project_respond'} %> </td>
+	    <div id='<%= id %>' class="respond-form">
-			</tr>
+			<%= render :partial => 'new_respond', :locals => {:journal => journal, :m_reply_id => journal} %>
-			<tr>
+	    </div>
-				<td colspan='2'>
+	    <div style="clear: both;"></div>
-				<div id=<%= ids%> style="display: none">
+	    <div>
-					<%= render :partial => 'new_respond', :locals => {:journal => journal, :m_reply_id => journal} %>
+			<%= render :partial => "words/journal_reply", :locals => {:journal => journal } %>
-				</div></td>
+		</div>
-			</tr>
+    </li>
-		</table></td>
+	<% end %>
-	</tr>
+</ul>
-</table>
-<div class="line_under"></div>
-<% end %>
 <% end %>
 
 <div class="pagination" style="float:left;">