From c75391b3a0702a44310c691854bd6f5c178cf97d Mon Sep 17 00:00:00 2001
From: fanqiang <316257774@qq.com>
Date: Wed, 9 Oct 2013 16:47:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=AA=97=E5=8F=A3=E9=87=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=A1=86=E7=9A=84=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_bid_show.html.erb     |  6 +++---
 app/views/projects/_new_join.html.erb | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/views/bids/_bid_show.html.erb b/app/views/bids/_bid_show.html.erb
index 5b3747b12..696443f02 100644
--- a/app/views/bids/_bid_show.html.erb
+++ b/app/views/bids/_bid_show.html.erb
@@ -26,9 +26,9 @@
 					<tr>
 						<td><span class="font_lighter"><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid) %></strong>) </span><span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span><span class="font_lighter"> <%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<strong><%= link_to bid.watcher_users.count, respond_path(bid) %></strong>)</span></td>
 					</tr>
-					<% unless bid.courses.empty? %>
-					<% teacher = Course.find_by_extra(bid.courses.first.identifier).teacher %>
-					<tr>
+						<% unless bid.courses.empty? %>
+						<% teacher = Course.find_by_extra(bid.courses.first.identifier).teacher %>
+						<tr>
 						<td><span class="font_lighter">课程名称：<%= link_to bid.courses.first.name, project_path(bid.courses.first)%>&nbsp;&nbsp;教师：<%= link_to teacher.lastname+teacher.firstname, user_path(teacher) %></span></td>
 						</tr>
 						<% end %>
diff --git a/app/views/projects/_new_join.html.erb b/app/views/projects/_new_join.html.erb
index ca06715f3..34aa0cda5 100644
--- a/app/views/projects/_new_join.html.erb
+++ b/app/views/projects/_new_join.html.erb
@@ -13,7 +13,7 @@
 		border: 1px solid rgb(148, 148, 148);
 		box-shadow: none;
 		text-shadow: none;
-		margin-top: -10px;
+		/*margin-top: -10px;*/
 		/*margin-right: -4px;*/
 	}
 	input[type="button"].bid_btn {
@@ -28,7 +28,7 @@
 		border: 1px solid rgb(148, 148, 148);
 		box-shadow: none;
 		text-shadow: none;
-		margin-top: -10px;
+		/*margin-top: -10px;*/
 		margin-right: -2px;
 	}
 	textarea:focus {
@@ -44,11 +44,15 @@
              :remote => true,
              :method => :post,
              :id => 'new-watcher-form') do %>
+<table border="0">
+	<tr>
+		<td align="cneter">
+  <%= text_field_tag 'course_password', nil, :size => 30%></td>
 
-  <%= text_field_tag 'course_password', nil, :size => 48%>
-
-  <p class="buttons" style="padding-top: 10px; padding-bottom: 1px; margin-bottom: 1px">
-    <%= submit_tag '加入', :name => nil, :class => "bid_btn", :onclick => "hideModal(this);" %>
+ <td align="center">
+    <%= submit_tag '加入', :name => nil, :class => "bid_btn", :onclick => "hideModal(this);" %></td>
+    <td align="center">
     <%= submit_tag l(:button_cancel), :name => nil, :class => "bid_btn", :onclick => "hideModal(this);", :type => 'button' %>
-  </p>
+</td>
+</tr></table>
 <% end %>