bug 修复。

app/views/account/register.html.erb

@@ -216,8 +216,9 @@
 
 <p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_identity) %><span class="required"> *</span></strong></td>
 	          <td class="info" style="width: 10px">
-	          	<%= select_tag 'identity', "<option value = '0'>#{l(:label_teacher)}</option> <option value = '1'>#{l(:label_student)}</option> <option value = '2'>#{l(:label_other)}</option>"
+	          	<%= select_tag 'identity', "<option value = '0'>#{l(:label_teacher)}</option>
-	          								.html_safe %></td></tr></table></p>
+	          								<option value = '1'>#{l(:label_student)}</option>
+	          								<option value = '2'>#{l(:label_other)}</option>".html_safe %></td></tr></table></p>
 
 
 <p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_gender) %></strong></td>

app/views/bids/_project_list.html.erb

@@ -16,6 +16,63 @@
 	</td>
 	<% end %>
 </table>
+
+<% @bidding_project.each do |b_project|%>
+<table width="90%" border="0" align='center'>
+	<tr>
+		<td>
+		<table width="660px" border="0" align='center'>
+			<tr>
+				<td width="50px" valign="top" colspan="2" align="middle">
+				<div style="width: 50px; height: 50px;">
+					<%= link_to image_tag(url_to_avatar(b_project.project), :class => 'avatar3'), :class => "avatar" %>
+				</div></td>
+				<td width="60%" valign="top">
+				<table width="100%" valign="top">
+					<tr>
+						<td colspan="2" valign="top"><strong><%= link_to(b_project.project.name, project_path(b_project.project)) %></strong><a class="font_lighter"><%= l(:label_jion_bidding_homework)%></a></td>
+					</tr>
+					<tr></tr>
+					<tr>
+						<td valign="top"><%= b_project.project.description %></td>
+					</tr>
+					<tr>
+						<td valign="top"><a class="font_lighter"><%=format_time(b_project.created_at) %></a></td>
+					</tr>
+				</table></td>
+				<td width="30%">
+				<div class="bid-user-message" style="border-left:  1px solid rgb(225, 225, 225); margin-left: 20px; padding-left: 20px;">
+					<table width="100%">
+						<tr>
+							<td><%= l(:label_bidding_user_homework) %> : <%= link_to(b_project.user.name, user_path(b_project.user)) %></td>
+						</tr>
+						<tr>
+							<td style=" word-wrap: break-word; word-break: break-all"><%= l(:label_bidding_reason_homewrok) %> : <%= b_project.description %></td>
+						</tr>
+					</table>
+				</div></td>
+			</tr>
+		</table></td>
+	</tr>
+</table>
+<% end %>
+
+
+
+	<% else %>
+<table width="1000px" border="0" style="padding-left: 15px">
+	<td class="font_lighter" style="font-size: 15px;"><%= l(:label_bidding_project) %>(<%= @bidding_project.count%>)</td>
+	
+	<% if User.current.logged? %>
+	<td>
+	<% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %>
+	<div class='icon icon-add'>
+		<%= toggle_link l(:button_bidding_homework), 'put-bid-form' %>
+	</div>	
+	<% end %>
+	</td>
+	<% end %>
+</table>
 <% end %>
 <%= render :partial=> "list_projects",:locals => {:bidding_project => @bidding_project,:bid => @bid }%>
 

db/schema.rb

@@ -12,7 +12,7 @@
 # It's strongly recommended to check this file into your version control system.
 
 
-ActiveRecord::Schema.define(:version => 20130922123849) do
+
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -71,8 +71,10 @@ ActiveRecord::Schema.define(:version => 20130922123849) do
     t.datetime "created_at",  :null => false
     t.datetime "updated_at",  :null => false
 
+
     t.string   "reward"
 
+
   end
 
   create_table "bids", :force => true do |t|