1、 实践课程->“课程作业”中的“提交情况”,”作业”后应该加数量【光辉 周二】

2、	实践课程->url错误，应该是course【光辉 周二】
3、	竞赛—参与项目 参与项目显示时间是UTC格式，应该与其他的时间格式一致；【周二 光辉】
4、	创新竞赛—>参与项目列表中每个项目名后面的“参与了应标“应改为”参与了竞赛“，“应标人”改为“参赛人”【光辉周二解决】

app/views/bids/_homework_list.html.erb

@@ -4,7 +4,7 @@
 <div class="project-search-block">
 	<table width="100%" valign="center">
 		<tr>
-			<td ><span style="margin-left:0px"><%= l(:label_task_plural)%></span></td>
+			<td ><span style="margin-left:0px"><%= l(:label_task_plural)%>(<%= @homework_list.count%>)</span></td>
             <td align="right">
 			<div class="project-search">
 				<%= text_field_tag 'student_id', params[:student_id], :size => 30 %>

app/views/bids/_list_projects.html.erb

@@ -3,10 +3,7 @@
 <div class="project-search-block">
 	<table width="100%" valign="center">
 		<tr>
-			<td width="16%"><span style="margin-left:0px"><%= l(:label_task_plural)%></span></td>
-			
-           
-           
+			<td width="16%"><span style="margin-left:0px"><%= l(:label_task_plural)%></span></td>         
             <td align="right">
 			<div class="project-search">
 				<%= text_field_tag 'student_id', params[:student_id], :size => 30 %>
@@ -19,9 +16,6 @@
 <% end %>
 <% bidding_project.each do |b_project|%>
 <% if b_project.project %>
-
-
-
 <table width="90%" border="0" align='center'>
 	<tr>
 		<td>
@@ -38,7 +32,15 @@
 						<td colspan="2" valign="top" width="50%"><strong>
 							<%= link_to(b_project.project.name, project_path(b_project.project)) %>
 							
-							</strong><a class="font_lighter"><%= l(:label_join_bidding)%></a>
+							</strong><a class="font_lighter">
+								<% if @bid.reward_type == 2 %>
+								     <%= l(:label_join_contest)%>
+								<% end %>
+								<% if @bid.reward_type == 1 %>
+								     <%= l(:label_join_bidding)%>
+								<% end %>
+								
+							</a>
 						</td>
 						
 						<!-- 如果需求到期     并且是该需求的管理员  -->
@@ -142,7 +144,7 @@
 				
 					<tr>
 						<td valign="top"><span class="font_lighter">
-							<%= b_project.created_at%>
+							<%= format_time b_project.created_at%>
 						</span></td>
 					</tr>
 				</table>
@@ -170,7 +172,13 @@
 						</tr>
 						<% else %>
 						<tr>
-						<td><strong><%= l(:label_bidding_user) %>
+						<td><strong>
+							<% if @bid.reward_type == 2%>
+							      <%= l(:label_contest_user) %>
+							<% end %>
+							<% if @bid.reward_type == 1 %>
+							      <%= l(:label_bidding_user) %>
+							<% end %>
 							<% unless b_project.user.nil? %>
 							<%= b_project.user.lastname %><%= b_project.user.firstname %>
 							<% end %></strong>
@@ -185,7 +193,15 @@
 						
 						</tr>
 						<tr>
-							<td style=" word-wrap: break-word; word-break: break-all"><%= l(:label_bidding_reason) %><%= b_project.description %></td>
+							<td style=" word-wrap: break-word; word-break: break-all">
+								
+								<% if @bid.reward_type == 2%>
+							          <%= l(:label_contest_reason) %>
+							    <% end %>
+							    <% if @bid.reward_type == 1 %>
+							          <%= l(:label_bidding_reason) %>
+							    <% end %>
+								<%= b_project.description %></td>
 						</tr>								
 						<% end %>
 					</table>

app/views/bids/_project_homework.html.erb

@@ -30,7 +30,7 @@
 						<td valign="top"><%= b_project.project.description %></td>
 					</tr>
 					<tr>
-						<td valign="top"><a class="font_lighter"><%= b_project.created_at%></a></td>
+						<td valign="top"><a class="font_lighter"><%=  b_project.created_at %></a></td>
 					</tr>
 				</table></td>
 				<td width="30%">

app/views/projects/course.html.erb

@@ -25,7 +25,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td style="padding-left: 8px"><a><%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'course', :project_type => 1 %> </a></td>
+			<td style="padding-left: 8px"><a><%= link_to "forge.trustie.net/project/course", :controller => 'projects', :action => 'course', :project_type => 1 %> </a></td>
 	        <td ><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course', :project_type => 1 %></td>
 		</tr>
 	</table>

app/views/welcome/index.html.erb

@@ -263,6 +263,7 @@
 <div class="right" style="float: right; margin-right: 10px; height: 445px; width: 45%; ">	
 	<ul class="user-welcome-message-list" style="width: 94%; margin-top: 0px;">
 		<h3 style="margin-left: -5px; color: rgb(21, 188, 207)"><strong>用户动态</strong></h3>
+		<span style="margin-top: -30px;float: right; display: block;"><%= link_to "更多>>", { :controller => 'users', :action => 'index'} %></span>
 		<div class="user-message-box-list">
 		<% find_all_activities.each do |event| %>
 		<li style="display: block;height:60px; padding-bottom: 4px;">

config/locales/zh.yml

@@ -1748,3 +1748,6 @@ zh:
   label_project_module_forums: 公共贴吧
   label_memo_locked: 帖子已被锁定
   label_downloads_list: 进入附件列表
+  label_join_contest: 参与了竞赛
+  label_contest_user: 参赛人：
+  label_contest_reason: 参赛宣言：