From d541309455af5b8fccd3a324f9c75d17d777ed38 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 15 Oct 2014 17:24:49 +0800
Subject: [PATCH] =?UTF-8?q?#1295=E5=8F=96=E6=B6=88=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=BF=99=E7=9A=84=E5=85=B3=E6=B3=A8=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_contest.html.erb    | 81 ++++++++++++----------
 app/views/layouts/base_newcontest.html.erb | 80 ++++++++++++---------
 2 files changed, 93 insertions(+), 68 deletions(-)

diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb
index 740016ff8..ae44933ab 100644
--- a/app/views/layouts/base_contest.html.erb
+++ b/app/views/layouts/base_contest.html.erb
@@ -27,27 +27,27 @@
 					<div id="main" class="">
 						<!-- added by bai	 -->
 						<div class="top-content">
-									<table>
-										<tr>
-											<td class="info_font" style="width: 240px; color: #15bccf"><%=l(:label_contest_innovate_community)%></td>
-											<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
-											<td rowspan="2" width="250px">
-												<div class="project-search">
-													<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %>
-													    <%= text_field_tag 'name', params[:name], :size => 20 %>
-													    <%= hidden_field_tag 'reward_type', @bid.reward_type %>
-													    <%= hidden_field_tag 'project_type', params[:project_type] %>
-													    <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
-													<% end %>
-												</div>
-											</td>
-										</tr>
-										<tr>
-											<td style="padding-left: 8px"><%=link_to request.host()+"/contest", :controller => 'bids', :action => 'contest' %></td>
-			                        		<td ><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %> >
-			                        			<span><%= link_to @bid.name, bid_path %></span></td>
-										</tr>
-									</table>
+                            <table>
+                                <tr>
+                                    <td class="info_font" style="width: 240px; color: #15bccf"><%=l(:label_contest_innovate_community)%></td>
+                                    <td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
+                                    <td rowspan="2" width="250px">
+                                        <div class="project-search">
+                                            <%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %>
+                                                <%= text_field_tag 'name', params[:name], :size => 20 %>
+                                                <%= hidden_field_tag 'reward_type', @bid.reward_type %>
+                                                <%= hidden_field_tag 'project_type', params[:project_type] %>
+                                                <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+                                            <% end %>
+                                        </div>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td style="padding-left: 8px"><%=link_to request.host()+"/contest", :controller => 'bids', :action => 'contest' %></td>
+                                    <td ><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %> >
+                                        <span><%= link_to @bid.name, bid_path %></span></td>
+                                </tr>
+                            </table>
 						</div>
 			<!-- end -->
 						<div id="sidebar">
@@ -65,20 +65,25 @@
 														<td class="info_font" style=" word-wrap: break-word; word-break: break-all"><%= h @bid.name %></td>
 													</tr>
 													<% if User.current.login? %>		<!--added by linchun-->
-													<tr colspan='3'>
-														<td valign="middle">
-															<span style="display:block; margin-left:20px;"><%= join_in_contest(@bid, User.current)%></span>
-															<span style="display:block; margin-left:20px;"><span class="icon-fav icon"></span><%= watcher_link(@bid, User.current) %></span>
-														</td>
-												   </tr>
+                                                        <tr colspan='3'>
+                                                            <td valign="middle">
+                                                                <span style="display:block; margin-left:20px;">
+                                                                  <%= join_in_contest(@bid, User.current)%>
+                                                                </span>
+                                                                <span style="display:block; margin-left:20px;">
+                                                                  <span class="icon-fav icon"></span>
+                                                                  <%= watcher_link(@bid, User.current) %>
+                                                                </span>
+                                                            </td>
+                                                       </tr>
 												   <% end %>
 												</table>
 							   <!-- added by bai 增加了竞赛的配置 -->
-														<% if User.current.logged? %>
-													      <% if @bid.author.id == User.current.id %>
-														     <%= link_to l(:label_contest_modify_settings), {:controller => 'bids', :action => 'settings', :id => @bid} %>
-													      <% end %>
-													    <% end %>
+                                                <% if User.current.logged? %>
+                                                  <% if @bid.author.id == User.current.id %>
+                                                     <%= link_to l(:label_contest_modify_settings), {:controller => 'bids', :action => 'settings', :id => @bid} %>
+                                                  <% end %>
+                                                <% end %>
 						                   </td>
 						               </table>
 						        </div>
