diff --git a/app/views/contests/show_attendingcontest.html.erb b/app/views/contests/show_attendingcontest.html.erb index d336919a5..668aa927f 100644 --- a/app/views/contests/show_attendingcontest.html.erb +++ b/app/views/contests/show_attendingcontest.html.erb @@ -36,14 +36,14 @@ -
温馨提示：如果您希望在我们平台托管参赛数据和代码，请按下面参赛步骤参赛！
+
+ 温馨提示：如果您希望在我们平台托管参赛数据和代码，请按下面参赛步骤参赛！ +
<% if User.current.logged? %> -
-
参赛步骤：
-
- 步骤1： - <%= link_to '新建参赛作品', new_softapplication_path(:target=>'_blank'), :target=>'_blank' %> - （先点击“新建参赛作品”， 然后返回本页继续步骤2即可。） -
-
- 步骤2： - <%= link_to '关联参赛作品', "javascript:void(0);", onclick: "$('#put-bid-form').toggle();" %> -
+
+
+ 参赛步骤：
- - - + + + + + + + <% end %>
@@ -106,74 +180,62 @@ <% if @contest.id == 2 or @contest.id == 3 or @contest.id == 6 %> - <% @contesting_project.each do |c_project|%> - <% if c_project.project %> -
-
- - 参赛作品: - - <%= link_to(c_project.project.name, project_path(c_project.project), :target => '_blank') %> - -
-
-
- - 简介: - - <%= c_project.project.description.truncate(90, omission: '...') %> - -
-
-
- - 发布时间： - - <%= format_time c_project.created_at%> - - - -
-
- <% end %> -
- <% end %> +<% @contesting_project.each do |c_project|%> +<% if c_project.project %> +
+
+ + 参赛作品: + <%= link_to(c_project.project.name, project_path(c_project.project), :target => '_blank') %> +
+
+
+ + 简介: + <%= c_project.project.description.truncate(90, omission: '...') %> +
+
+
+ + 发布时间： + <%= format_time c_project.created_at%> + + +
+
+<% end %> +
+<% end %> <% else %> - <% @contesting_softapplication.each do |c_softapplication|%> - <% if c_softapplication.softapplication %> -
-
- - 参赛作品: - - <%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication), :target => '_blank') %> - -
-
-
- - 简介: - - <%= c_softapplication.softapplication.description.truncate(90, omission: '...') %> - -
-
-
- - 发布时间： - - <%=format_time c_softapplication.created_at %> - - - -
-
- <% end %> -
- <% end %> +<% @contesting_softapplication.each do |c_softapplication|%> +<% if c_softapplication.softapplication %> +
+
+ + 参赛作品: + <%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication), :target => '_blank') %> +
+
+
+ + 简介: + <%= c_softapplication.softapplication.description.truncate(90, omission: '...') %> +
+
+
+ + 发布时间： + <%= format_time c_softapplication.created_at %> + + +
+
+<% end %> +
+<% end %> <% end %> - - - + diff --git a/lib/redmine.rb b/lib/redmine.rb index d22feb9fc..3d3565430 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -279,8 +279,8 @@ end ###new add by linchun Redmine::MenuManager.map :contest_menu do |menu| menu.push :respond, :show_contest_contest_path, :caption => :label_user_response - #menu.push :project, :show_project_contest_path, :caption => :label_contest_project - #menu.push :application, :show_softapplication_contest_path, :caption => :label_contest_application + menu.push :project, :show_project_contest_path, :caption => :label_contest_project + menu.push :application, :show_softapplication_contest_path, :caption => :label_contest_application menu.push :attendingcontest, {:controller => 'contests', :action => 'show_attendingcontest'}, :caption => :label_attending_contest # menu.push :attendingcontest, :show_attendingcontest_contest_path, :caption => :label_attendin,g_contest # menu.push :result, { :controller => 'bids', :action => 'show_results' },