修改密码

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@748 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/tpl/index/account/user.html

@@ -1,24 +1,57 @@
+<style>
+.base-info .title {
+	width: 56px;
+	line-height: 30px;
+}
+.base-info .content {
+	line-height: 30px;
+}
+.radio input[type="radio"], .radio-inline input[type="radio"], .checkbox input[type="checkbox"], .checkbox-inline input[type="checkbox"] {
+	margin-top: 10px;
+}
+.password label {
+	
+}
+.password .col {
+	line-height: 30px;
+}
+.password .line {
+	margin-bottom: 15px;
+}
+</style>
+<div class="loading in" ng-class="{'in': loading}">
+	<i></i>
+</div>
 <div class="pane base-info">
 	<div class="pane-header">
 		我的个人资料
 		<div class="pull-right">
-			<a href="#" class="text-simple"><i class="fa fa-pencil fa-fw"></i>编辑</a><a
-				href="#" class="text-simple"><i class="fa fa-lock fa-fw"></i>修改密码</a>
+			<a ng-disabled="userForm.$invalid" class="text-simple text-success" ng-show="editing" ng-click="saveUser()"><i class="fa fa-save fa-fw"></i>保存修改</a>
+			<a class="text-simple" ng-show="editing" ng-click="editing=false"><i class="fa fa-reply-all fa-fw"></i>取消编辑</a>
+			<a class="text-simple" ng-show="!editing" ng-click="editing=true"><i class="fa fa-pencil fa-fw"></i>编辑</a>
+			<a class="text-simple text-danger" ng-click="updatePassword()"><i class="fa fa-lock fa-fw"></i>修改密码</a>
 		</div>
 	</div>
 	<div class="pane-body">
+		<form ng="userForm" class="form-inline">
 		<div class="row row-sm item">
 			<div class="col-xs-3">
 				<span class="title">姓名</span>
-				<div class="content" ng-bind="::user.userName"></div>
+				<div class="content" ng-show="!editing" ng-bind="user.userName"></div>
+				<div class="content" ng-show="editing"><input reqired ng-model="user.userName" class="form-control input-sm" type="text"/></div>
 			</div>
 			<div class="col-xs-3">
 				<span class="title">性别</span>
-				<div class="content" ng-bind="::user.userSex == 'F' ? '女' : '男'"></div>
+				<div class="content" ng-show="!editing" ng-bind="user.userSex == 'F' ? '女' : '男'"></div>
+				<div class="content" ng-show="editing">
+					<label class="radio-inline"><input ng-model="user.userSex" value="F" type="radio"/> 女 </label>
+					<label class="radio-inline"><input ng-model="user.userSex" value="M" type="radio"/> 男 </label>
+				</div>
 			</div>
 			<div class="col-xs-6">
 				<span class="title">身份证号</span>
-				<div class="content" ng-bind="::user.userIdcode"></div>
+				<div class="content" ng-show="!editing" ng-bind="user.userIdcode"></div>
+				<div class="content" ng-show="editing"><input ng-model="user.userIdcode" class="form-control input-sm" type="text"/></div>
 			</div>
 		</div>
 		<div class="row row-sm item">
@@ -28,15 +61,53 @@
 			</div>
 			<div class="col-xs-3">
 				<span class="title">电话</span>
-				<div class="content" ng-bind="::user.userTel"></div>
+				<div class="content" ng-show="!editing" ng-bind="user.userTel"></div>
+				<div class="content" ng-show="editing"><input reqired ng-model="user.userTel" class="form-control input-sm" type="text"/></div>
 			</div>
 			<div class="col-xs-6">
 				<span class="title">邮箱</span>
-				<div class="content" ng-bind="::user.userEmail"></div>
+				<div class="content" ng-show="!editing" ng-bind="user.userEmail"></div>
+				<div class="content" ng-show="editing"><input reqired ng-model="user.userEmail" class="form-control input-sm" type="text"/></div>
 			</div>
 		</div>
+		</form>
 	</div>
 </div>
+	<script type="text/ng-template" id="updatePassword.html">
+        <div class="modal-header">
+            <h3 class="modal-title"><i class="fa fa-lock fa-fw"></i>修改密码</h3>
+        </div>
+		<form class="password" name="sampleSendForm" ng-submit="ok()">
+        	<div class="modal-body">
+				<div class="row">
+					<label class="col-md-4 col-sm-4 col text-right">用户：</label>
+					<div class="col-md-4 col-sm-4 col">{{::user.userUU}} - {{::user.userName}} </div>
+				</div>
+				<div class="row line">
+					<label class="col-md-4 col-sm-4 col text-right">原密码：</label>
+					<div class="col-md-4 col-sm-4 col"><input ng-model="user.password" class="form-control input-sm" type="text" ng-blur="checkPassword(user.password)" required></div>
+					<div class="col-md-4 col-sm-4 col">
+						<i ng-show="checking" class="fa fa-spinner fa-spin"></i>
+						<i ng-show="checkSuccess" class="fa fa-check"></i><i ng-show="checkFailed" class="fa fa-close"></i></div>
+				</div>
+				<div class="row">
+					<label class="col-md-4 col-sm-4 col text-right">新密码：</label>
+					<div class="col-md-4 col-sm-4 col">
+						<input ng-model="user.newPassword" class="form-control input-sm" type="text" required>
+						<div>密码复杂度</div>
+					</div>
+				</div>
+				<div class="row line">
+					<label ng-model="user.newPassword1" class="col-md-4 col-sm-4 col text-right">重复新密码：</label>
+					<div class="col-md-4 col-sm-4 col"><input class="form-control input-sm" type="text" required></div>
+				</div>
+        	</div>
+        	<div class="modal-footer">
+            	<button class="btn btn-primary" type="submit">确认修改</button>
+            	<button class="btn btn-warning" ng-click="cancel()" type="button">取消</button>
+        	</div>
+		</form>
+    </script>
 <div class="pane base-info">
 	<div class="pane-header">
 		全部用户