From 7fa8d2fff854ad7852a40632860c7487fe94bf89 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 27 Nov 2014 17:05:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=A0=87=E9=A2=98=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/contest.html.erb                  | 16 ++++++++++++----
 app/views/contests/index.html.erb                | 12 +++++++++---
 .../_base_softapplication_top_content.html.erb   |  2 +-
 app/views/layouts/base_newcontest.html.erb       |  2 +-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/app/views/bids/contest.html.erb b/app/views/bids/contest.html.erb
index bd069c8c8..a5dcf8041 100644
--- a/app/views/bids/contest.html.erb
+++ b/app/views/bids/contest.html.erb
@@ -2,8 +2,14 @@
 	<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %>
 	<table width="940px">
 		<tr>
-			<td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_contest_innovate) %></td>
-			<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
+			<td class="info_font" style="width: 220px; color: #15bccf" rowspan="2">
+              <a href="http://<%= Setting.host_contest%>" style="color: #15bccf;">
+                <%=l(:label_contest_innovate_community)%>
+              </a>
+            </td>
+			<td class="location-list">
+              <strong><%= l(:label_user_location) %> :</strong>
+            </td>
 			<td rowspan="2">
 			<% if User.current.logged? %>
 			<% unless User.current.user_extensions.identity == 1 %>					
@@ -20,8 +26,10 @@
 			</td>
 		</tr>
 		<tr>
-			<td style="padding-left: 8px"><a><%= link_to request.host()+"/contest", :controller => 'bids', :action => 'index' %> </a></td>
-	        <td ><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %></td>
+	        <td >
+              <%=link_to l(:field_homepage), home_path %> >
+              <a><%= l(:label_contest_innovate) %></a>
+            </td>
 		</tr>
 	</table>
 	<% end %>
diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb
index 0c6b0e109..f966f149d 100644
--- a/app/views/contests/index.html.erb
+++ b/app/views/contests/index.html.erb
@@ -2,8 +2,14 @@
   <%= form_tag({:controller => 'contests', :action => 'index'}, :method => :get) do %>
       <table width="940px">
         <tr>
-          <td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_contest_innovate) %></td>
-          <td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
+          <td class="info_font" style="width: 220px; color: #15bccf" rowspan="2">
+            <a href="http://<%= Setting.host_contest%>" style="color: #15bccf;">
+              <%=l(:label_contest_innovate_community)%>
+            </a>
+          </td>
+          <td class="location-list">
+            <strong><%= l(:label_user_location) %> :</strong>
+          </td>
           <td rowspan="2">
             <% if User.current.logged? %>
                 <% unless User.current.user_extensions.identity == 1 %>
@@ -29,7 +35,7 @@
           </td>
           <td >
             <%=link_to l(:field_homepage), home_path %> >
-            <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
+            <a><%= l(:label_contest_innovate) %></a>
             <!-- end longjun -->
           </td>
         </tr>
diff --git a/app/views/layouts/_base_softapplication_top_content.html.erb b/app/views/layouts/_base_softapplication_top_content.html.erb
index e92ce7c34..afa2e1d29 100644
--- a/app/views/layouts/_base_softapplication_top_content.html.erb
+++ b/app/views/layouts/_base_softapplication_top_content.html.erb
@@ -15,7 +15,7 @@
 		<tr>
 			<td >
               <%=link_to l(:field_homepage), home_path %> >
-			  <%=link_to l(:label_contest_innovate), :controller=>'contests', :action=>'index' %> >
+              <a><%= l(:label_contest_innovate) %></a>
 			  <span>
                 <% contest = @softapplication.contests.first %><%= contest ? link_to(contest.name, show_contest_contest_path(contest)) : '尚未加入竞赛'%>
 		      </span>
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index 52a65e379..c118078d0 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -47,7 +47,7 @@
                                 </tr>
                                 <tr>
                                     <td><%=link_to l(:field_homepage), home_path %> >
-                                        <%=link_to l(:label_contest_innovate), :controller=>'contests', :action=>'index' %> >
+                                      <a><%= l(:label_contest_innovate) %></a> >
                                         <span title="<%= @contest.name%>">
                                           <%= link_to h(truncate(@contest.name, length: 20, omission: '...')), show_contest_contest_path(@contest) %>
                                         </span>