diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
index 65fbcf9..8c12a56 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -17,9 +17,10 @@
 <title>中天电子-教育管理系统</title>
 
 <!-- Bootstrap -->
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 <link href="../static/css/teach.css?a=1" rel="stylesheet">
 <link href="../static/css/mb_style.css" rel="stylesheet">
 
@@ -278,9 +279,9 @@
 			<!-- /.modal-dialog -->
 		</div>
 		<!-- /.modal -->
-		<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+		<script src="../static/js/jquery.min.js"></script>
 		<script
-			src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+			src="../static/js/bootstrap.min.js"></script>
 		<script src="../static/js/model.js"></script>
 		<script src="../static/js/loading.js"></script>
 		<script src="../static/js/remove.js?a=2"></script>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
index 74820c5..85c1025 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
@@ -17,9 +17,10 @@
 <title>SunVote-Education Management System</title>
 
 <!-- Bootstrap -->
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 <link href="../static/css/en_teach.css?a=1" rel="stylesheet">
 <link href="../static/css/mb_style.css" rel="stylesheet">
 
@@ -50,7 +51,7 @@
 				<div class="name">
 					<p>welcome！</p>
 					<p id="school" title="${SNAME }">${SNAME }</p>
-					<p id="name" title="${SNAME } 管理员">${SNAME }administrator</p>
+					<p id="name" title="${SNAME } administrator">${SNAME }administrator</p>
 					</br>
 					</br>
 				</div>
@@ -87,7 +88,7 @@
 				</p>
 				<ul class="menu_1">
 					<li>
-						<p>Course management</p>
+						<p>Courses management</p>
 						<ul class="menu_2">
 							<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
 								<li
@@ -247,7 +248,7 @@
 							<div class="clearfix"></div>
 						</div>
 						<div class="form-group">
-							<label for="enter_time" class="col-sm-4 control-label">subject</label>
+							<label for="enter_time" class="col-sm-4 control-label">Subject</label>
 							<div class="col-sm-6">
 								<select class="chosen-select form-control" name="subject_id"
 									id="subject_id" onchange="getTemplates()"
@@ -278,12 +279,12 @@
 			<!-- /.modal-dialog -->
 		</div>
 		<!-- /.modal -->
-		<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+		<script src="../static/js/jquery.min.js"></script>
 		<script
-			src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+			src="../static/js/bootstrap.min.js"></script>
 		<script src="../static/js/model.js"></script>
 		<script src="../static/js/loading.js"></script>
-		<script src="../static/js/remove.js?a=2"></script>
+		<script src="../static/js/en_remove.js?a=2"></script>
 		<script src="../static/js/dailog.js"></script>
 		<script type="text/javascript">
 	
diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp
index 1ab487f..b4f42b7 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list2.jsp
@@ -15,9 +15,10 @@
 <base href="<%=basePath%>">
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp
index 9cf6f3b..22a91dd 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp
@@ -15,9 +15,10 @@
 <base href="<%=basePath%>">
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
@@ -49,7 +50,7 @@
 					<col style="width: 30%" />
 					<thead>
 						<tr>
-							<th><input type="checkbox" name='ids' id="ids" />Number</th>
+							<th><input type="checkbox" name='ids' id="ids" />No.</th>
 							<th>Teacher Name</th>
 							<th>Class Name</th>
 							<th>Subject</th>
@@ -87,7 +88,7 @@
 			</table>
 			<div class="footer">
 				<div class="creat">
-					<input type="button"  onclick="add()" value="Distribute class teacher task" />
+					<input type="button"  onclick="add()" value="Distribute class task" />
 				</div>
 				<div class="removeAll">
 					<input type="button" onclick="deleteAll()" value="Remove class task" />
@@ -118,6 +119,7 @@
 	<script type="text/javascript">
 	$(document).ready(function(){
 		window.top.loading.remove();	
+		$(".table_box").css("padding-top",$(".head_box").height());
 	});
 	
 	function tosearch(){
diff --git a/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_edit2.jsp
index 40cc522..d234b50 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_edit2.jsp
@@ -34,7 +34,7 @@
 						<div id="zhongxin" style="padding-top: 13px;">
 						<table id="table_report" class="table">
 							<tr>
-								<td style="width:75px;text-align: right;padding-top: 13px;">Course name:</td>
+								<td style="width:110px;text-align: right;padding-top: 13px;">Course name:</td>
 								<td>
 									<select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder="">
 									<c:forEach var="item" items="${gradeList}">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp
index 236919f..5e0934d 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp
@@ -15,12 +15,13 @@
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
 <!-- jsp文件头和头部 -->
-<link href="../static/css/teach.css" rel="stylesheet">
+<link href="static/css/teach.css" rel="stylesheet">
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 </head>
 <body class="no-skin">
@@ -39,12 +40,12 @@
 			</div>
 			<div style="padding:0 5%;background:#fff;">
 				<table class="table table-striped">
-					<col style="width: 10%" />
-					<col style="width: 45%" />
-					<col style="width: 45%" />
+					<col style="width: 20%" />
+					<col style="width: 40%" />
+					<col style="width: 40%" />
 					<thead>
 						<tr>
-							<th><input type="checkbox" name='ids' id="ids" value="${var.SCHOOLGRADESUBJECT_ID}" />Number</th>
+							<th><input type="checkbox" name='ids' id="ids" value="${var.SCHOOLGRADESUBJECT_ID}" />No.</th>
 							<th class="center">Grade name</th>
 							<th class="center">Grade description</th>
 						</tr>
@@ -54,10 +55,9 @@
 		</div>
 		<div class="table_box">
 			<table class="table table-striped">
-				<col style="width: 10%" />
-				<col style="width: 30%" />
-				<col style="width: 30%" />
-				<col style="width: 30%" />
+				<col style="width: 20%" />
+				<col style="width: 40%" />
+				<col style="width: 40%" />
 
 				<tbody>
 					<c:choose>
@@ -67,9 +67,7 @@
 									<td><input type="checkbox" name='ids' id="ids"
 										value="${var.SCHOOLGRADESUBJECT_ID}" />${vs.index+1}</td>
 									<td class='center'>${var.NAME}</td>
-									<td class='center'>${var.DESC}</td>
-									<td class='center'></td>
-
+									<td class='center'>${var.DESC}</td>								
 								</tr>
 
 							</c:forEach>
@@ -116,6 +114,7 @@
 	<script type="text/javascript">
 		$(document).ready(function(){
 			window.top.loading.remove();
+			$(".table_box").css("padding-top",$(".head_box").height());
 		});
 		
 		//检索
diff --git a/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp
index 81911b2..379d60b 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/grade/grade_list2.jsp
@@ -15,12 +15,13 @@
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
 <!-- jsp文件头和头部 -->
-<link href="../static/css/teach.css" rel="stylesheet">
+<link href="static/css/teach.css" rel="stylesheet">
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 </head>
 <body class="no-skin">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_list2.jsp
index 9afe34f..763b51b 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_list2.jsp
@@ -21,7 +21,10 @@
 
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
-<link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+<!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 </head>
 <body class="no-skin">
@@ -29,8 +32,9 @@
 
 	<!-- 检索  -->
 	<form action="headmaster/listcs.do" method="post" name="Form" id="Form">
-		<input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
-		<input type="hidden" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}"/>
+		<input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID"
+			value="${pd.SCHOOL_ID}" /> <input type="hidden" name="GRADE_ID"
+			id="GRADE_ID" value="${pd.GRADE_ID}" />
 		<div class="head_box">
 			<div class="box_header">
 				<div class="head_box_l">
@@ -40,18 +44,19 @@
 				</div>
 				<div class="clearfix"></div>
 			</div>
-			<div style="background:#fff;padding:0 5%;" >
+			<div style="background:#fff;padding:0 5%;">
 
-				<table class="table table-striped" >
+				<table class="table table-striped">
 					<col style="width: 10%" />
 					<col style="width: 10%" />
+					<col style="width: 20%" />
 					<col style="width: 10%" />
-					<col style="width: 10%" />					
 					<col style="width: 20%" />
 					<col style="width: 20%" />
+					<col style="width: 10%" />
 					<thead>
 						<tr>
-							<th><input type="checkbox" value="0" name='ids' id="ids" />Number</th>
+							<th><input type="checkbox" value="0" name='ids' id="ids" />No.</th>
 							<th class="center">Name</th>
 							<th class="center">User Name</th>
 							<th class="center">Password</th>
@@ -59,7 +64,7 @@
 							<th class="center">Class</th>
 							<th class="center">Operation</th>
 						</tr>
-						
+
 					</thead>
 				</table>
 			</div>
@@ -68,52 +73,58 @@
 			<!-- 检索  -->
 
 		</div>
-		<div class="table_box" >
-			<table class="table table-striped" >
+		<div class="table_box">
+			<table class="table table-striped">
 				<col style="width: 10%" />
-				<col style="width: 10%" />
-				<col style="width: 10%" />
-				<col style="width: 10%" />				
-				<col style="width: 20%" />
-				<col style="width: 20%" />
+					<col style="width: 10%" />
+					<col style="width: 20%" />
+					<col style="width: 10%" />
+					<col style="width: 20%" />
+					<col style="width: 20%" />
+					<col style="width: 10%" />
 				<tbody>
 					<!-- 开始循环 -->
-				<c:choose>
-					<c:when test="${not empty varList}">
-						<c:forEach items="${varList}" var="var" varStatus="vs">
-							<tr>		
-								<td><input type="checkbox" name='ids' id="ids"
+					<c:choose>
+						<c:when test="${not empty varList}">
+							<c:forEach items="${varList}" var="var" varStatus="vs">
+								<tr>
+									<td><input type="checkbox" name='ids' id="ids"
 										value="${var.ID}" />${vs.index+1}</td>
