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:
miss 2017-08-16 17:37:03 +08:00
parent a20044c593 c3f9ad0809
commit 3db33d0bc7
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
<li id="codetab_nav_1" class="blacktab_hover" onclick="HoverLi_new(1);">
<a href="javascript:void(0);" class="tab_type tab_color" >代码</a>
</li>
<li id="codetab_nav_2">
<li id="codetab_nav_2" >
<% if @myshixun.shixun.try(:webssh) %>
<a href="javascript:void(0);" class="tab_type tab_color" >命令行</a>
<% end %>
@ -81,7 +81,7 @@
g_l('codetab_con_'+n).className='dis -relative';
g_l('codetab_nav_'+n).className='blacktab_hover';
};
<% if @myshixun.shixun.try(:webssh) %>
$('#codetab_nav_2').on("click", function(){
$.ajax({
url: "<%= open_webssh_myshixun_path(@myshixun) %>",
@ -94,15 +94,16 @@
// 本地版
var html_local ="<iframe src='http://127.0.0.1:9527?Host=106.75.96.108&Port=40054&Username=root&Password=123123&Gameid=" +data.game_id + "'" + " style='width:100%;border:0;' scrolling='no' id='game_webssh'></iframe><div class='-brother undis'></div>";
$("#codetab_con_2").html(html);
var h = $("#games_repository_contents").height() - $("#top_repository").height() - 10;
$("#game_webssh").css("min-height", h);
HoverLi_new(2);
// console.log( $("#game_webssh").contentDocument.body.height());
var h = $("#games_repository_contents").height() - $("#top_repository").height() - 10;
$("#game_webssh").css("min-height", h);
HoverLi_new(2);
// console.log( $("#game_webssh").contentDocument.body.height());
}
}
}
}
})
});
<% end %>
</script>

6
app/views/shixuns/_form.html.erb
View File

@ -22,7 +22,7 @@
</li>
<li class="clearfix mb15">
<label class="panel-form-label fl">简介&nbsp;&nbsp;&nbsp;</label>
<div id="shixun_introduction" class="new_li fl" style="margin-bottom: 0px">
<div id="shixun_introduction" class="new_li fl">
<textarea name="shixun[description]"><%= @shixun.description %></textarea>
</div>
<p id="e_tip_in" style="margin-left: 10%" class="c_grey"></p>
@ -161,7 +161,7 @@
/* ------------------------------- 简介md ------------------------------*/
var shixun_editormd = editormd("shixun_introduction", {
width : "89.7%",
height : 300,
height : 600,
syncScrolling : "single",
//你的lib目录的路径，我这边用JSP做测试的
path : "/editormd/lib/",
@ -190,7 +190,7 @@
/* --------------------------------- 背景知识 -------------------------------------- */
var shixun_propaedeutics = editormd("shixun_propaedeutics", {
width : "89.7%",
height : 300,
height : 600,
syncScrolling : "single",
//你的lib目录的路径，我这边用JSP做测试的
path : "/editormd/lib/",