From eabdc8c8ccdf480d69aeb220dfd4793d53d5357b Mon Sep 17 00:00:00 2001
From: miss <994230062@qq.com>
Date: Wed, 16 Aug 2017 08:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/challenges/_skill_form.html.erb |  2 +-
 app/views/games/_code_actions.html.erb    |  4 +-
 app/views/layouts/base_myshixun.html.erb  |  7 ++--
 public/javascripts/application.js         | 10 ++---
 public/javascripts/edu/edu_tpi.js         | 47 ++++++++++++-----------
 public/stylesheets/css/edu-common.css     |  9 +++--
 public/stylesheets/css/public.css         |  4 +-
 public/stylesheets/public.css             | 14 +++----
 8 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/app/views/challenges/_skill_form.html.erb b/app/views/challenges/_skill_form.html.erb
index 8fe6bb0ae..0efbdd47a 100644
--- a/app/views/challenges/_skill_form.html.erb
+++ b/app/views/challenges/_skill_form.html.erb
@@ -22,7 +22,7 @@
   <div class="prop-notice-info mb10 ml95">
     <ol>
       <% if @st == 0 %>
-        <li>学员为参考答案通过了本阶段的评测时将获得技能，否则不能获得技能</li>
+        <li>学员未参考答案通过了本阶段的评测时将获得技能，否则不能获得技能</li>
       <% else %>
         <li>学员答题正确将获得技能，否则不能获得技能</li>
       <% end %>
diff --git a/app/views/games/_code_actions.html.erb b/app/views/games/_code_actions.html.erb
index d09224b1f..8e1edbfe6 100644
--- a/app/views/games/_code_actions.html.erb
+++ b/app/views/games/_code_actions.html.erb
@@ -136,8 +136,8 @@
         // 加载页面
         nEvalContent = $("#evaluating_contents").hide();
         nEvalInfo = $("#evaluating_info").hide();
-      /*  nAjaxLoading = $("#evaluating_ajax_loading").css("display","flex").show().html("<embed src='/images/bigdata/loading2.svg' />");
-        nInfoAjaxLoading = $("#info_ajax_loading").css("display","flex").show().html("<embed src='/images/bigdata/loading2.svg' />");*/
+        nAjaxLoading = $("#evaluating_ajax_loading").css("display","flex").show().html("<embed src='/images/bigdata/loading2.svg' />");
+        nInfoAjaxLoading = $("#info_ajax_loading").css("display","flex").show().html("<embed src='/images/bigdata/loading2.svg' />");
 //        nAjaxLoading.css("display","flex");
 //        nInfoAjaxLoading.css("display","flex");
 //        nEvalContent.hide();
diff --git a/app/views/layouts/base_myshixun.html.erb b/app/views/layouts/base_myshixun.html.erb
index e33dac307..ad7798911 100644
--- a/app/views/layouts/base_myshixun.html.erb
+++ b/app/views/layouts/base_myshixun.html.erb
@@ -52,11 +52,12 @@
 </div>
 <%= yield %>
 </div>
-<!--<div id="ajax-indicator" style="display:none;">
-  <span><%#= l(:label_loading) %></span>
+
+<div id="ajax-indicator" style="display:none;">
+  <!--<span><embed src='/images/bigdata/loading2.svg' /></span>-->
 </div>
 
-<div id="ajax-modal" style="display:none;"></div>-->
+<!--<div id="ajax-modal" style="display:none;"></div>-->
 </body>
 <!-- MathJax的配置 -->
 <script type="text/javascript" src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 090d0fd19..5e6fafe75 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -671,18 +671,18 @@ function setupHeartBeat(){
   setInterval(function(){$.getJSON('/account/heartbeat');},time);
 }
 
-/*function setupAjaxIndicator() {
+function setupAjaxIndicator() {
   $('#ajax-indicator').bind('ajaxSend', function(event, xhr, settings) {
     if(settings && settings.url && settings.url.match(/account\/heartbeat$/)){
       return;
     }
     if ($('.ajax-loading').length === 0 && settings.contentType != 'application/octet-stream') {
-      $('#ajax-indicator').show();
+      $('#ajax-indicator').show().html("<span><embed src='/images/bigdata/loading2.svg' /></span>");
     }
   });
   
   $('#ajax-indicator').bind('ajaxStop', function() {
-    $('#ajax-indicator').hide();
+    $('#ajax-indicator').html("").hide();
       if(MathJax && MathJax.Hub)
           MathJax.Hub.Queue(['Typeset', MathJax.Hub]); //如果是ajax刷新页面的话，手动执行MathJax的公式显示
       try{
@@ -691,7 +691,7 @@ function setupHeartBeat(){
 
       }
   });
-}*/
+}
 
 function hideOnLoad() {
   $('.hol').hide();
@@ -729,7 +729,7 @@ function transpotUrl (scope) {
   });
 }
 
-//$(document).ready(setupAjaxIndicator);
+$(document).ready(setupAjaxIndicator);
 $(document).ready(setupHeartBeat);
 $(document).ready(hideOnLoad);
 $(document).ready(addFormObserversForDoubleSubmit);