-								<td class='center'>${var.NAME}</td>
-								<td class='center'>${var.USERNAME}</td>
-								<td class='center'>${var.PASSWORD}</td>								
-								<td class='center'>${var.PHONE}</td>
-								<td class='center'>${var.CLASS_NAME}</td>
-								<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>								
-							</tr>
+									<td class='center'>${var.NAME}</td>
+									<td class='center'>${var.USERNAME}</td>
+									<td class='center'>${var.PASSWORD}</td>
+									<td class='center'>${var.PHONE}</td>
+									<td class='center'>${var.CLASS_NAME}</td>
+									<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>
+								</tr>
 
-						</c:forEach>
-					</c:when>
-					<c:otherwise>
-						<tr class="main_info">
-							<td colspan="100" class="center">There is no data</td>
-						</tr>
-					</c:otherwise>
-				</c:choose>
+							</c:forEach>
+						</c:when>
+						<c:otherwise>
+							<tr class="main_info">
+								<td colspan="100" class="center">There is no data</td>
+							</tr>
+						</c:otherwise>
+					</c:choose>
 				</tbody>
 			</table>
 			<div class="footer" style="width:auto;margin: 0px 5%;">
 				<div class="creat">
 					<input type="button" onclick="add();" value="Add the monitor" />
 				</div>
-				 <div class="removeAll">
+				<div class="removeAll">
 					<input type="button" onclick="del();" value="Remove" />
-				</div> 
-				
+				</div>
+
 				<div class="page_box">
-					<div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
+					<div class="pagination"
+						style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
 				</div>
-			</div> 
+			</div>
 		</div>
 	</form>
 	</div>
@@ -124,7 +135,11 @@
 	<%@ include file="../../system/index/foot.jsp"%>
 
 	<script type="text/javascript">
+	$(document).ready(function(){
 		window.top.loading.remove();
+		$(".table_box").css("padding-top",$(".head_box").height());
+	});
+		
 		//检索
 		function tosearch(){
 			$("#Form").submit();
@@ -165,24 +180,26 @@
 					
 					$.ajax({
 							type: "POST",
-							url: '<%=basePath%>headmaster/deleteAll.do?tm='+new Date().getTime(),
-					    	data: {DATA_IDS:str},
-							dataType:'json',
-							//beforeSend: validateData,
-							cache: false,
-							success: function(data){
-								tosearch();
+							url: '<%=basePath%>headmaster/deleteAll.do?tm='
+													+ new Date().getTime(),
+											data : {
+												DATA_IDS : str
+											},
+											dataType : 'json',
+											//beforeSend: validateData,
+											cache : false,
+											success : function(data) {
+												tosearch();
+											}
+										});
+
+							} else {
+								console.log("false");
 							}
-						});
-					
-				}
-				else{
-					console.log("false");
-				}
-			}});
+						}
+					});
 			window.top.remove.show();
 		}
-
 	</script>
 
 
diff --git a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp
index 8e59eff..25acee3 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp
@@ -21,7 +21,10 @@
 
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
-<link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+<!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 </head>
 <body class="no-skin">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_edit2.jsp
index 02f3a89..075737b 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_edit2.jsp
@@ -51,11 +51,11 @@
 						<table id="table_report" class="table">
 							<tr>
 								<td style="width:95px;text-align: right;padding-top: 13px;">Exercise Title</td>
-								<td><input type="text" name="NAME" class="form-control" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="输入练习标题，不超过20个汉字" title="作业代码" /></td>
+								<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>
 							</tr>
 							<tr>
 								<td style="width:95px;text-align: right;padding-top: 13px;">Exercise Description</td>
-								<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>
+								<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>
 							</tr>
 							<tr>
 								<td style="width:95px;text-align: right;padding-top: 13px;">Assign completed time of class</td>
@@ -210,7 +210,7 @@
 	<!--提示框-->
 	<script type="text/javascript" src="static/js/jquery.tips.js"></script>
 	<!--页面交互-->
-	<script src="static/js/control_homework.js?t=2"></script>
+	<script src="static/js/en_control_homework.js?t=2"></script>
 	<script>
 	var homework_id="${pd.HOMEWORK_ID}";
 	
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_list.jsp
index 0c86a51..bef94c3 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_list.jsp
@@ -49,22 +49,22 @@
 			<div style="padding:0 5%;background:#fff;">
 				<table class="table table-striped">
 				<col style="width: 8%" />
-				<col style="width: 20%" />
+				<col style="width: 15%" />
 				<col style="width: 15%" />
 				<col style="width: 15%" />
 				<col style="width: 10%" />
-				<col style="width: 7%" />
 				<col style="width: 10%" />
-				<col style="width: 5%" />
+				<col style="width: 10%" />
+				<col style="width: 7%" />
 				<col style="width: 10%" />
 				<thead>
 					<tr>
-						<th><input type="checkbox"  name='ids' id="ids" />Number</th>
+						<th><input type="checkbox"  name='ids' id="ids" />No.</th>
 						<th>Exercise List</th>
 						<th>Assignment time</th>
 						<th>Completion time</th>
 						<th>Class</th>
-						<th>Item number</th>
+						<th>Item No.</th>
 						<th>Completion Situation</th>
 						<th>Total score</th>
 						<th>Operation</th>
@@ -76,13 +76,13 @@
 		<div class="table_box">
 			<table class="table table-striped">
 				<col style="width: 8%" />
-				<col style="width: 20%" />
+				<col style="width: 15%" />
 				<col style="width: 15%" />
 				<col style="width: 15%" />
 				<col style="width: 10%" />
-				<col style="width: 7%" />
 				<col style="width: 10%" />
-				<col style="width: 5%" />
+				<col style="width: 10%" />
+				<col style="width: 7%" />
 				<col style="width: 10%" />
 				<tbody>
 				<c:choose>
