孙向锦 / SunvoteEducation

Commit 66d02d57f6377286eecc216ef78fd0c4998f1783

Authored by jack
1 parent 8f88069a

1.英文翻译（5）

Inline Side-by-side
Showing 15 changed files with 280 additions and 96 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
  View file @66d02d5
... ... @@ -35,10 +35,10 @@
35 35 <body>
36 36 <div class="header">
37 37 <div class="logo">
38   - <img src="../static/images/logo.png" />
  38 + <img src="../static/images/en_logo.png" />
39 39 </div>
40 40 <div class="out">
41   - <a href="../logout"><img src="../static/images/close.png" />log out</a>
  41 + <a href="../logout"><img src="../static/images/close.png" />Log Out</a>
42 42 </div>
43 43 <div class="clear"></div>
44 44 </div>
... ... @@ -100,7 +100,7 @@
100 100 </li>
101 101  
102 102 <li onclick="event.stopPropagation();coursemanager('${SCHOOL_ID}')"><p>Classroom management</p></li>
103   - <li onclick="event.stopPropagation();teacher('${SCHOOL_ID}')"><p>teacher management </p></li>
  103 + <li onclick="event.stopPropagation();teacher('${SCHOOL_ID}')"><p>Teacher management </p></li>
104 104 </ul>
105 105 </div>
106 106 <div class="testpaper tab1">
... ... @@ -109,15 +109,15 @@
109 109 </p>
110 110 <ul class="menu_1">
111 111 <li>
112   - <p>test paper management</p>
  112 + <p>Test paper management</p>
113 113 <ul class="menu_2">
114   - <li><p id="new_paper">paper making</p></li>
  114 + <li><p id="new_paper">Paper making</p></li>
115 115 <li><p id="qingsongkao_paper">View all papers</p></li>
116 116  
117 117 </ul>
118 118 </li>
119 119 <li>
120   - <p>examination situation</p>
  120 + <p>Examination situation</p>
121 121 <ul class="menu_2">
122 122 <c:forEach items="${gradeInfos}" var="var" varStatus="vs">
123 123 <c:forEach items="${var.classInfos}" var="var1" varStatus="vs1">
... ... @@ -139,10 +139,10 @@
139 139  
140 140 <ul class="menu_1">
141 141 <li>
142   - <p id="jishice_paper">test paper management</p>
  142 + <p id="jishice_paper">Test paper management</p>
143 143 </li>
144 144 <li>
145   - <p>test analysis</p>
  145 + <p>Test analysis</p>
146 146 <ul class="menu_2">
147 147 <c:forEach items="${gradeInfos}" var="var" varStatus="vs">
148 148 <c:forEach items="${var.classInfos}" var="var1" varStatus="vs1">
... ... @@ -159,34 +159,34 @@
159 159  
160 160 <div class="analyse tab1">
161 161 <p>
162   - after-class exercise<span class="right jiao"></span>
  162 + After-class exercise<span class="right jiao"></span>
163 163 </p>
164 164  
165 165 <ul class="menu_1">
166 166 <li>
167   - <p onclick="event.stopPropagation();monitor('${SCHOOL_ID}')">monitor management</p>
  167 + <p onclick="event.stopPropagation();monitor('${SCHOOL_ID}')">Monitor management</p>
168 168 </li>
169 169 <li>
170   - <p id="homework_paper">homework management</p>
  170 + <p id="homework_paper">Homework management</p>
171 171 </li>
172 172 <li>
173   - <p id="homework_analysis">homework analysis</p>
  173 + <p id="homework_analysis">Homework analysis</p>
174 174 </li>
175 175 </ul>
176 176 </div>
177 177  
178 178 <div class="analyse tab1">
179 179 <p>
180   - system settings<span class="right jiao"></span>
  180 + System settings<span class="right jiao"></span>
181 181 </p>
182 182  
183 183 <ul class="menu_1">
184 184 <li>
185   - <p onclick="event.stopPropagation();school('${SCHOOL_ID}')">school settings</p>
  185 + <p onclick="event.stopPropagation();school('${SCHOOL_ID}')">School settings</p>
186 186  
187 187 </li>
188 188 <li>
189   - <p onclick="event.stopPropagation();grade('${SCHOOL_ID}')">grade settings</p>
  189 + <p onclick="event.stopPropagation();grade('${SCHOOL_ID}')">Grade settings</p>
