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-30 14:34:59 +08:00
parent bfdb9be8ce 09bb152fea
commit ddf7a6e4a0
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,7 +270,7 @@
$('#edit_challenge_<%= @challenge.id %>').submit();
}
}
challenge_knowledge_editor = KindEditor.create('#challenge_answer',
challenge_answer_editor = KindEditor.create('#challenge_answer',
{"width":"87.5%",
"resizeType":0,
"no_label":true,
@ -281,7 +281,7 @@
"uploadJson":"/kindeditor/upload",
"fileManagerJson":"/kindeditor/filemanager"
});
challenge_knowledge_editor = KindEditor.create('#challenge_task_pass',
challenge_task_pass_editor = KindEditor.create('#challenge_task_pass',
{"width":"87.5%",
"resizeType":0,
"no_label":true,

4
app/views/games/_exec_results.html.erb
View File

@ -121,7 +121,7 @@
$("#code_results").html(html);
if(data.status == 2){
if( data.had_done == 0 ) {
var htmlvalue = "<%= j (render :partial => 'games/pass_game_show', :locals => { :game=> @game, :myshixun => @myshixun, :had_done => 1}) %>";
var htmlvalue = "<%= j (render :partial => 'games/pass_game_show', :locals => { :game=> @game, :myshixun => @myshixun, :had_done => 0}) %>";
}else{
var htmlvalue = "<%= j (render :partial => 'games/pass_game_show', :locals => { :game=> @game, :myshixun => @myshixun, :had_done => 1}) %>";
}
@ -151,7 +151,7 @@
});
}
function extend_window(){
// $(".content-half-fix").show();
$(".content-half-fix").show();
}
function hide_windows(){
$(".content-half-fix").hide();

4
app/views/games/_games_list.html.erb
View File

@ -38,14 +38,14 @@
<span class=" mr10">完成时间：<%= format_time(game.updated_at) %></span>
<span class=" mr10">耗时：<%#= game_avg_hour(game.created_at, game.updated_at) %>小时<%= game_avg_min(game.created_at, game.updated_at) %>分</span>
<span class=" mr10">测评次数：<%#= avg_my_pass game %>次</span>
<span class=" mr10">得分：<%= game.final_score %>分</span>
<span class=" mr10">得分：<%#= game.final_score %>分</span>
</p>
<% elsif game.status == 3 %>
<div class="fl">
<h4 class=" panel-inner-title "><i class="fa fa-lock font-18 color-grey mr5"></i><span class="color-red">第<%= game.challenge.try(:position) %>关</span>
<%= game.challenge.try(:subject) %></h4>
<p class="ml15 mt15 color-grey">
<span class=" mr10">已闯关：<%= had_pass(@myshixun) %>人</span>
<span class=" mr10">已闯关：<%#= had_pass(@myshixun) %>人</span>
<span class=" mr10">平均耗时：0小时28分</span>
</p>
</div>

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

@ -95,7 +95,7 @@ a:hover.leftnav-box-inner,a.leftnav-active{border-left:3px solid #29bd8b;color:
.rightbar-score li a{ color:#fff;}
a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:245px; margin-top: 12px;}
.rightbar-h2{ color:#fff; margin:12px 0 0 20px; font-weight: normal;}
.rightbar{background:#f5f9fc; color:#333;}
.rightbar{background:#f5f9fc; color:#333; position: relative;}
/*右侧内容*/
.content{ min-width:1000px; }
.content-row{ padding:15px; }