From b7027405ce50277a95d235b99e8560ee2b7f007e Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Tue, 5 Nov 2013 16:53:00 +0800
Subject: [PATCH] fix some little bug!

---
 app/views/bids/show_project.html.erb | 224 +++++++++++++--------------
 config/locales/zh.yml                |   6 +-
 2 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/app/views/bids/show_project.html.erb b/app/views/bids/show_project.html.erb
index 4dc2c373c..804602c35 100644
--- a/app/views/bids/show_project.html.erb
+++ b/app/views/bids/show_project.html.erb
@@ -1,112 +1,112 @@
-<!-- fq -->
-
-<% if @bid.homework_type == 1%>
-	<%= render :partial => 'homework' %>
- 
-<% else %>
-<style>
-	input[type="submit"].bid_btn {
-		vertical-align: middle;
-		width: 60px;
-		height: 30px;
-		line-height: 18px;
-		font-size: 14px;
-		color: rgb(0, 0, 0);
-		background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
-		padding: 0px 0px 4px 0px;
-		border-radius: 2px;
-		border: 1px solid rgb(148, 148, 148);
-		box-shadow: none;
-		text-shadow: none;
-		margin-top: -10px;
-		/*margin-right: -4px;*/
-	}
-	input[type="button"].bid_btn {
-		width: 60px;
-		height: 30px;
-		line-height: 18px;
-		font-size: 14px;
-		color: rgb(0, 0, 0);
-		background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
-		padding: 0px 0px 4px 0px;
-		border-radius: 2px;
-		border: 1px solid rgb(148, 148, 148);
-		box-shadow: none;
-		text-shadow: none;
-		margin-top: -10px;
-		margin-right: -2px;
-	}
-	textarea:focus {
-		border: #d5dee9 1px solid;
-	}
-</style>
-
-<script type="text/javascript" language="javascript">
-	function clearInfo(id,content) {
-		var text = $('#' + id);
-		if (text.val() == content) {
-			$('#' + id).val('');
-		}
-	}
-
-	function showInfo(id,content) {
-		var text = $('#' + id);
-		if (text.val() == '') {
-			$('#' + id).val(content);
-		}
-	}
-
-	function cancel() {
-		$("#put-bid-form").hide();
-	}
-</script>
-
-	<% if User.current.logged? %>
-<!--我要竞标弹出框-->
-	<div id = 'flash' style="float:left; width: 100%; display: none" ></div>
-	<div id="put-bid-form" style="display: none">
-		<%= form_for "bid_for_save", :remote=>true, :url => {:controller => 'bids', :action => 'add'},
-		:update => "bidding_project_list",
-		:complete => '$("#put-bid-form").hide();' do |f| %>
-		<table id="bidding_table" border="0" width="100%" style="margin-left: 40px;">
-			<tr>
-				<td><%= select_tag 'bid', options_for_select(@option), :name => 'bid', :class => 'grayline' %></td>
-		<div id="prompt_create_pro"><!-- nyan -->
-			<td>
-				<p>
-					<div class="font_lighter" style="font-size: 13px;">
-					<%= link_to '创建项目', new_project_path, :target=>'_blank'%>，以提交作业。
-					</div>
-				</p>
-			</td>
-		</div>
-			</tr>
-			<% if @bid.reward_type == 3 %>
-			<tr>
-				<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason_homework), :style => "resize: none;", :class => 'noline'%></td>
-			</tr>
-			<% else %>
-			<tr>
-				<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason), :style => "resize: none;", :class => 'noline'%></td>
-			</tr>
-			<% end %>			
-			<tr>
-				<td align="right">
-				<%= submit_tag l(:button_add), :name => nil , :class => "bid_btn",
-				 :onmouseout => "this.style.backgroundPosition = 'left top'",
-				  :onmouseover => "this.style.backgroundPosition = 'left -30px'"%>
-				<%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();", 
-				:type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'",
-				:onmouseover => "this.style.backgroundPosition = 'left -30px'" %> 
-				</td>
-			</tr>
-		</table>
-		<% end %>
-	</div>
-	<% end %>
-
-	<div id='bidding_project_list'>
-	<%= render :partial => 'project_list', :locals => {:bidding_project => @bidding_project,:bid => @bid} %>
-	</div>
-<% end %>
-
+<!-- fq -->
+
+<% if @bid.homework_type == 1%>
+	<%= render :partial => 'homework' %>
+ 
+<% else %>
+<style>
+	input[type="submit"].bid_btn {
+		vertical-align: middle;
+		width: 60px;
+		height: 30px;
+		line-height: 18px;
+		font-size: 14px;
+		color: rgb(0, 0, 0);
+		background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
+		padding: 0px 0px 4px 0px;
+		border-radius: 2px;
+		border: 1px solid rgb(148, 148, 148);
+		box-shadow: none;
+		text-shadow: none;
+		margin-top: -10px;
+		/*margin-right: -4px;*/
+	}
+	input[type="button"].bid_btn {
+		width: 60px;
+		height: 30px;
+		line-height: 18px;
+		font-size: 14px;
+		color: rgb(0, 0, 0);
+		background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
+		padding: 0px 0px 4px 0px;
+		border-radius: 2px;
+		border: 1px solid rgb(148, 148, 148);
+		box-shadow: none;
+		text-shadow: none;
+		margin-top: -10px;
+		margin-right: -2px;
+	}
+	textarea:focus {
+		border: #d5dee9 1px solid;
+	}
+</style>
+
+<script type="text/javascript" language="javascript">
+	function clearInfo(id,content) {
+		var text = $('#' + id);
+		if (text.val() == content) {
+			$('#' + id).val('');
+		}
+	}
+
+	function showInfo(id,content) {
+		var text = $('#' + id);
+		if (text.val() == '') {
+			$('#' + id).val(content);
+		}
+	}
+
+	function cancel() {
+		$("#put-bid-form").hide();
+	}
+</script>
+
+	<% if User.current.logged? %>
+<!--我要竞标弹出框-->
+	<div id = 'flash' style="float:left; width: 100%; display: none" ></div>
+	<div id="put-bid-form" style="display: none">
+		<%= form_for "bid_for_save", :remote=>true, :url => {:controller => 'bids', :action => 'add'},
+		:update => "bidding_project_list",
+		:complete => '$("#put-bid-form").hide();' do |f| %>
+		<table id="bidding_table" border="0" width="100%" style="margin-left: 40px;">
+			<tr>
+				<td><%= select_tag 'bid', options_for_select(@option), :name => 'bid', :class => 'grayline' %></td>
+		<div id="prompt_create_pro"><!-- nyan -->
+			<td>
+				<p>
+					<div class="font_lighter" style="font-size: 13px;">
+					<%= link_to '创建项目', new_project_path, :target=>'_blank'%>
+					</div>
+				</p>
+			</td>
+		</div>
+			</tr>
+			<% if @bid.reward_type == 3 %>
+			<tr>
+				<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason_homework), :style => "resize: none;", :class => 'noline'%></td>
+			</tr>
+			<% else %>
+			<tr>
+				<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason), :style => "resize: none;", :class => 'noline'%></td>
+			</tr>
+			<% end %>			
+			<tr>
+				<td align="right">
+				<%= submit_tag l(:button_add), :name => nil , :class => "bid_btn",
+				 :onmouseout => "this.style.backgroundPosition = 'left top'",
+				  :onmouseover => "this.style.backgroundPosition = 'left -30px'"%>
+				<%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();", 
+				:type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'",
+				:onmouseover => "this.style.backgroundPosition = 'left -30px'" %> 
+				</td>
+			</tr>
+		</table>
+		<% end %>
+	</div>
+	<% end %>
+
+	<div id='bidding_project_list'>
+	<%= render :partial => 'project_list', :locals => {:bidding_project => @bidding_project,:bid => @bid} %>
+	</div>
+<% end %>
+
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 5a4203f8b..6c052df57 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -448,13 +448,13 @@ zh:
   label_module_share: DTS测试工具
 
   label_user: 用户
-  label_user_plural: 用户
+  label_user_plural: 用户列表
   label_user_new: 新建用户
   label_user_anonymous: 匿名用户
   label_project: 项目
   label_activity_project: '项目: '  #added by bai
   label_project_new: 新建项目
-  label_project_plural: 项目
+  label_project_plural: 项目列表
   label_x_projects:
     zero:  无项目
     one:   1 个项目
@@ -503,7 +503,7 @@ zh:
   label_home: 主页
   #by young
   label_requirement: 需求
-  label_new_course: 课程
+  label_new_course: 课程列表
   label_course_practice: 实践课程
   label_project_deposit: 项目托管
   label_software_user: 软件创客