Commit 1abbf146ce4ba7cd63dc0bae79296c9f4762ae47

Authored by jack
1 parent 0f84a2bc

1.修改翻译

WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
@@ -84,11 +84,11 @@ @@ -84,11 +84,11 @@
84 </div> --%> 84 </div> --%>
85 <div class="class tab1"> 85 <div class="class tab1">
86 <p> 86 <p>
87 - Classroom management<span class="right jiao"></span> 87 + Course management<span class="right jiao"></span>
88 </p> 88 </p>
89 <ul class="menu_1"> 89 <ul class="menu_1">
90 <li> 90 <li>
91 - <p>Courses management</p> 91 + <p>Subject management</p>
92 <ul class="menu_2"> 92 <ul class="menu_2">
93 <c:forEach items="${gradeInfos}" var="var" varStatus="vs"> 93 <c:forEach items="${gradeInfos}" var="var" varStatus="vs">
94 <li 94 <li
@@ -219,22 +219,22 @@ @@ -219,22 +219,22 @@
219 <label for="enter_title" class="col-sm-4 control-label">Test title</label> 219 <label for="enter_title" class="col-sm-4 control-label">Test title</label>
220 <div class="col-sm-6"> 220 <div class="col-sm-6">
221 <input type="text" class="form-control" id="enter_title" 221 <input type="text" class="form-control" id="enter_title"
222 - placeholder="Enter the test title (no more than 100 characters)" maxlength="100" minlength="1"> 222 + placeholder="no more than 100 characters" maxlength="100" minlength="1">
223 </div> 223 </div>
224 <div class="clearfix"></div> 224 <div class="clearfix"></div>
225 </div> 225 </div>
226 226
227 <div class="form-group"> 227 <div class="form-group">
228 - <label for="enter_time" class="col-sm-4 control-label">Test duration (minutes)</label> 228 + <label for="enter_time" class="col-sm-4 control-label">Test duration</label>
229 <div class="col-sm-6"> 229 <div class="col-sm-6">
230 <input type="number" class="form-control" id="enter_time" 230 <input type="number" class="form-control" id="enter_time"
231 - placeholder="Input test duration (unit: minutes)" maxlength="3" 231 + placeholder="Input test duration" maxlength="3"
232 oninput="if(value.length>3) value=value.slice(0,3)"> 232 oninput="if(value.length>3) value=value.slice(0,3)">
233 </div> 233 </div>
234 <div class="clearfix"></div> 234 <div class="clearfix"></div>
235 </div> 235 </div>
236 <div class="form-group"> 236 <div class="form-group">
237 - <label for="enter_time" class="col-sm-4 control-label">grade</label> 237 + <label for="enter_time" class="col-sm-4 control-label">Grade</label>
238 <div class="col-sm-6"> 238 <div class="col-sm-6">
239 <select class="chosen-select form-control" name="grade_id" 239 <select class="chosen-select form-control" name="grade_id"
240 id="grade_id" onchange="getSubjects('${SCHOOL_ID}')" 240 id="grade_id" onchange="getSubjects('${SCHOOL_ID}')"
WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp
@@ -88,10 +88,10 @@ @@ -88,10 +88,10 @@
88 </table> 88 </table>
89 <div class="footer"> 89 <div class="footer">
90 <div class="creat"> 90 <div class="creat">
91 - <input type="button" onclick="add()" value="Distribute class task" /> 91 + <input type="button" onclick="add()" value="Add a task" />
92 </div> 92 </div>
93 <div class="removeAll"> 93 <div class="removeAll">
94 - <input type="button" onclick="deleteAll()" value="Remove class task" /> 94 + <input type="button" onclick="deleteAll()" value="Remove" />
95 </div> 95 </div>
96 <div class="page_box"> 96 <div class="page_box">
97 97
WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 <input type="button" onclick="add()" value="Add a grade" /> 85 <input type="button" onclick="add()" value="Add a grade" />
86 </div> 86 </div>
87 <div class="removeAll"> 87 <div class="removeAll">
88 - <input type="button" onclick="del()" value="Remove the grade" /> 88 + <input type="button" onclick="del()" value="Remove" />
89 </div> 89 </div>
90 <div class="page_box"> 90 <div class="page_box">
91 91
WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_list2.jsp
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 <th class="center">Name</th> 60 <th class="center">Name</th>
61 <th class="center">User Name</th> 61 <th class="center">User Name</th>
62 <th class="center">Password</th> 62 <th class="center">Password</th>
63 - <th class="center">Contact Number</th> 63 + <th class="center">Contact No.</th>
64 <th class="center">Class</th> 64 <th class="center">Class</th>
65 <th class="center">Operation</th> 65 <th class="center">Operation</th>
66 </tr> 66 </tr>
WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_list.jsp
@@ -125,7 +125,7 @@ @@ -125,7 +125,7 @@
125 <input type="button" onclick="add('${pd.TEACHER_ID}')" value="Arrange Exercise" /> 125 <input type="button" onclick="add('${pd.TEACHER_ID}')" value="Arrange Exercise" />
126 </div> 126 </div>
127 <div class="removeAll"> 127 <div class="removeAll">
128 - <input type="button" onclick="del()" value="Batch delete" /> 128 + <input type="button" onclick="del()" value="Remove" />
129 </div> 129 </div>
130 <div class="page_box"> 130 <div class="page_box">
131 131
WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_report.jsp
@@ -101,9 +101,9 @@ @@ -101,9 +101,9 @@
101 <thead> 101 <thead>
102 <tr> 102 <tr>
103 <th class="center th_name"><div style="width:150px;">Name</div></th> 103 <th class="center th_name"><div style="width:150px;">Name</div></th>
104 - <th class="center "><div style="width:150px;">Average score of the course</div></th>  
105 - <th class="center"><div style="width:80px;">Course total scores</div></th>  
106 - <th class="center"><div style="width:150px;">Personal performance</div></th> 104 + <th class="center "><div style="width:150px;">Subject average score</div></th>
  105 + <th class="center"><div style="width:80px;">Subject total scores</div></th>
  106 + <th class="center"><div style="width:150px;">Completion rate</div></th>
