From ed71a3faa169d9aeb28a7ac056505f87eac0b706 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Fri, 25 Apr 2014 11:10:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=A0=E9=99=A4=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B=E7=9A=84=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F=E5=8F=8A?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contests/settings.html.erb       | 13 ++++++++++++-
 app/views/layouts/base_newcontest.html.erb |  6 +++---
 config/locales/zh.yml                      |  2 ++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/views/contests/settings.html.erb b/app/views/contests/settings.html.erb
index def1c7f5..8e25bb6a 100644
--- a/app/views/contests/settings.html.erb
+++ b/app/views/contests/settings.html.erb
@@ -1,5 +1,16 @@
 <!-- added by bai -->
-<h3><%=l(:label_settings)%></h3>
+<p>
+	<td><%=l(:label_contest_settings)%></td>&nbsp;&nbsp;&nbsp;
+
+	<% if User.current.logged? %>
+		<% if @contest.author.id == User.current.id %>
+			<td>
+				<%= link_to '删除竞赛', {:controller => 'contests', :action => 'destroy_contest', :id => @contest},  data: { confirm: '你确定要删除该竞赛吗?' } %>
+			</td>
+		<% end %>
+	<% end %>
+</p>
+
 <script type="text/javascript" language="javascript">
 	function show(id, id_t, label_reward, label_money, label_credit, label_content) {
 		var text = $('#' + id);
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index 147df524..c169e2d6 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -67,7 +67,7 @@
 														<% 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; margin-bottom: 5px"><%= join_in_competition(@contest, User.current)%></span> -->   
 																<span style="display:block; margin-left:20px;"><%= new_watcher_link(@contest, User.current) %></span>   	
 															</td>
 													    </tr>
@@ -145,13 +145,13 @@
 										<div class="created_on_project">
 											<strong style="color: #068d9c"><%= l(:label_create_time) %>：</strong><%= format_time(@contest.created_on) %>
 										</div>
-										<% if User.current.logged? %>
+										<!-- <% if User.current.logged? %>
 											<% if @contest.author.id == User.current.id %>
 												<div>
 													<%= link_to '删除', {:controller => 'contests', :action => 'destroy_contest', :id => @contest},  data: { confirm: '你确定要删除该竞赛吗?' } %>
 												</div>
 											<% end %>
-										<% end %>
+										<% end %> -->
 									</div>
 									<div class="user_underline"></div>
 								</div>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index fc7e90e9..cc0e84b8 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1858,6 +1858,8 @@ zh:
   label_add_contest_succeed_fail: 添加失败,该应用已参赛.
   label_no_ftapplication: 暂无应用
   label_edit_softapplication: 修改应用
+  label_contest_settings: 配置竞赛
+  label_contest_delete: 删除竞赛
   
   
   
\ No newline at end of file