@@ -150,6 +150,7 @@
 	<script type="text/javascript">
 	$(document).ready(function() {
 		window.top.loading.remove();
+		$(".table_box").css("padding-top",$(".head_box").height());
 		//日期框
 		$('.date-picker').datepicker({
 			autoclose: true,
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_report.jsp
index cde39be..c6d25ef 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_report.jsp
@@ -22,9 +22,10 @@
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
   <link type="text/css" href="static/css/tablescroller.css" rel="stylesheet" />
 
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
 
@@ -70,7 +71,7 @@
 					<td><div style="width:150px;text-align:center;">Course statistics: ${fn:length(pd.DATA.HOMEWORKS)}</div></td>
 					<td><div style="width:150px;text-align:center;">Class roster: ${myelfun:findClassName(pd.CLASS_ID)}</div></td>
 				
-					<td><div style="width:150px;text-align:center;"><span>student number: ${fn:length(pd.DATA.STUDENTS)}</span></div></td>
+					<td><div style="width:150px;text-align:center;"><span>Student number: ${fn:length(pd.DATA.STUDENTS)}</span></div></td>
 					<td></td>
 					
 				
@@ -111,7 +112,7 @@
 				</thead>
 				<tbody>
 					<tr>
-						<td class="center"><div style="width:150px;">course total scores of class</div></td>
+						<td class="center"><div style="width:150px;">Class total score</div></td>
 						<td class="center"><div style="width:150px;"></div></td>
 						<td class="center"><div style="width:80px;"></div></td>
 						<td class="center"><div style="width:80px;"></div></td>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp
index fac50cc..9af6afd 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp
@@ -77,12 +77,12 @@ li {
 				<div class="info row">
 					<div class="col-md-6">
 						<p>
-							Class average score<span id="class_avg">0.0</span>%
+							Class Average<span id="class_avg">0.0</span>%
 						</p>
 					</div>
 					<div class="col-md-6">
 						<p>
-							Highest grade rate in class<span id="class_max">0.0</span>%
+							Class Highest<span id="class_max">0.0</span>%
 						</p>
 					</div>
 				</div>
@@ -95,16 +95,16 @@ li {
 					<div class="col-md-9">
 						<div class="color">
 							<ul>
-								<li><span class="green"></span>Class average </li>
-								<li><span class="blue"></span>Student personal</li>
-								<li><span class="yellow"></span>Highest score in class</li>
+								<li><span class="green"></span>Class AVG </li>
+								<li><span class="blue"></span>Student</li>
+								<li><span class="yellow"></span>Class Highest</li>
 								<div class="clear"></div>
 							</ul>
 						</div>
 						<div class="check_box">
 							<input type="radio" checked value="1" name="check" id="check1" />
-							<label for="check1">According to the scoring rate</label> <input type="radio" value="2"
-								name="check" id="check2" /> <label for="check2">According to the score</label>
+							<label for="check1">Correct Rate</label> <input type="radio" value="2"
+								name="check" id="check2" /> <label for="check2">Marks</label>
 						</div>
 					</div>
 				</div>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
index 256c115..12618b9 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
@@ -22,9 +22,10 @@
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
   <link type="text/css" href="static/css/tablescroller.css" rel="stylesheet" />
 
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
 
diff --git a/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp
index f3e51e5..b0753ea 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp
@@ -14,9 +14,10 @@
 <base href="<%=basePath%>">
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
@@ -46,7 +47,7 @@
 					<col style="width: 12.5%" />
 					<thead>
 						<tr>
-							<th><input type="checkbox" name='ids' id="ids" />Number</th>
+							<th><input type="checkbox" name='ids' id="ids" />No.</th>
 							<th class="center">Template name</th>
 							<th class="center">Subject</th>
 							<th class="center">Grade</th>
@@ -172,6 +173,7 @@
 	
 	$(document).ready(function() {
 		window.top.loading.remove();
+		$(".table_box").css("padding-top",$(".head_box").height());
 	});
 	
 	$('#ids').on('click', function(){
diff --git a/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/pagetemplate_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/pagetemplate_list2.jsp
index 2a74a0b..981672b 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/pagetemplate_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/pagetemplate_list2.jsp
@@ -14,9 +14,10 @@
 <base href="<%=basePath%>">
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list2.jsp
index 981ac4c..dd9dddc 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list2.jsp
@@ -15,13 +15,14 @@
 <title>SunVote-Education Management System</title>
 
 <!-- Bootstrap -->
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 <link href="../static/css/teach.css" rel="stylesheet">
 <link rel="stylesheet" href="../static/ace/css/datepicker.css" /> 
 <script src="../static/js/loading.js"></script>
-<script src="../static/js/remove.js?a=1"></script>
+<script src="../static/js/en_remove.js?a=1"></script>
 <script src="../static/js/dailog.js"></script>
 
 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询（media queries）功能 -->
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp
index 03d4635..93d5944 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp
@@ -17,13 +17,15 @@
 <title>中天电子-教育管理系统</title>
 
 <!-- Bootstrap -->
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 <link href="../static/css/teach.css" rel="stylesheet">
 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
+<script src="../static/js/jquery.min.js"></script>
 <script src="../static/js/loading.js"></script>
-<script src="../static/js/remove.js?a=1"></script>
+<script src="../static/js/en_remove.js?a=1"></script>
 <script src="../static/js/dailog.js"></script>
 
 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询（media queries）功能 -->
@@ -82,11 +84,11 @@
 					<col style="width: 10%" />
 					<thead>
 						<tr>
-							<th><input type="checkbox" name='ids' id="ids" />number</th>
+							<th><input type="checkbox" name='ids' id="ids" />No.</th>
 							<th>Test title</th>
 							<th>Grade</th>
 							<th>Class</th>
-							<th>出卷老师</th>
+							<th>Instructor</th>
 							<th>Creation time</th>
 							<th>Recommended test duration</th>
 							<th>Total score</th>
@@ -175,7 +177,7 @@
 		
 		function del(Id){
 			//var remove = new remove();
-			window.top.remove.init({"title":"删除","func":function(success){
+			window.top.remove.init({"title":"Remove","func":function(success){
 				if(success){
 					var url = "<%=basePath%>paper/delete.do?PAPER_ID="+Id+"&qingsongkao=true&tm="+new Date().getTime();
 					window.top.loading.show();
@@ -214,7 +216,7 @@
 		});
 		
 		function deleteAll(){
-			window.top.remove.init({"title":"删除","func":function(success){
+			window.top.remove.init({"title":"Remove","func":function(success){
 				if(success){
 					var str = '';
 					for(var i=0;i < document.getElementsByName('ids').length;i++){
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp
index be7bba4..36c8a2d 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp
@@ -16,13 +16,15 @@
 <title>中天电子-教育管理系统</title>
 
 <!-- Bootstrap -->
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 <link href="../static/css/teach.css" rel="stylesheet">
 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
+<script src="../static/js/jquery.min.js"></script>
 <script src="../static/js/loading.js"></script>
-<script src="../static/js/remove.js?a=1"></script>
+<script src="../static/js/en_remove.js?a=1"></script>
 <script src="../static/js/dailog.js"></script>
 
 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询（media queries）功能 -->
@@ -62,14 +64,14 @@
 				<col style="width: 10%" />
 				<thead>
 					<tr>
-						<th><input type="checkbox"  name='ids' id="ids" />Number</th>
+						<th><input type="checkbox"  name='ids' id="ids" />No.</th>
 						<th>Test title</th>
 						<th>Creation time</th>
-						<th>grade</th>
-						<th>subject</th>
+						<th>Grade</th>
+						<th>Subject</th>
 						<th>Recommended test duration</th>
 						<th>Total score</th>
-						<th>operation</th>
+						<th>Operation</th>
 					</tr>
 				</thead>
 			</table>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
index 7962221..6245c9f 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
@@ -15,9 +15,10 @@
 <title>中天电子-教育管理系统</title>
 
 <!-- Bootstrap -->
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 <link href="../static/css/teach.css" rel="stylesheet">
 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
 <script src="../static/js/loading.js"></script>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
index 4eec2f5..0f8a874 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
@@ -16,9 +16,10 @@
 <title>中天电子-教育管理系统</title>
 
 <!-- Bootstrap -->
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 <link href="../static/css/teach.css" rel="stylesheet">
 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
 <script src="../static/js/loading.js"></script>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
index 85d1141..5d6b7f6 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
@@ -16,9 +16,10 @@
 <title>中天电子-教育管理系统</title>
 
 <!-- Bootstrap -->
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 <link href="../static/css/teach.css" rel="stylesheet">
 <link rel="stylesheet" href="../static/ace/css/datepicker.css" />
 <script src="../static/js/loading.js"></script>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/school/en_school_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/school/en_school_edit2.jsp
index da5030b..f350e3c 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/school/en_school_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/school/en_school_edit2.jsp
@@ -12,9 +12,10 @@
 <base href="<%=basePath%>">
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
@@ -53,8 +54,8 @@
 	    padding: 10px 15px;
 	    width:100%;
 	}
-	.school_info .col-sm-4{
-		width:100px;
+	.school_info .col-md-4{
+		
 		padding-right:0;
 		line-height:34px;
 		font-size:16px;
@@ -79,39 +80,39 @@
 			</div>
 		</div>
 					
-		<div class="col-md-6 school_info" style="margin-left:25%;margin-top:5%;">
+		<div class="col-md-8 school_info" style="margin-left:16.6%;margin-top:5%;">
 			<div class="form-group">
-			    <label for="enter_title" class="col-sm-4 control-label">School name:</label>
-			    <div class="col-sm-8">
+			    <label for="enter_title" class="col-md-4 control-label">School name:</label>
+			    <div class="col-md-8">
 			      <input type="text" class="form-control" disabled placeholder="Enter the School name"  maxlength="100" minlength="1"  name="NAME" id="NAME" value="${pd.NAME}">
 			    </div>
 			    <div class="clearfix"></div>
 			</div>
 	       
 	        <div class="form-group">
-			    <label for="enter_time" class="col-sm-4 control-label">School address:</label>
-			    <div class="col-sm-8">
+			    <label for="enter_time" class="col-md-4 control-label">School address:</label>
+			    <div class="col-md-8">
 			      <input type="text" class="form-control" disabled placeholder="Enter the school address"  name="ADDRESS" id="ADDRESS" value="${pd.ADDRESS}" maxlength="255" >
 			    </div>
 			    <div class="clearfix"></div>
 			</div>
 			 <div class="form-group">
-			    <label for="enter_time" class="col-sm-4 control-label">Headmaster:</label>
-			    <div class="col-sm-8">
+			    <label for="enter_time" class="col-md-4 control-label">Headmaster:</label>
+			    <div class="col-md-8">
 			      <input type="text" class="form-control" disabled placeholder="Enter the Headmaster" name="PRESIDENT" id="PRESIDENT" value="${pd.PRESIDENT}" maxlength="255" >
 			    </div>
 			    <div class="clearfix"></div>
 			</div>
 			 <div class="form-group">
-			    <label for="enter_time" class="col-sm-4 control-label">Contact number:</label>
-			    <div class="col-sm-8">
+			    <label for="enter_time" class="col-md-4 control-label">Contact number:</label>
+			    <div class="col-md-8">
 			      <input type="text" class="form-control" disabled placeholder="Enter the Contact number" name="PHONE" id="PHONE" value="${pd.PHONE}" maxlength="255" >
 			    </div>
 			    <div class="clearfix"></div>
 			</div>
 			 <div class="form-group">
-			    <label for="enter_time" class="col-sm-4 control-label">Remarks:</label>
-			    <div class="col-sm-8">
+			    <label for="enter_time" class="col-md-4 control-label">Remarks:</label>
+			    <div class="col-md-8">
 			      <input type="text" class="form-control" disabled placeholder="Enter the Remarks"  name="REMARK" id="REMARK"  value="${pd.REMARK}" maxlength="255" >
 			    </div>
 			    <div class="clearfix"></div>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/school/other_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/school/other_edit.jsp
index 771c94a..67d5353 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/school/other_edit.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/school/other_edit.jsp
@@ -12,9 +12,10 @@
 <base href="<%=basePath%>">
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
diff --git a/WebRoot/WEB-INF/jsp/sunvote/school/school_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/school/school_edit2.jsp
index 8b73c2d..26a069d 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/school/school_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/school/school_edit2.jsp
@@ -12,9 +12,10 @@
 <base href="<%=basePath%>">
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
diff --git a/WebRoot/WEB-INF/jsp/sunvote/school/school_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/school/school_list2.jsp
index 37959b7..a3fa0ee 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/school/school_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/school/school_list2.jsp
@@ -13,9 +13,10 @@
 <base href="<%=basePath%>">
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
diff --git a/WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_list2.jsp
index a01b53e..c570180 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_list2.jsp
@@ -19,7 +19,10 @@
 
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
-<link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+<!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 </head>
 <body class="no-skin">
@@ -48,11 +51,11 @@
 					<col style="width: 18%" />
 					<thead>
 						<tr>
-							<th><input type="checkbox" value="0" name='ids' id="ids" />Number</th>
+							<th><input type="checkbox" value="0" name='ids' id="ids" />No.</th>
 							<th class="center">Class Name</th>
 							<th class="center">Class Type</th>
 							<th class="center">Class Coding</th>
-							<th class="center">班级基站</th>
+							<th class="center">Classroom base station</th>
 							<th class="center">Operation</th>
 						</tr>
 					</thead>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
index c4e6843..99024ff 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
@@ -19,7 +19,10 @@
 
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
-<link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+<!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 </head>
 <body class="no-skin">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/en_student_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/en_student_edit2.jsp
index 2dd977b..b66ea09 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/student/en_student_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/en_student_edit2.jsp
@@ -114,7 +114,7 @@ input[type="text"],select {
 			</li>
 			
 			<li>
-				<p>Sex:</p>
+				<p>Gender:</p>
 				<div class="li_r">
 					<select class="chosen-select form-control" name="SEX" id="SEX"
 						data-placeholder="please choose the sex">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp
index 38a144e..37f11f8 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp
@@ -15,9 +15,10 @@
 <title>SunVote-Education Management System</title>
 
 <!-- Bootstrap -->
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 <link href="../static/css/teach.css" rel="stylesheet">
 
 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询（media queries）功能 -->
@@ -49,7 +50,7 @@
 				<col style="width: 23%" />
 				<thead>
 					<tr>
-						<th><input type="checkbox" value="0" name='ids' id="ids"  />Serial No.</th>
+						<th><input type="checkbox" value="0" name='ids' id="ids"  />No.</th>
 						<th>Name</th>
 						<th>Student ID</th>
 						<th>Keypad ID</th>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
index ca4bd2b..b980b24 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
@@ -15,9 +15,10 @@
 <title>中天电子-教育管理系统</title>
 
 <!-- Bootstrap -->
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 <link href="../static/css/teach.css" rel="stylesheet">
 
 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询（media queries）功能 -->
diff --git a/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_list2.jsp
index 68310ff..0201935 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_list2.jsp
@@ -16,12 +16,13 @@
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
 <!-- jsp文件头和头部 -->
 
-<link href="../static/css/teach.css" rel="stylesheet">
+<link href="static/css/teach.css" rel="stylesheet">
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 </head>
 <body class="no-skin">
@@ -46,7 +47,7 @@
 					<col style="width: 30%" />
 					<thead>
 						<tr>
-							<th><input type="checkbox" name='ids' id="ids" />Number</th>
+							<th><input type="checkbox" name='ids' id="ids" />No.</th>
 							<th class="center">Chinese name</th>
 							<th class="center">English names</th>
 							<th class="center">Operation</th>
@@ -119,6 +120,7 @@
 	<script type="text/javascript">
 		$(document).ready(function(){
 			window.top.loading.remove();
+			$(".table_box").css("padding-top",$(".head_box").height());
 		});
 		function tosearch(){
 			$("#Form").submit();
diff --git a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
index 53df532..334907b 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
@@ -19,9 +19,10 @@
 <link href="../static/css/teach.css" rel="stylesheet">
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 </head>
 <body class="no-skin">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view.jsp
index 4cc0954..825eeb0 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view.jsp
@@ -15,7 +15,10 @@
     <title>SunVote-Education Management System</title>
 
     <!-- Bootstrap -->
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+ <!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 	<link href="../static/css/teach.css" rel="stylesheet">
 	<link href="../static/css/paper_view.css?t=1" rel="stylesheet">
 
@@ -58,7 +61,7 @@
 	<script>
 		var subjectId = '${pd.subject_id}';
 	</script>
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+	<script src="../static/js/jquery.min.js"></script>
 	<script src="../static/js/echars.js"></script>
 	<script src="../static/js/en_paper_view.js?a=0"></script>
 	
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view2.jsp
index 56cac69..f169356 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view2.jsp
@@ -15,7 +15,10 @@
     <title>SunVote-Education Management System</title>
 
     <!-- Bootstrap -->
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+    <!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 	<link href="../static/css/teach.css" rel="stylesheet">
 	<link href="../static/css/paper_view.css?t=1" rel="stylesheet">
 
@@ -97,7 +100,7 @@
 	</div>
 
 	</div>
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+	<script src="../static/js/jquery.min.js"></script>
 	<script src="../static/js/echars.js"></script>
 	<script src="../static/js/loading.js"></script>
 	<script src="../static/js/en_paper_view2.js"></script>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_set_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_set_question.jsp
index e4124e3..96bc608 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_set_question.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_set_question.jsp
@@ -7,7 +7,10 @@
     <title>SunVote-Education Management System</title>
 
     <!-- Bootstrap -->
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+    <!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 	<link href="../static/css/teach.css" rel="stylesheet">
 	<link href="../static/css/set_quetion.css?t=12" rel="stylesheet">
 
@@ -100,7 +103,7 @@ Complete question selection
 	<script>
 		//var subject_id = '${subject_id}' ;
 	</script>
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>   
-	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+	<script src="../static/js/jquery.min.js"></script>   
+	<script src="../static/js/bootstrap.min.js"></script>
 	<script src="../static/js/en_set_question.js?a=0"></script>
 </html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp
index 3ff7d1a..1c31869 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp
@@ -15,7 +15,10 @@
     <title>E-class Paper Management</title>
 
     <!-- Bootstrap -->
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+    <!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 	
 	<link rel="stylesheet" href="../static/ace/css/datepicker.css" />
 	<link href="../static/css/teach.css" rel="stylesheet">
@@ -120,8 +123,8 @@
 		</div><!-- /.modal -->
   	
  
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
-	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+	<script src="../static/js/jquery.min.js"></script>
+	<script src="../static/js/bootstrap.min.js"></script>
 	<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
 	<script src="../static/ace/js/bootbox.js"></script>
 	<script type="text/javascript">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_edit2.jsp
index a1a22b6..38074e4 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_edit2.jsp
@@ -60,7 +60,7 @@
 								<td><input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="Enter the Password" title="Password" style="width:98%;"/></td>
 							</tr>
 							<tr>
-								<td style="width:75px;text-align: right;padding-top: 13px;">Sex:</td>
+								<td style="width:75px;text-align: right;padding-top: 13px;">Gender:</td>
 								<td>
 								<select class="chosen-select form-control" name="SEX" id="SEX" data-placeholder="Sex">
 										<option value="1"  <c:if test="${pd.SEX==1}">selected="true"</c:if>>male</option>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp
index 35e1cb9..da4aa54 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp
@@ -19,9 +19,10 @@
 
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 </head>
 <body class="no-skin">
@@ -52,15 +53,15 @@
 					<col style="width: 9%" />
 					<thead>
 						<tr>
-							<th><input type="checkbox" value="0" name='ids' id="ids" />Number</th>
+							<th><input type="checkbox" value="0" name='ids' id="ids" />No.</th>
 							<th class="center">Name</th>
-							<th class="center">Phone number</th>
-							<th class="center">Tel number</th>
+							<th class="center">Phone No.</th>
+							<th class="center">Tel No.</th>
 							<th class="center">Id no.</th>
 							<th class="center">Account</th>
-							<th class="center">Sex</th>
-							<th class="center">Teacher card number</th>
-							<th class="center">subjects</th>
+							<th class="center">Gender</th>
+							<th class="center">T-card</th>
+							<th class="center">Subjects</th>
 							<th class="center">Operation</th>
 						</tr>
 					</thead>
@@ -209,6 +210,10 @@
 	<script type="text/javascript">
 		$(document).ready(function() {
 			window.top.loading.remove();
+			
+			var h_height = $(".head_box").height();			
+			$(".table_box").css("padding-top",h_height);
+			
 		});
 		
 		//检索
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp
index 2c6c061..2c57022 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp
@@ -17,9 +17,10 @@
 <title>SunVote-Education Management System</title>
 
 <!-- Bootstrap -->
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 <link href="../static/css/teach.css?a=1" rel="stylesheet">
 <link href="../static/css/mb_style.css" rel="stylesheet">
 
@@ -170,12 +171,12 @@
 	    </div><!-- /.modal-content -->
 	  </div><!-- /.modal-dialog -->
 	</div><!-- /.modal -->
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+	<script src="../static/js/jquery.min.js"></script>
 	<script
-		src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+		src="../static/js/bootstrap.min.js"></script>
 	<script src="../static/js/model.js"></script>
 	<script src="../static/js/loading.js"></script>
-	<script src="../static/js/remove.js?a=2"></script>
+	<script src="../static/js/en_remove.js?a=2"></script>
 	<script src="../static/js/dailog.js"></script>
 	<script type="text/javascript">
 		function chooseClass(classID,termID){
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp
index ec392ef..199b0fb 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp
@@ -15,7 +15,10 @@
     <title>E-class</title>
 
     <!-- Bootstrap -->
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+    <!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 	<link rel="stylesheet" href="../static/ace/css/datepicker.css" />
 	<link href="../static/css/teach.css" rel="stylesheet">
 	<link href="../static/css/paper.css?t=1" rel="stylesheet">
@@ -76,8 +79,8 @@
 			</div>
 		</div>
   
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
-	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+	<script src="../static/js/jquery.min.js"></script>
+	<script src="../static/js/bootstrap.min.js"></script>
 	<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
 	<script type="text/javascript">
 		var user_id= "${pd.userId}";
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp
index ffd8734..dcbac5d 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp
@@ -15,7 +15,10 @@
     <title>中天电子-教育管理系统</title>
 
     <!-- Bootstrap -->
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+    <!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 	<link href="../static/css/teach.css" rel="stylesheet">
 	<link href="../static/css/paper_view.css?t=1" rel="stylesheet">
 
@@ -58,7 +61,7 @@
 	<script>
 		var subjectId = '${pd.subject_id}';
 	</script>
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+	<script src="../static/js/jquery.min.js"></script>
 	<script src="../static/js/echars.js"></script>
 	<script src="../static/js/paper_view.js?a=2"></script>
 	
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view1.jsp
index 84da3f3..d863005 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view1.jsp
@@ -15,7 +15,10 @@
     <title>中天电子-教育管理系统</title>
 
     <!-- Bootstrap -->
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+    <!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 	<link href="../static/css/teach.css" rel="stylesheet">
 	<link href="../static/css/paper_view.css?t=2" rel="stylesheet">
 
@@ -140,8 +143,8 @@
 	  </div><!-- /.modal-dialog -->
 	</div><!-- /.modal -->
 	</div>
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
-	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+	<script src="../static/js/jquery.min.js"></script>
+	<script src="../static/js/bootstrap.min.js"></script>
 	<script src="../static/js/echars.js"></script>
 	<script src="../static/js/paper_view1.js?a=1"></script>
 	
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view2.jsp
index 91d445d..9eee7cb 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view2.jsp
@@ -15,7 +15,10 @@
     <title>中天电子-教育管理系统</title>
 
     <!-- Bootstrap -->
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+    <!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 	<link href="../static/css/teach.css" rel="stylesheet">
 	<link href="../static/css/paper_view.css?t=1" rel="stylesheet">
 
@@ -97,7 +100,7 @@
 	</div>
 
 	</div>
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+	<script src="../static/js/jquery.min.js"></script>
 	<script src="../static/js/echars.js"></script>
 	<script src="../static/js/loading.js"></script>
 	<script src="../static/js/paper_view2.js"></script>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp
index 08eaef2..2bafa39 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp
@@ -7,7 +7,10 @@
     <title>中天电子-教育管理系统</title>
 
     <!-- Bootstrap -->
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+    <!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 	<link href="../static/css/teach.css" rel="stylesheet">
 	<link href="../static/css/set_quetion.css?t=12" rel="stylesheet">
 
@@ -100,7 +103,7 @@
 	<script>
 		//var subject_id = '${subject_id}' ;
 	</script>
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>   
-	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+	<script src="../static/js/jquery.min.js"></script>   
+	<script src="../static/js/bootstrap.min.js"></script>
 	<script src="../static/js/set_question.js?a=0"></script>
 </html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
index 3bb0f65..f53273d 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
@@ -15,7 +15,10 @@
     <title>即时测</title>
 
     <!-- Bootstrap -->
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+    <!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 	
 	<link rel="stylesheet" href="../static/ace/css/datepicker.css" />
 	<link href="../static/css/teach.css" rel="stylesheet">
@@ -127,8 +130,8 @@
 			var view = "查看" ;
   	</script>
  
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
-	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+	<script src="../static/js/jquery.min.js"></script>
+	<script src="../static/js/bootstrap.min.js" ></script>
 	<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
 	<script src="../static/ace/js/bootbox.js"></script>
 	<script src="../static/js/teach_paper.js?a=2"></script>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp
index 5209e79..1212315 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp
@@ -15,7 +15,10 @@
     <title>即时测</title>
 
     <!-- Bootstrap -->
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+    <!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 	
 	<link rel="stylesheet" href="../static/ace/css/datepicker.css" />
 	<link href="../static/css/teach.css" rel="stylesheet">
@@ -120,8 +123,8 @@
 		</div><!-- /.modal -->
   
  
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
-	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+	<script src="../static/js/jquery.min.js"></script>
+	<script src="../static/js/bootstrap.min.js"></script>
 	<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
 	<script src="../static/ace/js/bootbox.js"></script>
 	<script src="../static/js/teach_paper.js?a=2"></script>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
index 9a043ec..7e1c463 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
@@ -19,9 +19,10 @@
 
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
-<link
+<!-- <link
 	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
-	rel="stylesheet">
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="static/css/bootstrap.min.css" />
 <link href="static/css/teach.css" rel="stylesheet">
 </head>
 <body class="no-skin">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
index 20f4fb7..e057d76 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
@@ -15,7 +15,10 @@
     <title>即时测</title>
 
     <!-- Bootstrap -->
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+    <!-- <link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"> -->
+	<link rel="stylesheet" href="../static/css/bootstrap.min.css" />
 	<link rel="stylesheet" href="../static/ace/css/datepicker.css" />
 	<link href="../static/css/teach.css" rel="stylesheet">
 	<link href="../static/css/paper.css?t=1" rel="stylesheet">
@@ -76,8 +79,8 @@
 			</div>
 		</div>
   
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
-	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+	<script src="../static/js/jquery.min.js"></script>
+	<script src="../static/js/bootstrap.min.js"></script>
 	<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
 	<script type="text/javascript">
 		var user_id= "${pd.userId}";
diff --git a/WebRoot/WEB-INF/jsp/system/index/en_login.jsp b/WebRoot/WEB-INF/jsp/system/index/en_login.jsp
index beafdea..567871f 100644
--- a/WebRoot/WEB-INF/jsp/system/index/en_login.jsp
+++ b/WebRoot/WEB-INF/jsp/system/index/en_login.jsp
@@ -27,7 +27,7 @@
 <script type="text/javascript" src="static/js/jQuery.md5.js"></script>
 <script type="text/javascript" src="static/js/jquery.tips.js"></script>
 <script type="text/javascript" src="static/js/lang.js"></script>
-<script type="text/javascript" src="static/js/remove.js"></script>
+<script type="text/javascript" src="static/js/en_remove.js"></script>
 <script type="text/javascript" >
 	if(lang() != 'en'){
 		
@@ -84,7 +84,7 @@ html,body{
 						<input type="text"  id="password" placeholder="Password" value="" autoComplete="off"/>
 						<div class="rember" style="width:50%;float:left;text-align:left;margin-top:10px;display:inline-block;line-height:34px;">
 							<input type="checkbox" id="rem_flag"/>
-							<span>记住密码</span>
+							<span>Remember me</span>
 						</div>
 						<div class="language" style="display:inline-block;width:50%;margin-top:10px;text-align:right;">
 							<select name="language" id="language" style="line-height:34px;height:34px;width:120px;">
@@ -175,7 +175,7 @@ html,body{
 			if ($("#loginname").val() == "") {
 				$("#loginname").tips({
 					side : 2,
-					msg : '用户名不得为空',
+					msg : 'User name must not be empty',
 					bg : '#AE81FF',
 					time : 3
 				});
@@ -188,7 +188,7 @@ html,body{
 			if ($("#password").val() == "") {
 				$("#password").tips({
 					side : 2,
-					msg : '密码不得为空',
+					msg : 'Password must not be empty',
 					bg : '#AE81FF',
 					time : 3
 				});
@@ -199,7 +199,7 @@ html,body{
 			
 			 $("#loginbox").tips({
 				side : 1,
-				msg : '正在登录 , 请稍后 ...',
+				msg : 'Logging in, please wait a moment ...',
 				bg : '#68B500',
 				time : 10
 			}); 
@@ -235,7 +235,7 @@ html,body{
 						}else if("usererror" == data.result){
 							$("#loginname").tips({
 								side : 1,
-								msg : "用户名或密码有误",
+								msg : "Error in username or password",
 								bg : '#FF5080',
 								time : 15
 							});
@@ -244,7 +244,7 @@ html,body{
 						}else if("codeerror" == data.result){
 							$("#code").tips({
 								side : 1,
-								msg : "验证码输入有误",
+								msg : "Error in input of validation code",
 								bg : '#FF5080',
 								time : 15
 							});
@@ -253,7 +253,7 @@ html,body{
 						}else{
 							$("#loginname").tips({
 								side : 1,
-								msg : "缺少参数",
+								msg : "Lack of parameters",
 								bg : '#FF5080',
 								time : 15
 							});
@@ -273,7 +273,7 @@ html,body{
 		
 		//清除历史记录
    		function clear_history(){
-   			window.top.remove.init({"title":"确定清除历史记录吗？","func":function(success){
+   			window.top.remove.init({"title":"Are you sure you want to clear the history?","func":function(success){
    				if(success){
    					storage.clear();
    					$(".history").hide();
diff --git a/WebRoot/static/css/teach.css b/WebRoot/static/css/teach.css
index c3778e0..626f93e 100644
--- a/WebRoot/static/css/teach.css
+++ b/WebRoot/static/css/teach.css
@@ -1,5 +1,5 @@
 html,body{width:100%;height:100%;}
-table{font-size:16px;}
+table{font-size:14px;}
 .clear{clear:both;}
 .right{width:12px;height:12px;display:inline-block;background:url(../images/right.png) no-repeat;background-size:100%;}
 .right_b{width:20px;height:20px;margin-right:20px;display:inline-block;background:url(../images/right_b.png) no-repeat;background-size:100%;}
diff --git a/WebRoot/static/js/en_control_homework.js b/WebRoot/static/js/en_control_homework.js
new file mode 100644
index 0000000..36f5dc5
--- /dev/null
+++ b/WebRoot/static/js/en_control_homework.js
@@ -0,0 +1,344 @@
+var saveData={} //声明保存数据
+		
+		$(document).on('click',"input[type='checkbox']",function(){   //选择班级
+			console.log($(this).prop("checked"));
+			if($(this).prop('checked')){
+				$(this).closest("li").attr("class","checked");
+			}else{
+				$(this).closest("li").removeClass("checked");
+			}
+			
+		});
+		var work={        //保存标题框中的数字框的值
+			que_num:0,
+			ans_num:4,
+			score:0
+		}
+		//点击+执行操作
+		function creat_work(_id,index,num){//index:开始序号，num:目标序号
+			
+			if(_id=="que_num"){    //新增题目
+				for(j=index;j<=num;j++){
+					$(".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>');
+					for(i=0;i<work.ans_num;i++){
+						$(".question"+j+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i)+'</li>')
+					}
+				}
+			}
+			else if(_id=="ans_num"){//新增选项
+				//alert($("#que_num").val());
+				for(j=1;j<=work.que_num;j++){	//轮询每道题目
+					var now_length=$(".question"+j+" ul").find(".btn").length; //获取当前题目选项个数
+					if(now_length<work.ans_num){   //当前题目选项个数小于数字框中个数，则把选项个数增加到数字框中的个数
+						for(i=now_length;i<work.ans_num;i++){
+							console.log("index:"+index+"-"+"num:"+num+"i:"+i);
+							$(".question"+j+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i)+'</li>')
+						}
+					}
+					if(now_length>work.ans_num){//当前题目选项个数大于数字框中个数，则把选项个数减少到数字框中的个数
+						for(i=now_length;i>=work.ans_num;i--){
+							$(".question"+j+" ul").find(".btn").eq(work.ans_num).remove();
+						}
+					}
+					
+				}
+				
+			}else{
+				if(_id.siblings(".w_100").attr("class").indexOf("ans_num")>-1){ //没有id，但是class中含有ans_num，则为单个题目中的选项设置框
+					var _index=_id.closest("tr").index()+1;
+					console.log(_index);
+					for(i=index;i<=num;i++){
+						$(".question"+_index+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i-1)+'</li>')
+					}
+				}
+			}
+		}
+		//点击-执行操作
+		function remove_work(_id,index,num){
+			
+			if(_id=="que_num"){	//减少题目
+				for(i=index;i<=num;i++){
+					$(".subject_body_tbody tr").eq(index).remove();
+				}
+			}
+			if(_id=="ans_num"){  //减少选项
+				for(j=1;j<=work.que_num;j++){    //轮询每道题目
+					var now_length=$(".question"+j+" ul").find(".btn").length;  //获取当前题目中的选项个数
+					if(now_length>work.ans_num){     //如果当前选项个数大于数字框中的值，则减少选项个数到数字框中的个数
+						for(i=now_length;i>=work.ans_num;i--){
+							$(".question"+j+" ul").find(".btn").eq(work.ans_num).remove();
+						}
+					}
+					if(now_length<work.ans_num){  //如果当前选项个数小于数字框中的值，则增加选项个数到数字框中的个数
+						for(i=now_length;i<work.ans_num;i++){
+							$(".question"+j+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i)+'</li>')
+						}
+					}
+					
+				}
+			}else{
+				if(_id.siblings(".w_100").attr("class").indexOf("ans_num")>-1){  //没有id值，但是类名中含有ans_num，则判断为单个题目中的选项设置框
+					var _index=_id.closest("tr").index()+1;
+					for(i=index;i<=num;i++){
+						$(".question"+_index+" ul").find(".btn").eq(index).remove();
+					}
+				}
+			}
+			
+		}
+		//点击+按钮
+		$(document).on("click",".add",function(){
+			var _that=$(this);
+			var temp_num=0;
+			//获取当前按钮旁边数字框的值
+			temp_num=parseInt(_that.siblings(".w_100").val());
+			temp_num+=1;
+			//点击+号，数字框中的数字+1
+			_that.siblings(".w_100").val(temp_num);
+			//如果数字框有id，则是标题栏上面的数字框
+			if(_that.siblings(".w_100").attr("id")){
+				//将下面的数字框的值设置成标题栏数字框的值
+				var _class=_that.siblings(".w_100").attr("id");
+				
+				//题目数
+				if(_class=="que_num"){
+					work.que_num=temp_num;
+					creat_work(_class,work.que_num,work.que_num);					
+				}
+				//选项数
+				if(_class=="ans_num"){
+					if(temp_num>=10){
+						temp_num=9;
+					}
+					work.ans_num=temp_num;
+					creat_work(_class,work.ans_num,work.ans_num);
+				}	
+				$("."+_class).val(temp_num);
+			}
+			else{
+				if(_that.siblings(".w_100").attr("class").indexOf("ans_num")>-1){
+					creat_work(_that,temp_num,temp_num);
+				}
+			}
+			if(work.que_num!=0){
+				$(".main_info").remove();
+			}
+		})
+		//点击-按钮
+		$(document).on("click",".redu",function(){
+			var _that=$(this);
+			var temp_num=0;
+			
+			temp_num=parseInt(_that.siblings(".w_100").val());
+			temp_num-=1;
+			if(temp_num<0){
+				temp_num=0;
+				return;
+			}
+			
+			_that.siblings(".w_100").val(temp_num);
+			
+			if(_that.siblings(".w_100").attr("id")){
+				var _class=$(this).siblings(".w_100").attr("id");
+				$("."+_class).val(temp_num);
+				
+				if(_class=="que_num"){
+					work.que_num=temp_num;
+					remove_work(_class,work.que_num,work.que_num);
+				}
+				if(_class=="ans_num"){
+					work.ans_num=temp_num;
+					remove_work(_class,work.ans_num,work.ans_num);
+				}	
+			}else{
+				if(_that.siblings(".w_100").attr("class").indexOf("ans_num")>-1){
+					remove_work(_that,temp_num,temp_num);
+				}
+			}
+			if(work.que_num!=0){
+				$(".main_info").remove();
+			}
+		})
+		$(document).on("click",".remove",function(){
+			var _that=$(this);
+			_that.closest("tr").remove();
+			work.que_num=$(".first").length;
+			$("#que_num").val(work.que_num);
+			for(i=0;i<$(".first").length;i++){
+				//console.log($(".first").closest("tr").index());
+				$(".first").eq(i).text(i+1);
+				$(".question").eq(i).attr("class","question question"+(i+1));
+			}
+		});
+		$(document).on("click","li.btn ",function(){
+			if($(this).attr("class").indexOf("on")>-1)
+				$(this).removeClass("on");
+			else
+				$(this).addClass("on");
+		});
+		$("#que_num").change(function(){
+			var now_num=parseInt($("#que_num").val());
+			var old_num=parseInt(work.que_num);
+			var _temp=now_num-old_num;
+			
+			if(now_num!=0){
+				$(".main_info").remove();
+			}
+			if(_temp>0){
+				creat_work($(this).attr("id"),(old_num+1),now_num);
+			}else{
+				remove_work($(this).attr("id"),now_num,old_num);
+			}
+			
+			work.que_num=now_num;
+			
+		})
+		$("#ans_num").change(function(){
+			var now_num=parseInt($("#ans_num").val());
+			var old_num=parseInt(work.ans_num);
+			var _temp=now_num-old_num;
+			if(now_num>=10){
+				now_num=9;	
+			}
+			$(".ans_num").val(now_num);
+			work.ans_num=now_num;
+			
+			if(_temp>0){
+				creat_work($(this).attr("id"),(old_num+1),now_num);
+			}else{
+				remove_work($(this).attr("id"),now_num,old_num);
+			}
+			
+			
+		});
+		
+		
+		
+		function save(){
+			if($("#NAME").val()==""){
+				$("#NAME").tips({
+					side:3,
+		            msg:'Please enter the title of exercise',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#NAME").focus();
+			return false;
+			}
+			if($("#HOMEWORK_DESC").val()==""){
+				$("#HOMEWORK_DESC").tips({
+					side:3,
+		            msg:'Please enter the  instructions of exercise',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#HOMEWORK_DESC").focus();
+			return false;
+			}
+			var all_score=0;
+			for(var i=0;i<work.que_num;i++){
+				all_score+=parseInt($(".score").eq(i+1).val());
+			}
+			var CLASSLIST=[];
+			if($(".checked").length>0){
+				for(var j=0;j<$(".checked").length;j++){
+					var _index=$(".checked").eq(j).index();
+					console.log($(".date-picker").eq(_index).val());
+					if($(".date-picker").eq(_index).val()==''){
+						$(".date-picker").eq(_index).tips({
+							side:3,
+				            msg:'Please select the time',
+				            bg:'#AE81FF',
+				            time:2
+				        });
+						return false;
+					}
+					
+					CLASSLIST[j]={
+						CLASS_ID:$("#class"+_index).val(),
+						COMPLETE_DATE:$(".date-picker").eq(_index).val()
+					};
+					
+				}
+			}else{
+				$(".classBox").tips({
+					side:3,
+		            msg:'Please select class and time',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				return false;
+			}
+			
+			if(work.que_num<=0){
+				$('.subject').tips({
+					side:3,
+		            msg:'Please add a question',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				return false;
+			}
+			var QUESTIONS=[];
+			for(var k=0;k<work.que_num;k++){
+				QUESTIONS[k]={
+					RANK:$(".first").eq(k).text(),
+					NAME:$(".first").eq(k).text(),
+					OPTION_NUM:$(".ans_num").eq(k+1).val(),
+					SCORE:$(".score").eq(k+1).val(),
+					RIGHT_ANSWER:"",
+					TYPE:""
+				}
+				
+				var type=0,right_ans='';
+				var a_num=$('.question'+(k+1)).find('.on').length;
+				if(a_num<=0){
+					//alert("题目"+(k+1)+"请选择正确答案");
+					$('.question'+(k+1)).tips({
+						side:3,
+			            msg:'Please specify the correct answer',
+			            bg:'#AE81FF',
+			            time:2
+			        });
+					return false;
+				}
+				for(var x=0;x<a_num;x++){
+					right_ans+=$('.question'+(k+1)).find('.on').eq(x).text();
+				}
+				if(a_num>1){
+					type=2;
+				}else{
+					type=1;
+				}
+				
+				QUESTIONS[k].RIGHT_ANSWER=right_ans;
+				QUESTIONS[k].TYPE=type;
+			}
+			
+			
+			saveData.TEACHER_ID=$("#TEACHER_ID").val();
+			saveData.NAME=$("#NAME").val();
+			saveData.HOMEWORK_DESC=$("#HOMEWORK_DESC").val();
+			saveData.ALL_SCORE=all_score;
+			saveData.CLASSLIST=CLASSLIST;
+			saveData.QUESTION_COUNT=work.que_num;
+			saveData.QUESTIONS=QUESTIONS;
+			
+			//console.log(saveData);
+			if(homework_id==""){
+				save_data(JSON.stringify(saveData));
+				//console.log("保存");
+			}
+			else{
+				//console.log("更新");
+				saveData.HOMEWORK_ID=homework_id;
+				up_data(JSON.stringify(saveData));
+			}
+				
+			
+			
+			
+			
+		}
+		
+		
\ No newline at end of file
diff --git a/WebRoot/static/js/en_control_template.js b/WebRoot/static/js/en_control_template.js
new file mode 100644
index 0000000..2e9caf1
--- /dev/null
+++ b/WebRoot/static/js/en_control_template.js
@@ -0,0 +1,478 @@
+var questionNUm = 0;
+/*数字转汉字数字*/
+var chnNumChar = [ "零", "一", "二", "三", "四", "五", "六", "七", "八", "九" ];
+var chnUnitSection = [ "", "万", "亿", "万亿", "亿亿" ];
+var chnUnitChar = [ "", "十", "百", "千" ];
+/* 快速创建答案列表 */
+var score = 0;
+var total_score = 0;
+var answerLen = 0;
+
+
+$(function() {
+	
+
+	function creat(q_num, a_num, fraction) {
+		// $(".section").remove();
+		answer_index_b = $(".section").length + 1;
+
+		$(".content").append('<div class="section section-'	+ answer_index_b+ ' single" data-fraction="'+ fraction+ '" data-score="'				
+								+ (q_num * fraction) + '" style="margin-top:80px;"><div class="title"><h3>No.'	+ answer_index_b+ '(Single choice) total score: '
+								+ q_num	+ ' X '	+ fraction	+ ' = '	+ (q_num * fraction)
+								+ ' <!--<span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span> --></h3> </div><div class="question_list"></div></div>');
+		for (var i = 0; i < q_num; i++) {
+			str_temp = str[i];
+			str_temp = str_temp.toUpperCase()
+			code = str_temp.charCodeAt();
+			on_index = code - 65;
+			questionNUm++;
+			if (code < (65 + a_num)) {
+				console.log(str_temp);
+				$(".section-" + answer_index_b + " .question_list").append(
+						'<div class="question question' + (questionNUm)
+								+ '"><span>' + (questionNUm)
+								+ '、</span><ul></ul></div>');
+				for (var j = 0; j < a_num; j++) {
+					option = String.fromCharCode(0x41 + j);
+					if (on_index == j) {
+						console.log(on_index + "---" + j);
+						$(".question" + (questionNUm) + ' ul').append(
+								'<li class="btn btn-default on">' + option
+										+ '</li>');
+					} else
+						$(".question" + (questionNUm) + ' ul').append(
+								'<li class="btn btn-default">' + option
+										+ '</li>');
+				}
+			} else {
+				alert("No." + (i + 1) + ":" + String.fromCharCode(code)
+						+ "The answer is wrong, exceeding the number of choices");
+				// return;
+			}
+		}
+		$(".section-" + answer_index_b).attr("data-score",
+				q_num * fraction);
+		total_score += q_num * fraction;
+		$("#score_all").text(total_score);
+	}
+
+	/***************************************************************************
+	 * 1、单选题 2、完形填空 3、阅读理解 4、判断题 5、多选题
+	 **************************************************************************/
+
+	function addQuestion(type, a_num, index_s_2, fraction2) {
+		console.log(type);
+		fraction2=parseInt(fraction2);
+		console.log(fraction2);
+		answer_index_b = $(".section").length + 1;
+		var question_num = SectionToChinese($(".section").length + 1);
+		switch (type) {
+		case 1: // 单选题
+			// alert(typeof(index_s_2));
+			$(".content")
+			.append(
+					'<div class="section section-'
+							+ answer_index_b
+							+ ' " '
+							+'data-type="1" '
+							+'data-questionNum="'
+							+index_s_2
+							+'" data-optionNum="'
+							+a_num
+							+'" '
+							+'data-fraction="'
+							+ fraction2
+							+ '" data-score="'
+							+ (index_s_2 * fraction2)
+							+ '"> <div class="title"><h3>No.'
+							+ answer_index_b
+							+ '(Single choice) total score: '
+							+ index_s_2
+							+ ' X '
+							+ fraction2
+							+ ' = '
+							+ index_s_2 * fraction2
+							+ ' <!--<span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span>--></h3> </div> <div class="question_list"></div></div>');
+			for (i = 1; i <= index_s_2; i++) {
+				$(".section-" + answer_index_b + " .question_list").append(
+						'<div class="question question' + i + '"><span>' + i
+								+ '、</span><ul></ul></div>');
+				for (var j = 0; j < a_num; j++) {
+					option = String.fromCharCode(0x41 + j);
+					$(".section-" + answer_index_b + " .question" + i + ' ul')
+							.append(
+									'<li class="btn btn-default">' + option
+											+ '</li>');
+				}
+			}
+			total_score += index_s_2 * fraction2;
+			$("#score_all").text(total_score);
+			break;		
+		case 2: // 多选题
+		// $(".content").html("");
+			$(".content")
+					.append(
+							'<div class="section section-'
+									+ answer_index_b
+									+ ' " '
+									+'data-type="2" '
+									+'data-questionNum="'
+									+index_s_2
+									+'" data-optionNum="'
+									+a_num
+									+'" '
+									+ ' " data-fraction="'
+									+ fraction2
+									+ '" data-score="'
+									+ (index_s_2 * fraction2)
+									+ '"> <div class="title"><h3>No.'
+									+ answer_index_b
+									+ '(Multiple choice) total score: '
+									+ index_s_2
+									+ ' X '
+									+ fraction2
+									+ ' = '
+									+ index_s_2 * fraction2
+									+ ' <!--<span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span>--></h3> </div> <div class="question_list"></div></div>');
+			for (var i = 1; i <= index_s_2; i++) {
+				questionNUm++;
+				$(".section-" + answer_index_b + " .question_list").append(
+						'<div class="question question' + questionNUm
+								+ '"><span>' + questionNUm
+								+ '、</span><ul></ul></div>');
+				for (var j = 0; j < a_num; j++) {
+					option = String.fromCharCode(0x41 + j);
+					$(
+							".section-" + answer_index_b + " .question"
+									+ questionNUm + ' ul').append(
+							'<li class="btn btn-default">' + option + '</li>');
+				}
+			}
+			total_score += index_s_2 * fraction2;
+			$("#score_all").text(total_score);
+			break;
+		}
+		$(".section0").attr("data-score",
+				$(".section0").find(".question").length * fraction2);
+	}
+
+	
+
+	/* 添加试题的确定按钮 */
+	$("#addQuestion_submit").click(function() {
+		// $("#fast").attr("disabled","disabled");
+		var type_2 = parseInt($("#type").val());
+		var index_s_2 =parseInt($("#index_s_2").val());
+		//var index_e_2 = parseInt($("#index_s_2").val());
+		
+		
+		// var answer_2=$("#answer_2").val();
+		var num_ans_2 = $("#num_ans_2").val();
+		var fraction2 = parseFloat($("#fraction2").val());
+		if (isNaN(index_s_2)) {
+			alert("Please enter the number of questions");
+			return;
+		} else if (isNaN(fraction2)) {
+			alert("Please enter the score");
+			return;
+		}
+		
+		// console.log(typeof(type_2));
+		console.log(type_2+'-'+ num_ans_2+"-"+ index_s_2+"-"+ fraction2);
+		
+		addQuestion(type_2, num_ans_2, index_s_2, fraction2);
+		$('.addQuestion').modal('hide');
+	})
+	
+
+
+
+	/* 提交保存数据 */
+	$("#save").click(function() {
+						var content = [];
+
+						if ($(".section").length > 0) {
+							var rank = 0;
+							for (i = 0; i < $(".section").length; i++) {
+								content[i] = {
+										index: i+1,
+										type: $(".section").eq(i).attr("data-type"),
+										questionNum: $(".section").eq(i).attr("data-questionNum"),
+										optionNum: $(".section").eq(i).attr("data-optionNum"),
+										score: $(".section").eq(i).attr("data-fraction")
+								};	
+							}
+						}
+						self.location.href = URL + JSON.stringify(content) + "&page_score=" + total_score;
+					});
+
+	/* ajax封装函数 */
+	function ajax_submit(url, data) {
+		$(".loading").css("display", "block");
+		console.log(data);
+		$.ajax({
+			url : url,
+			type : "POST",
+			data : data,
+			dataType : "json",
+			contentType : "application/x-www-form-urlencoded; charset=utf-8",
+			success : function(data) {
+				$(".loading").css("display", "none");
+				if(testData.paper_type == '1'){
+					window.location.href = JUMP_URL + "?a=1&defaulturl=../paper/list2.do";
+				}else{
+					window.location.href = JUMP_URL + "?a=1&defaulturl=../paper/list4.do?school_id=" + testData.school_id ;
+				}
+			}
+		})
+	}
+	function fastSort(array, head, tail) {
+		// 考虑到给每个分区操作的时候都是在原有的数组中进行操作的，所以这里head,tail来确定分片的位置
+		/* 生成随机项 */
+		var randomnum = parseInt((head + tail) / 2);
+		var random = array[randomnum];
+		/* 将小于random的项放置在其左边 策略就是通过一个临时的数组来储存分好区的结果，再到原数组中替换 */
+		var arrayTemp = [];
+		var unshiftHead = 0;
+		for (var i = head; i <= tail; i++) {
+			if (parseInt(array[i].rank) < parseInt(random.rank)) {
+				arrayTemp.unshift(array[i]);
+				unshiftHead++;
+			} else if (parseInt(array[i].rank) > parseInt(random.rank)) {
+				arrayTemp.push(array[i]);
+			}
+			/* 当它等于的时候放哪，这里我想选择放到队列的前面，也就是从unshift后的第一个位置放置 */
+			if (parseInt(array[i].rank) === parseInt(random.rank)) {
+				arrayTemp.splice(unshiftHead, 0, array[i]);
+			}
+		}
+		/* 将对应项覆盖原来的记录 */
+		for (var j = head, u = 0; j <= tail; j++, u++) {
+			array.splice(j, 1, arrayTemp[u]);
+		}
+		/* 寻找中间项所在的index */
+		var nowIndex = array.indexOf(random);
+
+		/* 设置出口，当要放进去的片段只有2项的时候就可以收工了 */
+		if (arrayTemp.length <= 2) {
+			return;
+		}
+		/* 递归，同时应用其左右两个区域 */
+		fastSort(array, head, nowIndex);
+		fastSort(array, nowIndex + 1, tail);
+	}
+	function creatHtml(data) {
+		console.log(data);
+		$(".header_box h1").html(data.title);
+		$("#time").html(data.exam_time);
+		if(data.score != null && data.score > 0 && data.score != ''){
+			$("#score_all").html(data.score);
+		}
+
+		if (data.questions.length > 0) {
+			$(".time").removeAttr("data-target");
+			$(".remove").remove();
+			$(".btn_box").remove();
+		}
+
+		for (var i = 0; i < data.questions.length; i++) {
+			if (data.questions[i].questions) {
+				$(".content")
+						.append(
+								'<div class="section section-'
+										+ i
+										+ '" data-fraction="'
+										+ data.questions[i].score
+										+ '" style="margin-top:80px;"> <h3><span class="que_num">'
+										+ 'No.'
+										+ (i + 1)
+										+ 'total score:'
+										+ data.questions[i].questions.length
+										+ " X "
+										+ (parseFloat(data.questions[i].sug_score) / data.questions[i].questions.length)
+										+ " = "
+										+ data.questions[i].sug_score
+										+ '</span>'
+										+ '<span class="que_name">'
+										+ data.questions[i].content
+										+ '</span></h3><!-- <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> --> <div class="question_list"></div></div>');
+			} else {
+				if (i == 0) {
+					$(".content")
+							.append(
+									'<div class="section section0"> <div class="question_list" style="margin-top:80px"></div></div>');
+				}
+				$(".section0").find(".question_list").append(
+						'<div class="question question' + (i + 1) + '"><span>'
+								+ (++questionNUm) + '、</span><ul></ul></div>');
+				for (var k = 0; k < parseInt(data.questions[i].option_num); k++) {
+					str_temp = data.questions[i].answer;
+					$(".section0").find(".question" + (i + 1) + ' ul').append(
+							'<li class="btn btn-default">'
+									+ String.fromCharCode(0x41 + k) + '</li>');
+					for (var l = 0; l < str_temp.length; l++) {
+						str_temp_arry = str_temp.split('');
+						code = str_temp_arry[l].charCodeAt();
+						on_index = code - 65;
+						if (on_index == k) {
+							$(".section0").find(
+									".question" + (i + 1) + ' ul li').eq(
+									on_index).attr("class",
+									"btn btn-default on");
+						}
+					}
+				}
+			}
+
+			if (data.questions[i].questions) {
+				for (var j = 0; j < data.questions[i].questions.length; j++) {
+					$(".section-" + i).find(".question_list").append(
+							'<div class="question question' + (j + 1)
+									+ '"><span>' + (++questionNUm)
+									+ '、</span><ul></ul></div>');
+					if ($(".section-" + i).find(".que_name").text() == "判断题") {
+						for (var k = 0; k < parseInt(data.questions[i].questions[j].option_num); k++) {
+							str_temp = data.questions[i].questions[j].answer;
+							if (k % 2 == 0) {
+								$(".section-" + i).find(
+										".question" + (j + 1) + ' ul').append(
+										'<li class="btn btn-default">√</li>');
+							} else if (k % 2 == 1) {
+								$(".section-" + i).find(
+										".question" + (j + 1) + ' ul').append(
+										'<li class="btn btn-default">×</li>');
+							}
+
+							if (str_temp == "√")
+								$(".section-" + i).find(
+										".question" + (j + 1) + ' ul li').eq(0)
+										.attr("class", "btn btn-default on");
+							else
+								$(".section-" + i).find(
+										".question" + (j + 1) + ' ul li').eq(1)
+										.attr("class", "btn btn-default on");
+						}
+					} else {
+						for (var k = 0; k < parseInt(data.questions[i].questions[j].option_num); k++) {
+							str_temp = data.questions[i].questions[j].answer;
+							$(".section-" + i).find(
+									".question" + (j + 1) + ' ul').append(
+									'<li class="btn btn-default">'
+											+ String.fromCharCode(0x41 + k)
+											+ '</li>');
+							for (var l = 0; l < str_temp.length; l++) {
+								str_temp_arry = str_temp.split('');
+								code = str_temp_arry[l].charCodeAt();
+								on_index = code - 65;
+								if (on_index == k) {
+									$(".section-" + i).find(
+											".question" + (j + 1) + ' ul li')
+											.eq(on_index).attr("class",
+													"btn btn-default on");
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	
+	/*快速建题中，每输入五个答案就加一个空格*/
+	$("#answer").on("input propertychange", function(event) {
+		var answerStr = "";
+		answerStr = $("#answer").val();
+		var result = "";
+		if (answerStr.length > 5) {
+			answerStr = answerStr.replace(new RegExp(" ", "gm"), "");
+			for (var i = 0; i < answerStr.length; i++) {
+				result += answerStr[i];
+				if (i % 5 == 4 && i != answerStr.length - 1) {
+					result += " ";
+				}
+			}
+		} else {
+			result = answerStr;
+		}
+		$("#answer").val(result);
+		if (answerStr.length > 0) {
+			$(".tips").text("Total" + answerStr.length + "question");
+		} else {
+			$(".tips").text("");
+		}
+	})
+
+	
+
+	function SectionToChinese(section) {
+		var strIns = '', chnStr = '';
+		var unitPos = 0;
+		var zero = true;
+		while (section > 0) {
+			var v = section % 10;
+			if (v === 0) {
+				if (!zero) {
+					zero = true;
+					chnStr = chnNumChar[v] + chnStr;
+				}
+			} else {
+				zero = false;
+				strIns = chnNumChar[v];
+				strIns += chnUnitChar[unitPos];
+				chnStr = strIns + chnStr;
+			}
+			unitPos++;
+			section = Math.floor(section / 10);
+		}
+		return chnStr;
+	}
+
+	
+	if (template != null && template.length > 0) {
+		
+			$("#addQuestion").attr("disabled", "disabled");
+			$("#fast").attr("disabled", "disabled");
+			for (var i = 0; i < template.length; i++) {
+				if (template[i].type == 1) {
+					var answer = "";
+					for (var j = 0; j < template[i].questionNum; j++) {
+						answer += "1";
+					}
+					creat(answer, template[i].optionNum, template[i].score);
+				}
+				if (template[i].type == 2) {
+					addQuestion(5, template[i].optionNum, 1,
+							template[i].questionNum, template[i].score);
+				}
+			}
+			if(testData != null){
+				$(".header_box h1").html(testData.title);
+				$("#time").html(testData.exam_time);
+				if(testData.score != null && testData.score > 0 && testData.score != ''){
+					$("#score_all").html(testData.score);
+				}
+			}
+		
+	}else if (testData != null && testData.questions != null
+			&& testData.questions.length > 0) {
+		fastSort(testData.questions, 0, testData.questions.length - 1);
+		for (var i = 0; i < testData.questions.length; i++) {
+
+			if (testData.questions[0].questions
+					&& testData.questions[0].questions.length > 1) {
+				fastSort(testData.questions[i].questions, 0,
+						testData.questions[i].questions.length - 1);
+			}
+		}
+		creatHtml(testData);
+	}else{
+		if(testData != null){
+			$(".header_box h1").html(testData.title);
+			$("#time").html(testData.exam_time);
+			if(testData.score != null && testData.score > 0 && testData.score != ''){
+				$("#score_all").html(testData.score);
+			}
+		}
+	}
+})
diff --git a/WebRoot/static/js/en_remove.js b/WebRoot/static/js/en_remove.js
new file mode 100644
index 0000000..9cd8bf6
--- /dev/null
+++ b/WebRoot/static/js/en_remove.js
@@ -0,0 +1,43 @@
+
+var remove={
+	init:function(obj){
+		this.init.title=obj.title;
+		this.init.func = obj.func;
+		this.init.msg = obj.msg;
+		this.init.ok = obj.ok;
+		this.init.cancel = obj.cancel;
+		if(typeof(this.init.ok) ==  "undefined"){
+			this.init.ok = "Confirm";
+		}
+		if(typeof(this.init.cancel) ==  "undefined"){
+			this.init.cancel = "Cancel" ;
+		}
+		},
+	show:function(){
+		if(window.top!=window.self){			
+			$("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>');
+			console.log(typeof(window.top.remove.init.msg));
+			if(typeof(window.top.remove.init.msg) != "undefined"){
+				$(".mb_content_l").before('<div class="mb_msg"><p>'+window.top.remove.init.msg+'</p></div>');
+			}
+		}else{
+			if($(".loading").length==0)
+			{
+				console.log(typeof(window.top.remove.init.msg));
+				$("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>');
+				if(typeof(window.top.remove.init.msg) != "undefined"){
+					$(".mb_content_l").before('<div class="mb_msg"><p>'+window.top.remove.init.msg+'</p></div>');
+				}
+			}
+		}
+	},
+	remove:function(){
+		if(window.top!=window.self){
+			$(".remove",top.document).remove();
+		}else{
+			if($(".remove").length>0)
+			$(".remove").remove();
+		}
+			
+	}
+}
\ No newline at end of file
diff --git a/resources/mybatis1/sunvote/CourseManagementMapper.xml b/resources/mybatis1/sunvote/CourseManagementMapper.xml
index 43b46cf..0ccef18 100644
--- a/resources/mybatis1/sunvote/CourseManagementMapper.xml
+++ b/resources/mybatis1/sunvote/CourseManagementMapper.xml
@@ -153,6 +153,7 @@
 			sv_teacher.`NAME`,
 			sv_sclass.CLASS_NAME,
 			sv_subject.CNAME,
+			sv_subject.ENAME,
 			SV_COURSEMANAGEMENT.SUBJECT_ID,
 			SV_COURSEMANAGEMENT.TEACHER_ID,
 			SV_COURSEMANAGEMENT.CLASS_ID,
@@ -193,6 +194,7 @@
 			sv_teacher.`NAME`,
 			sv_sclass.CLASS_NAME,
 			sv_subject.CNAME,
+			sv_subject.ENAME,
 			SV_COURSEMANAGEMENT.SUBJECT_ID,
 			SV_COURSEMANAGEMENT.TEACHER_ID,
 			SV_COURSEMANAGEMENT.CLASS_ID,