diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
index c9dd7cb..0761cca 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -167,6 +167,9 @@
 						<p>年级升级</p>
 					</li>
 					<li>
+						<p>模板设置</p>
+					</li>
+					<li>
 						<p>其他配置</p>
 					</li>
 				</ul>
diff --git a/WebRoot/WEB-INF/jsp/system/index/login.jsp b/WebRoot/WEB-INF/jsp/system/index/login.jsp
index 1bfb2bb..ba8c8b3 100644
--- a/WebRoot/WEB-INF/jsp/system/index/login.jsp
+++ b/WebRoot/WEB-INF/jsp/system/index/login.jsp
@@ -78,6 +78,15 @@
    		if(window.top != window.self){
 	   		window.top.location.href = "<%=basePath%>";
    		}
+   		
+   		document.onkeydown = function (e) { // 回车提交表单
+   		// 兼容FF和IE和Opera
+   		    var theEvent = window.event || e;
+   		    var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+   		    if (code == 13) {
+   		    	severCheck();
+   		    }
+   		}
    		//客户端校验
 		function check() {