kevinli
/
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-08-18 16:24:59 +08:00
parent 7fbaa66e88 66a2fdc174
commit b18ddc73ab
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/common/_file.html.erb
View File

@ -26,5 +26,7 @@
lint: true,
readOnly: "nocursor"
});
shixun_show_CodeMirror.setSize("auto","auto");
$(function(){
shixun_show_CodeMirror.setSize("auto","auto");
});
</script>

3
app/views/games/_code_actions.html.erb
View File

@ -167,9 +167,10 @@
$("#exit_shixun").attr("href", "javascript:void(0);").removeClass("shixun-task-btn").removeClass("task-btn-blue").addClass("task-btn");
$(".blacktab_con").eq(1).trigger("click"); // 回到测试结果页面
// 保存版本库代码
var fileUpdateUrl = $("#current_repository_path").html();
$.ajax({
type: "POST",
url: '<%= file_update_myshixun_game_path(@game, :myshixun_id => @myshixun, :path => @path) %>',
url: fileUpdateUrl,
data:{ content: $('#challenge-answer-edit-small').val()},
success: function(data){
if(data.success == "success"){

1
app/views/games/_repository.html.erb
View File

@ -62,6 +62,7 @@
</div>
</div>
</div>
<div id="current_repository_path" class="undis"><%= file_update_myshixun_game_path(@game, :myshixun_id => @myshixun, :path => @path) %></div>
<script>
<% if @myshixun.shixun.try(:webssh) %>
$('#codetab_nav_2').on("click", function(){

2
public/javascripts/edu/edu_tpi.js
View File

@ -328,7 +328,7 @@ function setupAjaxIndicatorBase() {
return;
}
if ($('.ajax-loading').length === 0 && settings.contentType != 'application/octet-stream') {
$('#ajax-indicator-base').show().html("<span><embed src='/images/bigdata/loading2.svg' /></span>");
$('#ajax-indicator-base').css("display","flex").show().html("<span><embed src='/images/bigdata/loading2.svg' /></span>");
}
});

16
public/stylesheets/css/taskstyle.css
View File

@ -368,14 +368,16 @@ a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weigh
.loading_main img{border-radius: 4px;}
.loading_main span{font-size: 44px;font-weight: bold;color: #ff7500;letter-spacing: 5px;margin-left: 5px;}
.load{width: auto;top:50%;margin-top:-100px;position: relative;}
.loading_seconde{color: #ff7500;letter-spacing: 3px;font-size: 16px;}#ajax-indicator-base {
.loading_seconde{color: #ff7500;letter-spacing: 3px;font-size: 16px;}
#ajax-indicator-base {
position: absolute; /* fixed not supported by IE*/
background-color:#eee;
border: 1px solid #bbb;
top:35%;
left:40%;
width:20%;
height:5%;
top: 50%;
left: 50%;
margin-left: -20px;
margin-top: -40px;
/* width: 20%; */
/* height: 5%; */
font-weight:bold;
text-align:center;
padding:0.6em;