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:
huang 2017-08-22 16:10:12 +08:00
parent b836b09b6f 8037d443bc
commit 0395cd2f4f
7 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/games/_game_show.html.erb
View File

@ -64,7 +64,7 @@
</div>
</div>
<div class="-layout-h -padding-h-16 -horizontal -footer-left">
<ul class="-task-ml80">
<ul class="-task-ml80" style="height:40px;">
<%= render :partial => "games/shixun_comment_block" %>
<li class="fl mt10 ml20"><a href="javascript:void(0);" onclick="send_dis_to_shixun()" class="course-bth-blue color_white">发送</a></li>
<li class="fl ml20 mt15">

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

@ -19,7 +19,7 @@
<div class="cl"></div>
</ul>
<div class="cl"></div>
<div id="codetab_con_1">
<div id="codetab_con_1" style="background: #2b2b2b;">
<div class="panel-header clearfix" id="top_repository" style="border-bottom:0">
<h3 class="fl">
<%= render :partial => 'myshixun_breadcrumbs', :locals => {:path => @path, :kind => 'dir'} %>
@ -28,9 +28,9 @@
</div>
<div class="-flex -relative">
<div class="fit">
<!-- <div class="-layout-v -fit loading-center undis" id="coding_ajax_loading">
<embed src='/images/bigdata/loading2.svg' />
</div>-->
<!-- <div class="-layout-v -fit loading-center undis" id="coding_ajax_loading">
<embed src='/images/bigdata/loading2.svg' />
</div>-->
<div class="-layout-v -fit" id="coding_area">
<div class="-flex">
<div class="content-editor-inner">
@ -52,9 +52,11 @@
<div id="codetab_con_2" class="undis -relative"></div>
<div id="current_repository_path" class="undis"><%= file_update_myshixun_game_path(@game, :myshixun_id => @myshixun, :path => @path) %></div>
<script>
$(function(){
LoadingWebssh();
});
$(function(){
<% if @myshixun.shixun.try(:webssh) %>
LoadingWebssh();
<% end %>
});
var H = 2;
function g_l(o){return document.getElementById(o);}
function HoverLi_new(n){
@ -118,16 +120,17 @@
if(data.error){
return;
}else{
var h = $("#games_repository_contents").height() - 40;
var h = $("#games_repository_contents").height() - 50;
var rows = parseInt(h / 18);
// 测试版
var html = "<iframe src='<%= Redmine::Configuration['webssh'] %>/?Host=" + data.host + "&Port=" + data.port + "&Username=" + data.username + "&Password=" + data.password + "&Gameid=" + data.game_id + "&rows=" + rows + "'" + " style='width:100%;border:0;' scrolling='no' class='game_webssh'></iframe><div class='-brother undis'></div>";
var html = "<iframe src='<%= Redmine::Configuration['webssh'] %>?Host=" + data.host + "&Port=" + data.port + "&Username=" + data.username + "&Password=" + data.password + "&Gameid=" + data.game_id + "&Rows=" + rows + "'" + " style='width:100%;border:0;' scrolling='no' class='game_webssh'></iframe><div class='-brother undis'></div>";
// 本地版
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 + "&rows=" + rows + "'" + " style='width:100%;border:0;' scrolling='no' class='game_webssh'></iframe><div class='-brother undis'></div>";
// $("#LazyLoading").remove();
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 + "&Rows=" + rows + "'" + " style='width:100%;border:0;' scrolling='no' class='game_webssh'></iframe><div class='-brother undis'></div>";
// $("#LazyLoading").remove();
console.log(html);
$("#codetab_con_"+H).html(html);
$(".game_webssh").css("min-height", h);
// HoverLi_new(2);
// HoverLi_new(2);
}
}

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

@ -1,4 +1,4 @@
<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %>
<%= stylesheet_link_tag '/editormd/css/editormd' %>
<%= javascript_include_tag '/editormd/editormd.min.js' %>
<div class="edu-con-bg01 user_bg_shadow mb20" style="padding:30px 0;">
<div class="ml30 mr30">

1
public/editormd/css/editormd.css
View File

