Merge branch 'cxt_course' into szzh

This commit is contained in:
cxt 2016-01-08 20:36:08 +08:00
commit cc135503c2
2 changed files with 6 additions and 2 deletions

View File

@ -12,13 +12,14 @@
</div>
<div class="cl"></div>
<div class="mt15 grey_c lh22">
<%= link_to "复制学期", copy_course_course_path(@course.id),:remote=>true, :class => "term_btn fl" %>
<!--<a href="javascript:" class="term_btn fl" onclick="copyTerm();">
复制学期
</a>-->
<div class="disable_btn fl">
<!--<div class="disable_btn fl">
<span style="display: inline-block">复制学期</span>
<span style="display: inline-block">(开发中...)</span>
</div>
</div>-->
复制学期将为您创建一个新的课程学期,新学期将继承本学期的相关资源,具体您稍后可以选择。
</div>
<div class="cl"></div>

View File

@ -1,3 +1,6 @@
if(document.getElementById("popbox02")) {
hideModal("#popbox02");
}
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'copy_course') %>');
showModal('ajax-modal', '730px');
$('#ajax-modal').css('height','530px').css('width','730px');