diff --git a/public/javascripts/edu/edu_tpi.js b/public/javascripts/edu/edu_tpi.js
index d4e9c052e..bf2034b04 100644
--- a/public/javascripts/edu/edu_tpi.js
+++ b/public/javascripts/edu/edu_tpi.js
@@ -350,29 +350,30 @@ function game_tread(obj_id){
 
 
 
-function setupAjaxIndicator() {
-    //alert($('#evaluating_ajax_loading')[0]);
-    $('#evaluating_ajax_loading').bind('ajaxSend', function(event, xhr, settings) {
-        if(settings && settings.url && settings.url.match(/account\/heartbeat$/)){
-            return;
-        }
-        if (settings.contentType != 'application/octet-stream') {
-            console.log("样式");
-            $('#evaluating_ajax_loading').css("display","flex").show().html("<embed src='/images/bigdata/loading2.svg' />");
-        }
-    });
-
-    $('#evaluating_ajax_loading').bind('ajaxStop', function() {
-        $('#evaluating_ajax_loading').hide();
-        if(MathJax && MathJax.Hub)
-            MathJax.Hub.Queue(['Typeset', MathJax.Hub]); //如果是ajax刷新页面的话，手动执行MathJax的公式显示
-        try{
-            prettyPrint(); //如果刷新出来的页面如果存在代码行的话，也需要美化
-        }catch (e){
-
-        }
-    });
-}
+//function setupAjaxIndicator() {
+//    //alert($('#evaluating_ajax_loading')[0]);
+//    $('#evaluating_ajax_loading').bind('ajaxSend', function(event, xhr, settings) {
+//        if(settings && settings.url && settings.url.match(/account\/heartbeat$/)){
+//            return;
+//        }
+//        if (settings.contentType != 'application/octet-stream') {
+//            console.log("样式");
+//            $('#evaluating_ajax_loading').css("display","flex").show().html("<embed src='/images/bigdata/loading2.svg' />");
+//        }
+//    });
+//
+//    $('#evaluating_ajax_loading').bind('ajaxStop', function() {
+//        $('#evaluating_ajax_loading').html("").hide();
+//        console.log("jiegou");
+//        if(MathJax && MathJax.Hub)
+//            MathJax.Hub.Queue(['Typeset', MathJax.Hub]); //如果是ajax刷新页面的话，手动执行MathJax的公式显示
+//        try{
+//            prettyPrint(); //如果刷新出来的页面如果存在代码行的话，也需要美化
+//        }catch (e){
+//
+//        }
+//    });
+//}
 // test_sets：测试集；had_test_count：输出集的个数；test_sets_count：测试集的个数；had_passed_testsests_error_count：测试集报错数；test_sets_hidden_count：隐藏测试集的个数
 // test_sets_public_count：公开测试集的个人；had_passed_testsests_hidden_count：通过的隐藏集个数；had_passed_testsests_public_count：通过的公开测试集个数
 // final_score：最终得分；latest_output：最新的输出；language：实训的语言
diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css
index 0be4f0c41..aeb7845da 100644
--- a/public/stylesheets/css/edu-common.css
+++ b/public/stylesheets/css/edu-common.css
@@ -252,12 +252,13 @@ table.table-pa5 th,table.table-pa5 td{ padding:0 5px;}
 /***** loading ******/
 /***** Ajax indicator ******/
 #ajax-indicator {
-    position: absolute; /* fixed not supported by IE */
+    position: absolute; /* fixed not supported by IE*/
     background-color:#eee;
     border: 1px solid #bbb;
     top:35%;
     left:40%;
     width:20%;
+    height:5%;
     font-weight:bold;
     text-align:center;
     padding:0.6em;
@@ -267,12 +268,14 @@ table.table-pa5 th,table.table-pa5 td{ padding:0 5px;}
 
 html>body #ajax-indicator { position: fixed; }
 
-#ajax-indicator span {
+#ajax-indicator 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;
 }
 
 
diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css
index 704ecd665..fc437b285 100644
--- a/public/stylesheets/css/public.css
+++ b/public/stylesheets/css/public.css
@@ -96,10 +96,10 @@ a.opnionButton:hover{background: #297fb8; }
 .hiddent{ overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .font_bold{font-weight: bold;}
 /***** Ajax indicator ******/
-#ajax-indicator { position: absolute; /* fixed not supported by IE */ background-color:#eee;border: 1px solid #bbb; top:35%; left:40%; width:20%; font-weight:bold; text-align:center;
+#ajax-indicator { position: absolute; /* fixed not supported by IE */ background-color:#eee;border: 1px solid #bbb; top:35%; left:40%; width:50%; font-weight:bold; text-align:center;
     padding:0.6em; z-index:100000;  opacity: 0.5;}
 html>body #ajax-indicator { position: fixed; }
-#ajax-indicator span { background-position: 0% 40%; background-repeat: no-repeat;  background-image: url(/images/loading.gif);  padding-left: 26px; vertical-align: bottom;}
+/*#ajax-indicator span { background-position: 0% 40%;  vertical-align: bottom;}*/
 div.modal { border-radius: 5px; background: #fff; z-index: 50; padding: 4px;}
 .ui-widget-content { border: 1px solid #ddd; color: #333;}
 .ui-widget { font-family: Verdana, sans-serif; font-size: 1.1em;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 99d0de4b0..6328e498b 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -812,13 +812,13 @@ a.opnionButton:hover{background: #297fb8; }
 
 html>body #ajax-indicator { position: fixed; }
 
-#ajax-indicator span {
-    background-position: 0% 40%;
-    background-repeat: no-repeat;
-    background-image: url(../images/loading.gif);
-    padding-left: 26px;
-    vertical-align: bottom;
-}
+/*#ajax-indicator span {*/
+    /*background-position: 0% 40%;*/
+    /*background-repeat: no-repeat;*/
+    /*background-image: url(../images/loading.gif);*/
+    /*padding-left: 26px;*/
+    /*vertical-align: bottom;*/
+/*}*/
 
 div.modal {
     border-radius: 5px;