竞赛 :作品--》提交

This commit is contained in:
cxt 2016-12-30 13:58:09 +08:00
parent 619dfa7a7a
commit d1fbaa27b9
7 changed files with 23 additions and 21 deletions

View File

@ -7,7 +7,7 @@
</div>
<div class="homepagePostTitle hidden fl m_w505">
<% index = get_work_index(homework, is_teacher) %>
<%= link_to "<span class='fontBlue2'>题目#{index + 1}</span>".html_safe + homework.name,contestant_works_path(:work => homework.id),:class => "postGrey"%>
<%= link_to homework.name,contestant_works_path(:work => homework.id),:class => "postGrey"%>
</div>
<%=get_cw_status(homework).html_safe %>
<div class="cl"></div>

View File

@ -98,14 +98,14 @@
<% end %>
<% hcommons.each_with_index do |homework_common,index |%>
<% if homework_common.id == @contestwork.id %>
<%="题目 #{hcommons.count - index}" %>
<%="提交 #{hcommons.count - index}" %>
<% end %>
<% end%>
</a>
<ul>
<% hcommons.each_with_index do |homework_common,index |%>
<li class="pr10">
<%= link_to "题目#{hcommons.count - index}#{homework_common.name}",contestant_works_path(:work => homework_common.id)%>
<%= link_to "提交#{hcommons.count - index}#{homework_common.name}",contestant_works_path(:work => homework_common.id)%>
<%#= link_to "第#{@homework_commons.count - index}次作业",student_work_index_path(:homework => homework_common.id)%>
</li>
<% end%>
@ -143,7 +143,7 @@
<ul class="homework-detail-tab mb10 mt15 fb">
<li class="selected" id="student_work_tab1" onclick="HoverLi(1);">
<a href="javascript:void(0);" class="fontGrey3">题目信息</a>
<a href="javascript:void(0);" class="fontGrey3">提交信息</a>
</li>
<li onclick="HoverLi(2);" id="student_work_tab2">
<a href="javascript:void(0);" class="fontGrey3">作品列表</a>

View File

@ -14,7 +14,7 @@
<ul class="user_navmore_txt">
<% if is_teacher %>
<li class="clear">
<%= link_to "作品",works_path(:contest => contest.id), :class => 'user_navmore_li fl', :target => '_blank' %>
<%= link_to "提交",works_path(:contest => contest.id), :class => 'user_navmore_li fl', :target => '_blank' %>
<%= link_to '+',works_path(:contest => contest.id,:is_new => 1), :class => 'user_navmore_add fl', :title => '发布作品',:target => '_blank' %>
</li>
<li class="clear">
@ -23,7 +23,7 @@
</li>
<% else %>
<li>
<%= link_to "作品",works_path(:contest => contest.id), :class => 'user_navmore_li', :target => '_blank' %>
<%= link_to "提交",works_path(:contest => contest.id), :class => 'user_navmore_li', :target => '_blank' %>
<div class="cl"></div>
</li>
<li>

View File

@ -47,7 +47,7 @@
<div class="user_leftnav ">
<% if hidden_unproject_infos %>
<ul class="users_accordion mb10">
<li id="user_01" class="user_icons_course">
<li id="user_01" class="user_icons_contest">
<%= link_to '竞赛',{:controller => "users", :action => "user_contestlist", :id => @user}, :id => "user_contest_list" %>
<font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_contestlist", :id => @user}, :style => "color:#aaa;" %></font>
<% contests = @user.favorite_contests.visible.where("is_delete =?", 0).select("contests.*,(SELECT MAX(updated_at) FROM `contest_activities` WHERE contest_activities.contest_id = contests.id) AS a").order("a desc").limit(10) %>

View File

@ -40,7 +40,7 @@
</li>
<!--<li id="sy_03" class="sy_icons_boards"> <a href="">讨论区<span>26</span></a> <a href="javascript:void(0);" class="sy_class_add"></a></li>-->
<li id="sy_03" class="sy_icons_hwork">
<a href="<%= works_path(:contest => @contest) %>">作品<span><%= work_num%></span></a>
<a href="<%= works_path(:contest => @contest) %>">提交<span><%= work_num%></span></a>
<% if is_admin %>
<a href="<%= works_path(:contest => @contest.id,:is_new => 1) %>" class="sy_class_add"></a>
<% end %>

View File

@ -8,20 +8,22 @@
<div class="homepagePostDes">
<div class="homepagePostTo break_word">
<%= link_to activity.user.show_name, user_path(activity.user,:host=>Setting.host_user), :class => "newsBlue mr15" %>
TO
<% if hw_status == 3 || hw_status == 2 %>
<%= link_to "作品", works_path(:contest => activity.contest.id), :class => "newsBlue ml15"%>
<% if hw_status == 3 %>
<% elsif hw_status == 2 %>
TO
<%= link_to "提交", works_path(:contest => activity.contest.id), :class => "newsBlue ml15"%>
<% else %>
<%= link_to activity.contest.name.to_s+" | 竞赛作品", works_path(:contest => activity.contest.id), :class => "newsBlue ml15"%>
TO
<%= link_to activity.contest.name.to_s+" | 竞赛提交", works_path(:contest => activity.contest.id), :class => "newsBlue ml15"%>
<% end %>
</div>
<div class="homepagePostTitle hidden fl m_w505"> <!--+"(作业名称)"-->
<% if hw_status == 3 || hw_status == 5 %>
<% index = get_work_index(activity, is_teacher) %>
<%= link_to "<span class='fontBlue2'>作品#{index+1}</span>".html_safe+activity.name,contestant_works_path(:work => activity.id),:class => "postGrey"%>
<% else %>
<%= link_to activity.name.to_s, contestant_works_path(:work => activity.id), :class => "postGrey"%>
<% end %>
<%# if hw_status == 3 || hw_status == 5 %>
<%# index = get_work_index(activity, is_teacher) %>
<%= link_to activity.name,contestant_works_path(:work => activity.id),:class => "postGrey"%>
<%# else %>
<%#= link_to activity.name.to_s, contestant_works_path(:work => activity.id), :class => "postGrey"%>
<%# end %>
</div>
<%=get_cw_status(activity).html_safe %>

View File

@ -44,14 +44,14 @@
<div id="menu_r" class="NewsBannerName" style="margin-bottom: -10px;">
<ul class="menu_r b_w" style="padding-left: 0px; margin-top: -5px;">
<li>
<a href="javascript:void(0);" class="menu_arrow" style="font-size:16px; color:#4b4b4b; font-weight: normal; padding-left: 0px;">题目</a>
<a href="javascript:void(0);" class="menu_arrow" style="font-size:16px; color:#4b4b4b; font-weight: normal; padding-left: 0px;">提交</a>
<ul style="max-height:240px; overflow-y:auto; overflow-x:hidden;">
<% if @homework_commons.empty? %>
<li class="pr10" style="font-weight: normal; color: #888888; width: 120px; padding-left: 15px; padding-bottom: 5px;">目前尚未发布题目</li>
<li class="pr10" style="font-weight: normal; color: #888888; width: 120px; padding-left: 15px; padding-bottom: 5px;">目前尚未发布提交</li>
<% else %>
<% @homework_commons.each_with_index do |homework_common,index|%>
<li class="pr10">
<%= link_to "题目#{@homework_commons.count - index}#{homework_common.name}",contestant_works_path(:work => homework_common.id),:target=>"_blank"%>
<%= link_to "提交#{@homework_commons.count - index}#{homework_common.name}",contestant_works_path(:work => homework_common.id),:target=>"_blank"%>
</li>
<% end%>
<% end %>