Commit b638e17aa0b131859da14068653d4fd6e65dd67d

Authored by jack
1 parent 8d18341d

1.英文翻译(三)

Showing 55 changed files with 1203 additions and 239 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -17,9 +17,10 @@ @@ -17,9 +17,10 @@
17 <title>中天电子-教育管理系统</title> 17 <title>中天电子-教育管理系统</title>
18 18
19 <!-- Bootstrap --> 19 <!-- Bootstrap -->
20 -<link 20 +<!-- <link
21 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 21 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
22 - rel="stylesheet"> 22 + rel="stylesheet"> -->
  23 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
23 <link href="../static/css/teach.css?a=1" rel="stylesheet"> 24 <link href="../static/css/teach.css?a=1" rel="stylesheet">
24 <link href="../static/css/mb_style.css" rel="stylesheet"> 25 <link href="../static/css/mb_style.css" rel="stylesheet">
25 26
@@ -278,9 +279,9 @@ @@ -278,9 +279,9 @@
278 <!-- /.modal-dialog --> 279 <!-- /.modal-dialog -->
279 </div> 280 </div>
280 <!-- /.modal --> 281 <!-- /.modal -->
281 - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script> 282 + <script src="../static/js/jquery.min.js"></script>
282 <script 283 <script
283 - src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> 284 + src="../static/js/bootstrap.min.js"></script>
284 <script src="../static/js/model.js"></script> 285 <script src="../static/js/model.js"></script>
285 <script src="../static/js/loading.js"></script> 286 <script src="../static/js/loading.js"></script>
286 <script src="../static/js/remove.js?a=2"></script> 287 <script src="../static/js/remove.js?a=2"></script>
WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
@@ -17,9 +17,10 @@ @@ -17,9 +17,10 @@
17 <title>SunVote-Education Management System</title> 17 <title>SunVote-Education Management System</title>
18 18
19 <!-- Bootstrap --> 19 <!-- Bootstrap -->
20 -<link 20 +<!-- <link
21 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 21 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
22 - rel="stylesheet"> 22 + rel="stylesheet"> -->
  23 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
23 <link href="../static/css/en_teach.css?a=1" rel="stylesheet"> 24 <link href="../static/css/en_teach.css?a=1" rel="stylesheet">
24 <link href="../static/css/mb_style.css" rel="stylesheet"> 25 <link href="../static/css/mb_style.css" rel="stylesheet">
25 26
@@ -50,7 +51,7 @@ @@ -50,7 +51,7 @@
50 <div class="name"> 51 <div class="name">
51 <p>welcome!</p> 52 <p>welcome!</p>
52 <p id="school" title="${SNAME }">${SNAME }</p> 53 <p id="school" title="${SNAME }">${SNAME }</p>
53 - <p id="name" title="${SNAME } 管理员">${SNAME }administrator</p> 54 + <p id="name" title="${SNAME } administrator">${SNAME }administrator</p>
54 </br> 55 </br>
55 </br> 56 </br>
56 </div> 57 </div>
@@ -87,7 +88,7 @@ @@ -87,7 +88,7 @@
87 </p> 88 </p>
88 <ul class="menu_1"> 89 <ul class="menu_1">
89 <li> 90 <li>
90 - <p>Course management</p> 91 + <p>Courses management</p>
91 <ul class="menu_2"> 92 <ul class="menu_2">
92 <c:forEach items="${gradeInfos}" var="var" varStatus="vs"> 93 <c:forEach items="${gradeInfos}" var="var" varStatus="vs">
93 <li 94 <li
@@ -247,7 +248,7 @@ @@ -247,7 +248,7 @@
247 <div class="clearfix"></div> 248 <div class="clearfix"></div>
248 </div> 249 </div>
249 <div class="form-group"> 250 <div class="form-group">
250 - <label for="enter_time" class="col-sm-4 control-label">subject</label> 251 + <label for="enter_time" class="col-sm-4 control-label">Subject</label>
251 <div class="col-sm-6"> 252 <div class="col-sm-6">
252 <select class="chosen-select form-control" name="subject_id" 253 <select class="chosen-select form-control" name="subject_id"
253 id="subject_id" onchange="getTemplates()" 254 id="subject_id" onchange="getTemplates()"
@@ -278,12 +279,12 @@ @@ -278,12 +279,12 @@
278 <!-- /.modal-dialog --> 279 <!-- /.modal-dialog -->
279 </div> 280 </div>
280 <!-- /.modal --> 281 <!-- /.modal -->
281 - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script> 282 + <script src="../static/js/jquery.min.js"></script>
282 <script 283 <script
283 - src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> 284 + src="../static/js/bootstrap.min.js"></script>
284 <script src="../static/js/model.js"></script> 285 <script src="../static/js/model.js"></script>
285 <script src="../static/js/loading.js"></script> 286 <script src="../static/js/loading.js"></script>
286 - <script src="../static/js/remove.js?a=2"></script> 287 + <script src="../static/js/en_remove.js?a=2"></script>
287 <script src="../static/js/dailog.js"></script> 288 <script src="../static/js/dailog.js"></script>
288 <script type="text/javascript"> 289 <script type="text/javascript">
289 290
WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp
@@ -15,9 +15,10 @@ @@ -15,9 +15,10 @@
15 <base href="<%=basePath%>"> 15 <base href="<%=basePath%>">
16 <!-- 下拉框 --> 16 <!-- 下拉框 -->
17 <link rel="stylesheet" href="static/ace/css/chosen.css" /> 17 <link rel="stylesheet" href="static/ace/css/chosen.css" />
18 -<link 18 +<!-- <link
19 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 19 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
20 - rel="stylesheet"> 20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
21 <link href="static/css/teach.css" rel="stylesheet"> 22 <link href="static/css/teach.css" rel="stylesheet">
22 <!-- 日期框 --> 23 <!-- 日期框 -->
23 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 24 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp
@@ -15,9 +15,10 @@ @@ -15,9 +15,10 @@
15 <base href="<%=basePath%>"> 15 <base href="<%=basePath%>">
16 <!-- 下拉框 --> 16 <!-- 下拉框 -->
17 <link rel="stylesheet" href="static/ace/css/chosen.css" /> 17 <link rel="stylesheet" href="static/ace/css/chosen.css" />
18 -<link 18 +<!-- <link
19 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 19 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
20 - rel="stylesheet"> 20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
21 <link href="static/css/teach.css" rel="stylesheet"> 22 <link href="static/css/teach.css" rel="stylesheet">
22 <!-- 日期框 --> 23 <!-- 日期框 -->
23 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 24 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
@@ -49,7 +50,7 @@ @@ -49,7 +50,7 @@
49 <col style="width: 30%" /> 50 <col style="width: 30%" />
50 <thead> 51 <thead>
51 <tr> 52 <tr>
52 - <th><input type="checkbox" name='ids' id="ids" />Number</th> 53 + <th><input type="checkbox" name='ids' id="ids" />No.</th>
53 <th>Teacher Name</th> 54 <th>Teacher Name</th>
54 <th>Class Name</th> 55 <th>Class Name</th>
55 <th>Subject</th> 56 <th>Subject</th>
@@ -87,7 +88,7 @@ @@ -87,7 +88,7 @@
87 </table> 88 </table>
88 <div class="footer"> 89 <div class="footer">
89 <div class="creat"> 90 <div class="creat">
90 - <input type="button" onclick="add()" value="Distribute class teacher task" /> 91 + <input type="button" onclick="add()" value="Distribute class task" />
91 </div> 92 </div>
92 <div class="removeAll"> 93 <div class="removeAll">
93 <input type="button" onclick="deleteAll()" value="Remove class task" /> 94 <input type="button" onclick="deleteAll()" value="Remove class task" />
@@ -118,6 +119,7 @@ @@ -118,6 +119,7 @@
118 <script type="text/javascript"> 119 <script type="text/javascript">
119 $(document).ready(function(){ 120 $(document).ready(function(){
120 window.top.loading.remove(); 121 window.top.loading.remove();
  122 + $(".table_box").css("padding-top",$(".head_box").height());
121 }); 123 });
122 124
123 function tosearch(){ 125 function tosearch(){
WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_edit2.jsp
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 <div id="zhongxin" style="padding-top: 13px;"> 34 <div id="zhongxin" style="padding-top: 13px;">
35 <table id="table_report" class="table"> 35 <table id="table_report" class="table">
36 <tr> 36 <tr>
37 - <td style="width:75px;text-align: right;padding-top: 13px;">Course name:</td> 37 + <td style="width:110px;text-align: right;padding-top: 13px;">Course name:</td>
38 <td> 38 <td>
39 <select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder=""> 39 <select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder="">
40 <c:forEach var="item" items="${gradeList}"> 40 <c:forEach var="item" items="${gradeList}">
WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp
@@ -15,12 +15,13 @@ @@ -15,12 +15,13 @@
15 <!-- 下拉框 --> 15 <!-- 下拉框 -->
16 <link rel="stylesheet" href="static/ace/css/chosen.css" /> 16 <link rel="stylesheet" href="static/ace/css/chosen.css" />
17 <!-- jsp文件头和头部 --> 17 <!-- jsp文件头和头部 -->
18 -<link href="../static/css/teach.css" rel="stylesheet"> 18 +<link href="static/css/teach.css" rel="stylesheet">
19 <!-- 日期框 --> 19 <!-- 日期框 -->
20 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 20 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
21 -<link 21 +<!-- <link
22 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 22 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
23 - rel="stylesheet"> 23 + rel="stylesheet"> -->
  24 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
24 <link href="static/css/teach.css" rel="stylesheet"> 25 <link href="static/css/teach.css" rel="stylesheet">
25 </head> 26 </head>
26 <body class="no-skin"> 27 <body class="no-skin">
@@ -39,12 +40,12 @@ @@ -39,12 +40,12 @@
39 </div> 40 </div>
40 <div style="padding:0 5%;background:#fff;"> 41 <div style="padding:0 5%;background:#fff;">
41 <table class="table table-striped"> 42 <table class="table table-striped">
42 - <col style="width: 10%" />  
43 - <col style="width: 45%" />  
44 - <col style="width: 45%" /> 43 + <col style="width: 20%" />
  44 + <col style="width: 40%" />
  45 + <col style="width: 40%" />
45 <thead> 46 <thead>
46 <tr> 47 <tr>
47 - <th><input type="checkbox" name='ids' id="ids" value="${var.SCHOOLGRADESUBJECT_ID}" />Number</th> 48 + <th><input type="checkbox" name='ids' id="ids" value="${var.SCHOOLGRADESUBJECT_ID}" />No.</th>
48 <th class="center">Grade name</th> 49 <th class="center">Grade name</th>
49 <th class="center">Grade description</th> 50 <th class="center">Grade description</th>
50 </tr> 51 </tr>
@@ -54,10 +55,9 @@ @@ -54,10 +55,9 @@
54 </div> 55 </div>
55 <div class="table_box"> 56 <div class="table_box">
56 <table class="table table-striped"> 57 <table class="table table-striped">
57 - <col style="width: 10%" />  
58 - <col style="width: 30%" />  
59 - <col style="width: 30%" />  
60 - <col style="width: 30%" /> 58 + <col style="width: 20%" />
  59 + <col style="width: 40%" />
  60 + <col style="width: 40%" />
61 61
62 <tbody> 62 <tbody>
63 <c:choose> 63 <c:choose>
@@ -67,9 +67,7 @@ @@ -67,9 +67,7 @@
67 <td><input type="checkbox" name='ids' id="ids" 67 <td><input type="checkbox" name='ids' id="ids"
68 value="${var.SCHOOLGRADESUBJECT_ID}" />${vs.index+1}</td> 68 value="${var.SCHOOLGRADESUBJECT_ID}" />${vs.index+1}</td>
69 <td class='center'>${var.NAME}</td> 69 <td class='center'>${var.NAME}</td>
70 - <td class='center'>${var.DESC}</td>  
71 - <td class='center'></td>  
72 - 70 + <td class='center'>${var.DESC}</td>
73 </tr> 71 </tr>
74 72
75 </c:forEach> 73 </c:forEach>
@@ -116,6 +114,7 @@ @@ -116,6 +114,7 @@
116 <script type="text/javascript"> 114 <script type="text/javascript">
117 $(document).ready(function(){ 115 $(document).ready(function(){
118 window.top.loading.remove(); 116 window.top.loading.remove();
  117 + $(".table_box").css("padding-top",$(".head_box").height());
119 }); 118 });
120 119
121 //检索 120 //检索
WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp
@@ -15,12 +15,13 @@ @@ -15,12 +15,13 @@
15 <!-- 下拉框 --> 15 <!-- 下拉框 -->
16 <link rel="stylesheet" href="static/ace/css/chosen.css" /> 16 <link rel="stylesheet" href="static/ace/css/chosen.css" />
17 <!-- jsp文件头和头部 --> 17 <!-- jsp文件头和头部 -->
18 -<link href="../static/css/teach.css" rel="stylesheet"> 18 +<link href="static/css/teach.css" rel="stylesheet">
19 <!-- 日期框 --> 19 <!-- 日期框 -->
20 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 20 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
21 -<link 21 +<!-- <link
22 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 22 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
23 - rel="stylesheet"> 23 + rel="stylesheet"> -->
  24 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
24 <link href="static/css/teach.css" rel="stylesheet"> 25 <link href="static/css/teach.css" rel="stylesheet">
25 </head> 26 </head>
26 <body class="no-skin"> 27 <body class="no-skin">
WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_list2.jsp
@@ -21,7 +21,10 @@ @@ -21,7 +21,10 @@
21 21
22 <!-- 日期框 --> 22 <!-- 日期框 -->
23 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 23 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
24 -<link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 24 +<!-- <link
  25 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  26 + rel="stylesheet"> -->
  27 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
25 <link href="static/css/teach.css" rel="stylesheet"> 28 <link href="static/css/teach.css" rel="stylesheet">
26 </head> 29 </head>
27 <body class="no-skin"> 30 <body class="no-skin">
@@ -29,8 +32,9 @@ @@ -29,8 +32,9 @@
29 32
30 <!-- 检索 --> 33 <!-- 检索 -->
31 <form action="headmaster/listcs.do" method="post" name="Form" id="Form"> 34 <form action="headmaster/listcs.do" method="post" name="Form" id="Form">
32 - <input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>  
33 - <input type="hidden" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}"/> 35 + <input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID"
  36 + value="${pd.SCHOOL_ID}" /> <input type="hidden" name="GRADE_ID"
  37 + id="GRADE_ID" value="${pd.GRADE_ID}" />
34 <div class="head_box"> 38 <div class="head_box">
35 <div class="box_header"> 39 <div class="box_header">
36 <div class="head_box_l"> 40 <div class="head_box_l">
@@ -40,18 +44,19 @@ @@ -40,18 +44,19 @@
40 </div> 44 </div>
41 <div class="clearfix"></div> 45 <div class="clearfix"></div>
42 </div> 46 </div>
43 - <div style="background:#fff;padding:0 5%;" > 47 + <div style="background:#fff;padding:0 5%;">
44 48
45 - <table class="table table-striped" > 49 + <table class="table table-striped">
46 <col style="width: 10%" /> 50 <col style="width: 10%" />
47 <col style="width: 10%" /> 51 <col style="width: 10%" />
  52 + <col style="width: 20%" />
48 <col style="width: 10%" /> 53 <col style="width: 10%" />
49 - <col style="width: 10%" />  
50 <col style="width: 20%" /> 54 <col style="width: 20%" />
51 <col style="width: 20%" /> 55 <col style="width: 20%" />
  56 + <col style="width: 10%" />
52 <thead> 57 <thead>
53 <tr> 58 <tr>
54 - <th><input type="checkbox" value="0" name='ids' id="ids" />Number</th> 59 + <th><input type="checkbox" value="0" name='ids' id="ids" />No.</th>
55 <th class="center">Name</th> 60 <th class="center">Name</th>
56 <th class="center">User Name</th> 61 <th class="center">User Name</th>
57 <th class="center">Password</th> 62 <th class="center">Password</th>
@@ -59,7 +64,7 @@ @@ -59,7 +64,7 @@
59 <th class="center">Class</th> 64 <th class="center">Class</th>
60 <th class="center">Operation</th> 65 <th class="center">Operation</th>
61 </tr> 66 </tr>
62 - 67 +
63 </thead> 68 </thead>
64 </table> 69 </table>
65 </div> 70 </div>
@@ -68,52 +73,58 @@ @@ -68,52 +73,58 @@
68 <!-- 检索 --> 73 <!-- 检索 -->
69 74
70 </div> 75 </div>
71 - <div class="table_box" >  
72 - <table class="table table-striped" > 76 + <div class="table_box">
  77 + <table class="table table-striped">
73 <col style="width: 10%" /> 78 <col style="width: 10%" />
74 - <col style="width: 10%" />  
75 - <col style="width: 10%" />  
76 - <col style="width: 10%" />  
77 - <col style="width: 20%" />  
78 - <col style="width: 20%" /> 79 + <col style="width: 10%" />
  80 + <col style="width: 20%" />
  81 + <col style="width: 10%" />
  82 + <col style="width: 20%" />
  83 + <col style="width: 20%" />
  84 + <col style="width: 10%" />
79 <tbody> 85 <tbody>
80 <!-- 开始循环 --> 86 <!-- 开始循环 -->
81 - <c:choose>  
82 - <c:when test="${not empty varList}">  
83 - <c:forEach items="${varList}" var="var" varStatus="vs">  
84 - <tr>  
85 - <td><input type="checkbox" name='ids' id="ids" 87 + <c:choose>
  88 + <c:when test="${not empty varList}">
  89 + <c:forEach items="${varList}" var="var" varStatus="vs">
  90 + <tr>
  91 + <td><input type="checkbox" name='ids' id="ids"
86 value="${var.ID}" />${vs.index+1}</td> 92 value="${var.ID}" />${vs.index+1}</td>
87 - <td class='center'>${var.NAME}</td>  
88 - <td class='center'>${var.USERNAME}</td>  
89 - <td class='center'>${var.PASSWORD}</td>  
90 - <td class='center'>${var.PHONE}</td>  
91 - <td class='center'>${var.CLASS_NAME}</td>  
92 - <td><a onclick="edit('${var.HEADMASTER_ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a onclick="del('${var.HEADMASTER_ID}');"><img src="static/images/remove.png" /></a></td>  
93 - </tr> 93 + <td class='center'>${var.NAME}</td>
  94 + <td class='center'>${var.USERNAME}</td>
  95 + <td class='center'>${var.PASSWORD}</td>
  96 + <td class='center'>${var.PHONE}</td>
  97 + <td class='center'>${var.CLASS_NAME}</td>
  98 + <td><a onclick="edit('${var.HEADMASTER_ID}');"
  99 + style="margin-right:10px;"><img
  100 + src="static/images/eidtor.png" /></a><a
  101 + onclick="del('${var.HEADMASTER_ID}');"><img
  102 + src="static/images/remove.png" /></a></td>
  103 + </tr>
94 104
95 - </c:forEach>  
96 - </c:when>  
97 - <c:otherwise>  
98 - <tr class="main_info">  
99 - <td colspan="100" class="center">There is no data</td>  
100 - </tr>  
101 - </c:otherwise>  
102 - </c:choose> 105 + </c:forEach>
  106 + </c:when>
  107 + <c:otherwise>
  108 + <tr class="main_info">
  109 + <td colspan="100" class="center">There is no data</td>
  110 + </tr>
  111 + </c:otherwise>
  112 + </c:choose>
103 </tbody> 113 </tbody>
104 </table> 114 </table>
105 <div class="footer" style="width:auto;margin: 0px 5%;"> 115 <div class="footer" style="width:auto;margin: 0px 5%;">
106 <div class="creat"> 116 <div class="creat">
107 <input type="button" onclick="add();" value="Add the monitor" /> 117 <input type="button" onclick="add();" value="Add the monitor" />
108 </div> 118 </div>
109 - <div class="removeAll"> 119 + <div class="removeAll">
110 <input type="button" onclick="del();" value="Remove" /> 120 <input type="button" onclick="del();" value="Remove" />
111 - </div>  
112 - 121 + </div>
  122 +
113 <div class="page_box"> 123 <div class="page_box">
114 - <div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div> 124 + <div class="pagination"
  125 + style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
115 </div> 126 </div>
116 - </div> 127 + </div>
117 </div> 128 </div>
118 </form> 129 </form>
119 </div> 130 </div>
@@ -124,7 +135,11 @@ @@ -124,7 +135,11 @@
124 <%@ include file="../../system/index/foot.jsp"%> 135 <%@ include file="../../system/index/foot.jsp"%>
125 136
126 <script type="text/javascript"> 137 <script type="text/javascript">
  138 + $(document).ready(function(){
127 window.top.loading.remove(); 139 window.top.loading.remove();
  140 + $(".table_box").css("padding-top",$(".head_box").height());
  141 + });
  142 +
128 //检索 143 //检索
129 function tosearch(){ 144 function tosearch(){
130 $("#Form").submit(); 145 $("#Form").submit();
@@ -165,24 +180,26 @@ @@ -165,24 +180,26 @@
165 180
166 $.ajax({ 181 $.ajax({
167 type: "POST", 182 type: "POST",
168 - url: '<%=basePath%>headmaster/deleteAll.do?tm='+new Date().getTime(),  
169 - data: {DATA_IDS:str},  
170 - dataType:'json',  
171 - //beforeSend: validateData,  
172 - cache: false,  
173 - success: function(data){  
174 - tosearch(); 183 + url: '<%=basePath%>headmaster/deleteAll.do?tm='
  184 + + new Date().getTime(),
  185 + data : {
  186 + DATA_IDS : str
  187 + },
  188 + dataType : 'json',
  189 + //beforeSend: validateData,
  190 + cache : false,
  191 + success : function(data) {
  192 + tosearch();
  193 + }
  194 + });
  195 +
  196 + } else {
  197 + console.log("false");
175 } 198 }
176 - });  
177 -  
178 - }  
179 - else{  
180 - console.log("false");  
181 - }  
182 - }}); 199 + }
  200 + });