@@ -86,10 +91,14 @@
 								<div class="user_fans">
 									<table width="240" border="0">
 										<tr align="center" width="80px">
-											<td class="font_index"><%=link_to "#{@bid.join_in_contests.count}",:controller => "bids",
-											                                                                   :action => "show_participator" %></td>
-											<td class="font_index"><%=link_to "#{@bid.projects.where('is_public=1').count}", :controller => 'bids',
-											                                                            :action => 'show_project' %></td>
+											<td class="font_index">
+                                              <%=link_to "#{@bid.join_in_contests.count}",:controller => "bids",
+                                                         :action => "show_participator" %>
+                                            </td>
+											<td class="font_index">
+                                              <%=link_to "#{@bid.projects.where('is_public=1').count}", :controller => 'bids',
+                                                         :action => 'show_project' %>
+                                            </td>
 										<tr class="font_aram">
 											<td align="center" width="70px"> <%= l(:label_participator) %></td>
 											<td align="center" width="70px"> <%= l(:label_bidding_project) %></td>
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index adce80d24..d8945a5dc 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -5,19 +5,17 @@
 <!DOCTYPE html>
 <html lang="en">
 	<head>
-		<meta charset="utf-8" />
-		<title><%= h html_title %></title>
-		<meta name="description" content="<%= Redmine::Info.app_name %>" />
-		<meta name="keywords" content="issue,bug,tracker" />
-		<%= csrf_meta_tag %>
-		<%= favicon %>
-      <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
+        <meta charset="utf-8" />
+        <title><%= h html_title %></title>
+        <meta name="description" content="<%= Redmine::Info.app_name %>" />
+        <meta name="keywords" content="issue,bug,tracker" />
+        <%= csrf_meta_tag %>
+        <%= favicon %>
+        <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
-
 		<%= javascript_heads %>
 		<%= heads_for_theme %>
 		<%= call_hook :view_layouts_base_html_head %>
-
 		<%= yield :header_tags -%>
 	</head>
 	<body class="<%= h body_css_classes %>">
@@ -26,12 +24,15 @@
 				<div id="wrapper3">
 					<%=render :partial => 'layouts/base_header'%>
 					<div id="main" class="">
-
 						<div class="top-content">
                             <table>
                                 <tr>
-                                    <td class="info_font" style="width: 240px; color: #15bccf"><%=l(:label_contest_innovate_community)%></td>
-                                    <td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
+                                    <td class="info_font" style="width: 240px; color: #15bccf">
+                                      <%=l(:label_contest_innovate_community)%>
+                                    </td>
+                                    <td style="width: 430px; color: #15bccf">
+                                      <strong><%= l(:label_user_location) %> : </strong>
+                                    </td>
                                     <td rowspan="2" width="250px">
                                         <div class="project-search">
                                             <%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %>
@@ -43,10 +44,14 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td style="padding-left: 8px"><%=link_to request.host()+"/contests", :controller=>'contests', :action=>'index' %></td>
+                                    <td style="padding-left: 8px">
+                                      <%=link_to request.host()+"/contests", :controller=>'contests', :action=>'index' %>
+                                    </td>
                                     <td><%=link_to l(:field_homepage), home_path %> >
                                         <%=link_to l(:label_contest_innovate), :controller=>'contests', :action=>'index' %> >
-                                        <span title="<%= @contest.name%>"><%= link_to h(truncate(@contest.name, length: 20, omission: '...')), show_contest_contest_path(@contest) %></span>
+                                        <span title="<%= @contest.name%>">
+                                          <%= link_to h(truncate(@contest.name, length: 20, omission: '...')), show_contest_contest_path(@contest) %>
+                                        </span>
                                     </td>
                                 </tr>
                             </table>
@@ -61,17 +66,19 @@
 												<td align="left" width="100px">
 													<%= image_tag(url_to_avatar(@user), :class => "avatar2") %>
 												</td>
-
 												<td>
 													<table>
 														<tr>
-															<td class="info_font" title="<%= @contest.name%>"><%= link_to @contest.name, show_contest_contest_path(@contest) %></td>
+															<td class="info_font" title="<%= @contest.name%>">
+                                                              <%= link_to @contest.name, show_contest_contest_path(@contest) %>
+                                                            </td>
 														</tr>
 														<% if User.current.login? %>
 														<tr colspan='3'>
 															<td valign="middle">
