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

Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project

This commit is contained in:
huang 2017-03-22 15:48:21 +08:00
parent 5a8f4be6e5 6b3d266e57
commit 9bca636f04
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/challenges/_form.html.erb
View File

@ -134,7 +134,7 @@
</li>
<li class="clearfix">
<label class=" panel-form-label fl"><span class="c_red mr5">*</span>分值设定：</label>
<%= f.text_field :score, :class => "panel-form-height-30 fl", :no_label => true, :style => "padding:5px;" %>
<%= f.text_field :score, :class => "panel-form-height-30 fl", :no_label => true, :style => "padding:5px;", :placeholder => "请输入分值（只能是数字）" %>
<span class="fl ml5">分</span>
<div class="clear"></div>
<span style="display: none" class="c_red ml90" id="new_shixun_score">分值设定不能为空</span>

2
app/views/shixuns/_settings_challenges_action_tip.html.erb
View File

@ -1,6 +1,6 @@
<% unless @shixun.script.blank? %>
<% if @shixun.status == 1 %>
<a class="fr sy_btn_green mb10">已开启</a>
<a class="fr task-btn mb10 mr10">已开启</a>
<% else %>
<%= link_to "开启实训", shixun_job_create_shixun_path(@shixun), :class => "task-btn task-btn-green fr mr10", :remote => true %>
<% end %>