183 window.top.remove.show(); 201 window.top.remove.show();
184 } 202 }
185 -  
186 </script> 203 </script>
187 204
188 205
WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp
@@ -21,7 +21,10 @@ @@ -21,7 +21,10 @@
21 21
22 <!-- 日期框 --> 22 <!-- 日期框 -->
23 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 23 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
24 -<link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 24 +<!-- <link
  25 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  26 + rel="stylesheet"> -->
  27 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
25 <link href="static/css/teach.css" rel="stylesheet"> 28 <link href="static/css/teach.css" rel="stylesheet">
26 </head> 29 </head>
27 <body class="no-skin"> 30 <body class="no-skin">
WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_edit2.jsp
@@ -51,11 +51,11 @@ @@ -51,11 +51,11 @@
51 <table id="table_report" class="table"> 51 <table id="table_report" class="table">
52 <tr> 52 <tr>
53 <td style="width:95px;text-align: right;padding-top: 13px;">Exercise Title</td> 53 <td style="width:95px;text-align: right;padding-top: 13px;">Exercise Title</td>
54 - <td><input type="text" name="NAME" class="form-control" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="输入练习标题,不超过20个汉字" title="作业代码" /></td> 54 + <td><input type="text" name="NAME" class="form-control" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="Please enter the exercise title within 20 characters" title="作业代码" /></td>
55 </tr> 55 </tr>
56 <tr> 56 <tr>
57 <td style="width:95px;text-align: right;padding-top: 13px;">Exercise Description</td> 57 <td style="width:95px;text-align: right;padding-top: 13px;">Exercise Description</td>
58 - <td><input type="text" name=HOMEWORK_DESC class="form-control" id="HOMEWORK_DESC" value="${pd.HOMEWORK_DESC}" maxlength="255" placeholder="输入题目说明,如教材第12页1-5题,教辅第5页1-3题,尽量精简,不超过100个汉字" title="作业名称" /></td> 58 + <td><input type="text" name=HOMEWORK_DESC class="form-control" id="HOMEWORK_DESC" value="${pd.HOMEWORK_DESC}" maxlength="255" placeholder="Pis enter the descirption, e. g. item 1-5 of page 12, no more than 100 characters" title="作业名称" /></td>
59 </tr> 59 </tr>
60 <tr> 60 <tr>
61 <td style="width:95px;text-align: right;padding-top: 13px;">Assign completed time of class</td> 61 <td style="width:95px;text-align: right;padding-top: 13px;">Assign completed time of class</td>
@@ -210,7 +210,7 @@ @@ -210,7 +210,7 @@
210 <!--提示框--> 210 <!--提示框-->
211 <script type="text/javascript" src="static/js/jquery.tips.js"></script> 211 <script type="text/javascript" src="static/js/jquery.tips.js"></script>
212 <!--页面交互--> 212 <!--页面交互-->
213 - <script src="static/js/control_homework.js?t=2"></script> 213 + <script src="static/js/en_control_homework.js?t=2"></script>
214 <script> 214 <script>
215 var homework_id="${pd.HOMEWORK_ID}"; 215 var homework_id="${pd.HOMEWORK_ID}";
216 216
WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_list.jsp
@@ -49,22 +49,22 @@ @@ -49,22 +49,22 @@
49 <div style="padding:0 5%;background:#fff;"> 49 <div style="padding:0 5%;background:#fff;">
50 <table class="table table-striped"> 50 <table class="table table-striped">
51 <col style="width: 8%" /> 51 <col style="width: 8%" />
52 - <col style="width: 20%" /> 52 + <col style="width: 15%" />
53 <col style="width: 15%" /> 53 <col style="width: 15%" />
54 <col style="width: 15%" /> 54 <col style="width: 15%" />
55 <col style="width: 10%" /> 55 <col style="width: 10%" />
56 - <col style="width: 7%" />  
57 <col style="width: 10%" /> 56 <col style="width: 10%" />
58 - <col style="width: 5%" /> 57 + <col style="width: 10%" />
  58 + <col style="width: 7%" />
59 <col style="width: 10%" /> 59 <col style="width: 10%" />
60 <thead> 60 <thead>
61 <tr> 61 <tr>
62 - <th><input type="checkbox" name='ids' id="ids" />Number</th> 62 + <th><input type="checkbox" name='ids' id="ids" />No.</th>
63 <th>Exercise List</th> 63 <th>Exercise List</th>
64 <th>Assignment time</th> 64 <th>Assignment time</th>
65 <th>Completion time</th> 65 <th>Completion time</th>
66 <th>Class</th> 66 <th>Class</th>
67 - <th>Item number</th> 67 + <th>Item No.</th>
68 <th>Completion Situation</th> 68 <th>Completion Situation</th>
69 <th>Total score</th> 69 <th>Total score</th>
70 <th>Operation</th> 70 <th>Operation</th>
@@ -76,13 +76,13 @@ @@ -76,13 +76,13 @@
76 <div class="table_box"> 76 <div class="table_box">
77 <table class="table table-striped"> 77 <table class="table table-striped">
78 <col style="width: 8%" /> 78 <col style="width: 8%" />
79 - <col style="width: 20%" /> 79 + <col style="width: 15%" />
80 <col style="width: 15%" /> 80 <col style="width: 15%" />
81 <col style="width: 15%" /> 81 <col style="width: 15%" />
82 <col style="width: 10%" /> 82 <col style="width: 10%" />
83 - <col style="width: 7%" />  
84 <col style="width: 10%" /> 83 <col style="width: 10%" />
85 - <col style="width: 5%" /> 84 + <col style="width: 10%" />
  85 + <col style="width: 7%" />
