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

为竞赛添加新的页面

This commit is contained in:
huangjingquan 2013-10-12 10:45:48 +08:00
parent a5cdbc8e92
commit 8082bb456f
3 changed files with 194 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/controllers/bids_controller.rb
View File

@ -195,10 +195,14 @@ class BidsController < ApplicationController
format.html {
render :layout => 'base_homework'
}
else
elsif @bid.reward_type == 1
format.html {
render :layout => 'base_bids'
}
render :layout => 'base_bids'
}
else
format.html {
render :layout => 'base_contest'
}
end
format.api
@ -217,10 +221,14 @@ class BidsController < ApplicationController
format.html {
render :layout => 'base_homework'
}
else
elsif @bid.reward_type == 1
format.html {
render :layout => 'base_bids'
}
render :layout => 'base_bids'
}
else
format.html {
render :layout => 'base_contest'
}
end
format.api
@ -251,13 +259,17 @@ class BidsController < ApplicationController
end
respond_to do |format|
if @bid.reward_type == 3
format.html {
render :layout => 'base_homework'
}
elsif @bid.reward_type == 1
format.html {
render :layout => 'base_homework'
}
render :layout => 'base_bids'
}
else
format.html {
render :layout => 'base_bids'
}
format.html {
render :layout => 'base_contest'
}
end
format.api
end
@ -279,10 +291,14 @@ class BidsController < ApplicationController
format.html {
render :layout => 'base_homework'
}
else
elsif @bid.reward_type == 1
format.html {
render :layout => 'base_bids'
}
render :layout => 'base_bids'
}
else
format.html {
render :layout => 'base_contest'
}
end
format.api
end

159
app/views/layouts/base_contest.html.erb Normal file
View File

@ -0,0 +1,159 @@
<!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' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
<!-- page specific tags -->
<%= yield :header_tags -%>
</head>
<body class="<%= h body_css_classes %>">
<div id="wrapper">
<div id="wrapper2">
<div id="wrapper3">
<% if session[:enterprise_college] == 2 %>
<%=render :partial => 'layouts/base_enterprise_header'%>
<% elsif session[:enterprise_college] == 1 %>
<%=render :partial => 'layouts/base_college_header'%>
<% else %>
<%=render :partial => 'layouts/base_header'%>
<% end %>
<div id="main" class="">
<div id="sidebar">
<div class="main_context">
<div class="spaceleft">
<div class="inf_user_image">
<table>
<tr>
<td align="left" valign="middle">
<%= link_to image_tag(url_to_avatar(@user), :class => "avatar2"), user_path(@user), :class => "avatar" %>
</td>
<td>
<table>
<tr>
<td class="info_font" style=" word-wrap: break-word; word-break: break-all"><%= h @bid.name %></td>
</tr>
<tr>
<td align="center"> <%= watcher_link(@bid, User.current) %> <!-- <%= link_to("选为作业", fork_path(@bid)) %> --></td>
</tr>
</table></td>
</tr>
</table>
<table>
<tr>
<td><%= l(:lable_contest_user) %><%= link_to(@user, user_path(@user))%></td>
</tr>
<tr>
<td><%= l(:label_bids_reward_method) %><%= @bid.budget%></td>
</tr>
<tr>
<td><%= l(:label_limit_time) %> : <%= @bid.deadline%></td>
</tr>
</table>
<div>
<%= link_to l(:label_x_followers, :count => @bid.watcher_users.count)+"("+@bid.watcher_users.count.to_s+")", respond_path(@bid) %> &nbsp;
<%= link_to l(:label_bidding_project)+"("+@bid.biding_projects.count.to_s+")", project_for_bid_path(@bid) %>&nbsp;
<%= link_to l(:label_x_bids_responses, :count => @bid.commit)+"("+@bid.commit.to_s+")", respond_path(@bid)%>
</div>
</div>
<!--tags-->
<div class="user_fans">
<div class="font_title_left">
<strong><%= l(:label_tag) %></strong>
</div>
<div class="user_underline"></div>
<table style="font-family:微软雅黑">
<tr>
<td><!-- added by william -for tag -->
<%= render :partial => 'tags/tag', :locals => {:obj => @bid, :object_flag => "4"}%>
</td>
</tr>
</table>
</div>
<div class="user_fans">
<div class="font_title_left">
<strong><%= l(:label_x_followers, :count => @bid.watcher_users.count) %></strong>
</div>
<div class="user_underline"></div>
<div class="left_wf">
<table>
<tr>
<td style="padding-top: 5px">
<% if @bid.watcher_users.size>0 %>
<% for user in @bid.watcher_users%>
<%= link_to image_tag(url_to_avatar(user), :class => "avatar", :title => user.name ), user_path(user), :class => "avatar" %>
<% end %>
<% else %>
<p class="font_lighter"><%= l(:label_project_no_follow) %></p>
<% end%>
</td>
</tr>
</table>
</div>
</div>
<!--fans-->
<div class="user_fans">
<div class="font_title_left">
<strong><%= l(:label_bidding_project) %></strong>
</div>
<div class="user_underline"></div>
<div class="left_wf">
<table>
<tr>
<td style="padding-top: 5px">
<% if @bid.projects.size>0 %>
<% for project in @bid.projects%>
<%= link_to image_tag(url_to_avatar(project), :class => "avatar", :title => project.name), project_path(project), :class => "avatar" %>
<% end%>
<% else %>
<p class="font_lighter"><%= l(:label_no_bid_project) %></p>
<% end %>
</td>
</tr>
</table>
</div>
</div>
</div>
</div>
<!-- end -->
</div>
<div id="content">
<% if display_main_menu?(@bid) %>
<div class="tabs_new">
<%= render_menu :bid_menu %>
</div>
<% end %>
<%= yield %>
<%= call_hook :view_layouts_base_content %>
<div style="clear:both;"></div>
</div>
<%=render :partial => 'layouts/base_footer'%>
</div>
</div>
</div>
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>
</div>
<div id="ajax-modal" style="display:none;"></div>
</div>
<%= call_hook :view_layouts_base_body_bottom %>
</body>
</html>

1
config/locales/zh.yml
View File

@ -511,6 +511,7 @@ zh:
label_enterprise_into: 进入企业
label_college_into: 进入高校
label_investor: 投资人：
lable_contest_user: 竞赛发布人： #huang
label_theme: 主题
label_logged_as_new: 当前用户
button_register: 注册