diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index caace8e3e..7e6e5c96a 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -99,13 +99,13 @@ class GamesController < ApplicationController else echo -e '-1' fi" - aFile =File.new(File.join("files/temp/","#{@myshixun.identifier}.sh"), "w+") - # aFile = File.new("files/temp/#{@myshixun.identifier}.sh", "rw+") - if aFile - aFile.syswrite(script) - else - logger.error "Unable to open file!" - end + # aFile =File.new(File.join("files/temp/","#{@myshixun.identifier}.sh"), "w+") + # # aFile = File.new("files/temp/#{@myshixun.identifier}.sh", "rw+") + # if aFile + # aFile.syswrite(script) + # else + # logger.error "Unable to open file!" + # end # stdin, stdout, stderr = Open3.popen3("../files/test.sh") # ("files/test.sh").execute diff --git a/app/views/games/_game_show.html.erb b/app/views/games/_game_show.html.erb index e64912538..508fcb197 100644 --- a/app/views/games/_game_show.html.erb +++ b/app/views/games/_game_show.html.erb @@ -103,7 +103,7 @@
- <% if @tpm_modified %> + <%# if @tpm_modified %>
@@ -126,7 +126,7 @@
- <% end %> + <%# end %>
diff --git a/public/javascripts/edu/edu_tpi.js b/public/javascripts/edu/edu_tpi.js index 3940298d0..4afdd76a5 100644 --- a/public/javascripts/edu/edu_tpi.js +++ b/public/javascripts/edu/edu_tpi.js @@ -344,7 +344,7 @@ function setupAjaxIndicatorBase() { return; } if ($('.ajax-loading').length === 0 && settings.contentType != 'application/octet-stream') { - $('#ajax-indicator-base').css("display","flex").show().html(""); + $('#ajax-indicator-base').css("display","flex").html("").show(); } }); diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css index 24f02efd6..9e7f2c0a3 100644 --- a/public/stylesheets/css/taskstyle.css +++ b/public/stylesheets/css/taskstyle.css @@ -387,31 +387,41 @@ a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weigh .load{width: auto;top:50%;margin-top:-100px;position: relative;} .loading_seconde{color: #ff7500;letter-spacing: 3px;font-size: 16px;} #ajax-indicator-base { - position: absolute; /* fixed not supported by IE*/ + position: absolute; /* fixed not supported by IE*//* top: 50%; left: 50%; margin-left: -20px; margin-top: -40px; - /* width: 20%; */ - /* height: 5%; */ + width: 20%; + height: 5%; */ + width: 100%; + height: 100%; font-weight:bold; text-align:center; - padding:0.6em; - z-index:100; - opacity: 0.5; + /*padding:0.6em;*/ + z-index:9999; + background: rgba(225,225,225,0); } html>body #ajax-indicator-base { position: fixed; } -#ajax-indicator-base span{ +#ajax-indicator-base embed{ + position: relative; + top: 40%; + width: 40px; + height: 40px; + margin-left: -40px; + left: 50%; +} +/*#ajax-indicator-base span{ color:#fff; background-position: 0% 40%; background-repeat: no-repeat; - /*background-image: url(/images/loading.gif);*/ + *//*background-image: url(/images/loading.gif);*//* padding-left: 26px; vertical-align: bottom; z-index:999; -} +}*/ .save-tip{display:none;position: fixed;top:0px;left: 0px;width: 100%;height: 100%;} .save-tip-content{position: absolute;top:50%;left: 50%;margin-left: -36px;margin-top:-19px;background: rgba(0,0,0,0.7);color:#fff;padding:5px 15px;border-radius: 4px}