190 190 </li>
191 191 <li>
192 192 <p onclick="event.stopPropagation();pagetemplate('${SCHOOL_ID}')">Template Settings</p>
... ... @@ -212,7 +212,7 @@
212 212 aria-label="Close">
213 213 <span aria-hidden="true">&times;</span>
214 214 </button>
215   - <h4 class="modal-title">add a new test paper</h4>
  215 + <h4 class="modal-title">Add a new test paper</h4>
216 216 </div>
217 217 <div class="modal-body">
218 218 <div class="form-group">
... ... @@ -241,7 +241,7 @@
241 241 data-placeholder="Enter the school">
242 242 <option value="-1">please select</option>
243 243 <c:forEach items="${gradeInfos}" var="var" varStatus="vs">
244   - <option value="${var.GRADE_ID}">${var.GNAME}</option>
  244 + <option value="${var.GRADE_ID}">${var.ENAME}</option>
245 245 </c:forEach>
246 246 </select>
247 247 </div>
... ... @@ -270,8 +270,8 @@
270 270  
271 271 </div>
272 272 <div class="modal-footer">
273   - <button type="button" class="btn btn-primary" id="time_submit">confirm</button>
274   - <button type="button" class="btn btn-primary" data-dismiss="modal">cancel</button>
  273 + <button type="button" class="btn btn-primary" id="time_submit">Confirm</button>
  274 + <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
