From a62a7ce2c7c48a2b9ed7db3affe21c655c637d22 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Wed, 21 Mar 2018 14:49:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8F=8A=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/sys/userInfo.jsp     | 169 +++++++++++-------
 .../WEB-INF/views/sys/userModifyPwd.jsp       |  58 ++++--
 2 files changed, 145 insertions(+), 82 deletions(-)
diff --git a/src/main/webapp/WEB-INF/views/sys/userInfo.jsp b/src/main/webapp/WEB-INF/views/sys/userInfo.jsp
index 11299b40e..b0e8fc2e6 100644
--- a/src/main/webapp/WEB-INF/views/sys/userInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userInfo.jsp
@@ -1,75 +1,114 @@
-<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <html>
 <head>
-	<title>个人信息</title>
-	<script type="text/javascript">
-		$(document).ready(function() {
-			$("#inputForm").validate({
-				submitHandler: function(form){
-					loading('正在提交，请稍等...');
-					form.submit();
-				},
-				errorContainer: "#messageBox",
-				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
-					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
-						error.appendTo(element.parent().parent());
-					} else {
-						error.insertAfter(element);
-					}
-				}
+<title>个人信息</title>
+<script type="text/javascript">
+	$(document).ready(
+			function() {
+				$("#inputForm")
+						.validate(
+								{
+									submitHandler : function(form) {
+										loading('正在提交，请稍等...');
+										form.submit();
+									},
+									errorContainer : "#messageBox",
+									errorPlacement : function(error, element) {
+										$("#messageBox").text("输入有误，请先更正。");
+										if (element.is(":checkbox")
+												|| element.is(":radio")
+												|| element.parent().is(
+														".input-append")) {
+											error.appendTo(element.parent()
+													.parent());
+										} else {
+											error.insertAfter(element);
+										}
+									}
+								});
 			});
-		});
-	</script>
+</script>
 </head>
 <body>
-	<ul class="nav nav-tabs">
-		<li class="active"><a href="${ctx}/sys/user/info">个人信息</a></li>
-		<li><a href="${ctx}/sys/user/modifyPwd">修改密码</a></li>
-	</ul><br/>
-	<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/info" method="post" class="form-horizontal">
-		<sys:message content="${message}"/>
-		
-		<div class="control-group">
-			<label class="control-label">头像:</label>
-			<div class="controls">
-				<form:hidden id="nameImage" path="photo" htmlEscape="false" maxlength="255" class="input-xlarge"/>
-				<sys:ckfinder input="nameImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+	<div class="page-content">
+		<div class="row">
+			<ul class="nav nav-tabs">
+				<li class="active"><a href="${ctx}/sys/user/info">个人信息</a></li>
+				<li><a href="${ctx}/sys/user/modifyPwd">修改密码</a></li>
+			</ul>
+			<br />
+			<div class="col-md-12">
+				<div class="portlet box blue">
+
+					<div class="portlet-title">
+						<div class="caption">
+							<i class="fa fa-gift"></i>
+							<spring:message code="userInfo" />
+						</div>
+					</div>
+					<div class="portlet-body form">
+						<form:form id="inputForm" modelAttribute="user"
+							action="${ctx}/sys/user/info" method="post"
+							class="form-horizontal form-striped">
+							<sys:message content="${message}" />
+							<div class="form-body">
+								<div class="form-group">
+									<label class="col-md-3 control-label">头像:</label>
+									<div class="col-md-4">
+										<form:hidden id="nameImage" path="photo" htmlEscape="false"
+											maxlength="255" class="input-xlarge" />
+										<sys:ckfinder input="nameImage" type="images"
+											uploadPath="/photo" selectMultiple="false" maxWidth="100"
+											maxHeight="100" />
+									</div>
+								</div>
+
+								<div class="form-group">
+									<label class="col-md-3 control-label">姓名:</label>
+									<div class="col-md-4">
+										<form:input path="name" htmlEscape="false" maxlength="50"
+											class="required form-control" readonly="true" />
+									</div>
+								</div>
+								<div class="form-group">
+									<label class="col-md-3 control-label">邮箱:</label>
+									<div class="col-md-4">
+										<form:input path="email" htmlEscape="false" maxlength="50"
+											class="email form-control" />
+									</div>
+								</div>
+
+								<div class="form-group">
+									<label class="col-md-3 control-label">用户部门:</label>
+									<div class="col-md-4">
+										<label class="lbl control-label">${user.office.name}</label>
+									</div>
+								</div>
+
+
+								<div class="form-group">
+									<label class="col-md-3 control-label">用户角色:</label>
+									<div class="col-md-4">
+										<label class="lbl control-label">${user.roleNames}</label>
+									</div>
+								</div>
+							</div>
+
+							<div class="form-actions">
+								<div class="row">
+									<div class="col-md-offset-3 col-md-9">
+										<button id="btnSubmit" type="submit" class="btn btn-primary">
+											<spring:message code="submit"></spring:message>
+										</button>
+									</div>
+								</div>
+							</div>
+						</form:form>
+					</div>
+				</div>
 			</div>
 		</div>
