Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop

app/views/softapplications/_new_message.erb

@@ -28,22 +28,23 @@
 	</div>
 
 	<% if User.current.logged? %>
-		<table border="0" width="525px" align="center" >
-			<tr>
-			    <td><%= f.text_area 'message', :rows => 3, :cols => 65, :placeholder => l(:label_my_respond), :style => "resize: none;", :class => 'noline'%></td>
-			</tr>
-		</table>
-
-		<%= f.text_field :reference_user_id, :style=>"display:none"%>  <!--what function?-->
-
-		<!-- modified by bai -->
-		<table border="0" width="518px" align="center">
-			<tr>
-				<td align="right"> <%= submit_tag l(:label_button_ok), :name => nil , :class => "softapplication_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%>
-				<%= submit_tag l(:button_clear_requirement), :name => nil, :onclick => "clearMessage('softapplication_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
-			</tr>
-		</table>
-	<!-- end -->
+		<% unless User.current.id == @softapplication.user_id %>
+			<table border="0" width="525px" align="center" >
+				<tr>
+				    <td><%= f.text_area 'message', :rows => 3, :cols => 65, :placeholder => l(:label_my_respond), :style => "resize: none;", :class => 'noline'%></td>
+				</tr>
+			</table>
+	
+			<%= f.text_field :reference_user_id, :style=>"display:none"%>  <!--what function?-->
+	
+			<!-- modified by bai -->
+			<table border="0" width="518px" align="center">
+				<tr>
+					<td align="right"> <%= submit_tag l(:label_button_ok), :name => nil , :class => "softapplication_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%>
+					<%= submit_tag l(:button_clear_requirement), :name => nil, :onclick => "clearMessage('softapplication_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
+				</tr>
+			</table>
+		<% end %>
 	<% else %>
 		<div style="font-size: 14px;margin:10px;">
 			<%= l(:label_user_login_score_and_comment) %>

app/views/softapplications/show.html.erb

@@ -120,8 +120,10 @@
 
 <div style="height: 50px">
   <div style="font-size: 15px"><strong>作品评论：</strong></div>
-  <div style="padding-left: 210px">评分: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %>
-    <span style="font-size: 11px">(您可以重新打分，打分结果以最后一次打分为主！)</span></div>
+  <% if (User.current.logged? and User.current.id != @softapplication.user_id) %>
+	  <div style="padding-left: 210px">评分: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %>
+	    <span style="font-size: 11px">(您可以重新打分，打分结果以最后一次打分为主！)</span></div>
+  <% end %>
 
 </div>