From f77ecf71f160bf1cfcd096b4ebb39bc73b89e13e Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Thu, 2 Jan 2014 15:21:03 +0800
Subject: [PATCH] mpdified project and contest message

---
 app/views/bids/_history.html.erb | 85 +++++++++++++-------------------
 1 file changed, 35 insertions(+), 50 deletions(-)

diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb
index 2f627fa1d..913c9e269 100644
--- a/app/views/bids/_history.html.erb
+++ b/app/views/bids/_history.html.erb
@@ -1,20 +1,12 @@
-<!-- added by fq  -->
-<!--
-	 modified by william 2012-8-30 
-     here used to end the bid;
-     when the manager closed it or to the deadline.	
--->
 
 <table width="660px" border="0" align="center" style="padding-left: 26px">
 <tr><td>
-	<!-- modified by huang -->
 	<% if @bid.reward_type ==3 %>
 	<td class="font_lighter" style="font-size: 15px;"><%=l(:label_student_response)%></td>
 	<% else %>
 	<td class="font_lighter" style="font-size: 15px;"><%=l(:label_user_response)%></td>	
 	<% end %>
 	</td>
- <!-- end -->
 </tr></table>
 
 
@@ -24,46 +16,39 @@
 
 
 <% if journals.size >0 %>
-
-<% for journal in journals%>
-<table width="660px" border="0" align="center">
-  <tr>
-    <td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></td>
-    <td><table width="580px" border="0">
-      <tr>
-        <% label = '';
-        case @bid.reward_type
-          when 1
-            label = l(:label_respond_requirement)
-          when 2
-            label = l(:label_contest_requirement)
-          when 3
-            label = l(:label_question_requirement)
-          else
-            
-        end
-        %>  	
-        <td colspan="2" valign="top"><strong> <%=link_to journal.user, user_path(journal.user)%></strong> <span class="font_lighter"><%= label %></span></td>
-        </tr>
-        
-      <tr>
-        <td colspan="2" width="580px" ><p class="font_description"><%= textilizable journal.notes%></p></td>
-        </tr>
-      <tr>
-        <td align="left"><span class="font_lighter"><%= l(:label_bids_published) %>&nbsp;<%= time_tag(journal.created_on).html_safe %>&nbsp;<%= l(:label_bids_published_ago) %></span></td>
-        <% if @user==User.current|| User.current.admin? %>
-        <td width="200" align="right" class="a"><%= link_to(l(:label_bid_respond_quote), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true, 
-        	:method => 'post', :title => l(:button_quote))%>
-        	<%= link_to(l(:label_bid_respond_delete), {:controller => 'bids', :action => 'destroy', :object_id => journal, :id => bid},:confirm => l(:label_delete_confirm),
-            :remote => true, :method => 'delete', :class => "delete", :confirm => l(:text_are_you_sure), :title => l(:button_delete)) %></td>
-      <% else %>
-       <td width="200" align="right" class="a"><%= link_to(l(:label_bid_respond_quote), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true, 
-        	:method => 'post', :title => l(:button_quote))%>
-      <% end %>
-      </tr>
-    </table></td>
-  </tr>
-</table>
-<div class="line_under"></div>
-<% end %>
+<ul class="message-for-user">
+	<% for journal in journals%>
+		<li id='word_li_<%= journal.id.to_s %>' class="outer-message-for-user">
+			<span class="portrait"><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></span>
+			        <% label = '';
+				        case @bid.reward_type
+				          when 1
+				            label = l(:label_respond_requirement)
+				          when 2
+				            label = l(:label_contest_requirement)
+				          when 3
+				            label = l(:label_question_requirement)
+				          else
+				        end
+			        %>  
+			<span class="body">	
+				<span class="user"><%= link_to journal.user, user_path(journal.user)%></span>
+				<span class="font_lighter"><%= label %></span>
+				<%= textilizable journal.notes%>
+				<span class="font_lighter"><%= l(:label_bids_published) %>&nbsp;<%= time_tag(journal.created_on).html_safe %>&nbsp;<%= l(:label_bids_published_ago) %></span>
+				<span><% if @user==User.current|| User.current.admin? %>
+					    <%= link_to(l(:label_bid_respond_quote), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true, 
+							:method => 'post', :title => l(:button_quote))%>
+						<%= link_to(l(:label_bid_respond_delete), {:controller => 'bids', :action => 'destroy', :object_id => journal, :id => bid},:confirm => l(:label_delete_confirm),
+					    	:remote => true, :method => 'delete', :class => "delete", :confirm => l(:text_are_you_sure), :title => l(:button_delete)) %>
+					  <% else %>
+					    <%= link_to(l(:label_bid_respond_quote), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true, 
+					    	:method => 'post', :title => l(:button_quote))%>
+					  <% end %>
+				</span>
+			</span>
+			<div style="clear: both;"></div>
+		</li>
+	<% end %>
+</ul>
 <% end %>