Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project

This commit is contained in:
huang 2017-03-21 14:06:14 +08:00
commit 8655e91d48
4 changed files with 61 additions and 27 deletions

View File

@ -1,4 +1,4 @@
<div class="autoscroll"> <div class="autoscroll_new">
<table class="filecontent syntaxhl mt5" style="width:100%"> <table class="filecontent syntaxhl mt5" style="width:100%">
<tbody> <tbody>
<% line_num = 1 %> <% line_num = 1 %>

View File

@ -45,3 +45,56 @@
<%= render :partial => 'exec_results' %> <%= render :partial => 'exec_results' %>
</div> </div>
</div> </div>
<script type="text/javascript" language="javascript">
var web_h = window.innerHeight;
$(document).ready(function(){
if($.browser.msie) {
$(".content").css("height", web_h - 75 + "px");
$(".tab-info-inner").css("height", web_h * 0.55 + "px"); //IE
$(".content-editor").css("height", web_h * 0.55 + 100 + "px");
}
else if($.browser.safari)
{
$(".content").css("height", web_h - 75 + "px");
$(".tab-info-inner").css("height", web_h * 0.55 + "px"); //Safari
$(".content-editor").css("height", web_h * 0.55 + 105 + "px");
}
else if($.browser.mozilla)
{
$(".content").css("height", web_h - 75 + "px");
$(".tab-info-inner").css("height", web_h * 0.48 + 50 + "px"); //Firefox
$(".content-editor").css("height", web_h * 0.48 + 155 + "px");
}
else if($.browser.opera) {
$(".content").css("height", web_h - 75 + "px");
$(".tab-info-inner").css("height", web_h * 0.55 + "px"); //Opera
$(".content-editor").css("height", web_h * 0.55 + 105 + "px");
}else if($.browser.chrome){
if(window.navigator.userAgent.indexOf("MetaSr") == -1){
$(".content").css("height", web_h - 75 + "px");
$(".tab-info-inner").css("height", web_h * 0.55 + "px");
$(".content-editor").css("height", web_h * 0.55 + 105 + "px");
}else{
$(".content").css("height", web_h - 75 + "px");
$(".tab-info-inner").css("height", web_h * 0.52 + "px");
$(".content-editor").css("height", web_h * 0.52 + 105 + "px");
}
}
});
//课程大纲tab
function g(o){return document.getElementById(o);}
function HoverLi(n){
for(var i=1;i<=3;i++){
g('tab_nav_'+i).className='tab_nomal';
g('tab_con_'+i).className='undis';
}
g('tab_con_'+n).className='dis';
g('tab_nav_'+n).className='tab_hover';
}
$("#close_myshixun_tip").click(function(){
$("#myshixun_tip").hide();
});
function extend_game_description(){
$(".content-all-fix").show();
}
</script>

View File

@ -49,27 +49,33 @@
if($.browser.msie) { if($.browser.msie) {
$(".content-half-fix02").css("height", web_h - 85 + "px"); $(".content-half-fix02").css("height", web_h - 85 + "px");
$(".content-half-fix02").css("width", "86%"); $(".content-half-fix02").css("width", "86%");
$(".autoscroll_new").css("height", web_h * 0.61 + "px");
} }
else if($.browser.safari) else if($.browser.safari)
{ {
$(".content-half-fix02").css("height", web_h - 85 + "px"); $(".content-half-fix02").css("height", web_h - 85 + "px");
$(".content-half-fix02").css("width", "86%"); $(".content-half-fix02").css("width", "86%");
$(".autoscroll_new").css("height", web_h * 0.61 + "px");
} }
else if($.browser.mozilla) else if($.browser.mozilla)
{ {
$(".content-half-fix02").css("height", web_h - 85 + "px"); $(".content-half-fix02").css("height", web_h - 85 + "px");
$(".content-half-fix02").css("width", "86%"); $(".content-half-fix02").css("width", "86%");
$(".autoscroll_new").css("height", web_h * 0.595 + "px");
} }
else if($.browser.opera) { else if($.browser.opera) {
$(".content-half-fix02").css("height", web_h - 85 + "px"); $(".content-half-fix02").css("height", web_h - 85 + "px");
$(".content-half-fix02").css("width", "86%"); $(".content-half-fix02").css("width", "86%");
$(".autoscroll_new").css("height", web_h * 0.61 + "px");
}else if($.browser.chrome){ }else if($.browser.chrome){
if(window.navigator.userAgent.indexOf("MetaSr") == -1){ if(window.navigator.userAgent.indexOf("MetaSr") == -1){
$(".content-half-fix02").css("height", web_h - 85 + "px"); $(".content-half-fix02").css("height", web_h - 85 + "px");
$(".content-half-fix02").css("width", "86%"); $(".content-half-fix02").css("width", "86%");
$(".autoscroll_new").css("height", web_h * 0.61 + "px");
}else{ }else{
$(".content-half-fix02").css("height", web_h - 80 + "px"); $(".content-half-fix02").css("height", web_h - 80 + "px");
$(".content-half-fix02").css("width", "85.7%"); $(".content-half-fix02").css("width", "85.7%");
$(".autoscroll_new").css("height", web_h * 0.58 + "px");
} }
} }
}); });

View File

@ -1,6 +1,6 @@
<div class="autoscroll_new"> <div class="autoscroll_new">
<table class="list entries" id="browser" style="table-layout: fixed;"> <table class="list entries" id="browser" style="table-layout: fixed;">
<tbody style="line-height: 1.9;"> <tbody style="line-height: 1.9;" id="sasadas">
<% @entries.each do |entry| %> <% @entries.each do |entry| %>
<% tr_id = Digest::MD5.hexdigest(entry.path) <% tr_id = Digest::MD5.hexdigest(entry.path)
depth = params[:depth].to_i %> depth = params[:depth].to_i %>
@ -20,29 +20,4 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<script>
var web_h = window.innerHeight;
$(document).ready(function(){
if($.browser.msie) {
$(".autoscroll_new").css("height", web_h * 0.61 + "px");
}
else if($.browser.safari)
{
$(".autoscroll_new").css("height", web_h * 0.61 + "px");
}
else if($.browser.mozilla)
{
$(".autoscroll_new").css("height", web_h * 0.595 + "px");
}
else if($.browser.opera) {
$(".autoscroll_new").css("height", web_h * 0.61 + "px");
}else if($.browser.chrome){
if(window.navigator.userAgent.indexOf("MetaSr") == -1){
$(".autoscroll_new").css("height", web_h * 0.61 + "px");
}else{
$(".autoscroll_new").css("height", web_h * 0.58 + "px");
}
}
});
</script>