-		
-		<div class="control-group">
-			<label class="control-label">姓名:</label>
-			<div class="controls">
-				<form:input path="name" htmlEscape="false" maxlength="50" class="required" readonly="true"/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">邮箱:</label>
-			<div class="controls">
-				<form:input path="email" htmlEscape="false" maxlength="50" class="email"/>
-			</div>
-		</div>
-		
-		<div class="control-group">
-			<label class="control-label">用户部门:</label>
-			<div class="controls">
-				<label class="lbl">${user.office.name}</label>
-			</div>
-		</div>
-		
-		
-		<div class="control-group">
-			<label class="control-label">用户角色:</label>
-			<div class="controls">
-				<label class="lbl">${user.roleNames}</label>
-			</div>
-		</div>
-		
-		<div class="form-actions">
-			<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>
-		</div>
-	</form:form>
+	</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/sys/userModifyPwd.jsp b/src/main/webapp/WEB-INF/views/sys/userModifyPwd.jsp
index 77070e9a6..d7c63a985 100644
--- a/src/main/webapp/WEB-INF/views/sys/userModifyPwd.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userModifyPwd.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
 	<title>修改密码</title>
-	<script type="text/javascript">
+<script type="text/javascript">
 		$(document).ready(function() {
 			$("#oldPassword").focus();
 			$("#inputForm").validate({
@@ -30,37 +30,61 @@
 	</script>
 </head>
 <body>
+<div class="page-content">
+		<div class="row">
 	<ul class="nav nav-tabs">
 		<li><a href="${ctx}/sys/user/info">个人信息</a></li>
 		<li class="active"><a href="${ctx}/sys/user/modifyPwd">修改密码</a></li>
 	</ul><br/>
+	<div class="col-md-12">
+		<div class="portlet box blue">
+				<div class="portlet-title">
+					<div class="caption">
+							<i class="fa fa-gift"></i>
+					<spring:message code="updatePwd" />
+				</div>
+		</div>
+	<div class="portlet-body form">	
 	<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/modifyPwd" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
 		<sys:message content="${message}"/>
-		<div class="control-group">
-			<label class="control-label">旧密码:</label>
-			<div class="controls">
-				<input id="oldPassword" name="oldPassword" type="password" value="" maxlength="50" minlength="3" class="required"/>
-				<span class="help-inline"><font color="red">*</font> </span>
+		<div class="form-body">
+		<div class="form-group">
+			<label class="col-md-3 control-label">旧密码:</label>
+			<div class="col-md-4">
+				<input id="oldPassword" name="oldPassword" type="password" value="" maxlength="50" minlength="3" class="required form-control"/>
 			</div>
+				<span class="help-inline"><font color="red">*</font> </span>
 		</div>
-		<div class="control-group">
-			<label class="control-label">新密码:</label>
-			<div class="controls">
-				<input id="newPassword" name="newPassword" type="password" value="" maxlength="50" minlength="3" class="required"/>
-				<span class="help-inline"><font color="red">*</font> </span>
+		<div class="form-group">
+			<label class="col-md-3 control-label">新密码:</label>
+			<div class="col-md-4">
+				<input id="newPassword" name="newPassword" type="password" value="" maxlength="50" minlength="3" class="required form-control"/>
 			</div>
+				<span class="help-inline"><font color="red">*</font> </span>
 		</div>
-		<div class="control-group">
-			<label class="control-label">确认新密码:</label>
-			<div class="controls">
-				<input id="confirmNewPassword" name="confirmNewPassword" type="password" value="" maxlength="50" minlength="3" class="required" equalTo="#newPassword"/>
-				<span class="help-inline"><font color="red">*</font> </span>
+		<div class="form-group">
+			<label class="col-md-3 control-label">确认新密码:</label>
+			<div class="col-md-4">
+				<input id="confirmNewPassword" name="confirmNewPassword" type="password" value="" maxlength="50" minlength="3" class="required form-control" equalTo="#newPassword"/>
 			</div>
+				<span class="help-inline"><font color="red">*</font> </span>
 		</div>
 		<div class="form-actions">
-			<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>
+		<div class="row">
+				<div class="col-md-offset-3 col-md-9">
+			<button id="btnSubmit" type="submit" class="btn btn-primary">
+				<spring:message code="submit"></spring:message>
+			</button>
+		</div>
+		</div>
+		</div>
 		</div>
 	</form:form>
+	</div>
+	</div>
+	</div>
+	</div>
+</div>
 </body>
 </html>
\ No newline at end of file