86 <col style="width: 10%" /> 86 <col style="width: 10%" />
87 <tbody> 87 <tbody>
88 <c:choose> 88 <c:choose>
@@ -150,6 +150,7 @@ @@ -150,6 +150,7 @@
150 <script type="text/javascript"> 150 <script type="text/javascript">
151 $(document).ready(function() { 151 $(document).ready(function() {
152 window.top.loading.remove(); 152 window.top.loading.remove();
  153 + $(".table_box").css("padding-top",$(".head_box").height());
153 //日期框 154 //日期框
154 $('.date-picker').datepicker({ 155 $('.date-picker').datepicker({
155 autoclose: true, 156 autoclose: true,
WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_report.jsp
@@ -22,9 +22,10 @@ @@ -22,9 +22,10 @@
22 <link rel="stylesheet" href="static/ace/css/chosen.css" /> 22 <link rel="stylesheet" href="static/ace/css/chosen.css" />
23 <link type="text/css" href="static/css/tablescroller.css" rel="stylesheet" /> 23 <link type="text/css" href="static/css/tablescroller.css" rel="stylesheet" />
24 24
25 -<link 25 +<!-- <link
26 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 26 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
27 - rel="stylesheet"> 27 + rel="stylesheet"> -->
  28 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
28 <!-- 日期框 --> 29 <!-- 日期框 -->
29 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 30 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
30 31
@@ -70,7 +71,7 @@ @@ -70,7 +71,7 @@
70 <td><div style="width:150px;text-align:center;">Course statistics: ${fn:length(pd.DATA.HOMEWORKS)}</div></td> 71 <td><div style="width:150px;text-align:center;">Course statistics: ${fn:length(pd.DATA.HOMEWORKS)}</div></td>
71 <td><div style="width:150px;text-align:center;">Class roster: ${myelfun:findClassName(pd.CLASS_ID)}</div></td> 72 <td><div style="width:150px;text-align:center;">Class roster: ${myelfun:findClassName(pd.CLASS_ID)}</div></td>
72 73
73 - <td><div style="width:150px;text-align:center;"><span>student number: ${fn:length(pd.DATA.STUDENTS)}</span></div></td> 74 + <td><div style="width:150px;text-align:center;"><span>Student number: ${fn:length(pd.DATA.STUDENTS)}</span></div></td>
74 <td></td> 75 <td></td>
75 76
76 77
@@ -111,7 +112,7 @@ @@ -111,7 +112,7 @@
111 </thead> 112 </thead>
112 <tbody> 113 <tbody>
113 <tr> 114 <tr>
114 - <td class="center"><div style="width:150px;">course total scores of class</div></td> 115 + <td class="center"><div style="width:150px;">Class total score</div></td>
115 <td class="center"><div style="width:150px;"></div></td> 116 <td class="center"><div style="width:150px;"></div></td>
116 <td class="center"><div style="width:80px;"></div></td> 117 <td class="center"><div style="width:80px;"></div></td>
117 <td class="center"><div style="width:80px;"></div></td> 118 <td class="center"><div style="width:80px;"></div></td>
WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp
@@ -77,12 +77,12 @@ li { @@ -77,12 +77,12 @@ li {
77 <div class="info row"> 77 <div class="info row">
78 <div class="col-md-6"> 78 <div class="col-md-6">
79 <p> 79 <p>
80 - Class average score<span id="class_avg">0.0</span>% 80 + Class Average<span id="class_avg">0.0</span>%
81 </p> 81 </p>
82 </div> 82 </div>
83 <div class="col-md-6"> 83 <div class="col-md-6">
84 <p> 84 <p>
85 - Highest grade rate in class<span id="class_max">0.0</span>% 85 + Class Highest<span id="class_max">0.0</span>%
86 </p> 86 </p>
87 </div> 87 </div>
88 </div> 88 </div>
@@ -95,16 +95,16 @@ li { @@ -95,16 +95,16 @@ li {
95 <div class="col-md-9"> 95 <div class="col-md-9">
96 <div class="color"> 96 <div class="color">
97 <ul> 97 <ul>
98 - <li><span class="green"></span>Class average </li>  
99 - <li><span class="blue"></span>Student personal</li>  
100 - <li><span class="yellow"></span>Highest score in class</li> 98 + <li><span class="green"></span>Class AVG </li>
  99 + <li><span class="blue"></span>Student</li>
  100 + <li><span class="yellow"></span>Class Highest</li>
101 <div class="clear"></div> 101 <div class="clear"></div>
102 </ul> 102 </ul>
103 </div> 103 </div>
104 <div class="check_box"> 104 <div class="check_box">
105 <input type="radio" checked value="1" name="check" id="check1" /> 105 <input type="radio" checked value="1" name="check" id="check1" />
106 - <label for="check1">According to the scoring rate</label> <input type="radio" value="2"  
107 - name="check" id="check2" /> <label for="check2">According to the score</label> 106 + <label for="check1">Correct Rate</label> <input type="radio" value="2"
  107 + name="check" id="check2" /> <label for="check2">Marks</label>
108 </div> 108 </div>
109 </div> 109 </div>
110 </div> 110 </div>
WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
@@ -22,9 +22,10 @@ @@ -22,9 +22,10 @@
22 <link rel="stylesheet" href="static/ace/css/chosen.css" /> 22 <link rel="stylesheet" href="static/ace/css/chosen.css" />
23 <link type="text/css" href="static/css/tablescroller.css" rel="stylesheet" /> 23 <link type="text/css" href="static/css/tablescroller.css" rel="stylesheet" />
24 24
25 -<link 25 +<!-- <link
26 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 26 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
27 - rel="stylesheet"> 27 + rel="stylesheet"> -->
  28 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
28 <!-- 日期框 --> 29 <!-- 日期框 -->
29 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 30 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
30 31
WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp
@@ -14,9 +14,10 @@ @@ -14,9 +14,10 @@
14 <base href="<%=basePath%>"> 14 <base href="<%=basePath%>">
15 <!-- 下拉框 --> 15 <!-- 下拉框 -->
16 <link rel="stylesheet" href="static/ace/css/chosen.css" /> 16 <link rel="stylesheet" href="static/ace/css/chosen.css" />
17 -<link 17 +<!-- <link
18 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 18 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
19 - rel="stylesheet"> 19 + rel="stylesheet"> -->
  20 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
20 <link href="static/css/teach.css" rel="stylesheet"> 21 <link href="static/css/teach.css" rel="stylesheet">
21 <!-- 日期框 --> 22 <!-- 日期框 -->
22 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 23 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
@@ -46,7 +47,7 @@ @@ -46,7 +47,7 @@
46 <col style="width: 12.5%" /> 47 <col style="width: 12.5%" />
47 <thead> 48 <thead>
48 <tr> 49 <tr>
49 - <th><input type="checkbox" name='ids' id="ids" />Number</th> 50 + <th><input type="checkbox" name='ids' id="ids" />No.</th>
50 <th class="center">Template name</th> 51 <th class="center">Template name</th>
51 <th class="center">Subject</th> 52 <th class="center">Subject</th>
52 <th class="center">Grade</th> 53 <th class="center">Grade</th>
@@ -172,6 +173,7 @@ @@ -172,6 +173,7 @@
172 173
173 $(document).ready(function() { 174 $(document).ready(function() {
174 window.top.loading.remove(); 175 window.top.loading.remove();
  176 + $(".table_box").css("padding-top",$(".head_box").height());
175 }); 177 });
176 178
177 $('#ids').on('click', function(){ 179 $('#ids').on('click', function(){
WebRoot/WEB-INF/jsp/sunvote/pagetemplate/pagetemplate_list2.jsp
@@ -14,9 +14,10 @@ @@ -14,9 +14,10 @@
14 <base href="<%=basePath%>"> 14 <base href="<%=basePath%>">
15 <!-- 下拉框 --> 15 <!-- 下拉框 -->
16 <link rel="stylesheet" href="static/ace/css/chosen.css" /> 16 <link rel="stylesheet" href="static/ace/css/chosen.css" />
17 -<link 17 +<!-- <link
18 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 18 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
19 - rel="stylesheet"> 19 + rel="stylesheet"> -->
  20 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
20 <link href="static/css/teach.css" rel="stylesheet"> 21 <link href="static/css/teach.css" rel="stylesheet">
21 <!-- 日期框 --> 22 <!-- 日期框 -->
22 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 23 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list2.jsp
@@ -15,13 +15,14 @@ @@ -15,13 +15,14 @@
15 <title>SunVote-Education Management System</title> 15 <title>SunVote-Education Management System</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 -<link 18 +<!-- <link
19 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 19 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
20 - rel="stylesheet"> 20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
21 <link href="../static/css/teach.css" rel="stylesheet"> 22 <link href="../static/css/teach.css" rel="stylesheet">
22 <link rel="stylesheet" href="../static/ace/css/datepicker.css" /> 23 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
23 <script src="../static/js/loading.js"></script> 24 <script src="../static/js/loading.js"></script>
24 -<script src="../static/js/remove.js?a=1"></script> 25 +<script src="../static/js/en_remove.js?a=1"></script>
25 <script src="../static/js/dailog.js"></script> 26 <script src="../static/js/dailog.js"></script>
26 27
27 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询(media queries)功能 --> 28 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询(media queries)功能 -->
WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp
@@ -17,13 +17,15 @@ @@ -17,13 +17,15 @@
17 <title>中天电子-教育管理系统</title> 17 <title>中天电子-教育管理系统</title>
18 18
19 <!-- Bootstrap --> 19 <!-- Bootstrap -->
20 -<link 20 +<!-- <link
21 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 21 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
22 - rel="stylesheet"> 22 + rel="stylesheet"> -->
  23 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
23 <link href="../static/css/teach.css" rel="stylesheet"> 24 <link href="../static/css/teach.css" rel="stylesheet">
24 <link rel="stylesheet" href="../static/ace/css/datepicker.css" /> 25 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
  26 +<script src="../static/js/jquery.min.js"></script>
25 <script src="../static/js/loading.js"></script> 27 <script src="../static/js/loading.js"></script>
26 -<script src="../static/js/remove.js?a=1"></script> 28 +<script src="../static/js/en_remove.js?a=1"></script>
27 <script src="../static/js/dailog.js"></script> 29 <script src="../static/js/dailog.js"></script>
28 30
29 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询(media queries)功能 --> 31 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询(media queries)功能 -->
@@ -82,11 +84,11 @@ @@ -82,11 +84,11 @@
82 <col style="width: 10%" /> 84 <col style="width: 10%" />
83 <thead> 85 <thead>
84 <tr> 86 <tr>
85 - <th><input type="checkbox" name='ids' id="ids" />number</th> 87 + <th><input type="checkbox" name='ids' id="ids" />No.</th>
86 <th>Test title</th> 88 <th>Test title</th>
87 <th>Grade</th> 89 <th>Grade</th>
88 <th>Class</th> 90 <th>Class</th>
89 - <th>出卷老师</th> 91 + <th>Instructor</th>
90 <th>Creation time</th> 92 <th>Creation time</th>
91 <th>Recommended test duration</th> 93 <th>Recommended test duration</th>
92 <th>Total score</th> 94 <th>Total score</th>
@@ -175,7 +177,7 @@ @@ -175,7 +177,7 @@
175 177
176 function del(Id){ 178 function del(Id){
177 //var remove = new remove(); 179 //var remove = new remove();
178 - window.top.remove.init({"title":"删除","func":function(success){ 180 + window.top.remove.init({"title":"Remove","func":function(success){
179 if(success){ 181 if(success){
180 var url = "<%=basePath%>paper/delete.do?PAPER_ID="+Id+"&qingsongkao=true&tm="+new Date().getTime(); 182 var url = "<%=basePath%>paper/delete.do?PAPER_ID="+Id+"&qingsongkao=true&tm="+new Date().getTime();
181 window.top.loading.show(); 183 window.top.loading.show();
@@ -214,7 +216,7 @@ @@ -214,7 +216,7 @@
214 }); 216 });
215 217
216 function deleteAll(){ 218 function deleteAll(){
217 - window.top.remove.init({"title":"删除","func":function(success){ 219 + window.top.remove.init({"title":"Remove","func":function(success){
218 if(success){ 220 if(success){
219 var str = ''; 221 var str = '';
220 for(var i=0;i < document.getElementsByName('ids').length;i++){ 222 for(var i=0;i < document.getElementsByName('ids').length;i++){
WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp
@@ -16,13 +16,15 @@ @@ -16,13 +16,15 @@
16 <title>中天电子-教育管理系统</title> 16 <title>中天电子-教育管理系统</title>
17 17
18 <!-- Bootstrap --> 18 <!-- Bootstrap -->
19 -<link 19 +<!-- <link
20 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 20 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
21 - rel="stylesheet"> 21 + rel="stylesheet"> -->
  22 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
22 <link href="../static/css/teach.css" rel="stylesheet"> 23 <link href="../static/css/teach.css" rel="stylesheet">
23 <link rel="stylesheet" href="../static/ace/css/datepicker.css" /> 24 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
  25 +<script src="../static/js/jquery.min.js"></script>
24 <script src="../static/js/loading.js"></script> 26 <script src="../static/js/loading.js"></script>
25 -<script src="../static/js/remove.js?a=1"></script> 27 +<script src="../static/js/en_remove.js?a=1"></script>
26 <script src="../static/js/dailog.js"></script> 28 <script src="../static/js/dailog.js"></script>
27 29
28 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询(media queries)功能 --> 30 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询(media queries)功能 -->
@@ -62,14 +64,14 @@ @@ -62,14 +64,14 @@
62 <col style="width: 10%" /> 64 <col style="width: 10%" />
63 <thead> 65 <thead>
64 <tr> 66 <tr>
65 - <th><input type="checkbox" name='ids' id="ids" />Number</th> 67 + <th><input type="checkbox" name='ids' id="ids" />No.</th>
66 <th>Test title</th> 68 <th>Test title</th>
67 <th>Creation time</th> 69 <th>Creation time</th>
68 - <th>grade</th>  
69 - <th>subject</th> 70 + <th>Grade</th>
  71 + <th>Subject</th>
70 <th>Recommended test duration</th> 72 <th>Recommended test duration</th>
71 <th>Total score</th> 73 <th>Total score</th>
72 - <th>operation</th> 74 + <th>Operation</th>
73 </tr> 75 </tr>
74 </thead> 76 </thead>
75 </table> 77 </table>
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
@@ -15,9 +15,10 @@ @@ -15,9 +15,10 @@
15 <title>中天电子-教育管理系统</title> 15 <title>中天电子-教育管理系统</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 -<link 18 +<!-- <link
19 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 19 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
20 - rel="stylesheet"> 20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
21 <link href="../static/css/teach.css" rel="stylesheet"> 22 <link href="../static/css/teach.css" rel="stylesheet">
22 <link rel="stylesheet" href="../static/ace/css/datepicker.css" /> 23 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
23 <script src="../static/js/loading.js"></script> 24 <script src="../static/js/loading.js"></script>
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
@@ -16,9 +16,10 @@ @@ -16,9 +16,10 @@
16 <title>中天电子-教育管理系统</title> 16 <title>中天电子-教育管理系统</title>
17 17
18 <!-- Bootstrap --> 18 <!-- Bootstrap -->
19 -<link 19 +<!-- <link
20 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 20 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
21 - rel="stylesheet"> 21 + rel="stylesheet"> -->
  22 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
22 <link href="../static/css/teach.css" rel="stylesheet"> 23 <link href="../static/css/teach.css" rel="stylesheet">
23 <link rel="stylesheet" href="../static/ace/css/datepicker.css" /> 24 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
24 <script src="../static/js/loading.js"></script> 25 <script src="../static/js/loading.js"></script>
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
@@ -16,9 +16,10 @@ @@ -16,9 +16,10 @@
16 <title>中天电子-教育管理系统</title> 16 <title>中天电子-教育管理系统</title>
17 17
18 <!-- Bootstrap --> 18 <!-- Bootstrap -->
19 -<link 19 +<!-- <link
20 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 20 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
21 - rel="stylesheet"> 21 + rel="stylesheet"> -->
  22 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
22 <link href="../static/css/teach.css" rel="stylesheet"> 23 <link href="../static/css/teach.css" rel="stylesheet">
23 <link rel="stylesheet" href="../static/ace/css/datepicker.css" /> 24 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
24 <script src="../static/js/loading.js"></script> 25 <script src="../static/js/loading.js"></script>
WebRoot/WEB-INF/jsp/sunvote/school/en_school_edit2.jsp
@@ -12,9 +12,10 @@ @@ -12,9 +12,10 @@
12 <base href="<%=basePath%>"> 12 <base href="<%=basePath%>">
13 <!-- 下拉框 --> 13 <!-- 下拉框 -->
14 <link rel="stylesheet" href="static/ace/css/chosen.css" /> 14 <link rel="stylesheet" href="static/ace/css/chosen.css" />
15 -<link 15 +<!-- <link
16 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 16 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
17 - rel="stylesheet"> 17 + rel="stylesheet"> -->
  18 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
18 <link href="static/css/teach.css" rel="stylesheet"> 19 <link href="static/css/teach.css" rel="stylesheet">
19 <!-- 日期框 --> 20 <!-- 日期框 -->
20 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 21 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
@@ -53,8 +54,8 @@ @@ -53,8 +54,8 @@
53 padding: 10px 15px; 54 padding: 10px 15px;
54 width:100%; 55 width:100%;
55 } 56 }
56 - .school_info .col-sm-4{  
57 - width:100px; 57 + .school_info .col-md-4{
  58 +
58 padding-right:0; 59 padding-right:0;
59 line-height:34px; 60 line-height:34px;
60 font-size:16px; 61 font-size:16px;
@@ -79,39 +80,39 @@ @@ -79,39 +80,39 @@
79 </div> 80 </div>
80 </div> 81 </div>
81 82
82 - <div class="col-md-6 school_info" style="margin-left:25%;margin-top:5%;"> 83 + <div class="col-md-8 school_info" style="margin-left:16.6%;margin-top:5%;">
83 <div class="form-group"> 84 <div class="form-group">
84 - <label for="enter_title" class="col-sm-4 control-label">School name:</label>  
85 - <div class="col-sm-8"> 85 + <label for="enter_title" class="col-md-4 control-label">School name:</label>
  86 + <div class="col-md-8">
86 <input type="text" class="form-control" disabled placeholder="Enter the School name" maxlength="100" minlength="1" name="NAME" id="NAME" value="${pd.NAME}"> 87 <input type="text" class="form-control" disabled placeholder="Enter the School name" maxlength="100" minlength="1" name="NAME" id="NAME" value="${pd.NAME}">
87 </div> 88 </div>
88 <div class="clearfix"></div> 89 <div class="clearfix"></div>
89 </div> 90 </div>
90 91
91 <div class="form-group"> 92 <div class="form-group">
92 - <label for="enter_time" class="col-sm-4 control-label">School address:</label>  
93 - <div class="col-sm-8"> 93 + <label for="enter_time" class="col-md-4 control-label">School address:</label>
  94 + <div class="col-md-8">
94 <input type="text" class="form-control" disabled placeholder="Enter the school address" name="ADDRESS" id="ADDRESS" value="${pd.ADDRESS}" maxlength="255" > 95 <input type="text" class="form-control" disabled placeholder="Enter the school address" name="ADDRESS" id="ADDRESS" value="${pd.ADDRESS}" maxlength="255" >
95 </div> 96 </div>
96 <div class="clearfix"></div> 97 <div class="clearfix"></div>
97 </div> 98 </div>
98 <div class="form-group"> 99 <div class="form-group">
99 - <label for="enter_time" class="col-sm-4 control-label">Headmaster:</label>  
100 - <div class="col-sm-8"> 100 + <label for="enter_time" class="col-md-4 control-label">Headmaster:</label>
  101 + <div class="col-md-8">
101 <input type="text" class="form-control" disabled placeholder="Enter the Headmaster" name="PRESIDENT" id="PRESIDENT" value="${pd.PRESIDENT}" maxlength="255" > 102 <input type="text" class="form-control" disabled placeholder="Enter the Headmaster" name="PRESIDENT" id="PRESIDENT" value="${pd.PRESIDENT}" maxlength="255" >
102 </div> 103 </div>
103 <div class="clearfix"></div> 104 <div class="clearfix"></div>
104 </div> 105 </div>
105 <div class="form-group"> 106 <div class="form-group">
106 - <label for="enter_time" class="col-sm-4 control-label">Contact number:</label>  
107 - <div class="col-sm-8"> 107 + <label for="enter_time" class="col-md-4 control-label">Contact number:</label>
  108 + <div class="col-md-8">
108 <input type="text" class="form-control" disabled placeholder="Enter the Contact number" name="PHONE" id="PHONE" value="${pd.PHONE}" maxlength="255" > 109 <input type="text" class="form-control" disabled placeholder="Enter the Contact number" name="PHONE" id="PHONE" value="${pd.PHONE}" maxlength="255" >
109 </div> 110 </div>
110 <div class="clearfix"></div> 111 <div class="clearfix"></div>
111 </div> 112 </div>
112 <div class="form-group"> 113 <div class="form-group">
113 - <label for="enter_time" class="col-sm-4 control-label">Remarks:</label>  
114 - <div class="col-sm-8"> 114 + <label for="enter_time" class="col-md-4 control-label">Remarks:</label>
  115 + <div class="col-md-8">
115 <input type="text" class="form-control" disabled placeholder="Enter the Remarks" name="REMARK" id="REMARK" value="${pd.REMARK}" maxlength="255" > 116 <input type="text" class="form-control" disabled placeholder="Enter the Remarks" name="REMARK" id="REMARK" value="${pd.REMARK}" maxlength="255" >
116 </div> 117 </div>
117 <div class="clearfix"></div> 118 <div class="clearfix"></div>
WebRoot/WEB-INF/jsp/sunvote/school/other_edit.jsp
@@ -12,9 +12,10 @@ @@ -12,9 +12,10 @@
12 <base href="<%=basePath%>"> 12 <base href="<%=basePath%>">
13 <!-- 下拉框 --> 13 <!-- 下拉框 -->
14 <link rel="stylesheet" href="static/ace/css/chosen.css" /> 14 <link rel="stylesheet" href="static/ace/css/chosen.css" />
15 -<link 15 +<!-- <link
16 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 16 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
17 - rel="stylesheet"> 17 + rel="stylesheet"> -->
  18 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
18 <link href="static/css/teach.css" rel="stylesheet"> 19 <link href="static/css/teach.css" rel="stylesheet">
19 <!-- 日期框 --> 20 <!-- 日期框 -->
20 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 21 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
WebRoot/WEB-INF/jsp/sunvote/school/school_edit2.jsp
@@ -12,9 +12,10 @@ @@ -12,9 +12,10 @@
12 <base href="<%=basePath%>"> 12 <base href="<%=basePath%>">
13 <!-- 下拉框 --> 13 <!-- 下拉框 -->
14 <link rel="stylesheet" href="static/ace/css/chosen.css" /> 14 <link rel="stylesheet" href="static/ace/css/chosen.css" />
15 -<link 15 +<!-- <link
16 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 16 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
17 - rel="stylesheet"> 17 + rel="stylesheet"> -->
  18 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
18 <link href="static/css/teach.css" rel="stylesheet"> 19 <link href="static/css/teach.css" rel="stylesheet">
19 <!-- 日期框 --> 20 <!-- 日期框 -->
20 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 21 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
WebRoot/WEB-INF/jsp/sunvote/school/school_list2.jsp
@@ -13,9 +13,10 @@ @@ -13,9 +13,10 @@
13 <base href="<%=basePath%>"> 13 <base href="<%=basePath%>">
14 <!-- 下拉框 --> 14 <!-- 下拉框 -->
15 <link rel="stylesheet" href="static/ace/css/chosen.css" /> 15 <link rel="stylesheet" href="static/ace/css/chosen.css" />
16 -<link 16 +<!-- <link
17 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 17 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
18 - rel="stylesheet"> 18 + rel="stylesheet"> -->
  19 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
19 <link href="static/css/teach.css" rel="stylesheet"> 20 <link href="static/css/teach.css" rel="stylesheet">
20 <!-- 日期框 --> 21 <!-- 日期框 -->
21 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 22 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_list2.jsp
@@ -19,7 +19,10 @@ @@ -19,7 +19,10 @@
19 19
20 <!-- 日期框 --> 20 <!-- 日期框 -->
21 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 21 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
22 -<link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 22 +<!-- <link
  23 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  24 + rel="stylesheet"> -->
  25 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
23 <link href="static/css/teach.css" rel="stylesheet"> 26 <link href="static/css/teach.css" rel="stylesheet">
24 </head> 27 </head>
25 <body class="no-skin"> 28 <body class="no-skin">
@@ -48,11 +51,11 @@ @@ -48,11 +51,11 @@
48 <col style="width: 18%" /> 51 <col style="width: 18%" />
49 <thead> 52 <thead>
50 <tr> 53 <tr>
51 - <th><input type="checkbox" value="0" name='ids' id="ids" />Number</th> 54 + <th><input type="checkbox" value="0" name='ids' id="ids" />No.</th>
52 <th class="center">Class Name</th> 55 <th class="center">Class Name</th>
53 <th class="center">Class Type</th> 56 <th class="center">Class Type</th>
54 <th class="center">Class Coding</th> 57 <th class="center">Class Coding</th>
55 - <th class="center">班级基站</th> 58 + <th class="center">Classroom base station</th>
56 <th class="center">Operation</th> 59 <th class="center">Operation</th>
57 </tr> 60 </tr>
58 </thead> 61 </thead>
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
@@ -19,7 +19,10 @@ @@ -19,7 +19,10 @@
19 19
20 <!-- 日期框 --> 20 <!-- 日期框 -->
21 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 21 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
22 -<link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 22 +<!-- <link
  23 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  24 + rel="stylesheet"> -->
  25 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
23 <link href="static/css/teach.css" rel="stylesheet"> 26 <link href="static/css/teach.css" rel="stylesheet">
24 </head> 27 </head>
25 <body class="no-skin"> 28 <body class="no-skin">
WebRoot/WEB-INF/jsp/sunvote/student/en_student_edit2.jsp
@@ -114,7 +114,7 @@ input[type=&quot;text&quot;],select { @@ -114,7 +114,7 @@ input[type=&quot;text&quot;],select {
114 </li> 114 </li>
115 115
116 <li> 116 <li>
117 - <p>Sex:</p> 117 + <p>Gender:</p>
118 <div class="li_r"> 118 <div class="li_r">
119 <select class="chosen-select form-control" name="SEX" id="SEX" 119 <select class="chosen-select form-control" name="SEX" id="SEX"
120 data-placeholder="please choose the sex"> 120 data-placeholder="please choose the sex">
WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp
@@ -15,9 +15,10 @@ @@ -15,9 +15,10 @@
15 <title>SunVote-Education Management System</title> 15 <title>SunVote-Education Management System</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 -<link 18 +<!-- <link
19 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 19 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
20 - rel="stylesheet"> 20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
21 <link href="../static/css/teach.css" rel="stylesheet"> 22 <link href="../static/css/teach.css" rel="stylesheet">
22 23
23 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询(media queries)功能 --> 24 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询(media queries)功能 -->
@@ -49,7 +50,7 @@ @@ -49,7 +50,7 @@
49 <col style="width: 23%" /> 50 <col style="width: 23%" />
50 <thead> 51 <thead>
51 <tr> 52 <tr>
52 - <th><input type="checkbox" value="0" name='ids' id="ids" />Serial No.</th> 53 + <th><input type="checkbox" value="0" name='ids' id="ids" />No.</th>
53 <th>Name</th> 54 <th>Name</th>
54 <th>Student ID</th> 55 <th>Student ID</th>
55 <th>Keypad ID</th> 56 <th>Keypad ID</th>
WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
@@ -15,9 +15,10 @@ @@ -15,9 +15,10 @@
15 <title>中天电子-教育管理系统</title> 15 <title>中天电子-教育管理系统</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 -<link 18 +<!-- <link
19 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 19 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
20 - rel="stylesheet"> 20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
21 <link href="../static/css/teach.css" rel="stylesheet"> 22 <link href="../static/css/teach.css" rel="stylesheet">
22 23
23 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询(media queries)功能 --> 24 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询(media queries)功能 -->
WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_list2.jsp
@@ -16,12 +16,13 @@ @@ -16,12 +16,13 @@
16 <link rel="stylesheet" href="static/ace/css/chosen.css" /> 16 <link rel="stylesheet" href="static/ace/css/chosen.css" />
17 <!-- jsp文件头和头部 --> 17 <!-- jsp文件头和头部 -->
18 18
19 -<link href="../static/css/teach.css" rel="stylesheet"> 19 +<link href="static/css/teach.css" rel="stylesheet">
20 <!-- 日期框 --> 20 <!-- 日期框 -->
21 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 21 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
22 -<link 22 +<!-- <link
23 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 23 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
24 - rel="stylesheet"> 24 + rel="stylesheet"> -->
  25 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
25 <link href="static/css/teach.css" rel="stylesheet"> 26 <link href="static/css/teach.css" rel="stylesheet">
26 </head> 27 </head>
27 <body class="no-skin"> 28 <body class="no-skin">
@@ -46,7 +47,7 @@ @@ -46,7 +47,7 @@
46 <col style="width: 30%" /> 47 <col style="width: 30%" />
47 <thead> 48 <thead>
48 <tr> 49 <tr>
49 - <th><input type="checkbox" name='ids' id="ids" />Number</th> 50 + <th><input type="checkbox" name='ids' id="ids" />No.</th>
50 <th class="center">Chinese name</th> 51 <th class="center">Chinese name</th>
51 <th class="center">English names</th> 52 <th class="center">English names</th>
52 <th class="center">Operation</th> 53 <th class="center">Operation</th>
@@ -119,6 +120,7 @@ @@ -119,6 +120,7 @@
119 <script type="text/javascript"> 120 <script type="text/javascript">
120 $(document).ready(function(){ 121 $(document).ready(function(){
121 window.top.loading.remove(); 122 window.top.loading.remove();
  123 + $(".table_box").css("padding-top",$(".head_box").height());
122 }); 124 });
123 function tosearch(){ 125 function tosearch(){
124 $("#Form").submit(); 126 $("#Form").submit();
WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
@@ -19,9 +19,10 @@ @@ -19,9 +19,10 @@
19 <link href="../static/css/teach.css" rel="stylesheet"> 19 <link href="../static/css/teach.css" rel="stylesheet">
20 <!-- 日期框 --> 20 <!-- 日期框 -->
21 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 21 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
22 -<link 22 +<!-- <link
23 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 23 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
24 - rel="stylesheet"> 24 + rel="stylesheet"> -->
  25 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
25 <link href="static/css/teach.css" rel="stylesheet"> 26 <link href="static/css/teach.css" rel="stylesheet">
26 </head> 27 </head>
27 <body class="no-skin"> 28 <body class="no-skin">
WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view.jsp
@@ -15,7 +15,10 @@ @@ -15,7 +15,10 @@
15 <title>SunVote-Education Management System</title> 15 <title>SunVote-Education Management System</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 - <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 18 + <!-- <link
  19 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
19 <link href="../static/css/teach.css" rel="stylesheet"> 22 <link href="../static/css/teach.css" rel="stylesheet">
20 <link href="../static/css/paper_view.css?t=1" rel="stylesheet"> 23 <link href="../static/css/paper_view.css?t=1" rel="stylesheet">
21 24
@@ -58,7 +61,7 @@ @@ -58,7 +61,7 @@
58 <script> 61 <script>
59 var subjectId = '${pd.subject_id}'; 62 var subjectId = '${pd.subject_id}';
60 </script> 63 </script>
61 - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script> 64 + <script src="../static/js/jquery.min.js"></script>
62 <script src="../static/js/echars.js"></script> 65 <script src="../static/js/echars.js"></script>
63 <script src="../static/js/en_paper_view.js?a=0"></script> 66 <script src="../static/js/en_paper_view.js?a=0"></script>
64 67
WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view2.jsp
@@ -15,7 +15,10 @@ @@ -15,7 +15,10 @@
15 <title>SunVote-Education Management System</title> 15 <title>SunVote-Education Management System</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 - <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 18 + <!-- <link
  19 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
19 <link href="../static/css/teach.css" rel="stylesheet"> 22 <link href="../static/css/teach.css" rel="stylesheet">
20 <link href="../static/css/paper_view.css?t=1" rel="stylesheet"> 23 <link href="../static/css/paper_view.css?t=1" rel="stylesheet">
21 24
@@ -97,7 +100,7 @@ @@ -97,7 +100,7 @@
97 </div> 100 </div>
98 101
99 </div> 102 </div>
100 - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script> 103 + <script src="../static/js/jquery.min.js"></script>
101 <script src="../static/js/echars.js"></script> 104 <script src="../static/js/echars.js"></script>
102 <script src="../static/js/loading.js"></script> 105 <script src="../static/js/loading.js"></script>
103 <script src="../static/js/en_paper_view2.js"></script> 106 <script src="../static/js/en_paper_view2.js"></script>
WebRoot/WEB-INF/jsp/sunvote/teacher/en_set_question.jsp
@@ -7,7 +7,10 @@ @@ -7,7 +7,10 @@
7 <title>SunVote-Education Management System</title> 7 <title>SunVote-Education Management System</title>
8 8
9 <!-- Bootstrap --> 9 <!-- Bootstrap -->
10 - <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 10 + <!-- <link
  11 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  12 + rel="stylesheet"> -->
  13 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
11 <link href="../static/css/teach.css" rel="stylesheet"> 14 <link href="../static/css/teach.css" rel="stylesheet">
12 <link href="../static/css/set_quetion.css?t=12" rel="stylesheet"> 15 <link href="../static/css/set_quetion.css?t=12" rel="stylesheet">
13 16
@@ -100,7 +103,7 @@ Complete question selection @@ -100,7 +103,7 @@ Complete question selection
100 <script> 103 <script>
101 //var subject_id = '${subject_id}' ; 104 //var subject_id = '${subject_id}' ;
102 </script> 105 </script>
103 - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>  
104 - <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> 106 + <script src="../static/js/jquery.min.js"></script>
  107 + <script src="../static/js/bootstrap.min.js"></script>
105 <script src="../static/js/en_set_question.js?a=0"></script> 108 <script src="../static/js/en_set_question.js?a=0"></script>
106 </html> 109 </html>
107 \ No newline at end of file 110 \ No newline at end of file
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp
@@ -15,7 +15,10 @@ @@ -15,7 +15,10 @@
15 <title>E-class Paper Management</title> 15 <title>E-class Paper Management</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 - <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 18 + <!-- <link
  19 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
19 22
20 <link rel="stylesheet" href="../static/ace/css/datepicker.css" /> 23 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
21 <link href="../static/css/teach.css" rel="stylesheet"> 24 <link href="../static/css/teach.css" rel="stylesheet">
@@ -120,8 +123,8 @@ @@ -120,8 +123,8 @@
120 </div><!-- /.modal --> 123 </div><!-- /.modal -->
121 124
122 125
123 - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>  
124 - <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> 126 + <script src="../static/js/jquery.min.js"></script>
  127 + <script src="../static/js/bootstrap.min.js"></script>
125 <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script> 128 <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
126 <script src="../static/ace/js/bootbox.js"></script> 129 <script src="../static/ace/js/bootbox.js"></script>
127 <script type="text/javascript"> 130 <script type="text/javascript">
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_edit2.jsp
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 <td><input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="Enter the Password" title="Password" style="width:98%;"/></td> 60 <td><input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="Enter the Password" title="Password" style="width:98%;"/></td>
61 </tr> 61 </tr>
62 <tr> 62 <tr>
63 - <td style="width:75px;text-align: right;padding-top: 13px;">Sex:</td> 63 + <td style="width:75px;text-align: right;padding-top: 13px;">Gender:</td>
64 <td> 64 <td>
65 <select class="chosen-select form-control" name="SEX" id="SEX" data-placeholder="Sex"> 65 <select class="chosen-select form-control" name="SEX" id="SEX" data-placeholder="Sex">
66 <option value="1" <c:if test="${pd.SEX==1}">selected="true"</c:if>>male</option> 66 <option value="1" <c:if test="${pd.SEX==1}">selected="true"</c:if>>male</option>
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp
@@ -19,9 +19,10 @@ @@ -19,9 +19,10 @@
19 19
20 <!-- 日期框 --> 20 <!-- 日期框 -->
21 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 21 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
22 -<link 22 +<!-- <link
23 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 23 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
24 - rel="stylesheet"> 24 + rel="stylesheet"> -->
  25 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
25 <link href="static/css/teach.css" rel="stylesheet"> 26 <link href="static/css/teach.css" rel="stylesheet">
26 </head> 27 </head>
27 <body class="no-skin"> 28 <body class="no-skin">
@@ -52,15 +53,15 @@ @@ -52,15 +53,15 @@
52 <col style="width: 9%" /> 53 <col style="width: 9%" />
53 <thead> 54 <thead>
54 <tr> 55 <tr>
55 - <th><input type="checkbox" value="0" name='ids' id="ids" />Number</th> 56 + <th><input type="checkbox" value="0" name='ids' id="ids" />No.</th>
56 <th class="center">Name</th> 57 <th class="center">Name</th>
57 - <th class="center">Phone number</th>  
58 - <th class="center">Tel number</th> 58 + <th class="center">Phone No.</th>
  59 + <th class="center">Tel No.</th>
59 <th class="center">Id no.</th> 60 <th class="center">Id no.</th>
60 <th class="center">Account</th> 61 <th class="center">Account</th>
61 - <th class="center">Sex</th>  
62 - <th class="center">Teacher card number</th>  
63 - <th class="center">subjects</th> 62 + <th class="center">Gender</th>
  63 + <th class="center">T-card</th>
  64 + <th class="center">Subjects</th>
64 <th class="center">Operation</th> 65 <th class="center">Operation</th>
65 </tr> 66 </tr>
66 </thead> 67 </thead>
@@ -209,6 +210,10 @@ @@ -209,6 +210,10 @@
209 <script type="text/javascript"> 210 <script type="text/javascript">
210 $(document).ready(function() { 211 $(document).ready(function() {
211 window.top.loading.remove(); 212 window.top.loading.remove();
  213 +
  214 + var h_height = $(".head_box").height();
  215 + $(".table_box").css("padding-top",h_height);
  216 +
212 }); 217 });
213 218
214 //检索 219 //检索
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp
@@ -17,9 +17,10 @@ @@ -17,9 +17,10 @@
17 <title>SunVote-Education Management System</title> 17 <title>SunVote-Education Management System</title>
18 18
19 <!-- Bootstrap --> 19 <!-- Bootstrap -->
20 -<link 20 +<!-- <link
21 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 21 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
22 - rel="stylesheet"> 22 + rel="stylesheet"> -->
  23 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
23 <link href="../static/css/teach.css?a=1" rel="stylesheet"> 24 <link href="../static/css/teach.css?a=1" rel="stylesheet">
24 <link href="../static/css/mb_style.css" rel="stylesheet"> 25 <link href="../static/css/mb_style.css" rel="stylesheet">
25 26
@@ -170,12 +171,12 @@ @@ -170,12 +171,12 @@
170 </div><!-- /.modal-content --> 171 </div><!-- /.modal-content -->
171 </div><!-- /.modal-dialog --> 172 </div><!-- /.modal-dialog -->
172 </div><!-- /.modal --> 173 </div><!-- /.modal -->
173 - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script> 174 + <script src="../static/js/jquery.min.js"></script>
174 <script 175 <script
175 - src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> 176 + src="../static/js/bootstrap.min.js"></script>
176 <script src="../static/js/model.js"></script> 177 <script src="../static/js/model.js"></script>
177 <script src="../static/js/loading.js"></script> 178 <script src="../static/js/loading.js"></script>
178 - <script src="../static/js/remove.js?a=2"></script> 179 + <script src="../static/js/en_remove.js?a=2"></script>
179 <script src="../static/js/dailog.js"></script> 180 <script src="../static/js/dailog.js"></script>
180 <script type="text/javascript"> 181 <script type="text/javascript">
181 function chooseClass(classID,termID){ 182 function chooseClass(classID,termID){
WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp
@@ -15,7 +15,10 @@ @@ -15,7 +15,10 @@
15 <title>E-class</title> 15 <title>E-class</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 - <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 18 + <!-- <link
  19 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
19 <link rel="stylesheet" href="../static/ace/css/datepicker.css" /> 22 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
20 <link href="../static/css/teach.css" rel="stylesheet"> 23 <link href="../static/css/teach.css" rel="stylesheet">
21 <link href="../static/css/paper.css?t=1" rel="stylesheet"> 24 <link href="../static/css/paper.css?t=1" rel="stylesheet">
@@ -76,8 +79,8 @@ @@ -76,8 +79,8 @@
76 </div> 79 </div>
77 </div> 80 </div>
78 81
79 - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>  
80 - <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> 82 + <script src="../static/js/jquery.min.js"></script>
  83 + <script src="../static/js/bootstrap.min.js"></script>
81 <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script> 84 <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
82 <script type="text/javascript"> 85 <script type="text/javascript">
83 var user_id= "${pd.userId}"; 86 var user_id= "${pd.userId}";
WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp
@@ -15,7 +15,10 @@ @@ -15,7 +15,10 @@
15 <title>中天电子-教育管理系统</title> 15 <title>中天电子-教育管理系统</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 - <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 18 + <!-- <link
  19 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
19 <link href="../static/css/teach.css" rel="stylesheet"> 22 <link href="../static/css/teach.css" rel="stylesheet">
20 <link href="../static/css/paper_view.css?t=1" rel="stylesheet"> 23 <link href="../static/css/paper_view.css?t=1" rel="stylesheet">
21 24
@@ -58,7 +61,7 @@ @@ -58,7 +61,7 @@
58 <script> 61 <script>
59 var subjectId = '${pd.subject_id}'; 62 var subjectId = '${pd.subject_id}';
60 </script> 63 </script>
61 - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script> 64 + <script src="../static/js/jquery.min.js"></script>
62 <script src="../static/js/echars.js"></script> 65 <script src="../static/js/echars.js"></script>
63 <script src="../static/js/paper_view.js?a=2"></script> 66 <script src="../static/js/paper_view.js?a=2"></script>
64 67
WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view1.jsp
@@ -15,7 +15,10 @@ @@ -15,7 +15,10 @@
15 <title>中天电子-教育管理系统</title> 15 <title>中天电子-教育管理系统</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 - <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 18 + <!-- <link
  19 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
19 <link href="../static/css/teach.css" rel="stylesheet"> 22 <link href="../static/css/teach.css" rel="stylesheet">
20 <link href="../static/css/paper_view.css?t=2" rel="stylesheet"> 23 <link href="../static/css/paper_view.css?t=2" rel="stylesheet">
21 24
@@ -140,8 +143,8 @@ @@ -140,8 +143,8 @@
140 </div><!-- /.modal-dialog --> 143 </div><!-- /.modal-dialog -->
141 </div><!-- /.modal --> 144 </div><!-- /.modal -->
142 </div> 145 </div>
143 - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>  
144 - <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> 146 + <script src="../static/js/jquery.min.js"></script>
  147 + <script src="../static/js/bootstrap.min.js"></script>
145 <script src="../static/js/echars.js"></script> 148 <script src="../static/js/echars.js"></script>
146 <script src="../static/js/paper_view1.js?a=1"></script> 149 <script src="../static/js/paper_view1.js?a=1"></script>
147 150
WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view2.jsp
@@ -15,7 +15,10 @@ @@ -15,7 +15,10 @@
15 <title>中天电子-教育管理系统</title> 15 <title>中天电子-教育管理系统</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 - <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 18 + <!-- <link
  19 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
19 <link href="../static/css/teach.css" rel="stylesheet"> 22 <link href="../static/css/teach.css" rel="stylesheet">
20 <link href="../static/css/paper_view.css?t=1" rel="stylesheet"> 23 <link href="../static/css/paper_view.css?t=1" rel="stylesheet">
21 24
@@ -97,7 +100,7 @@ @@ -97,7 +100,7 @@
97 </div> 100 </div>
98 101
99 </div> 102 </div>
100 - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script> 103 + <script src="../static/js/jquery.min.js"></script>
101 <script src="../static/js/echars.js"></script> 104 <script src="../static/js/echars.js"></script>
102 <script src="../static/js/loading.js"></script> 105 <script src="../static/js/loading.js"></script>
103 <script src="../static/js/paper_view2.js"></script> 106 <script src="../static/js/paper_view2.js"></script>
WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp
@@ -7,7 +7,10 @@ @@ -7,7 +7,10 @@
7 <title>中天电子-教育管理系统</title> 7 <title>中天电子-教育管理系统</title>
8 8
9 <!-- Bootstrap --> 9 <!-- Bootstrap -->
10 - <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 10 + <!-- <link
  11 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  12 + rel="stylesheet"> -->
  13 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
11 <link href="../static/css/teach.css" rel="stylesheet"> 14 <link href="../static/css/teach.css" rel="stylesheet">
12 <link href="../static/css/set_quetion.css?t=12" rel="stylesheet"> 15 <link href="../static/css/set_quetion.css?t=12" rel="stylesheet">
13 16
@@ -100,7 +103,7 @@ @@ -100,7 +103,7 @@
100 <script> 103 <script>
101 //var subject_id = '${subject_id}' ; 104 //var subject_id = '${subject_id}' ;
102 </script> 105 </script>
103 - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>  
104 - <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> 106 + <script src="../static/js/jquery.min.js"></script>
  107 + <script src="../static/js/bootstrap.min.js"></script>
105 <script src="../static/js/set_question.js?a=0"></script> 108 <script src="../static/js/set_question.js?a=0"></script>
106 </html> 109 </html>
107 \ No newline at end of file 110 \ No newline at end of file
WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
@@ -15,7 +15,10 @@ @@ -15,7 +15,10 @@
15 <title>即时测</title> 15 <title>即时测</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 - <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 18 + <!-- <link
  19 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
19 22
20 <link rel="stylesheet" href="../static/ace/css/datepicker.css" /> 23 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
21 <link href="../static/css/teach.css" rel="stylesheet"> 24 <link href="../static/css/teach.css" rel="stylesheet">
@@ -127,8 +130,8 @@ @@ -127,8 +130,8 @@
127 var view = "查看" ; 130 var view = "查看" ;
128 </script> 131 </script>
129 132
130 - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>  
131 - <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> 133 + <script src="../static/js/jquery.min.js"></script>
  134 + <script src="../static/js/bootstrap.min.js" ></script>
132 <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script> 135 <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
133 <script src="../static/ace/js/bootbox.js"></script> 136 <script src="../static/ace/js/bootbox.js"></script>
134 <script src="../static/js/teach_paper.js?a=2"></script> 137 <script src="../static/js/teach_paper.js?a=2"></script>
WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp
@@ -15,7 +15,10 @@ @@ -15,7 +15,10 @@
15 <title>即时测</title> 15 <title>即时测</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 - <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 18 + <!-- <link
  19 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
19 22
20 <link rel="stylesheet" href="../static/ace/css/datepicker.css" /> 23 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
21 <link href="../static/css/teach.css" rel="stylesheet"> 24 <link href="../static/css/teach.css" rel="stylesheet">
@@ -120,8 +123,8 @@ @@ -120,8 +123,8 @@
120 </div><!-- /.modal --> 123 </div><!-- /.modal -->
121 124
122 125
123 - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>  
124 - <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> 126 + <script src="../static/js/jquery.min.js"></script>
  127 + <script src="../static/js/bootstrap.min.js"></script>
125 <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script> 128 <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
126 <script src="../static/ace/js/bootbox.js"></script> 129 <script src="../static/ace/js/bootbox.js"></script>
127 <script src="../static/js/teach_paper.js?a=2"></script> 130 <script src="../static/js/teach_paper.js?a=2"></script>
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
@@ -19,9 +19,10 @@ @@ -19,9 +19,10 @@
19 19
20 <!-- 日期框 --> 20 <!-- 日期框 -->
21 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 21 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
22 -<link 22 +<!-- <link
23 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 23 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
24 - rel="stylesheet"> 24 + rel="stylesheet"> -->
  25 + <link rel="stylesheet" href="static/css/bootstrap.min.css" />
25 <link href="static/css/teach.css" rel="stylesheet"> 26 <link href="static/css/teach.css" rel="stylesheet">
26 </head> 27 </head>
27 <body class="no-skin"> 28 <body class="no-skin">
WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
@@ -15,7 +15,10 @@ @@ -15,7 +15,10 @@
15 <title>即时测</title> 15 <title>即时测</title>
16 16
17 <!-- Bootstrap --> 17 <!-- Bootstrap -->
18 - <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 18 + <!-- <link
  19 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  20 + rel="stylesheet"> -->
  21 + <link rel="stylesheet" href="../static/css/bootstrap.min.css" />
19 <link rel="stylesheet" href="../static/ace/css/datepicker.css" /> 22 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
20 <link href="../static/css/teach.css" rel="stylesheet"> 23 <link href="../static/css/teach.css" rel="stylesheet">
21 <link href="../static/css/paper.css?t=1" rel="stylesheet"> 24 <link href="../static/css/paper.css?t=1" rel="stylesheet">
@@ -76,8 +79,8 @@ @@ -76,8 +79,8 @@
76 </div> 79 </div>
77 </div> 80 </div>
78 81
79 - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>  
80 - <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> 82 + <script src="../static/js/jquery.min.js"></script>
  83 + <script src="../static/js/bootstrap.min.js"></script>
81 <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script> 84 <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
82 <script type="text/javascript"> 85 <script type="text/javascript">
83 var user_id= "${pd.userId}"; 86 var user_id= "${pd.userId}";
WebRoot/WEB-INF/jsp/system/index/en_login.jsp
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 <script type="text/javascript" src="static/js/jQuery.md5.js"></script> 27 <script type="text/javascript" src="static/js/jQuery.md5.js"></script>
28 <script type="text/javascript" src="static/js/jquery.tips.js"></script> 28 <script type="text/javascript" src="static/js/jquery.tips.js"></script>
29 <script type="text/javascript" src="static/js/lang.js"></script> 29 <script type="text/javascript" src="static/js/lang.js"></script>
30 -<script type="text/javascript" src="static/js/remove.js"></script> 30 +<script type="text/javascript" src="static/js/en_remove.js"></script>
31 <script type="text/javascript" > 31 <script type="text/javascript" >
32 if(lang() != 'en'){ 32 if(lang() != 'en'){
33 33
@@ -84,7 +84,7 @@ html,body{ @@ -84,7 +84,7 @@ html,body{
84 <input type="text" id="password" placeholder="Password" value="" autoComplete="off"/> 84 <input type="text" id="password" placeholder="Password" value="" autoComplete="off"/>
85 <div class="rember" style="width:50%;float:left;text-align:left;margin-top:10px;display:inline-block;line-height:34px;"> 85 <div class="rember" style="width:50%;float:left;text-align:left;margin-top:10px;display:inline-block;line-height:34px;">
86 <input type="checkbox" id="rem_flag"/> 86 <input type="checkbox" id="rem_flag"/>
87 - <span>记住密码</span> 87 + <span>Remember me</span>
88 </div> 88 </div>
89 <div class="language" style="display:inline-block;width:50%;margin-top:10px;text-align:right;"> 89 <div class="language" style="display:inline-block;width:50%;margin-top:10px;text-align:right;">
90 <select name="language" id="language" style="line-height:34px;height:34px;width:120px;"> 90 <select name="language" id="language" style="line-height:34px;height:34px;width:120px;">
@@ -175,7 +175,7 @@ html,body{ @@ -175,7 +175,7 @@ html,body{
175 if ($("#loginname").val() == "") { 175 if ($("#loginname").val() == "") {
176 $("#loginname").tips({ 176 $("#loginname").tips({
177 side : 2, 177 side : 2,
178 - msg : '用户名不得为空', 178 + msg : 'User name must not be empty',
179 bg : '#AE81FF', 179 bg : '#AE81FF',
180 time : 3 180 time : 3
181 }); 181 });
@@ -188,7 +188,7 @@ html,body{ @@ -188,7 +188,7 @@ html,body{
188 if ($("#password").val() == "") { 188 if ($("#password").val() == "") {
189 $("#password").tips({ 189 $("#password").tips({
190 side : 2, 190 side : 2,
191 - msg : '密码不得为空', 191 + msg : 'Password must not be empty',
192 bg : '#AE81FF', 192 bg : '#AE81FF',
193 time : 3 193 time : 3
194 }); 194 });
@@ -199,7 +199,7 @@ html,body{ @@ -199,7 +199,7 @@ html,body{
199 199
200 $("#loginbox").tips({ 200 $("#loginbox").tips({
201 side : 1, 201 side : 1,
202 - msg : '正在登录 , 请稍后 ...', 202 + msg : 'Logging in, please wait a moment ...',
203 bg : '#68B500', 203 bg : '#68B500',
204 time : 10 204 time : 10
205 }); 205 });
@@ -235,7 +235,7 @@ html,body{ @@ -235,7 +235,7 @@ html,body{
235 }else if("usererror" == data.result){ 235 }else if("usererror" == data.result){
236 $("#loginname").tips({ 236 $("#loginname").tips({
237 side : 1, 237 side : 1,
238 - msg : "用户名或密码有误", 238 + msg : "Error in username or password",
239 bg : '#FF5080', 239 bg : '#FF5080',
240 time : 15 240 time : 15
241 }); 241 });
@@ -244,7 +244,7 @@ html,body{ @@ -244,7 +244,7 @@ html,body{
244 }else if("codeerror" == data.result){ 244 }else if("codeerror" == data.result){
245 $("#code").tips({ 245 $("#code").tips({
246 side : 1, 246 side : 1,
247 - msg : "验证码输入有误", 247 + msg : "Error in input of validation code",
248 bg : '#FF5080', 248 bg : '#FF5080',
249 time : 15 249 time : 15
250 }); 250 });
@@ -253,7 +253,7 @@ html,body{ @@ -253,7 +253,7 @@ html,body{
253 }else{ 253 }else{
254 $("#loginname").tips({ 254 $("#loginname").tips({
255 side : 1, 255 side : 1,
256 - msg : "缺少参数", 256 + msg : "Lack of parameters",
257 bg : '#FF5080', 257 bg : '#FF5080',
258 time : 15 258 time : 15
259 }); 259 });
@@ -273,7 +273,7 @@ html,body{ @@ -273,7 +273,7 @@ html,body{
273 273
274 //清除历史记录 274 //清除历史记录
275 function clear_history(){ 275 function clear_history(){
276 - window.top.remove.init({"title":"确定清除历史记录吗?","func":function(success){ 276 + window.top.remove.init({"title":"Are you sure you want to clear the history?","func":function(success){
277 if(success){ 277 if(success){
278 storage.clear(); 278 storage.clear();
279 $(".history").hide(); 279 $(".history").hide();
WebRoot/static/css/teach.css
1 html,body{width:100%;height:100%;} 1 html,body{width:100%;height:100%;}
2 -table{font-size:16px;} 2 +table{font-size:14px;}
3 .clear{clear:both;} 3 .clear{clear:both;}
4 .right{width:12px;height:12px;display:inline-block;background:url(../images/right.png) no-repeat;background-size:100%;} 4 .right{width:12px;height:12px;display:inline-block;background:url(../images/right.png) no-repeat;background-size:100%;}
5 .right_b{width:20px;height:20px;margin-right:20px;display:inline-block;background:url(../images/right_b.png) no-repeat;background-size:100%;} 5 .right_b{width:20px;height:20px;margin-right:20px;display:inline-block;background:url(../images/right_b.png) no-repeat;background-size:100%;}
WebRoot/static/js/en_control_homework.js 0 → 100644
  1 +var saveData={} //声明保存数据
  2 +
  3 + $(document).on('click',"input[type='checkbox']",function(){ //选择班级
  4 + console.log($(this).prop("checked"));
  5 + if($(this).prop('checked')){
  6 + $(this).closest("li").attr("class","checked");
  7 + }else{
  8 + $(this).closest("li").removeClass("checked");
  9 + }
  10 +
  11 + });
  12 + var work={ //保存标题框中的数字框的值
  13 + que_num:0,
  14 + ans_num:4,
  15 + score:0
  16 + }
  17 + //点击+执行操作
  18 + function creat_work(_id,index,num){//index:开始序号,num:目标序号
  19 +
  20 + if(_id=="que_num"){ //新增题目
  21 + for(j=index;j<=num;j++){
  22 + $(".subject_body_tbody").append('<tr><td class="first">'+j+'</td><td class="middle"><div class="question question'+j+'"><ul></ul></div></td><td class="middle"><span>选项个数</span><span class="redu">-</span><input type="number" class="w_100 ans_num" value="'+$("#ans_num").val()+'"/><span class="add">+</span></td><td class="middle"><span>分值</span><span class="redu">-</span><input type="number" class="w_100 score" value="1"/><span class="add">+</span></td><td class="last"><a class="remove"><img src="static/images/remove.png" /></a></td></tr>');
  23 + for(i=0;i<work.ans_num;i++){
  24 + $(".question"+j+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i)+'</li>')
  25 + }
  26 + }
  27 + }
  28 + else if(_id=="ans_num"){//新增选项
  29 + //alert($("#que_num").val());
  30 + for(j=1;j<=work.que_num;j++){ //轮询每道题目
  31 + var now_length=$(".question"+j+" ul").find(".btn").length; //获取当前题目选项个数
  32 + if(now_length<work.ans_num){ //当前题目选项个数小于数字框中个数,则把选项个数增加到数字框中的个数
  33 + for(i=now_length;i<work.ans_num;i++){
  34 + console.log("index:"+index+"-"+"num:"+num+"i:"+i);
  35 + $(".question"+j+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i)+'</li>')
  36 + }
  37 + }
  38 + if(now_length>work.ans_num){//当前题目选项个数大于数字框中个数,则把选项个数减少到数字框中的个数
  39 + for(i=now_length;i>=work.ans_num;i--){
  40 + $(".question"+j+" ul").find(".btn").eq(work.ans_num).remove();
  41 + }
  42 + }
  43 +
  44 + }
  45 +
  46 + }else{
  47 + if(_id.siblings(".w_100").attr("class").indexOf("ans_num")>-1){ //没有id,但是class中含有ans_num,则为单个题目中的选项设置框
  48 + var _index=_id.closest("tr").index()+1;
  49 + console.log(_index);
  50 + for(i=index;i<=num;i++){
  51 + $(".question"+_index+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i-1)+'</li>')
  52 + }
  53 + }
  54 + }
  55 + }
  56 + //点击-执行操作
  57 + function remove_work(_id,index,num){
  58 +
  59 + if(_id=="que_num"){ //减少题目
  60 + for(i=index;i<=num;i++){
  61 + $(".subject_body_tbody tr").eq(index).remove();
  62 + }
  63 + }
  64 + if(_id=="ans_num"){ //减少选项
  65 + for(j=1;j<=work.que_num;j++){ //轮询每道题目
  66 + var now_length=$(".question"+j+" ul").find(".btn").length; //获取当前题目中的选项个数
  67 + if(now_length>work.ans_num){ //如果当前选项个数大于数字框中的值,则减少选项个数到数字框中的个数
  68 + for(i=now_length;i>=work.ans_num;i--){
  69 + $(".question"+j+" ul").find(".btn").eq(work.ans_num).remove();
  70 + }
  71 + }
  72 + if(now_length<work.ans_num){ //如果当前选项个数小于数字框中的值,则增加选项个数到数字框中的个数
  73 + for(i=now_length;i<work.ans_num;i++){
  74 + $(".question"+j+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i)+'</li>')
  75 + }
  76 + }
  77 +
  78 + }
  79 + }else{
  80 + if(_id.siblings(".w_100").attr("class").indexOf("ans_num")>-1){ //没有id值,但是类名中含有ans_num,则判断为单个题目中的选项设置框
  81 + var _index=_id.closest("tr").index()+1;
  82 + for(i=index;i<=num;i++){
  83 + $(".question"+_index+" ul").find(".btn").eq(index).remove();
  84 + }
  85 + }
  86 + }
  87 +
  88 + }
  89 + //点击+按钮
  90 + $(document).on("click",".add",function(){
  91 + var _that=$(this);
  92 + var temp_num=0;
  93 + //获取当前按钮旁边数字框的值
  94 + temp_num=parseInt(_that.siblings(".w_100").val());
  95 + temp_num+=1;
  96 + //点击+号,数字框中的数字+1
  97 + _that.siblings(".w_100").val(temp_num);
  98 + //如果数字框有id,则是标题栏上面的数字框
  99 + if(_that.siblings(".w_100").attr("id")){
  100 + //将下面的数字框的值设置成标题栏数字框的值
  101 + var _class=_that.siblings(".w_100").attr("id");
  102 +
  103 + //题目数
  104 + if(_class=="que_num"){
  105 + work.que_num=temp_num;
  106 + creat_work(_class,work.que_num,work.que_num);
  107 + }
  108 + //选项数
  109 + if(_class=="ans_num"){
  110 + if(temp_num>=10){
  111 + temp_num=9;
  112 + }
  113 + work.ans_num=temp_num;
  114 + creat_work(_class,work.ans_num,work.ans_num);
  115 + }
  116 + $("."+_class).val(temp_num);
  117 + }
  118 + else{
  119 + if(_that.siblings(".w_100").attr("class").indexOf("ans_num")>-1){
  120 + creat_work(_that,temp_num,temp_num);
  121 + }
  122 + }
  123 + if(work.que_num!=0){
  124 + $(".main_info").remove();
  125 + }
  126 + })
  127 + //点击-按钮
  128 + $(document).on("click",".redu",function(){
  129 + var _that=$(this);
  130 + var temp_num=0;
  131 +
  132 + temp_num=parseInt(_that.siblings(".w_100").val());
  133 + temp_num-=1;
  134 + if(temp_num<0){
  135 + temp_num=0;
  136 + return;
  137 + }
  138 +
  139 + _that.siblings(".w_100").val(temp_num);
  140 +
  141 + if(_that.siblings(".w_100").attr("id")){
  142 + var _class=$(this).siblings(".w_100").attr("id");
  143 + $("."+_class).val(temp_num);
  144 +
  145 + if(_class=="que_num"){
  146 + work.que_num=temp_num;
  147 + remove_work(_class,work.que_num,work.que_num);
  148 + }
  149 + if(_class=="ans_num"){
  150 + work.ans_num=temp_num;
  151 + remove_work(_class,work.ans_num,work.ans_num);
  152 + }
  153 + }else{
  154 + if(_that.siblings(".w_100").attr("class").indexOf("ans_num")>-1){
  155 + remove_work(_that,temp_num,temp_num);
  156 + }
  157 + }
  158 + if(work.que_num!=0){
  159 + $(".main_info").remove();
  160 + }
  161 + })
  162 + $(document).on("click",".remove",function(){
  163 + var _that=$(this);
  164 + _that.closest("tr").remove();
  165 + work.que_num=$(".first").length;
  166 + $("#que_num").val(work.que_num);
  167 + for(i=0;i<$(".first").length;i++){
  168 + //console.log($(".first").closest("tr").index());
  169 + $(".first").eq(i).text(i+1);
  170 + $(".question").eq(i).attr("class","question question"+(i+1));
  171 + }
  172 + });
  173 + $(document).on("click","li.btn ",function(){
  174 + if($(this).attr("class").indexOf("on")>-1)
  175 + $(this).removeClass("on");
  176 + else
  177 + $(this).addClass("on");
  178 + });
  179 + $("#que_num").change(function(){
  180 + var now_num=parseInt($("#que_num").val());
  181 + var old_num=parseInt(work.que_num);
  182 + var _temp=now_num-old_num;
  183 +
  184 + if(now_num!=0){
  185 + $(".main_info").remove();
  186 + }
  187 + if(_temp>0){
  188 + creat_work($(this).attr("id"),(old_num+1),now_num);
  189 + }else{
  190 + remove_work($(this).attr("id"),now_num,old_num);
  191 + }
  192 +
  193 + work.que_num=now_num;
  194 +
  195 + })
  196 + $("#ans_num").change(function(){
  197 + var now_num=parseInt($("#ans_num").val());
  198 + var old_num=parseInt(work.ans_num);
  199 + var _temp=now_num-old_num;
  200 + if(now_num>=10){
  201 + now_num=9;
  202 + }
  203 + $(".ans_num").val(now_num);
  204 + work.ans_num=now_num;
  205 +
  206 + if(_temp>0){
  207 + creat_work($(this).attr("id"),(old_num+1),now_num);
  208 + }else{
  209 + remove_work($(this).attr("id"),now_num,old_num);
  210 + }
  211 +
  212 +
  213 + });
  214 +
  215 +
  216 +
  217 + function save(){
  218 + if($("#NAME").val()==""){
  219 + $("#NAME").tips({
  220 + side:3,
  221 + msg:'Please enter the title of exercise',
  222 + bg:'#AE81FF',
  223 + time:2
  224 + });
  225 + $("#NAME").focus();
  226 + return false;
  227 + }
  228 + if($("#HOMEWORK_DESC").val()==""){
  229 + $("#HOMEWORK_DESC").tips({
  230 + side:3,
  231 + msg:'Please enter the instructions of exercise',
  232 + bg:'#AE81FF',
  233 + time:2
  234 + });
  235 + $("#HOMEWORK_DESC").focus();
  236 + return false;
  237 + }
  238 + var all_score=0;
  239 + for(var i=0;i<work.que_num;i++){
  240 + all_score+=parseInt($(".score").eq(i+1).val());
  241 + }
  242 + var CLASSLIST=[];
  243 + if($(".checked").length>0){
  244 + for(var j=0;j<$(".checked").length;j++){
  245 + var _index=$(".checked").eq(j).index();
  246 + console.log($(".date-picker").eq(_index).val());
  247 + if($(".date-picker").eq(_index).val()==''){
  248 + $(".date-picker").eq(_index).tips({
  249 + side:3,
  250 + msg:'Please select the time',
  251 + bg:'#AE81FF',
  252 + time:2
  253 + });
  254 + return false;
  255 + }
  256 +
  257 + CLASSLIST[j]={
  258 + CLASS_ID:$("#class"+_index).val(),
  259 + COMPLETE_DATE:$(".date-picker").eq(_index).val()
  260 + };
  261 +
  262 + }
  263 + }else{
  264 + $(".classBox").tips({
  265 + side:3,
  266 + msg:'Please select class and time',
  267 + bg:'#AE81FF',
  268 + time:2
  269 + });
  270 + return false;
  271 + }
  272 +
  273 + if(work.que_num<=0){
  274 + $('.subject').tips({
  275 + side:3,
  276 + msg:'Please add a question',
  277 + bg:'#AE81FF',
  278 + time:2
  279 + });
  280 + return false;
  281 + }
  282 + var QUESTIONS=[];
  283 + for(var k=0;k<work.que_num;k++){
  284 + QUESTIONS[k]={
  285 + RANK:$(".first").eq(k).text(),
  286 + NAME:$(".first").eq(k).text(),
  287 + OPTION_NUM:$(".ans_num").eq(k+1).val(),
  288 + SCORE:$(".score").eq(k+1).val(),
  289 + RIGHT_ANSWER:"",
  290 + TYPE:""
  291 + }
  292 +
  293 + var type=0,right_ans='';
  294 + var a_num=$('.question'+(k+1)).find('.on').length;
  295 + if(a_num<=0){
  296 + //alert("题目"+(k+1)+"请选择正确答案");
  297 + $('.question'+(k+1)).tips({
  298 + side:3,
  299 + msg:'Please specify the correct answer',
  300 + bg:'#AE81FF',
  301 + time:2
  302 + });
  303 + return false;
  304 + }
  305 + for(var x=0;x<a_num;x++){
  306 + right_ans+=$('.question'+(k+1)).find('.on').eq(x).text();
  307 + }
  308 + if(a_num>1){
  309 + type=2;
  310 + }else{
  311 + type=1;
  312 + }
  313 +
  314 + QUESTIONS[k].RIGHT_ANSWER=right_ans;
  315 + QUESTIONS[k].TYPE=type;
  316 + }
  317 +
  318 +
  319 + saveData.TEACHER_ID=$("#TEACHER_ID").val();
  320 + saveData.NAME=$("#NAME").val();
  321 + saveData.HOMEWORK_DESC=$("#HOMEWORK_DESC").val();
  322 + saveData.ALL_SCORE=all_score;
  323 + saveData.CLASSLIST=CLASSLIST;
  324 + saveData.QUESTION_COUNT=work.que_num;
  325 + saveData.QUESTIONS=QUESTIONS;
  326 +
  327 + //console.log(saveData);
  328 + if(homework_id==""){
  329 + save_data(JSON.stringify(saveData));
  330 + //console.log("保存");
  331 + }
  332 + else{
  333 + //console.log("更新");
  334 + saveData.HOMEWORK_ID=homework_id;
  335 + up_data(JSON.stringify(saveData));
  336 + }
  337 +
  338 +
  339 +
  340 +
  341 +
  342 + }
  343 +
  344 +
0 \ No newline at end of file 345 \ No newline at end of file
WebRoot/static/js/en_control_template.js 0 → 100644
  1 +var questionNUm = 0;
  2 +/*数字转汉字数字*/
  3 +var chnNumChar = [ "零", "一", "二", "三", "四", "五", "六", "七", "八", "九" ];
  4 +var chnUnitSection = [ "", "万", "亿", "万亿", "亿亿" ];
  5 +var chnUnitChar = [ "", "十", "百", "千" ];
  6 +/* 快速创建答案列表 */
  7 +var score = 0;
  8 +var total_score = 0;
  9 +var answerLen = 0;
  10 +
  11 +
  12 +$(function() {
  13 +
  14 +
  15 + function creat(q_num, a_num, fraction) {
  16 + // $(".section").remove();
  17 + answer_index_b = $(".section").length + 1;
  18 +
  19 + $(".content").append('<div class="section section-' + answer_index_b+ ' single" data-fraction="'+ fraction+ '" data-score="'
  20 + + (q_num * fraction) + '" style="margin-top:80px;"><div class="title"><h3>No.' + answer_index_b+ '(Single choice) total score: '
  21 + + q_num + ' X ' + fraction + ' = ' + (q_num * fraction)
  22 + + ' <!--<span>请在试题选项上点击,亮色为该试题的正确答案&nbsp; </span> --></h3> </div><div class="question_list"></div></div>');
  23 + for (var i = 0; i < q_num; i++) {
  24 + str_temp = str[i];
  25 + str_temp = str_temp.toUpperCase()
  26 + code = str_temp.charCodeAt();
  27 + on_index = code - 65;
  28 + questionNUm++;
  29 + if (code < (65 + a_num)) {
  30 + console.log(str_temp);
  31 + $(".section-" + answer_index_b + " .question_list").append(
  32 + '<div class="question question' + (questionNUm)
  33 + + '"><span>' + (questionNUm)
  34 + + '、</span><ul></ul></div>');
  35 + for (var j = 0; j < a_num; j++) {
  36 + option = String.fromCharCode(0x41 + j);
  37 + if (on_index == j) {
  38 + console.log(on_index + "---" + j);
  39 + $(".question" + (questionNUm) + ' ul').append(
  40 + '<li class="btn btn-default on">' + option
  41 + + '</li>');
  42 + } else
  43 + $(".question" + (questionNUm) + ' ul').append(
  44 + '<li class="btn btn-default">' + option
  45 + + '</li>');
  46 + }
  47 + } else {
  48 + alert("No." + (i + 1) + ":" + String.fromCharCode(code)
  49 + + "The answer is wrong, exceeding the number of choices");
  50 + // return;
  51 + }
  52 + }
  53 + $(".section-" + answer_index_b).attr("data-score",
  54 + q_num * fraction);
  55 + total_score += q_num * fraction;
  56 + $("#score_all").text(total_score);
  57 + }
  58 +
  59 + /***************************************************************************
  60 + * 1、单选题 2、完形填空 3、阅读理解 4、判断题 5、多选题
  61 + **************************************************************************/
  62 +
  63 + function addQuestion(type, a_num, index_s_2, fraction2) {
  64 + console.log(type);
  65 + fraction2=parseInt(fraction2);
  66 + console.log(fraction2);
  67 + answer_index_b = $(".section").length + 1;
  68 + var question_num = SectionToChinese($(".section").length + 1);
  69 + switch (type) {
  70 + case 1: // 单选题
  71 + // alert(typeof(index_s_2));
  72 + $(".content")
  73 + .append(
  74 + '<div class="section section-'
  75 + + answer_index_b
  76 + + ' " '
  77 + +'data-type="1" '
  78 + +'data-questionNum="'
  79 + +index_s_2
  80 + +'" data-optionNum="'
  81 + +a_num
  82 + +'" '
  83 + +'data-fraction="'
  84 + + fraction2
  85 + + '" data-score="'
  86 + + (index_s_2 * fraction2)
  87 + + '"> <div class="title"><h3>No.'
  88 + + answer_index_b
  89 + + '(Single choice) total score: '
  90 + + index_s_2
  91 + + ' X '
  92 + + fraction2
  93 + + ' = '
  94 + + index_s_2 * fraction2
  95 + + ' <!--<span>请在试题选项上点击,亮色为该试题的正确答案&nbsp; </span>--></h3> </div> <div class="question_list"></div></div>');
  96 + for (i = 1; i <= index_s_2; i++) {
  97 + $(".section-" + answer_index_b + " .question_list").append(
  98 + '<div class="question question' + i + '"><span>' + i
  99 + + '、</span><ul></ul></div>');
  100 + for (var j = 0; j < a_num; j++) {
  101 + option = String.fromCharCode(0x41 + j);
  102 + $(".section-" + answer_index_b + " .question" + i + ' ul')
  103 + .append(
  104 + '<li class="btn btn-default">' + option
  105 + + '</li>');
  106 + }
  107 + }
  108 + total_score += index_s_2 * fraction2;
  109 + $("#score_all").text(total_score);
  110 + break;
  111 + case 2: // 多选题
  112 + // $(".content").html("");
  113 + $(".content")
  114 + .append(
  115 + '<div class="section section-'
  116 + + answer_index_b
  117 + + ' " '
  118 + +'data-type="2" '
  119 + +'data-questionNum="'
  120 + +index_s_2
  121 + +'" data-optionNum="'
  122 + +a_num
  123 + +'" '
  124 + + ' " data-fraction="'
  125 + + fraction2
  126 + + '" data-score="'
  127 + + (index_s_2 * fraction2)
  128 + + '"> <div class="title"><h3>No.'
  129 + + answer_index_b
  130 + + '(Multiple choice) total score: '
  131 + + index_s_2
  132 + + ' X '
  133 + + fraction2
  134 + + ' = '
  135 + + index_s_2 * fraction2
  136 + + ' <!--<span>请在试题选项上点击,亮色为该试题的正确答案&nbsp; </span>--></h3> </div> <div class="question_list"></div></div>');
  137 + for (var i = 1; i <= index_s_2; i++) {
  138 + questionNUm++;
  139 + $(".section-" + answer_index_b + " .question_list").append(
  140 + '<div class="question question' + questionNUm
  141 + + '"><span>' + questionNUm
  142 + + '、</span><ul></ul></div>');
  143 + for (var j = 0; j < a_num; j++) {
  144 + option = String.fromCharCode(0x41 + j);
  145 + $(
  146 + ".section-" + answer_index_b + " .question"
  147 + + questionNUm + ' ul').append(
  148 + '<li class="btn btn-default">' + option + '</li>');
  149 + }
  150 + }
  151 + total_score += index_s_2 * fraction2;
  152 + $("#score_all").text(total_score);
  153 + break;
  154 + }
  155 + $(".section0").attr("data-score",
  156 + $(".section0").find(".question").length * fraction2);
  157 + }
  158 +
  159 +
  160 +
  161 + /* 添加试题的确定按钮 */
  162 + $("#addQuestion_submit").click(function() {
  163 + // $("#fast").attr("disabled","disabled");
  164 + var type_2 = parseInt($("#type").val());
  165 + var index_s_2 =parseInt($("#index_s_2").val());
  166 + //var index_e_2 = parseInt($("#index_s_2").val());
  167 +
  168 +
  169 + // var answer_2=$("#answer_2").val();
  170 + var num_ans_2 = $("#num_ans_2").val();
  171 + var fraction2 = parseFloat($("#fraction2").val());
  172 + if (isNaN(index_s_2)) {
  173 + alert("Please enter the number of questions");
  174 + return;
  175 + } else if (isNaN(fraction2)) {
  176 + alert("Please enter the score");
  177 + return;
  178 + }
  179 +
  180 + // console.log(typeof(type_2));
  181 + console.log(type_2+'-'+ num_ans_2+"-"+ index_s_2+"-"+ fraction2);
  182 +
  183 + addQuestion(type_2, num_ans_2, index_s_2, fraction2);
  184 + $('.addQuestion').modal('hide');
  185 + })
  186 +
  187 +
  188 +
  189 +
  190 + /* 提交保存数据 */
  191 + $("#save").click(function() {
  192 + var content = [];
  193 +
  194 + if ($(".section").length > 0) {
  195 + var rank = 0;
  196 + for (i = 0; i < $(".section").length; i++) {
  197 + content[i] = {
  198 + index: i+1,
  199 + type: $(".section").eq(i).attr("data-type"),
  200 + questionNum: $(".section").eq(i).attr("data-questionNum"),
  201 + optionNum: $(".section").eq(i).attr("data-optionNum"),
  202 + score: $(".section").eq(i).attr("data-fraction")
  203 + };
  204 + }
  205 + }
  206 + self.location.href = URL + JSON.stringify(content) + "&page_score=" + total_score;
  207 + });
  208 +
  209 + /* ajax封装函数 */
  210 + function ajax_submit(url, data) {
  211 + $(".loading").css("display", "block");
  212 + console.log(data);
  213 + $.ajax({
  214 + url : url,
  215 + type : "POST",
  216 + data : data,
  217 + dataType : "json",
  218 + contentType : "application/x-www-form-urlencoded; charset=utf-8",
  219 + success : function(data) {
  220 + $(".loading").css("display", "none");
  221 + if(testData.paper_type == '1'){
  222 + window.location.href = JUMP_URL + "?a=1&defaulturl=../paper/list2.do";
  223 + }else{
  224 + window.location.href = JUMP_URL + "?a=1&defaulturl=../paper/list4.do?school_id=" + testData.school_id ;
  225 + }
  226 + }
  227 + })
  228 + }
  229 + function fastSort(array, head, tail) {
  230 + // 考虑到给每个分区操作的时候都是在原有的数组中进行操作的,所以这里head,tail来确定分片的位置
  231 + /* 生成随机项 */
  232 + var randomnum = parseInt((head + tail) / 2);
  233 + var random = array[randomnum];
  234 + /* 将小于random的项放置在其左边 策略就是通过一个临时的数组来储存分好区的结果,再到原数组中替换 */
  235 + var arrayTemp = [];
  236 + var unshiftHead = 0;
  237 + for (var i = head; i <= tail; i++) {
  238 + if (parseInt(array[i].rank) < parseInt(random.rank)) {
  239 + arrayTemp.unshift(array[i]);
  240 + unshiftHead++;
  241 + } else if (parseInt(array[i].rank) > parseInt(random.rank)) {
  242 + arrayTemp.push(array[i]);
  243 + }
  244 + /* 当它等于的时候放哪,这里我想选择放到队列的前面,也就是从unshift后的第一个位置放置 */
  245 + if (parseInt(array[i].rank) === parseInt(random.rank)) {
  246 + arrayTemp.splice(unshiftHead, 0, array[i]);
  247 + }
  248 + }
  249 + /* 将对应项覆盖原来的记录 */
  250 + for (var j = head, u = 0; j <= tail; j++, u++) {
  251 + array.splice(j, 1, arrayTemp[u]);
  252 + }
  253 + /* 寻找中间项所在的index */
  254 + var nowIndex = array.indexOf(random);
  255 +
  256 + /* 设置出口,当要放进去的片段只有2项的时候就可以收工了 */
  257 + if (arrayTemp.length <= 2) {
  258 + return;
  259 + }
  260 + /* 递归,同时应用其左右两个区域 */
  261 + fastSort(array, head, nowIndex);
  262 + fastSort(array, nowIndex + 1, tail);
  263 + }
  264 + function creatHtml(data) {
  265 + console.log(data);
  266 + $(".header_box h1").html(data.title);
  267 + $("#time").html(data.exam_time);
  268 + if(data.score != null && data.score > 0 && data.score != ''){
  269 + $("#score_all").html(data.score);
  270 + }
  271 +
  272 + if (data.questions.length > 0) {
  273 + $(".time").removeAttr("data-target");
  274 + $(".remove").remove();
  275 + $(".btn_box").remove();
  276 + }
  277 +
  278 + for (var i = 0; i < data.questions.length; i++) {
  279 + if (data.questions[i].questions) {
  280 + $(".content")
  281 + .append(
  282 + '<div class="section section-'
  283 + + i
  284 + + '" data-fraction="'
  285 + + data.questions[i].score
  286 + + '" style="margin-top:80px;"> <h3><span class="que_num">'
  287 + + 'No.'
  288 + + (i + 1)
  289 + + 'total score:'
  290 + + data.questions[i].questions.length
  291 + + " X "
  292 + + (parseFloat(data.questions[i].sug_score) / data.questions[i].questions.length)
  293 + + " = "
  294 + + data.questions[i].sug_score
  295 + + '</span>'
  296 + + '<span class="que_name">'
  297 + + data.questions[i].content
  298 + + '</span></h3><!-- <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> --> <div class="question_list"></div></div>');
  299 + } else {
  300 + if (i == 0) {
  301 + $(".content")
  302 + .append(
  303 + '<div class="section section0"> <div class="question_list" style="margin-top:80px"></div></div>');
  304 + }
  305 + $(".section0").find(".question_list").append(
  306 + '<div class="question question' + (i + 1) + '"><span>'
  307 + + (++questionNUm) + '、</span><ul></ul></div>');
  308 + for (var k = 0; k < parseInt(data.questions[i].option_num); k++) {
  309 + str_temp = data.questions[i].answer;
  310 + $(".section0").find(".question" + (i + 1) + ' ul').append(
  311 + '<li class="btn btn-default">'
  312 + + String.fromCharCode(0x41 + k) + '</li>');
  313 + for (var l = 0; l < str_temp.length; l++) {
  314 + str_temp_arry = str_temp.split('');
  315 + code = str_temp_arry[l].charCodeAt();
  316 + on_index = code - 65;
  317 + if (on_index == k) {
  318 + $(".section0").find(
  319 + ".question" + (i + 1) + ' ul li').eq(
  320 + on_index).attr("class",
  321 + "btn btn-default on");
  322 + }
  323 + }
  324 + }
  325 + }
  326 +
  327 + if (data.questions[i].questions) {
  328 + for (var j = 0; j < data.questions[i].questions.length; j++) {
  329 + $(".section-" + i).find(".question_list").append(
  330 + '<div class="question question' + (j + 1)
  331 + + '"><span>' + (++questionNUm)
  332 + + '、</span><ul></ul></div>');
  333 + if ($(".section-" + i).find(".que_name").text() == "判断题") {
  334 + for (var k = 0; k < parseInt(data.questions[i].questions[j].option_num); k++) {
  335 + str_temp = data.questions[i].questions[j].answer;
  336 + if (k % 2 == 0) {
  337 + $(".section-" + i).find(
  338 + ".question" + (j + 1) + ' ul').append(
  339 + '<li class="btn btn-default">√</li>');
  340 + } else if (k % 2 == 1) {
  341 + $(".section-" + i).find(
  342 + ".question" + (j + 1) + ' ul').append(
  343 + '<li class="btn btn-default">×</li>');
  344 + }
  345 +
  346 + if (str_temp == "√")
  347 + $(".section-" + i).find(
  348 + ".question" + (j + 1) + ' ul li').eq(0)
  349 + .attr("class", "btn btn-default on");
  350 + else
  351 + $(".section-" + i).find(
  352 + ".question" + (j + 1) + ' ul li').eq(1)
  353 + .attr("class", "btn btn-default on");
  354 + }
  355 + } else {
  356 + for (var k = 0; k < parseInt(data.questions[i].questions[j].option_num); k++) {
  357 + str_temp = data.questions[i].questions[j].answer;
  358 + $(".section-" + i).find(
  359 + ".question" + (j + 1) + ' ul').append(
  360 + '<li class="btn btn-default">'
  361 + + String.fromCharCode(0x41 + k)
  362 + + '</li>');
  363 + for (var l = 0; l < str_temp.length; l++) {
  364 + str_temp_arry = str_temp.split('');
  365 + code = str_temp_arry[l].charCodeAt();
  366 + on_index = code - 65;
  367 + if (on_index == k) {
  368 + $(".section-" + i).find(
  369 + ".question" + (j + 1) + ' ul li')
  370 + .eq(on_index).attr("class",
  371 + "btn btn-default on");
  372 + }
  373 + }
  374 + }
  375 + }
  376 + }
  377 + }
  378 + }
  379 + }
  380 +
  381 +
  382 + /*快速建题中,每输入五个答案就加一个空格*/
  383 + $("#answer").on("input propertychange", function(event) {
  384 + var answerStr = "";
  385 + answerStr = $("#answer").val();
  386 + var result = "";
  387 + if (answerStr.length > 5) {
  388 + answerStr = answerStr.replace(new RegExp(" ", "gm"), "");
  389 + for (var i = 0; i < answerStr.length; i++) {
  390 + result += answerStr[i];
  391 + if (i % 5 == 4 && i != answerStr.length - 1) {
  392 + result += " ";
  393 + }
  394 + }
  395 + } else {
  396 + result = answerStr;
  397 + }
  398 + $("#answer").val(result);
  399 + if (answerStr.length > 0) {
  400 + $(".tips").text("Total" + answerStr.length + "question");
  401 + } else {
  402 + $(".tips").text("");
  403 + }
  404 + })
  405 +
  406 +
  407 +
  408 + function SectionToChinese(section) {
  409 + var strIns = '', chnStr = '';
  410 + var unitPos = 0;
  411 + var zero = true;
  412 + while (section > 0) {
  413 + var v = section % 10;
  414 + if (v === 0) {
  415 + if (!zero) {
  416 + zero = true;
  417 + chnStr = chnNumChar[v] + chnStr;
  418 + }
  419 + } else {
  420 + zero = false;
  421 + strIns = chnNumChar[v];
  422 + strIns += chnUnitChar[unitPos];
  423 + chnStr = strIns + chnStr;
  424 + }
  425 + unitPos++;
  426 + section = Math.floor(section / 10);
  427 + }
  428 + return chnStr;
  429 + }
  430 +
  431 +
  432 + if (template != null && template.length > 0) {
  433 +
  434 + $("#addQuestion").attr("disabled", "disabled");
  435 + $("#fast").attr("disabled", "disabled");
  436 + for (var i = 0; i < template.length; i++) {
  437 + if (template[i].type == 1) {
  438 + var answer = "";
  439 + for (var j = 0; j < template[i].questionNum; j++) {
  440 + answer += "1";
  441 + }
  442 + creat(answer, template[i].optionNum, template[i].score);
  443 + }
  444 + if (template[i].type == 2) {
  445 + addQuestion(5, template[i].optionNum, 1,
  446 + template[i].questionNum, template[i].score);
  447 + }
  448 + }
  449 + if(testData != null){
  450 + $(".header_box h1").html(testData.title);
  451 + $("#time").html(testData.exam_time);
  452 + if(testData.score != null && testData.score > 0 && testData.score != ''){
  453 + $("#score_all").html(testData.score);
  454 + }
  455 + }
  456 +
  457 + }else if (testData != null && testData.questions != null
  458 + && testData.questions.length > 0) {
  459 + fastSort(testData.questions, 0, testData.questions.length - 1);
  460 + for (var i = 0; i < testData.questions.length; i++) {
  461 +
  462 + if (testData.questions[0].questions
  463 + && testData.questions[0].questions.length > 1) {
  464 + fastSort(testData.questions[i].questions, 0,
  465 + testData.questions[i].questions.length - 1);
  466 + }
  467 + }
  468 + creatHtml(testData);
  469 + }else{
  470 + if(testData != null){
  471 + $(".header_box h1").html(testData.title);
  472 + $("#time").html(testData.exam_time);
  473 + if(testData.score != null && testData.score > 0 && testData.score != ''){
  474 + $("#score_all").html(testData.score);
  475 + }
  476 + }
  477 + }
  478 +})
WebRoot/static/js/en_remove.js 0 → 100644
  1 +
  2 +var remove={
  3 + init:function(obj){
  4 + this.init.title=obj.title;
  5 + this.init.func = obj.func;
  6 + this.init.msg = obj.msg;
  7 + this.init.ok = obj.ok;
  8 + this.init.cancel = obj.cancel;
  9 + if(typeof(this.init.ok) == "undefined"){
  10 + this.init.ok = "Confirm";
  11 + }
  12 + if(typeof(this.init.cancel) == "undefined"){
  13 + this.init.cancel = "Cancel" ;
  14 + }
  15 + },
  16 + show:function(){
  17 + if(window.top!=window.self){
  18 + $("body",top.document).append('<div class="mb remove"><div class="mb_box" ><div class="mb_head"><p>'+window.top.remove.init.title+'</p><div class="close"><img src="../static/images/close.png" /></div></div><div class="mb_content"><div class="mb_content_l"><a href="#" onclick="window.top.remove.init.func(true);window.top.remove.remove();">' +window.top.remove.init.ok + '</a></div><div class="mb_content_r"><a href="#" onclick="window.top.remove.remove();window.top.remove.init.func(false);">' + window.top.remove.init.cancel + '</a></div></div></div></div>');
  19 + console.log(typeof(window.top.remove.init.msg));
  20 + if(typeof(window.top.remove.init.msg) != "undefined"){
  21 + $(".mb_content_l").before('<div class="mb_msg"><p>'+window.top.remove.init.msg+'</p></div>');
  22 + }
  23 + }else{
  24 + if($(".loading").length==0)
  25 + {
  26 + console.log(typeof(window.top.remove.init.msg));
  27 + $("body").append('<div class="mb remove"><div class="mb_box" ><div class="mb_head"><p>'+window.top.remove.init.title+'</p><div class="close"><img src="../static/images/close.png" /></div></div><div class="mb_content"><div class="mb_content_l"><a href="#" onclick="window.top.remove.init.func(true);window.top.remove.remove();">' + window.top.remove.init.ok +'</a></div><div class="mb_content_r"><a href="#" onclick="window.top.remove.remove();window.top.remove.init.func(false);">' + window.top.remove.init.cancel + '</a></div></div></div></div>');
  28 + if(typeof(window.top.remove.init.msg) != "undefined"){
  29 + $(".mb_content_l").before('<div class="mb_msg"><p>'+window.top.remove.init.msg+'</p></div>');
  30 + }
  31 + }
  32 + }
  33 + },
  34 + remove:function(){
  35 + if(window.top!=window.self){
  36 + $(".remove",top.document).remove();
  37 + }else{
  38 + if($(".remove").length>0)
  39 + $(".remove").remove();
  40 + }
  41 +
  42 + }
  43 +}
0 \ No newline at end of file 44 \ No newline at end of file
resources/mybatis1/sunvote/CourseManagementMapper.xml
@@ -153,6 +153,7 @@ @@ -153,6 +153,7 @@
153 sv_teacher.`NAME`, 153 sv_teacher.`NAME`,
154 sv_sclass.CLASS_NAME, 154 sv_sclass.CLASS_NAME,
155 sv_subject.CNAME, 155 sv_subject.CNAME,
  156 + sv_subject.ENAME,
156 SV_COURSEMANAGEMENT.SUBJECT_ID, 157 SV_COURSEMANAGEMENT.SUBJECT_ID,
157 SV_COURSEMANAGEMENT.TEACHER_ID, 158 SV_COURSEMANAGEMENT.TEACHER_ID,
158 SV_COURSEMANAGEMENT.CLASS_ID, 159 SV_COURSEMANAGEMENT.CLASS_ID,
@@ -193,6 +194,7 @@ @@ -193,6 +194,7 @@
193 sv_teacher.`NAME`, 194 sv_teacher.`NAME`,
194 sv_sclass.CLASS_NAME, 195 sv_sclass.CLASS_NAME,
195 sv_subject.CNAME, 196 sv_subject.CNAME,
  197 + sv_subject.ENAME,
196 SV_COURSEMANAGEMENT.SUBJECT_ID, 198 SV_COURSEMANAGEMENT.SUBJECT_ID,
197 SV_COURSEMANAGEMENT.TEACHER_ID, 199 SV_COURSEMANAGEMENT.TEACHER_ID,
198 SV_COURSEMANAGEMENT.CLASS_ID, 200 SV_COURSEMANAGEMENT.CLASS_ID,