275 275 </div>
276 276 </div>
277 277 <!-- /.modal-content -->
... ... @@ -309,7 +309,7 @@
309 309 dataType: "json",
310 310 success: function(data) {
311 311 for(var key in data){
312   - $("#subject_id").append("<option value='"+data[key].ID+"'>"+data[key].CNAME+"</option>");
  312 + $("#subject_id").append("<option value='"+data[key].ID+"'>"+data[key].ENAME+"</option>");
313 313 }
314 314 getTemplates();
315 315 }
... ... @@ -324,7 +324,7 @@
324 324 if(grade != '-1' && subject_id != ''){
325 325 var path = "../pagetemplate/listdata?school_id=" + school_id + "&grade_id=" + grade_id + "&subject_id=" + subject_id ;
326 326 $("#TEMPLATE_ID").empty();
327   - $("#TEMPLATE_ID").append("<option value=''>自定义</option>");
  327 + $("#TEMPLATE_ID").append("<option value=''>Self-definition</option>");
328 328 $.ajax({
329 329 type: 'post',
330 330 url : path,
... ...
WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_edit2.jsp
  View file @66d02d5
... ... @@ -68,16 +68,16 @@
68 68 </select>
69 69 </td>
70 70 </tr> --%>
71   - <tr>
72   - <td style="width:75px;text-align: right;padding-top: 13px;">Semester:</td>
73   - <td>
74   - <select class="chosen-select form-control" name="TERM_ID" id="TERM_ID" data-placeholder="Semester">
75   - <c:forEach var="item" items="${terms}">
76   - <option value="${item.TERM_ID}" <c:if test="${pd.TERM_ID==item.TERM_ID}">selected="true"</c:if>>${item.NAME}</option>
77   - </c:forEach>
78   - </select>
79   - </td>
80   - </tr>
  71 +<!-- <tr> -->
  72 +<!-- <td style="width:75px;text-align: right;padding-top: 13px;">Semester:</td> -->
  73 +<!-- <td> -->
  74 +<!-- <select class="chosen-select form-control" name="TERM_ID" id="TERM_ID" data-placeholder="Semester"> -->
  75 +<!-- <c:forEach var="item" items="${terms}"> -->
  76 +<!-- <option value="${item.TERM_ID}" <c:if test="${pd.TERM_ID==item.TERM_ID}">selected="true"</c:if>>${item.NAME}</option> -->
  77 +<!-- </c:forEach> -->
  78 +<!-- </select> -->
  79 +<!-- </td> -->
  80 +<!-- </tr> -->
81 81 <tr>
82 82 <td style="text-align: center;" colspan="10">
83 83 <a class="btn btn-mini btn-primary" onclick="save();">Save</a>
... ...
WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_edit2.jsp
  View file @66d02d5
... ... @@ -38,7 +38,7 @@
38 38 <td>
39 39 <select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder="">
40 40 <c:forEach var="item" items="${gradeList}">
41   - <option value="${item.ID}">${item.NAME}</option>
  41 + <option value="${item.ID}">${item.ENAME}</option>
42 42 </c:forEach>
43 43 </select>
44 44 </td>
... ...
WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp
  View file @66d02d5
... ... @@ -41,13 +41,13 @@
41 41 <div style="padding:0 5%;background:#fff;">
42 42 <table class="table table-striped">
43 43 <col style="width: 20%" />
44   - <col style="width: 40%" />
45   - <col style="width: 40%" />
  44 + <col style="width: 80%" />
  45 +<!-- <col style="width: 40%" /> -->
46 46 <thead>
47 47 <tr>
48 48 <th><input type="checkbox" name='ids' id="ids" value="${var.SCHOOLGRADESUBJECT_ID}" />No.</th>
49 49 <th class="center">Grade name</th>
50   - <th class="center">Grade description</th>
  50 +<!-- <th class="center">Grade description</th> -->
51 51 </tr>
52 52 </thead>
53 53 </table>
... ... @@ -56,8 +56,8 @@
56 56 <div class="table_box">
57 57 <table class="table table-striped">
58 58 <col style="width: 20%" />
59   - <col style="width: 40%" />
60   - <col style="width: 40%" />
  59 + <col style="width: 80%" />
  60 +<!-- <col style="width: 40%" /> -->
61 61  
62 62 <tbody>
63 63 <c:choose>
... ... @@ -67,7 +67,7 @@
67 67 <td><input type="checkbox" name='ids' id="ids"
68 68 value="${var.SCHOOLGRADESUBJECT_ID}" />${vs.index+1}</td>
69 69 <td class='center'>${var.ENAME}</td>
70   - <td class='center'>${var.DESC}</td>
  70 +<!-- <td class='center'>${var.DESC}</td> -->
71 71 </tr>
72 72  
73 73 </c:forEach>
... ...
WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_edit2.jsp
  View file @66d02d5
... ... @@ -127,8 +127,8 @@
127 127 <col width="10%"/>
128 128 <thead>
129 129 <tr>
130   - <th style="text-align:left;"><span>question number</span><span class="redu">-</span><input type="number" class="w_100" id="que_num" value="${pd.QUESTION_COUNT==null?0:pd.QUESTION_COUNT}"/><span class="add">+</span></th>
131   - <th><span>option number</span><span class="redu">-</span><input type="number" class="w_100 ans_num" id="ans_num" value="4"/><span class="add">+</span></th>
  130 + <th style="text-align:left;"><span>question No.</span><span class="redu">-</span><input type="number" class="w_100" id="que_num" value="${pd.QUESTION_COUNT==null?0:pd.QUESTION_COUNT}"/><span class="add">+</span></th>
  131 + <th><span>option No.</span><span class="redu">-</span><input type="number" class="w_100 ans_num" id="ans_num" value="4"/><span class="add">+</span></th>
132 132 <th><span>score</span><span class="redu">-</span><input type="number" class="w_100 score" id="score" value="1"/><span class="add">+</span></th>
133 133 <th></th>
134 134 </tr>
... ... @@ -159,7 +159,7 @@
159 159 </div>
160 160  
161 161 </td>
162   - <td class="middle"><span>option number</span><span class="redu">-</span><input type="number" class="w_100 ans_num" value="${var.OPTION_NUM}"/><span class="add">+</span></td>
  162 + <td class="middle"><span>option No.</span><span class="redu">-</span><input type="number" class="w_100 ans_num" value="${var.OPTION_NUM}"/><span class="add">+</span></td>
163 163 <td class="middle"><span>score</span><span class="redu">-</span><input type="number" class="w_100 score" value="${var.SCORE}"/><span class="add">+</span></td>
164 164 <td class="last"><a class="remove"><img src="static/images/remove.png" /></a></td>
165 165 </tr>
... ... @@ -179,7 +179,7 @@
179 179 <div>
180 180 <div style="text-align: center;" colspan="10">
181 181  
182   - <a class="btn btn-mini btn-primary" onclick="save();">confirm the assignment</a>
  182 + <a class="btn btn-mini btn-primary" style="width:auto" onclick="save();">confirm the assignment</a>
183 183 <a class="btn btn-mini btn-danger" onclick="back()">Cancel</a>
184 184 </div>
185 185 </div>
... ... @@ -219,10 +219,23 @@
219 219 work.que_num=parseInt($("#que_num").val());
220 220 //日期框
221 221 $(document).on("focus",".date-picker",function(){
  222 + $.fn.datepicker.dates['en'] = {
  223 + days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
  224 + daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
  225 + daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"],
  226 + months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
  227 + monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
  228 + today: "Today",
  229 + clear: "Clear",
  230 + format: "mm/dd/yyyy",
  231 + titleFormat: "MM yyyy", /* Leverages same syntax as 'format' */
  232 + weekStart: 0
  233 + };
222 234 $(this).datepicker({
223 235 autoclose: true,
224 236 todayHighlight: true,
225   - orientation:'top'
  237 + orientation:'top' ,
  238 + language: 'en'
226 239 });
227 240 });
228 241 if(${pd.CLASS_ID==null}==true){
... ...
WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_report.jsp
  View file @66d02d5
... ... @@ -208,11 +208,28 @@
208 208 <script type="text/javascript">
209 209 $(function() {
210 210  
  211 +
  212 + $.fn.datepicker.dates['en'] = {
  213 + days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
  214 + daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
  215 + daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"],
  216 + months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
  217 + monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
  218 + today: "Today",
  219 + clear: "Clear",
  220 + format: "mm/dd/yyyy",
  221 + titleFormat: "MM yyyy", /* Leverages same syntax as 'format' */
  222 + weekStart: 0
  223 + };
  224 +
211 225 //日期框
212 226 $('.date-picker').datepicker({
213 227 autoclose : true,
214   - todayHighlight : true
  228 + todayHighlight : true,
  229 + language: 'en'
215 230 });
  231 +
  232 +
216 233  
217 234 //下拉框
218 235 if (!ace.vars['touch']) {
... ...
WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp
  View file @66d02d5
... ... @@ -133,10 +133,25 @@ li {
133 133 window.top.loading.remove();
134 134 });
135 135  
136   - $('.date-picker').datepicker({
137   - autoclose : true,
138   - todayHighlight : true
139   - });
  136 + $.fn.datepicker.dates['en'] = {
  137 + days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
  138 + daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
  139 + daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"],
  140 + months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
  141 + monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
  142 + today: "Today",
  143 + clear: "Clear",
  144 + format: "mm/dd/yyyy",
  145 + titleFormat: "MM yyyy", /* Leverages same syntax as 'format' */
  146 + weekStart: 0
  147 + };
  148 +
  149 + //日期框
  150 + $('.date-picker').datepicker({
  151 + autoclose : true,
  152 + todayHighlight : true,
  153 + language: 'en'
  154 + });
140 155 function student(classid,studentid){
141 156  
142 157 var url = "<%=basePath%>homework/student.do?STUDENT_ID=" + studentid + "&CLASS_ID=" + classid ;
... ...
WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_view.jsp
  View file @66d02d5
... ... @@ -88,8 +88,8 @@
88 88 <col width="10%"/>
89 89 <thead>
90 90 <tr>
91   - <th style="text-align:left;"><span>question number</span><input type="number" class="w_100" id="que_num" value="${pd.QUESTION_COUNT==null?0:pd.QUESTION_COUNT}"/></th>
92   - <th><span>option number</span><input type="number" class="w_100 ans_num" id="ans_num" value="4"/></th>
  91 + <th style="text-align:left;"><span>question No.</span><input type="number" class="w_100" id="que_num" value="${pd.QUESTION_COUNT==null?0:pd.QUESTION_COUNT}"/></th>
  92 + <th><span>option No.</span><input type="number" class="w_100 ans_num" id="ans_num" value="4"/></th>
93 93 <th><span>score</span><input type="number" class="w_100 score" id="score" value="1"/></th>
94 94 <th></th>
95 95 </tr>
... ... @@ -120,7 +120,7 @@
120 120 </div>
121 121  
122 122 </td>
123   - <td class="middle"><span>option number</span><input type="number" class="w_100 ans_num" value="${var.OPTION_NUM}"/></td>
  123 + <td class="middle"><span>option No.</span><input type="number" class="w_100 ans_num" value="${var.OPTION_NUM}"/></td>
124 124 <td class="middle"><span>score</span><input type="number" class="w_100 score" value="${var.SCORE}"/></td>
125 125 <td class="last"></td>
126 126 </tr>
... ...
WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp
  View file @66d02d5
... ... @@ -130,7 +130,7 @@
130 130 <div class="col-sm-6">
131 131 <select class="chosen-select form-control" name="subject_id" id="subject_id" data-placeholder="Enter the subject">
132 132 <c:forEach items="${subjectList}" var="var" varStatus="vs">
133   - <option value="${var.ID}">${var.CNAME}</option>
  133 + <option value="${var.ID}">${var.ENAME}</option>
134 134 </c:forEach>
135 135 </select>
136 136 </div>
... ... @@ -141,7 +141,7 @@
141 141 <div class="col-sm-6">
142 142 <select class="chosen-select form-control" name="grade_id" id="grade_id" data-placeholder="Enter the grade">
143 143 <c:forEach items="${gradeList}" var="var" varStatus="vs">
144   - <option value="${var.ID}">${var.NAME}</option>
  144 + <option value="${var.ID}">${var.ENAME}</option>
145 145 </c:forEach>
146 146 </select>
147 147 </div>
... ...
WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp
  View file @66d02d5
... ... @@ -52,14 +52,14 @@
52 52 <option value="">All</option>
53 53 <c:forEach items="${gradeInfos}" var="var" varStatus="vs">
54 54 <option value="${var.ID}"
55   - <c:if test="${pd.GRADE_ID==var.ID}">selected="true"</c:if>>${var.NAME}</option>
  55 + <c:if test="${pd.GRADE_ID==var.ID}">selected="true"</c:if>>${var.ENAME}</option>
56 56 </c:forEach>
57 57 </select> <label>subject: </label>&nbsp;&nbsp; <select name="subject_id"
58 58 id="subject_id" data-placeholder="这里输入所属科目">
59 59 <option value="">All</option>
60 60 <c:forEach items="${subjectInfos}" var="var" varStatus="vs">
61 61 <option value="${var.ID}"
62   - <c:if test="${pd.SUBJECT_ID==var.ID}">selected="true"</c:if>>${var.CNAME}</option>
  62 + <c:if test="${pd.SUBJECT_ID==var.ID}">selected="true"</c:if>>${var.ENAME}</option>
63 63 </c:forEach>
64 64 </select>&nbsp;&nbsp;&nbsp;&nbsp; <input class="date-picker" type="text"
65 65 placeholder="Start date" name="lastStart" id="lastStart"
... ...
WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_edit2.jsp
  View file @66d02d5
... ... @@ -51,22 +51,22 @@
51 51 <%-- <input type="text" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}" maxlength="255" placeholder="这里输入所属年级" title="所属年级" style="width:98%;"/></td> --%>
52 52 <select class="chosen-select form-control" name="GRADE_ID" disabled="disabled" id="GRADE_ID" data-placeholder="Enter the Grade" >
53 53 <c:forEach var="item" items="${grades}">
54   - <option value="${item.ID}" <c:if test="${pd.GRADE_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
55   - </c:forEach>
56   - </select>
57   - </td>
58   - </tr>
59   - <tr>
60   - <td style="width:75px;text-align: right;padding-top: 13px;">Class type:</td>
61   - <td>
62   - <%-- <input type="text" name="CLASS_TYPE" id="CLASS_TYPE" value="${pd.CLASS_TYPE}" maxlength="255" placeholder="这里输入班级类型" title="班级类型" style="width:98%;"/></td> --%>
63   - <select class="chosen-select form-control" name="CLASS_TYPE" id="CLASS_TYPE" data-placeholder="Enter the Class type">
64   - <c:forEach var="item" items="${classTypes}">
65   - <option value="${item.ID}" <c:if test="${pd.CLASS_TYPE==item.ID}">selected="true"</c:if>>${item.NAME}</option>
  54 + <option value="${item.ID}" <c:if test="${pd.GRADE_ID==item.ID}">selected="true"</c:if>>${item.ENAME}</option>
66 55 </c:forEach>
67 56 </select>
68 57 </td>
69 58 </tr>
  59 +<!-- <tr> -->
  60 +<!-- <td style="width:75px;text-align: right;padding-top: 13px;">Class type:</td> -->
  61 +<!-- <td> -->
  62 +<!-- <%-- <input type="text" name="CLASS_TYPE" id="CLASS_TYPE" value="${pd.CLASS_TYPE}" maxlength="255" placeholder="这里输入班级类型" title="班级类型" style="width:98%;"/></td> --%> -->
  63 +<!-- <select class="chosen-select form-control" name="CLASS_TYPE" id="CLASS_TYPE" data-placeholder="Enter the Class type"> -->
  64 +<!-- <c:forEach var="item" items="${classTypes}"> -->
  65 +<!-- <option value="${item.ID}" <c:if test="${pd.CLASS_TYPE==item.ID}">selected="true"</c:if>>${item.NAME}</option> -->
  66 +<!-- </c:forEach> -->
  67 +<!-- </select> -->
  68 +<!-- </td> -->
  69 +<!-- </tr> -->
70 70 <tr>
71 71 <td style="width:75px;text-align: right;padding-top: 13px;">Class name:</td>
72 72 <td><input type="text" name="CLASS_NAME" id="CLASS_NAME" value="${pd.CLASS_NAME}" maxlength="255" placeholder="Enter the Class name" title="班级名称" style="width:98%;"/></td>
... ... @@ -124,7 +124,7 @@
124 124 if($("#SCHOOL_ID").val()==""){
125 125 $("#SCHOOL_ID").tips({
126 126 side:3,
127   - msg:'请输入所属学校',
  127 + msg:'Please enter the school',
128 128 bg:'#AE81FF',
129 129 time:2
130 130 });
... ... @@ -134,27 +134,27 @@
134 134 if($("#GRADE_ID").val()==""){
135 135 $("#GRADE_ID").tips({
136 136 side:3,
137   - msg:'请输入所属年级',
  137 + msg:'Please enter the grade',
138 138 bg:'#AE81FF',
139 139 time:2
140 140 });
141 141 $("#GRADE_ID").focus();
142 142 return false;
143 143 }
144   - if($("#CLASS_TYPE").val()==""){
145   - $("#CLASS_TYPE").tips({
146   - side:3,
147   - msg:'请输入班级类型',
148   - bg:'#AE81FF',
149   - time:2
150   - });
151   - $("#CLASS_TYPE").focus();
152   - return false;
153   - }
  144 +// if($("#CLASS_TYPE").val()==""){
  145 +// $("#CLASS_TYPE").tips({
  146 +// side:3,
  147 +// msg:'请输入班级类型',
  148 +// bg:'#AE81FF',
  149 +// time:2
  150 +// });
  151 +// $("#CLASS_TYPE").focus();
  152 +// return false;
  153 +// }
154 154 if($("#CLASS_NAME").val()==""){
155 155 $("#CLASS_NAME").tips({
156 156 side:3,
157   - msg:'请输入班级名称',
  157 + msg:'Please enter the class name',
158 158 bg:'#AE81FF',
159 159 time:2
160 160 });
... ... @@ -164,7 +164,7 @@
164 164 if($("#CLASS_CODE").val()==""){
165 165 $("#CLASS_CODE").tips({
166 166 side:3,
167   - msg:'请输入班级编码',
  167 + msg:'Please enter the class coding',
168 168 bg:'#AE81FF',
169 169 time:2
170 170 });
... ... @@ -174,7 +174,7 @@
174 174 if($("#BASESTATION_ID").val()==""){
175 175 $("#BASESTATION_ID").tips({
176 176 side:3,
177   - msg:'请输入班级基站',
  177 + msg:'Please enter the classroom base station',
178 178 bg:'#AE81FF',
179 179 time:2
180 180 });
... ...
WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_list2.jsp
  View file @66d02d5
... ... @@ -44,16 +44,16 @@
44 44  
45 45 <table class="table table-striped" >
46 46 <col style="width: 10%" />
47   - <col style="width: 18%" />
48   - <col style="width: 18%" />
49   - <col style="width: 18%" />
50   - <col style="width: 18%" />
51   - <col style="width: 18%" />
  47 + <col style="width: 22.5%" />
  48 + <!-- <col style="width: 18%" /> -->
  49 + <col style="width: 22.5%" />
  50 + <col style="width: 22.5%" />
  51 + <col style="width: 22.5%" />
52 52 <thead>
53 53 <tr>
54 54 <th><input type="checkbox" value="0" name='ids' id="ids" />No.</th>
55 55 <th class="center">Class Name</th>
56   - <th class="center">Class Type</th>
  56 + <!-- <th class="center">Class Type</th> -->
57 57 <th class="center">Class Coding</th>
58 58 <th class="center">Classroom base station</th>
59 59 <th class="center">Operation</th>
... ... @@ -69,11 +69,11 @@
69 69 <div class="table_box" style="padding:0px 5%">
70 70 <table class="table table-striped" >
71 71 <col style="width: 10%" />
72   - <col style="width: 18%" />
73   - <col style="width: 18%" />
74   - <col style="width: 18%" />
75   - <col style="width: 18%" />
76   - <col style="width: 18%" />
  72 + <col style="width: 22.5%" />
  73 +<!-- <col style="width: 18%" /> -->
  74 + <col style="width: 22.5%" />
  75 + <col style="width: 22.5%" />
  76 + <col style="width: 22.5%" />
77 77 <tbody>
78 78 <!-- 开始循环 -->
79 79 <c:choose>
... ... @@ -83,7 +83,7 @@
83 83 <td><input type="checkbox" name='ids' id="ids"
84 84 value="${var.ID}" />${vs.index+1}</td>
85 85 <td class='center'><a href="student/listcs.do?class_id=${var.ID }">${var.CLASS_NAME}</a></td>
86   - <td class='center'>${myelfun:findClassTypeName(var.CLASS_TYPE)}</td>
  86 +<!-- <td class='center'>${myelfun:findClassTypeName(var.CLASS_TYPE)}</td> -->
87 87 <td class='center'>${var.CLASS_CODE}</td>
88 88 <td class='center'>${myelfun:findBasestationName(var.BASESTATION_ID)}</td>
89 89  
... ...
WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_edit2.jsp
  View file @66d02d5
... ... @@ -38,7 +38,7 @@
38 38 <td>
39 39 <select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="Enter the Course name">
40 40 <c:forEach var="item" items="${varList}">
41   - <option value="${item.ID}">${item.CNAME}</option>
  41 + <option value="${item.ID}">${item.ENAME}</option>
42 42 </c:forEach>
43 43 </select>
44 44 </td>
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/en_creat_template.jsp 0 → 100644
  View file @66d02d5
  1 +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
  2 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
  3 +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  4 +<%
  5 + String path = request.getContextPath();
  6 + String basePath = request.getScheme() + "://"
  7 + + request.getServerName() + ":" + request.getServerPort()
  8 + + path + "/";
  9 +%>
  10 +
  11 +<!DOCTYPE html>
  12 +
  13 +<html lang="en">
  14 +<head>
  15 + <title>创建模板</title>
  16 + <!-- 最新版本的 Bootstrap 核心 CSS 文件 -->
  17 + <link rel="stylesheet" href="../static/css/bootstrap.min.css">
  18 + <link rel="stylesheet" href="../static/css/style.css"/>
  19 + <script type="text/javascript" src="../static/js/jquery.min.js"></script>
  20 + <!-- 最新的 Bootstrap 核心 JavaScript 文件 -->
  21 + <script src="../static/js/bootstrap.min.js"></script>
  22 +</head>
  23 +<body>
  24 + <div class="page-header">
  25 + <div class="header_box container" style="display:block;">
  26 + <h1 class="text-center">&nbsp;</h1>
  27 + <div class="btn_group">
  28 + <div class="pull-left"><h3>Total Score:<span id='score_all'>0</span> </h3></div>
  29 + <div class="btn_box pull-right">
  30 + <button type="button" class="btn btn-success btn-lg" data-toggle="modal" data-target=".addQuestion" id="fast">Add</button>
  31 + <input type="button" class="btn btn-success btn-lg" name="save" value="Save" id="save"/>
  32 + <!-- <button type="button" class="btn btn-success btn-lg" data-toggle="modal" data-target=".fast" id="fast">单选出题</button>
  33 + <button type="button" class="btn btn-success btn-lg" data-toggle="modal" data-target=".addQuestion" id="addQuestion">多选出题</button> -->
  34 + <div class="clearfix"></div>
  35 + </div>
  36 + <div class="clearfix"></div>
  37 + </div>
  38 + </div>
  39 + </div>
  40 +
  41 + <div class="content container">
  42 +
  43 + </div>
  44 +
  45 +
  46 +
  47 +<!--添加试题-->
  48 +<div class="modal fade addQuestion" tabindex="-1" role="dialog">
  49 + <div class="modal-dialog" role="document">
  50 + <div class="modal-content">
  51 + <div class="modal-header">
  52 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
  53 + <h4 class="modal-title">Add Questions</h4>
  54 + </div>
  55 +
  56 +
  57 + <div class="modal-body">
  58 + <div class="form-group">
  59 + <label for="type" class="col-sm-4 control-label">Question Types</label>
  60 + <div class="col-sm-8">
  61 + <select class="form-control" id="type">
  62 + <option value="1">Single choice</option>
  63 + <option value="2">Multiple choice</option>
  64 + </select>
  65 + </div>
  66 + <div class="clearfix"></div>
  67 + </div>
  68 + <div class="form-group">
  69 + <label for="num_ans_2" class="col-sm-4 control-label">Option No.</label>
  70 + <div class="col-sm-8">
  71 + <select class="form-control" id="num_ans_2">
  72 + <option value="2">2</option>
  73 + <option value="3">3</option>
  74 + <option value="4" selected>4</option>
  75 + <option value="5">5</option>
  76 + <option value="6">6</option>
  77 + <option value="7">7</option>
  78 + <option value="8">8</option>
  79 + <option value="9">9</option>
  80 + <option value="10">10</option>
  81 + </select>
  82 + </div>
  83 + <div class="clearfix"></div>
  84 + </div>
  85 + <div class="form-group">
  86 + <label for="index_s_2" class="col-sm-4 control-label">Item No.</label>
  87 + <div class="col-sm-8">
  88 + <input type="number" class="form-control" id="index_s_2" placeholder="Please enter the Item No." maxlength="119">
  89 +
  90 + <div class="tips" style="color:#f00"></div>
  91 + </div>
  92 + <div class="clearfix"></div>
  93 + </div>
  94 + <div class="form-group">
  95 + <label for="fraction2" class="col-sm-4 control-label">Score for single question</label>
  96 + <div class="col-sm-8">
  97 + <input type="number" class="form-control" id="fraction2" placeholder="" value="1">
  98 + </div>
  99 + <div class="clearfix"></div>
  100 + </div>
  101 + </div>
  102 +
  103 +
  104 + <div class="modal-footer">
  105 + <button type="button" class="btn btn-default" id="addQuestion_submit">Confirm</button>
  106 + <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
  107 + </div>
  108 + </div><!-- /.modal-content -->
  109 + </div><!-- /.modal-dialog -->
  110 +</div><!-- /.modal -->
  111 +
  112 +
  113 +<div class="loading" style="background:rgba(0,0,0,0.5);width:100%;height:100%;position:fixed;top:0;display:none;">
  114 + <img src="../static/images/loading.gif" width="200px" style="position:absolute;top:0;bottom:0;left:0;right:0;margin:auto;"/>
  115 +</div>
  116 +<script>
  117 + var template = ${TEMPLEATE == null ? "[]" : TEMPLEATE.CONTENT};
  118 + var URL = "<%=basePath%>pagetemplate/save2.do?user_id=${pd.USER_ID}&name=${pd.NAME}&subject_id=${pd.SUBJECT_ID}&school_id=${pd.SCHOOL_ID}&grade_id=${pd.GRADE_ID}&content=";
  119 + var JUMP_URL = "<%=basePath%>/${JUMP_URL}";
  120 + var subject_id = '${pd.SUBJECT_ID}';
  121 + var school_id = '${pd.SCHOOL_ID}';
  122 + var grade_id = '${pd.GRADE_ID}';
  123 + var title = '${pd.NAME}';
  124 + $(document).ready(function(){
  125 + var _height = $(".page-header").height();
  126 + $(".content").css("padding-top",_height);
  127 +
  128 + });
  129 +
  130 +
  131 +
  132 + //var testData={"title":"TEST1","exam_time":46,"paper_type":"1","subject_id":"1","grade_id":"1","user_id":"1","score":5,"questions":[{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"单选","option_num":"","option_content":"","answer":"","difficulty":"","analysis":"","question_from":"","score":1,"part_score":"","remark":"","rank":"1","no_name":"一、","questions":[{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"A","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.1"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"B","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.2"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"C","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.3"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"D","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.4"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"A","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.5"}]}]};
  133 + //var testData={"title":"TEST1","exam_time":46,"paper_type":"1","subject_id":"1","grade_id":"1","user_id":"1","score":5,"questions":[]};
  134 +</script>
  135 +<script type="text/javascript" src="../static/js/en_control_template.js?a=0"></script>
  136 +
  137 +
  138 +</body>
  139 +</html>
0 140 \ No newline at end of file
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_edit2.jsp
  View file @66d02d5
... ... @@ -82,7 +82,7 @@
82 82 <td>
83 83 <select class="chosen-select form-control" name="SUBJECT_IDS" id="SUBJECT_IDS" data-placeholder="subjects">
84 84 <c:forEach var="item" items="${subjects}">
85   - <option value="${item.ID}" <c:if test="${pd.SUBJECT_IDS==item.ID}">selected="true"</c:if>>${item.CNAME}</option>
  85 + <option value="${item.ID}" <c:if test="${pd.SUBJECT_IDS==item.ID}">selected="true"</c:if>>${item.ENAME}</option>
86 86 </c:forEach>
87 87 </select>
88 88 </td>
... ...