孙向锦 / SunvoteEducation

Commit 1102ee1e56697a83f769f56758afbda66300dce1

Authored by jack
2 parents d7348237 601b1eb8

Merge branch 'develop' of http://120.78.57.84/Elvis/SunvoteEducation into develop

Inline Side-by-side
Showing 6 changed files with 22 additions and 5 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
  View file @1102ee1
... ... @@ -398,6 +398,8 @@
398 398 // $("#mainFrame").attr('src','<%=basePath%>teacher/test_list.do?classid=' + classId);
399 399 // window.top.loading.show();
400 400 //}
  401 + $("#mainFrame").attr('src','<%=basePath%>teacher/test_list.do?classid=' + classId);
  402 + window.top.loading.show();
401 403 }
402 404  
403 405 $("#time_submit").click(function(){
... ... @@ -451,8 +453,8 @@
451 453 $("#jishice_paper").click(function() {
452 454 var path = "../teacher/teach_paper.do?school_id=" + schoolId;
453 455 //if($("#mainFrame").attr('src') != (path)){
454   - // $("#mainFrame").attr('src',path);
455   - // window.top.loading.show();
  456 + $("#mainFrame").attr('src',path);
  457 + window.top.loading.show();
456 458 //}
457 459 });
458 460  
... ...
WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
  View file @1102ee1
... ... @@ -398,6 +398,8 @@
398 398 // $("#mainFrame").attr('src','<%=basePath%>teacher/test_list.do?classid=' + classId);
399 399 // window.top.loading.show();
400 400 //}
  401 + $("#mainFrame").attr('src','<%=basePath%>teacher/test_list.do?classid=' + classId);
  402 + window.top.loading.show();
401 403 }
402 404  
403 405 $("#time_submit").click(function(){
... ... @@ -451,8 +453,8 @@
451 453 $("#jishice_paper").click(function() {
452 454 var path = "../teacher/teach_paper.do?school_id=" + schoolId;
453 455 //if($("#mainFrame").attr('src') != (path)){
454   - // $("#mainFrame").attr('src',path);
455   - // window.top.loading.show();
  456 + $("#mainFrame").attr('src',path);
  457 + window.top.loading.show();
456 458 //}
457 459 });
458 460  
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp
  View file @1102ee1
... ... @@ -129,7 +129,11 @@
129 129 <script src="../static/ace/js/bootbox.js"></script>
130 130 <script type="text/javascript">
131 131 var url = "<%=basePath%>";
132   - $.fn.datepicker.dates['en'] = {
  132 +
  133 + $(document).ready(function(){
  134 + window.top.loading.remove();
  135 + });
  136 + $.fn.datepicker.dates['en'] = {
133 137 days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
134 138 daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
135 139 daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"],
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp
  View file @1102ee1
... ... @@ -85,6 +85,9 @@
85 85 <script type="text/javascript">
86 86 var user_id= "${pd.userId}";
87 87 var url = "<%=basePath%>";
  88 + $(document).ready(function(){
  89 + window.top.loading.remove();
  90 + });
88 91 </script>
89 92 <script src="../static/js/en_test_list.js?a=0"></script>
90 93 </html>
91 94 \ No newline at end of file
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
  View file @1102ee1
... ... @@ -123,6 +123,9 @@
123 123 </div><!-- /.modal -->
124 124 <script type="text/javascript">
125 125 var url = "<%=basePath%>" ;
  126 + $(document).ready(function(){
  127 + window.top.loading.remove();
  128 + });
126 129 $('.date-picker').datepicker({
127 130 autoclose: true,
128 131 todayHighlight: true,
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
  View file @1102ee1
... ... @@ -85,6 +85,9 @@
85 85 <script type="text/javascript">
86 86 var user_id= "${pd.userId}";
87 87 var url = "<%=basePath%>";
  88 + $(document).ready(function(){
  89 + window.top.loading.remove();
  90 + });
88 91 </script>
89 92 <script src="../static/js/test_list.js?a=1"></script>
90 93 </html>
91 94 \ No newline at end of file
... ...