jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整删除竞赛的显示样式及位置

This commit is contained in:
wanglinchun 2014-04-25 11:10:13 +08:00
parent 1ca0113204
commit ed71a3faa1
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/views/contests/settings.html.erb
View File

@ -1,5 +1,16 @@
<!-- added by bai --> <!-- 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"> <script type="text/javascript" language="javascript">
function show(id, id_t, label_reward, label_money, label_credit, label_content) { function show(id, id_t, label_reward, label_money, label_credit, label_content) {
var text = $('#' + id); var text = $('#' + id);

6
app/views/layouts/base_newcontest.html.erb
View File

@ -67,7 +67,7 @@
<% if User.current.login? %> <% if User.current.login? %>
<tr colspan='3'> <tr colspan='3'>
<td valign="middle"> <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> <span style="display:block; margin-left:20px;"><%= new_watcher_link(@contest, User.current) %></span>
</td> </td>
</tr> </tr>
@ -145,13 +145,13 @@
<div class="created_on_project"> <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>
<% if User.current.logged? %> <!-- <% if User.current.logged? %>
<% if @contest.author.id == User.current.id %> <% if @contest.author.id == User.current.id %>
<div> <div>
<%= link_to '删除', {:controller => 'contests', :action => 'destroy_contest', :id => @contest}, data: { confirm: '你确定要删除该竞赛吗?' } %> <%= link_to '删除', {:controller => 'contests', :action => 'destroy_contest', :id => @contest}, data: { confirm: '你确定要删除该竞赛吗?' } %>
</div> </div>
<% end %> <% end %>
<% end %> <% end %> -->
</div> </div>
<div class="user_underline"></div> <div class="user_underline"></div>
</div> </div>

2
config/locales/zh.yml
View File

@ -1858,6 +1858,8 @@ zh:
label_add_contest_succeed_fail: 添加失败,该应用已参赛. label_add_contest_succeed_fail: 添加失败,该应用已参赛.
label_no_ftapplication: 暂无应用 label_no_ftapplication: 暂无应用
label_edit_softapplication: 修改应用 label_edit_softapplication: 修改应用
label_contest_settings: 配置竞赛
label_contest_delete: 删除竞赛