-																<!-- <span style="display:block; margin-left:20px; margin-bottom: 5px"><%= join_in_competition(@contest, User.current)%></span> -->
-																<span style="display:block; margin-left:20px;"><%= new_watcher_link(@contest, User.current) %></span>
+																<span style="display:block; margin-left:20px;">
+                                                                  <%= new_watcher_link(@contest, User.current) unless (@contest.author.id == User.current.id) || User.current.admin?  %>
+                                                                </span>
 															</td>
 													    </tr>
 													   <% end %>
@@ -80,12 +87,17 @@
 													      <% if (@contest.author.id == User.current.id) || User.current.admin? %>
 													      <tr colspan='3'>
 													      	<td valign="middle">
-														     <span style="display:block; margin-left:20px;"><%= link_to l(:label_contest_modify_settings), {:controller => 'contests', :action => 'settings', :id => @contest} %></span>
+														     <span style="display:block; margin-left:20px;">
+                                                               <%= link_to l(:label_contest_modify_settings), {:controller => 'contests', :action => 'settings', :id => @contest} %>
+                                                             </span>
 													      	</td>
 													      </tr>
 													      <tr colspan='3'>
 													      	<td valign="middle">
-														     <span style="display:block; margin-left:20px;"><%= link_to l(:label_contest_delete), {:controller => 'contests', :action => 'destroy_contest', :id => @contest},  data: { confirm: '你确定要删除该竞赛吗?' }, method: :delete %></span>
+														     <span style="display:block; margin-left:20px;">
+                                                               <%= link_to l(:label_contest_delete), {:controller => 'contests', :action => 'destroy_contest', :id => @contest},
+                                                                           data: { confirm: '你确定要删除该竞赛吗?' }, method: :delete %>
+                                                             </span>
 													      	</td>
 													      </tr>
 													      <% end %>
@@ -116,7 +128,6 @@
 
 											</tr>
 										<tr class="font_aram">
-											<!-- <td align="center" width="70px"> <%= l(:label_participate) %></td>  -->
 											<td align="center" width="70px"> <%= l(:label_contest_watchers) %></td>
 											<td align="center" width="70px"> <%= l(:label_contest_work) %></td>
 
@@ -128,13 +139,22 @@
 								<div class="inf_user_image">
 									   <table>
 											<tr>
-												<td><%= l(:lable_contest_user) %>:&nbsp;<%= link_to(@user.name, user_path(@user))%></td>
+												<td>
+                                                  <%= l(:lable_contest_user) %>:&nbsp;
+                                                  <%= link_to(@user.name, user_path(@user))%>
+                                                </td>
 											</tr>
 											<tr>
-												<td><%= l(:label_bids_reward_method) %><%= @contest.budget%></td>
+												<td>
+                                                  <%= l(:label_bids_reward_method) %>
+                                                  <%= @contest.budget%>
+                                                </td>
 											</tr>
 											<tr>
-												<td><%= l(:label_limit_time) %> : <%= @contest.deadline%></td>
+												<td>
+                                                  <%= l(:label_limit_time) %> :
+                                                  <%= @contest.deadline%>
+                                                </td>
 											</tr>
 										</table>
 									</div>
@@ -156,7 +176,10 @@
 										</div>
 										<% end %>
 										<div class="created_on_project">
-											<strong style="color: #068d9c"><%= l(:label_create_time) %>：</strong><%= format_time(@contest.created_on) %>
+											<strong style="color: #068d9c">
+                                              <%= l(:label_create_time) %>：
+                                            </strong>
+                                          <%= format_time(@contest.created_on) %>
 										</div>
 									</div>
 									<div class="user_underline"></div>
@@ -173,7 +196,6 @@
 											</tr>
 										</table>
 									</div>
-
 									<!--关注-->
 									<div class="user_fans">
 										<div class="user_underline"></div>
@@ -193,22 +215,16 @@
 											</table>
 										</div>
 									</div>
-
 									<!-- 参赛项目 -->
 
 
 									<!-- 参赛应用-->
-
 								</div>
 							</div>
-
-
 							<div class="user_underline"></div>
-
 								<div class="user_underline"></div>
 						    </div>
 
-
 						<div id="content">
 							<% if display_main_menu?(@contest) %>
 							<div class="tabs_new">