Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop

Browse Source
dev_bj
caishi 5 years ago
parent fac3a95943 054c00767f
commit 29ea63a98f
4 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File

5
app/views/competitions/_qg_second_competition.html.erb
Unescape View File

@ -15,8 +15,11 @@
</p> </p>
<li class="inline enter_btn"> <li class="inline enter_btn">
<% "@urls[i][j][k]表示： 第i个比赛的第j个对象，的第k个url入口" %> <% "@urls[i][j][k]表示： 第i个比赛的第j个对象，的第k个url入口" %>
<% is_start = Time.now > section.start_time %>
<% section.competition_entries.each_with_index do |entry| %> <% section.competition_entries.each_with_index do |entry| %>
<a class="li-1" href="<%= Time.now > section.start_time ? "#{entry.url}" : "javascript:void(0);" %>" <%= Time.now > section.start_time ? 'target="_blank"' : "" %> ><%= entry.name %></a> <a class="li-1 <%= is_start ? 'active' : '' %>"
href="<%= is_start ? "#{entry.url}" : "javascript:void(0);" %>"
<%= Time.now > section.start_time ? 'target="_blank"' : "" %> ><%= entry.name %></a>
<% end %> <% end %>
</li> </li>
</ul> </ul>

34
app/views/competitions/enroll.html.erb
Unescape View File

@ -115,21 +115,25 @@
<img src="/images/educoder/competition/noTeam.png"/> <img src="/images/educoder/competition/noTeam.png"/>
</div> </div>
<% end %> <% end %>
<% if User.current.admin? && @teams.present? %>
<input class="fl ml20 mb5" style="padding: 5px; width: 200px; line-height: 20px;" maxlength="10" placeholder="输入学校名称进行搜索" type="text" id="school_name"> <% if User.current.admin?%>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 mb5" onclick="search_enroll_team();">搜索</a> <div class="mt20">
<span class="fl mb5 ml10 pr5 none">战队数：<span id="search_teams_count" class="color-orange"></span>个</span> <input class="fl ml20 mb5" style="padding: 5px; width: 200px; line-height: 20px;" maxlength="10" placeholder="输入学校名称进行搜索" type="text" id="school_name">
<span class="fl mb5 ml10 pr5 none">成员数：<span id="team_members_count" class="color-orange"></span>个</span> <a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 mb5" onclick="search_enroll_team();">搜索</a>
<span class="fr mb5 pr5"><%= @maximum_staff > 1 ? "战队总数" : "报名人数" %>：<span class="color-orange"><%= @team_count %></span>个</span> <span class="fl mb5 ml10 pr5 none">战队数：<span id="search_teams_count" class="color-orange"></span>个</span>
<div class="cl"></div> <span class="fl mb5 ml10 pr5 none">成员数：<span id="team_members_count" class="color-orange"></span>个</span>
<%= render :partial => "competitions/team_list" %> <span class="fr mb5 pr5"><%= @maximum_staff > 1 ? "战队总数" : "报名人数" %>：<span class="color-orange"><%= @team_count %></span>个</span>
<% else %> <div class="cl"></div>
<% unless @teams.present? %>
<div class="edu-txt-center"> <% if @teams.present? %>
<p class="font-30 color-green mb30">您还未参与报名哦，赶紧来挑战吧~</p> <%= render :partial => "competitions/team_list" %>
<img src="/images/educoder/competition/noTeam.png"/> <% else %>
</div> <div class="edu-txt-center">
<% end %> <p class="font-30 color-green mb30">还没有人报名~</p>
<img src="/images/educoder/competition/noTeam.png"/>
</div>
<% end %>
</div>
<% end %> <% end %>
</div> </div>
</div> </div>

2
app/views/competitions/index.html.erb
Unescape View File

@ -8,7 +8,7 @@
<%= image_tag(url_to_avatar(competition), :width => "100%", :height => "100%") %> <%= image_tag(url_to_avatar(competition), :width => "100%", :height => "100%") %>
</a> </a>
<div class="pt20 pl20 mb10 clearfix"> <div class="pt20 pl20 mb10 clearfix">
<a href="<%= competition_path(competition) %>" style="max-width: 400px;" class="font-16 task-hide fl" target="_blank"><%= competition.name %></a> <a href="<%= competition_path(competition) %>" style="max-width: 400px;" class="font-16 task-hide fl" target="_blank"><%= [competition.name, competition.sub_title.presence].compact.join('——') %></a>
<% if competition.start_time > Time.now %> <% if competition.start_time > Time.now %>
<% unless competition.enroll_end_time.present? && competition.enroll_end_time < Time.now %> <% unless competition.enroll_end_time.present? && competition.enroll_end_time < Time.now %>
<div class="fr status-orange"> <div class="fr status-orange">

2
public/stylesheets/educoder/edu-all.css
Unescape View File

@ -772,7 +772,7 @@ li.challenge_box:last-child{
.enrollItemContent{padding: 0px 10px;width: 100%;box-sizing: border-box;height: 100%;overflow: hidden;} .enrollItemContent{padding: 0px 10px;width: 100%;box-sizing: border-box;height: 100%;overflow: hidden;}
.enrollItemContent li{border-bottom: 1px solid #EAEAEA;padding: 20px;line-height: 20px} .enrollItemContent li{border-bottom: 1px solid #EAEAEA;padding: 20px;line-height: 20px}
.team-p-s{width: 20px;height: 20px;line-height: 12px;text-align: center;border-radius: 50%;background: #BCBCBC;color: #fff;float: left} .team-p-s{width: 20px;height: 20px;line-height: 12px;text-align: center;border-radius: 50%;background: #BCBCBC;color: #fff;float: left}
.enroll-in-b{display: block;border:4px solid #fff;width: 216px;height: 62px;text-align: center;line-height: 62px;margin: 0px 40px;font-size: 32px;color: #fff!important;background: #4CACFF} .enroll-in-b{display: block;border:4px solid #fff;width: 216px;height: 62px;text-align: center;line-height: 62px;margin: 0px 40px;font-size: 32px;color: #fff!important;background: #4CACFF;cursor: pointer;}
.main_title{ .main_title{
font-size: 50px; font-size: 50px;
font-family:MicrosoftYaHei-Bold; font-family:MicrosoftYaHei-Bold;

Write Preview
Loading…
Cancel
Save