107 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs"> 107 <c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
108 <th class="center kc"><a 108 <th class="center kc"><a
109 onclick="paper('${pd.CLASS_ID}','${var_h.HOMEWORK_ID}');"><div style="width:180px; margin: 0 auto;cursor:hand" class="font">${var_h.NAME}</br><span>${var_h.COMPLETE_DATE}</span></div></a></th> 109 onclick="paper('${pd.CLASS_ID}','${var_h.HOMEWORK_ID}');"><div style="width:180px; margin: 0 auto;cursor:hand" class="font">${var_h.NAME}</br><span>${var_h.COMPLETE_DATE}</span></div></a></th>
@@ -130,7 +130,7 @@ @@ -130,7 +130,7 @@
130 </c:forEach> 130 </c:forEach>
131 </tr> 131 </tr>
132 <tr> 132 <tr>
133 - <td class="center"><div style="width:150px;">course average correct rate of class</div></td> 133 + <td class="center"><div style="width:150px;">Class average accuracy</div></td>
134 <td class="center"><div style="width:150px;"></div></td> 134 <td class="center"><div style="width:150px;"></div></td>
135 <td class="center"><div style="width:80px;"></div></td> 135 <td class="center"><div style="width:80px;"></div></td>
136 <td class="center"><div style="width:80px;"></div></td> 136 <td class="center"><div style="width:80px;"></div></td>
WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp
@@ -54,12 +54,12 @@ li { @@ -54,12 +54,12 @@ li {
54 </nav> 54 </nav>
55 </div> 55 </div>
56 <div class="content row"> 56 <div class="content row">
57 - <div class="content_l col-md-2"> 57 + <div class="content_l col-sm-2 col-md-2">
58 <ul> 58 <ul>
59 59
60 </ul> 60 </ul>
61 </div> 61 </div>
62 - <div class="content_r col-md-10"> 62 + <div class="content_r col-sm-10 col-md-10">
63 <div class="tabel_t"> 63 <div class="tabel_t">
64 <div class="name"> 64 <div class="name">
65 <h1></h1> 65 <h1></h1>
@@ -91,7 +91,7 @@ li { @@ -91,7 +91,7 @@ li {
91 </div> 91 </div>
92 <div class="tabel_b"> 92 <div class="tabel_b">
93 <div class="tab_top row"> 93 <div class="tab_top row">
94 - <div class="col-md-3">Comparison chart of correct rate</div> 94 + <div class="col-md-3">Comparison chart of accuracy</div>
95 <div class="col-md-9"> 95 <div class="col-md-9">
96 <div class="color"> 96 <div class="color">
97 <ul> 97 <ul>
@@ -103,7 +103,7 @@ li { @@ -103,7 +103,7 @@ li {
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">Correct Rate</label> <input type="radio" value="2" 106 + <label for="check1">Accuracy</label> <input type="radio" value="2"
107 name="check" id="check2" /> <label for="check2">Marks</label> 107 name="check" id="check2" /> <label for="check2">Marks</label>
108 </div> 108 </div>
109 </div> 109 </div>
WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp
@@ -97,10 +97,10 @@ @@ -97,10 +97,10 @@
97 </table> 97 </table>
98 <div class="footer" style="width:auto"> 98 <div class="footer" style="width:auto">
99 <div class="creat"> 99 <div class="creat">
100 - <input type="button" onclick="$('.title_time').modal('show');" value="Add the Template" /> 100 + <input type="button" onclick="$('.title_time').modal('show');" value="Add a Template" />
101 </div> 101 </div>
102 <div class="removeAll"> 102 <div class="removeAll">
103 - <input type="button" onclick="del('')" value="Batch delete" /> 103 + <input type="button" onclick="del('')" value="Remove" />
104 </div> 104 </div>
105 <div class="page_box"> 105 <div class="page_box">
106 106
WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp
@@ -42,19 +42,19 @@ @@ -42,19 +42,19 @@
42 <div class="box_header"> 42 <div class="box_header">
43 <div class="head_box_l"> 43 <div class="head_box_l">
44 <p> 44 <p>
45 - <span class="right_b"></span>test paper management 45 + <span class="right_b"></span>Test paper management
46 </p> 46 </p>
47 </div> 47 </div>
48 <div class="head_box_r"> 48 <div class="head_box_r">
49 <input type="hidden" name="SCHOOL_ID" id="PAPER_ID" 49 <input type="hidden" name="SCHOOL_ID" id="PAPER_ID"
50 - value="${pd.SCHOOL_ID}" /> <label>grade: </label>&nbsp;&nbsp; <select 50 + value="${pd.SCHOOL_ID}" /> <label>Grade: </label>&nbsp;&nbsp; <select
51 name="grade_id" id="grade_id" data-placeholder="这里输入所属年级"> 51 name="grade_id" id="grade_id" data-placeholder="这里输入所属年级">
52 <option value="">All</option> 52 <option value="">All</option>
53 <c:forEach items="${gradeInfos}" var="var" varStatus="vs"> 53 <c:forEach items="${gradeInfos}" var="var" varStatus="vs">
54 <option value="${var.ID}" 54 <option value="${var.ID}"
55 <c:if test="${pd.GRADE_ID==var.ID}">selected="true"</c:if>>${var.ENAME}</option> 55 <c:if test="${pd.GRADE_ID==var.ID}">selected="true"</c:if>>${var.ENAME}</option>
56 </c:forEach> 56 </c:forEach>
57 - </select> <label>subject: </label>&nbsp;&nbsp; <select name="subject_id" 57 + </select> <label>Subject: </label>&nbsp;&nbsp; <select name="subject_id"
58 id="subject_id" data-placeholder="这里输入所属科目"> 58 id="subject_id" data-placeholder="这里输入所属科目">
59 <option value="">All</option> 59 <option value="">All</option>
60 <c:forEach items="${subjectInfos}" var="var" varStatus="vs"> 60 <c:forEach items="${subjectInfos}" var="var" varStatus="vs">
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 <th>Class</th> 90 <th>Class</th>
91 <th>Instructor</th> 91 <th>Instructor</th>
92 <th>Creation time</th> 92 <th>Creation time</th>
93 - <th>Recommended test duration</th> 93 + <th>Test duration</th>
94 <th>Total score</th> 94 <th>Total score</th>
95 </tr> 95 </tr>
96 </thead> 96 </thead>
WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 <div class="box_header"> 41 <div class="box_header">
42 <div class="head_box_l"> 42 <div class="head_box_l">
43 <p> 43 <p>
44 - <span class="right_b"></span>test paper management 44 + <span class="right_b"></span>Test paper management
45 </p> 45 </p>
46 </div> 46 </div>
47 <div class="head_box_r"> 47 <div class="head_box_r">
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 <th>Creation time</th> 69 <th>Creation time</th>
70 <th>Grade</th> 70 <th>Grade</th>
71 <th>Subject</th> 71 <th>Subject</th>
72 - <th>Recommended test duration</th> 72 + <th>Test duration</th>
73 <th>Total score</th> 73 <th>Total score</th>
74 <th>Operation</th> 74 <th>Operation</th>
75 </tr> 75 </tr>
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 <input type="button" onclick="parent.$('.title_time').modal('show');" value="Add a new paper" /> 119 <input type="button" onclick="parent.$('.title_time').modal('show');" value="Add a new paper" />
120 </div> 120 </div>
121 <div class="removeAll"> 121 <div class="removeAll">
122 - <input type="button" onclick="deleteAll()" value="Batch Remove" /> 122 + <input type="button" onclick="deleteAll()" value="Remove" />
123 </div> 123 </div>
124 <div class="page_box"> 124 <div class="page_box">
125 125
WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 <input type="button" onclick="upload();" value="Batch Import" /> 100 <input type="button" onclick="upload();" value="Batch Import" />
101 </div> 101 </div>
102 <div class="removeAll" > 102 <div class="removeAll" >
103 - <input type="button" onclick="deleteAll();" value="Batch Delete" /> 103 + <input type="button" onclick="deleteAll();" value="Remove" />
104 </div> 104 </div>
105 <div class="page_box"> 105 <div class="page_box">
106 <div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div> 106 <div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_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:75px;text-align: right;padding-top: 13px;">Subject:</td>
38 <td> 38 <td>
39 <select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="Enter the Course name"> 39 <select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="Enter the Course name">
40 <c:forEach var="item" items="${varList}"> 40 <c:forEach var="item" items="${varList}">
WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_list2.jsp
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 <div class="box_header"> 33 <div class="box_header">
34 <div class="head_box_l"> 34 <div class="head_box_l">
35 <p> 35 <p>
36 - <span class="right_b"></span>Course management 36 + <span class="right_b"></span>Subject management
37 </p> 37 </p>
38 </div> 38 </div>
39 <div class="head_box_r"></div> 39 <div class="head_box_r"></div>
@@ -88,10 +88,10 @@ @@ -88,10 +88,10 @@
88 </table> 88 </table>
89 <div class="footer" style="width:auto"> 89 <div class="footer" style="width:auto">
90 <div class="creat"> 90 <div class="creat">
91 - <input type="button" onclick="add()" value="Add the subject" /> 91 + <input type="button" onclick="add()" value="Add a subject" />
92 </div> 92 </div>
93 <div class="removeAll"> 93 <div class="removeAll">
94 - <input type="button" onclick="del()" value="Remove the subjects" /> 94 + <input type="button" onclick="del()" value="Remove" />
95 </div> 95 </div>
96 <div class="page_box"> 96 <div class="page_box">
97 97
WebRoot/WEB-INF/jsp/sunvote/teacher/en_stduent_report.jsp
@@ -103,7 +103,7 @@ li { @@ -103,7 +103,7 @@ li {
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">Correct Rate</label> <input type="radio" value="2" 106 + <label for="check1">Accuracy</label> <input type="radio" value="2"
107 name="check" id="check2" /> <label for="check2">Marks</label> 107 name="check" id="check2" /> <label for="check2">Marks</label>
108 </div> 108 </div>
109 </div> 109 </div>
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp
@@ -71,15 +71,15 @@ @@ -71,15 +71,15 @@
71 <div class="table_box"> 71 <div class="table_box">
72 <table class="table table-striped"> 72 <table class="table table-striped">
73 <col style="width: 8%" /> 73 <col style="width: 8%" />
74 - <col style="width: 10%" />  
75 - <col style="width: 10%" />  
76 - <col style="width: 10%" />  
77 - <col style="width: 15%" />  
78 - <col style="width: 15%" />  
79 - <col style="width: 7%" />  
80 - <col style="width: 8%" />  
81 - <col style="width: 7%" />  
82 - <col style="width: 9%" /> 74 + <col style="width: 10%" />
  75 + <col style="width: 10%" />
  76 + <col style="width: 10%" />
  77 + <col style="width: 15%" />
  78 + <col style="width: 15%" />
  79 + <col style="width: 7%" />
  80 + <col style="width: 8%" />
  81 + <col style="width: 7%" />
  82 + <col style="width: 9%" />
83 <tbody> 83 <tbody>
84 <!-- 开始循环 --> 84 <!-- 开始循环 -->
85 <c:choose> 85 <c:choose>
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_report_1.jsp
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 <thead> 74 <thead>
75 <tr> 75 <tr>
76 <th class="center th_name"><div style="width:150px;">Name</div></th> 76 <th class="center th_name"><div style="width:150px;">Name</div></th>
77 - <th class="center "><div style="width:150px;">Correct Rate</div></th> 77 + <th class="center "><div style="width:150px;">Accuracy</div></th>
78 <th class="center"><div style="width:80px;">Total</div></th> 78 <th class="center"><div style="width:80px;">Total</div></th>
79 <c:forEach items="${testpaperList}" var="var" varStatus="vs"> 79 <c:forEach items="${testpaperList}" var="var" varStatus="vs">
80 <th class="center kc"><a 80 <th class="center kc"><a
@@ -84,7 +84,7 @@ @@ -84,7 +84,7 @@
84 </thead> 84 </thead>
85 <tbody> 85 <tbody>
86 <tr> 86 <tr>
87 - <td class="center"><div style="width:150px;">Total Marks</div></td> 87 + <td class="center"><div style="width:150px;">Total Score</div></td>
88 <td class="center"><div style="width:150px;">N/A</div></td> 88 <td class="center"><div style="width:150px;">N/A</div></td>
89 <td class="center"><div style="width:80px;">N/A</div></td> 89 <td class="center"><div style="width:80px;">N/A</div></td>
90 <c:forEach items="${testpaperList}" var="var" varStatus="vs"> 90 <c:forEach items="${testpaperList}" var="var" varStatus="vs">
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 </c:forEach> 100 </c:forEach>
101 </tr> 101 </tr>
102 <tr> 102 <tr>
103 - <td class="center"><div style="width:150px;">Correct Rate</div></td> 103 + <td class="center"><div style="width:150px;">Accuracy</div></td>
104 <td class="center"><div style="width:150px;">N/A</div></td> 104 <td class="center"><div style="width:150px;">N/A</div></td>
105 <td class="center"><div style="width:80px;">N/A</div></td> 105 <td class="center"><div style="width:80px;">N/A</div></td>
106 <c:forEach items="${testpaperList}" var="var" varStatus="vs"> 106 <c:forEach items="${testpaperList}" var="var" varStatus="vs">
WebRoot/static/js/en_control1.js
@@ -148,7 +148,7 @@ @@ -148,7 +148,7 @@
148 $("#class_avg").html(class_avg); 148 $("#class_avg").html(class_avg);
149 $("#class_max").html(class_max); 149 $("#class_max").html(class_max);
150 $(".name h1").html(data.data.studentList[index].NAME); 150 $(".name h1").html(data.data.studentList[index].NAME);
151 - $(".circle .col-md-6").eq(1).html('<div id="myStathalf1" data-dimension="350" data-text="'+ratio+"%"+'" data-info="Individual Average Correct Rate" data-width="10" data-fontsize="38" data-percent="'+ratio+'" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div>'); 151 + $(".circle .col-md-6").eq(1).html('<div id="myStathalf1" data-dimension="350" data-text="'+ratio+"%"+'" data-info="Individual Average accuracy" data-width="10" data-fontsize="38" data-percent="'+ratio+'" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div>');
152 $(".circle .col-md-6").eq(0).html('<div id="myStathalf" data-dimension="350" data-text="'+part_num+'/'+test_num+'" data-info="Tests Paticipated" data-width="10" data-fontsize="38" data-percent="'+partake+'" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div>'); 152 $(".circle .col-md-6").eq(0).html('<div id="myStathalf" data-dimension="350" data-text="'+part_num+'/'+test_num+'" data-info="Tests Paticipated" data-width="10" data-fontsize="38" data-percent="'+partake+'" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div>');
153 $('#myStathalf1').circliful(); 153 $('#myStathalf1').circliful();
154 $('#myStathalf').circliful(); 154 $('#myStathalf').circliful();