@ -55,6 +55,7 @@
-moz-appearance: none;
-ms-appearance: none;
appearance: none;
line-height: normal;
}
.editormd ::-webkit-scrollbar {
height: 10px;

36
public/javascripts/edu/application.js
View File

@ -88,12 +88,24 @@ $(function(){
// opacity:0
// }).hide();
// });
var $desc = $("<div class=\"-task-title\">"+
var $desc = $("<div class=\"-task-title\">"+
"<div class=\"data-tip-down\"></div>"+
"<div class=\"data-tip-left\"></div>"+
"<div class=\"data-tip-right\"></div>"+
"</div>").appendTo("body");
$("[data-tip-down]").hover(function(){
//Dom：绑定事件的节点对象，ChangeDOM：操作的相关节点，
function LeaveTitle(Dom,ChangeDom){
Dom.live("mouseleave",function(){
ChangeDom.html("").hide();
$desc.css({
opacity:0
}).hide();
})
}
LeaveTitle($("[data-tip-down]"),$(".data-tip-down"));
LeaveTitle($("[data-tip-right]"),$(".data-tip-left"));
LeaveTitle($("[data-tip-left]"),$(".data-tip-right"));
$("[data-tip-down]").live("mouseenter",function(){
var $tool = $(this).attr("data-tip-down");
$(".data-tip-down").show().html($tool);
$desc.show().css({
@ -101,13 +113,8 @@ $(function(){
opacity:0.7,
top:$(this).offset().top+30
});
},function(){
$(".data-tip-down").html("").hide();
$desc.css({
opacity:0
}).hide();
});
$("[data-tip-right]").hover(function(){
$("[data-tip-right]").live("mouseenter",function(){
var $tool = $(this).attr("data-tip-right");
$(".data-tip-left").show().html($tool);
$desc.show().css({
@ -115,13 +122,8 @@ $(function(){
opacity:0.7,
top:$(this).offset().top-$desc.height()/4
});
},function(){
$(".data-tip-left").html("").hide();
$desc.css({
opacity:0
}).hide();
});
$("[data-tip-left]").hover(function(){
$("[data-tip-left]").live("mouseenter",function(){
var $tool = $(this).attr("data-tip-left");
$(".data-tip-right").show().html($tool);
$desc.show().css({
@ -129,12 +131,8 @@ $(function(){
opacity:0.7,
top:$(this).offset().top-$desc.height()/4
});
},function(){
$(".data-tip-right").html("").hide();
$desc.css({
opacity:0
}).hide();
});
//下拉框
$("[select-for]").append("<i class='fa fa-sort-desc lesson_img'></i>");
$("[select-for]").hover(function(){

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

@ -43,13 +43,15 @@ $(function(){
}
if(flag){
clickY = e.pageY;
if(clickY > topOffset+100) {
if(clickY > topOffset+150) {
cen.css('top', clickY - 7 - topOffset + 'px');
cen.prev().height( clickY-topOffset + 'px');
nextW1 = clickY-topOffset;
cen.next().height( wrapHeight - nextW1 + 'px');
var h = $("#games_repository_contents").height() - $("#top_repository").height() - 50;
$("#game_webssh").css("min-height", h);
var m = $("#games_repository_contents").height() - 50;
$(".game_webssh").css("min-height", m);
var rows = parseInt(m / 18);
$("#file_entry_content").find(".CodeMirror-scroll").css("min-height", h);
$("#file_entry_content").find(".CodeMirror-scroll").css("max-height", h);
} else {

2
public/stylesheets/css/edu-common.css
View File

@ -406,7 +406,7 @@ input::-ms-clear{display:none;}
.-task-title{opacity:0;position:absolute;left:0;top:0;display:none;z-index:9999;}
.data-tip-down,.data-tip-left,.data-tip-right{ position:relative; box-shadow:0px 0px 8px rgba(142,142,142,.1); background:#fff; color:#000; max-width:300px;
word-wrap: break-word; text-align:center; border-radius:10px; padding:1px 10px; border:1px solid #ccc; display:none; }
word-wrap: break-word; text-align:center; border-radius:4px; padding:1px 10px; border:1px solid #ccc; display:none; }
.data-tip-down:after,.data-tip-down:before,.data-tip-left:before,.data-tip-right:before,.data-tip-left:after,.data-tip-right:after{
position: absolute;content:''; width:0; height:0;}
.data-tip-down:after,.data-tip-down:before{left: 45%;top:-10px;