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-29 16:09:42 +08:00
parent 690ef2de28 e01bf2f978
commit 50caa50898
3 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/games_controller.rb
View File

@ -1,3 +1,4 @@
#coding=utf-8
class GamesController < ApplicationController class GamesController < ApplicationController
layout "base_myshixun" layout "base_myshixun"
skip_before_filter :verify_authenticity_token, :only => [:file_update] skip_before_filter :verify_authenticity_token, :only => [:file_update]

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

@ -140,33 +140,7 @@
}); });
} }
function extend_window(){ function extend_window(){
var web_h = window.innerHeight; // $(".content-half-fix").show();
if($.browser.msie) {
$(".content-half-fix").css("width", "42%");
$(".content-half-fix").css("height", web_h - 168 + "px");
}
else if($.browser.safari)
{
$(".content-half-fix").css("width", "42%");
$(".content-half-fix").css("height", web_h - 168 + "px");
}
else if($.browser.mozilla)
{
$(".content-half-fix").css("width", "42.5%");
$(".content-half-fix").css("height", web_h - 158 + "px");
}
else if($.browser.opera) {
$(".content-half-fix").css("width", "42%");
}else if($.browser.chrome){
if(window.navigator.userAgent.indexOf("MetaSr") == -1){
$(".content-half-fix").css("width", "42.5%");
$(".content-half-fix").css("height", web_h - 160 + "px");
}else{
$(".content-half-fix").css("width", "42.5%");
$(".content-half-fix").css("height", web_h - 155 + "px");
}
}
$(".content-half-fix").show();
} }
function hide_windows(){ function hide_windows(){
$(".content-half-fix").hide(); $(".content-half-fix").hide();

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

@ -29,5 +29,6 @@
}); });
function file_edit_submit(){ function file_edit_submit(){
$('#file_update_id').submit(); $('#file_update_id').submit();
$("#bottom_save_edit").hide();
} }
</script> </script>