#1295取消竞赛创建这的关注功能
This commit is contained in:
parent
e765445279
commit
d541309455
|
|
@ -27,27 +27,27 @@
|
||||||
<div id="main" class="">
|
<div id="main" class="">
|
||||||
<!-- added by bai -->
|
<!-- added by bai -->
|
||||||
<div class="top-content">
|
<div class="top-content">
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="info_font" style="width: 240px; color: #15bccf"><%=l(:label_contest_innovate_community)%></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 style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
|
||||||
<td rowspan="2" width="250px">
|
<td rowspan="2" width="250px">
|
||||||
<div class="project-search">
|
<div class="project-search">
|
||||||
<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %>
|
<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %>
|
||||||
<%= text_field_tag 'name', params[:name], :size => 20 %>
|
<%= text_field_tag 'name', params[:name], :size => 20 %>
|
||||||
<%= hidden_field_tag 'reward_type', @bid.reward_type %>
|
<%= hidden_field_tag 'reward_type', @bid.reward_type %>
|
||||||
<%= hidden_field_tag 'project_type', params[:project_type] %>
|
<%= hidden_field_tag 'project_type', params[:project_type] %>
|
||||||
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
|
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="padding-left: 8px"><%=link_to request.host()+"/contest", :controller => 'bids', :action => 'contest' %></td>
|
<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' %> >
|
<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>
|
<span><%= link_to @bid.name, bid_path %></span></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<!-- end -->
|
<!-- end -->
|
||||||
<div id="sidebar">
|
<div id="sidebar">
|
||||||
|
|
@ -65,20 +65,25 @@
|
||||||
<td class="info_font" style=" word-wrap: break-word; word-break: break-all"><%= h @bid.name %></td>
|
<td class="info_font" style=" word-wrap: break-word; word-break: break-all"><%= h @bid.name %></td>
|
||||||
</tr>
|
</tr>
|
||||||
<% if User.current.login? %> <!--added by linchun-->
|
<% if User.current.login? %> <!--added by linchun-->
|
||||||
<tr colspan='3'>
|
<tr colspan='3'>
|
||||||
<td valign="middle">
|
<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 style="display:block; margin-left:20px;"><span class="icon-fav icon"></span><%= watcher_link(@bid, User.current) %></span>
|
<%= join_in_contest(@bid, User.current)%>
|
||||||
</td>
|
</span>
|
||||||
</tr>
|
<span style="display:block; margin-left:20px;">
|
||||||
|
<span class="icon-fav icon"></span>
|
||||||
|
<%= watcher_link(@bid, User.current) %>
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
</table>
|
</table>
|
||||||
<!-- added by bai 增加了竞赛的配置 -->
|
<!-- added by bai 增加了竞赛的配置 -->
|
||||||
<% if User.current.logged? %>
|
<% if User.current.logged? %>
|
||||||
<% if @bid.author.id == User.current.id %>
|
<% if @bid.author.id == User.current.id %>
|
||||||
<%= link_to l(:label_contest_modify_settings), {:controller => 'bids', :action => 'settings', :id => @bid} %>
|
<%= link_to l(:label_contest_modify_settings), {:controller => 'bids', :action => 'settings', :id => @bid} %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</td>
|
</td>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -86,10 +91,14 @@
|
||||||
<div class="user_fans">
|
<div class="user_fans">
|
||||||
<table width="240" border="0">
|
<table width="240" border="0">
|
||||||
<tr align="center" width="80px">
|
<tr align="center" width="80px">
|
||||||
<td class="font_index"><%=link_to "#{@bid.join_in_contests.count}",:controller => "bids",
|
<td class="font_index">
|
||||||
:action => "show_participator" %></td>
|
<%=link_to "#{@bid.join_in_contests.count}",:controller => "bids",
|
||||||
<td class="font_index"><%=link_to "#{@bid.projects.where('is_public=1').count}", :controller => 'bids',
|
:action => "show_participator" %>
|
||||||
:action => 'show_project' %></td>
|
</td>
|
||||||
|
<td class="font_index">
|
||||||
|
<%=link_to "#{@bid.projects.where('is_public=1').count}", :controller => 'bids',
|
||||||
|
:action => 'show_project' %>
|
||||||
|
</td>
|
||||||
<tr class="font_aram">
|
<tr class="font_aram">
|
||||||
<td align="center" width="70px"> <%= l(:label_participator) %></td>
|
<td align="center" width="70px"> <%= l(:label_participator) %></td>
|
||||||
<td align="center" width="70px"> <%= l(:label_bidding_project) %></td>
|
<td align="center" width="70px"> <%= l(:label_bidding_project) %></td>
|
||||||
|
|
|
||||||
|
|
@ -5,19 +5,17 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<title><%= h html_title %></title>
|
<title><%= h html_title %></title>
|
||||||
<meta name="description" content="<%= Redmine::Info.app_name %>" />
|
<meta name="description" content="<%= Redmine::Info.app_name %>" />
|
||||||
<meta name="keywords" content="issue,bug,tracker" />
|
<meta name="keywords" content="issue,bug,tracker" />
|
||||||
<%= csrf_meta_tag %>
|
<%= csrf_meta_tag %>
|
||||||
<%= favicon %>
|
<%= favicon %>
|
||||||
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
|
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
|
||||||
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
|
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
|
||||||
|
|
||||||
<%= javascript_heads %>
|
<%= javascript_heads %>
|
||||||
<%= heads_for_theme %>
|
<%= heads_for_theme %>
|
||||||
<%= call_hook :view_layouts_base_html_head %>
|
<%= call_hook :view_layouts_base_html_head %>
|
||||||
|
|
||||||
<%= yield :header_tags -%>
|
<%= yield :header_tags -%>
|
||||||
</head>
|
</head>
|
||||||
<body class="<%= h body_css_classes %>">
|
<body class="<%= h body_css_classes %>">
|
||||||
|
|
@ -26,12 +24,15 @@
|
||||||
<div id="wrapper3">
|
<div id="wrapper3">
|
||||||
<%=render :partial => 'layouts/base_header'%>
|
<%=render :partial => 'layouts/base_header'%>
|
||||||
<div id="main" class="">
|
<div id="main" class="">
|
||||||
|
|
||||||
<div class="top-content">
|
<div class="top-content">
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="info_font" style="width: 240px; color: #15bccf"><%=l(:label_contest_innovate_community)%></td>
|
<td class="info_font" style="width: 240px; color: #15bccf">
|
||||||
<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
|
<%=l(:label_contest_innovate_community)%>
|
||||||
|
</td>
|
||||||
|
<td style="width: 430px; color: #15bccf">
|
||||||
|
<strong><%= l(:label_user_location) %> : </strong>
|
||||||
|
</td>
|
||||||
<td rowspan="2" width="250px">
|
<td rowspan="2" width="250px">
|
||||||
<div class="project-search">
|
<div class="project-search">
|
||||||
<%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %>
|
<%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %>
|
||||||
|
|
@ -43,10 +44,14 @@
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<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 %> >
|
<td><%=link_to l(:field_homepage), home_path %> >
|
||||||
<%=link_to l(:label_contest_innovate), :controller=>'contests', :action=>'index' %> >
|
<%=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>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
@ -61,17 +66,19 @@
|
||||||
<td align="left" width="100px">
|
<td align="left" width="100px">
|
||||||
<%= image_tag(url_to_avatar(@user), :class => "avatar2") %>
|
<%= image_tag(url_to_avatar(@user), :class => "avatar2") %>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td>
|
<td>
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<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>
|
</tr>
|
||||||
<% 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;">
|
||||||
<span style="display:block; margin-left:20px;"><%= new_watcher_link(@contest, User.current) %></span>
|
<%= new_watcher_link(@contest, User.current) unless (@contest.author.id == User.current.id) || User.current.admin? %>
|
||||||
|
</span>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
@ -80,12 +87,17 @@
|
||||||
<% if (@contest.author.id == User.current.id) || User.current.admin? %>
|
<% if (@contest.author.id == User.current.id) || User.current.admin? %>
|
||||||
<tr colspan='3'>
|
<tr colspan='3'>
|
||||||
<td valign="middle">
|
<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>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr colspan='3'>
|
<tr colspan='3'>
|
||||||
<td valign="middle">
|
<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>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
@ -116,7 +128,6 @@
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="font_aram">
|
<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_watchers) %></td>
|
||||||
<td align="center" width="70px"> <%= l(:label_contest_work) %></td>
|
<td align="center" width="70px"> <%= l(:label_contest_work) %></td>
|
||||||
|
|
||||||
|
|
@ -128,13 +139,22 @@
|
||||||
<div class="inf_user_image">
|
<div class="inf_user_image">
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
<td><%= l(:lable_contest_user) %>: <%= link_to(@user.name, user_path(@user))%></td>
|
<td>
|
||||||
|
<%= l(:lable_contest_user) %>:
|
||||||
|
<%= link_to(@user.name, user_path(@user))%>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><%= l(:label_bids_reward_method) %><%= @contest.budget%></td>
|
<td>
|
||||||
|
<%= l(:label_bids_reward_method) %>
|
||||||
|
<%= @contest.budget%>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><%= l(:label_limit_time) %> : <%= @contest.deadline%></td>
|
<td>
|
||||||
|
<%= l(:label_limit_time) %> :
|
||||||
|
<%= @contest.deadline%>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -156,7 +176,10 @@
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<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>
|
||||||
</div>
|
</div>
|
||||||
<div class="user_underline"></div>
|
<div class="user_underline"></div>
|
||||||
|
|
@ -173,7 +196,6 @@
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!--关注-->
|
<!--关注-->
|
||||||
<div class="user_fans">
|
<div class="user_fans">
|
||||||
<div class="user_underline"></div>
|
<div class="user_underline"></div>
|
||||||
|
|
@ -193,22 +215,16 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 参赛项目 -->
|
<!-- 参赛项目 -->
|
||||||
|
|
||||||
|
|
||||||
<!-- 参赛应用-->
|
<!-- 参赛应用-->
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="user_underline"></div>
|
<div class="user_underline"></div>
|
||||||
|
|
||||||
<div class="user_underline"></div>
|
<div class="user_underline"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div id="content">
|
<div id="content">
|
||||||
<% if display_main_menu?(@contest) %>
|
<% if display_main_menu?(@contest) %>
|
||||||
<div class="tabs_new">
|
<div class="tabs_new">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue