Hjqreturn
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

This commit is contained in:
cxt 2017-09-08 20:58:12 +08:00
parent 3363e3234a c4f90858f4
commit df83ea5d7f
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/courses/_course_index_search.html.erb
View File

@ -1,7 +1,7 @@
<form action="<%= courses_path(:select => @select) %>" data-remote="true" class="fr ml15" id="search_syllabuses_name" >
<div class="searchFor fr" style="margin-top: -3px">
<div class="searchCon">
<input type="text" class="searchinput" name="search" value="<%= @search %>" placeholder="请输入实训名称的关键字进行搜索" style="background: none;"/>
<input type="text" class="searchinput" name="search" value="<%= @search %>" placeholder="请输入课堂名称的关键字进行搜索" style="background: none;"/>
<i class="fa fa-close mr5 color-dark-grey" onclick="colse_searchbox();" title="搜索"></i>
</div>
<i class="fa fa-search mr5 color-dark-grey search_icon" onclick="$('#search_syllabuses_name').submit();" style="margin:10px" data-tip-down="搜索"></i>

2
app/views/messages/_form_course.html.erb
View File

@ -8,7 +8,7 @@
<label class="fl panel-form-label"><span class="color-red mr5">*</span>标题：</label>
<input type="text" class="panel-form-width-690 panel-form-height-30 fl panel-box-sizing" value="<%= @message.subject %>" name="message[subject]" id="course_message_subject" maxlength="100" onkeyup="regexSubject();" placeholder="字数100以内"/>
<div class="cl"></div>
<span class="color-orange fl none" id="new_course_message_notice" style="margin-left:10%;"><i class="fa fa-exclamation-circle mr5" ></i>课程名称不能为空</span>
<span class="color-orange fl none" id="new_course_message_notice" style="margin-left:10%;"><i class="fa fa-exclamation-circle mr5" ></i>帖子名称不能为空</span>
</li>
<% if User.current.admin? || User.current.allowed_to?(:as_teacher, @course) %>
<li class="clearfix">

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

@ -33,7 +33,7 @@
</ul>
</div>
<div id="no_data">
<% if @shixun.propaedeutics.nil? %>
<% if @shixun.propaedeutics.blank? %>
<%= render :partial => "welcome/no_data" %>
<% else %>
<div class="task-paner-con break_full_word new_li" id="challenge_editorMd_propaedeutics">

1
app/views/stages/destroy.js.erb
View File

@ -2,6 +2,7 @@
$("#stage_div_<%= @stage.id %>").remove();
<% @subject.stages.each do |stage| %>
$("#stage_div_<%= stage.id %>").find(".subject_stage_index").html("<%= stage.position %>");
$("#stage_div_<%= stage.id %>").find(".subject_stage_shixun_index").html("<%= stage.position %>");
<% end %>
$("#subject_top").html("<%= j(render :partial => 'subjects/subject_top') %>");
<% else %>

2
app/views/subjects/show.html.erb
View File

@ -36,7 +36,7 @@
style="<%= allow_shixun_exec(shixun) ? "" : "cursor: pointer" %>;" onclick="<%= allow_shixun_exec(shixun) ? "" : (shixun.status < 2 && !User.current.manager_of_shixun?(shixun) ? "" : "shixun_link('#{shixun.identifier}')") %>">
<li class="fl li-width63">
<i class="fa fa-sort-up color-grey-c fl transform90 font-18 icon-set mr5"></i>
<span class="color-grey3 paragraph_name"><%= s_index + 1 %>-<%= index + 1 %>&nbsp;&nbsp;<%= shixun.name %></span>
<span class="color-grey3 paragraph_name"><span class="subject_stage_shixun_index"><%= s_index + 1 %></span>-<%= index + 1 %>&nbsp;&nbsp;<%= shixun.name %></span>
</li>
<li class="fr status_li">
<% if @subject.status < 2 %>