From 29618d6a72a70cf88e2ca2fdbe53bac29d5c4bb5 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Fri, 18 Jul 2014 13:48:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E7=95=8C=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contestnotifications/index.html.erb |  2 +-
 app/views/contests/_contest_list.html.erb     |  2 +-
 app/views/layouts/base_newcontest.html.erb    | 10 +++++-----
 app/views/welcome/contest.html.erb            |  2 +-
 config/locales/zh.yml                         |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index fc71bc64a..0cf722851 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -77,7 +77,7 @@
       <%= stylesheet_link_tag 'scm' %>
   <% end %>
 
-  <% html_title(l(:label_news_plural)) -%>
+  <% html_title(l(:label_contest_notification)) -%>
 </div>
 
 <script type='text/javascript'>
diff --git a/app/views/contests/_contest_list.html.erb b/app/views/contests/_contest_list.html.erb
index 61dd6192c..780b18c27 100644
--- a/app/views/contests/_contest_list.html.erb
+++ b/app/views/contests/_contest_list.html.erb
@@ -14,7 +14,7 @@
                   <% unless contest.author.nil? %>
                       <%= link_to(contest.author, user_path(contest.author), :class => 'bid_user') %>:
                   <% end %>
-                     &nbsp;<%= link_to(contest.name, show_contest_contest_path(contest), :class => 'bid_path', :target => "_blank") %></strong></td>
+                     &nbsp;<%= link_to(contest.name,  contest_contestnotifications_path(contest), :class => 'bid_path', :target => "_blank") %></strong></td>
 			</tr>
 			<tr>
 				<td width="500">
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index a14f25cd6..256184813 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -214,11 +214,11 @@
 						<div id="content">
 							<% if display_main_menu?(@contest) %>
 							<div class="tabs_new">			
-								<ul>								
-									<li ><%= link_to l(:label_contest_userresponse), show_contest_contest_path(@contest), :class => link_class(:respond) %></li>
-									<li><%= link_to l(:label_contest_joincontest), show_attendingcontest_contest_path(@contest), :class => link_class(:attendingcontests) %></li>
-									<li><%= link_to l(:label_contest_notification),  contest_contestnotifications_path(@contest), :class => link_class(:contestnotifications) %></li>
-								</ul>								
+								<ul>
+                                  <li><%= link_to l(:label_contest_notification), contest_contestnotifications_path(@contest), :class => link_class(:contestnotifications) %></li>
+                                  <li><%= link_to l(:label_contest_joincontest), show_attendingcontest_contest_path(@contest), :class => link_class(:attendingcontests) %></li>
+                                  <li><%= link_to l(:label_contest_userresponse), show_contest_contest_path(@contest), :class => link_class(:respond) %></li>
+                                </ul>
 							</div>
 							<% end %>
 						
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 35ac5eda1..b48b5828a 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -157,7 +157,7 @@
 				
 				<div style="float: left; margin-left: 12px; margin-top: 10px; margin-bottom: -4px; width: 380px;">
 					<!-- <%= link_to(contest.name, contest.event_url, :class => "d-g-blue d-p-project-name",  :title => "#{contest.name}",  :target => "_blank")  %> -->
-					<%= link_to(contest.name, show_contest_contest_path(contest.id), :class => "d-g-blue d-p-project-name",  :title => "#{contest.name}",  :target => "_blank")  %>
+					<%= link_to(contest.name, contest_contestnotifications_path(contest.id), :class => "d-g-blue d-p-project-name",  :title => "#{contest.name}",  :target => "_blank")  %>
 					<% if contest.id == 2 or contest.id == 3 or contest.id == 6 %>
 						<span class="font_lighter">(<span style="font-size: 13px"><%= link_to("#{contest.projects.where('is_public=1').count}"+l(:label_work_quantity), show_attendingcontest_contest_path(contest), :target => "_blank") %></span>)</span>
 					<% else %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index c701ce41a..52624dcc9 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1776,7 +1776,7 @@ zh:
   label_fork_homework_new: 选为作业
   #wang
   label_contest_userresponse: 用户留言
-  label_contest_joincontest: 参入竞赛
+  label_contest_joincontest: 参加竞赛
   label_contest_notification: 竞赛通知
   #end