From 2e0502c28e83392b29a4e20f11f1e190aad59303 Mon Sep 17 00:00:00 2001
From: baiyu <316257774@qq.com>
Date: Sat, 17 Aug 2013 10:27:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E7=95=99?=
 =?UTF-8?q?=E8=A8=80=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_projects.html.erb | 3 ++-
 app/views/projects/feedback.html.erb     | 6 +-----
 app/views/welcome/index.html.erb         | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 822e99787..e0df12a0c 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -117,10 +117,11 @@
 											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> 
 												<%= link_to l(:project_module_boards) ,project_boards_path(@project) %>
 											</td>
-											<% if @project.identifier = 'trustie' %>
+											<% if @project.identifier == 'trustie' %>
 											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> 
 												<%= link_to l(:label_user_response) ,project_feedback_path(@project) %>
 											</td>
+											<% else %>
 											<% end %>
 										</tr>
 									</table>
diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb
index 8f316527a..23fbda04e 100644
--- a/app/views/projects/feedback.html.erb
+++ b/app/views/projects/feedback.html.erb
@@ -9,11 +9,7 @@
     <td><table width="580px" border="0">
       <tr>
         <td colspan="2" valign="top"><strong> <%=link_to journal.user, user_path(journal.user)%></strong>
-        	<% if @user == User.current%>
-        	<span class="font_lighter"><%= l(:label_leave_me_message) %></span>
-        	<% else %>
-        	<span class="font_lighter"><%= l(:label_leave_others_message) %></span>
-        	<% end %>
+        	<span class="font_lighter">对项目进行了反馈</span>
         	</td>
         </tr>
       <tr>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 7231eefc5..b91b638f1 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -253,7 +253,7 @@ software development and software crowdsourcing.</td></tr>
 <table border="0" width="525px" align="center" >
 
 	<tr>
-		<td><%= f.text_area 'project_message', :rows => 3, :cols => 65, :value => "#{l(:label_leave_a_message)}", :onfocus => "clearInfo('new_form_project_message','#{l(:label_leave_a_message)}')", :onblur => "showInfo('new_form_project_message','#{l(:label_leave_a_message)}')", :style => "resize: none;", :class => 'noline'%></td>
+		<td><%= f.text_area 'project_message', :rows => 3, :cols => 65, :value => "我要反馈", :onfocus => "clearInfo('new_form_project_message','我要反馈')", :onblur => "showInfo('new_form_project_message','我要反馈')", :style => "resize: none;", :class => 'noline'%></td>
 	</tr>
 </table>
 <table border="0" width="525px" align="center">