From f03f9f8edb46cf5352e3b6254d87ecf55b8b5bf6 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Mon, 9 Nov 2015 21:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=89=8D=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/oj/account/settings.js     |  3 +
 template/src/oj/account/change_password.html | 84 ++++++++++++--------
 2 files changed, 55 insertions(+), 32 deletions(-)
 create mode 100644 static/src/js/app/oj/account/settings.js

diff --git a/static/src/js/app/oj/account/settings.js b/static/src/js/app/oj/account/settings.js
new file mode 100644
index 00000000..320e97b8
--- /dev/null
+++ b/static/src/js/app/oj/account/settings.js
@@ -0,0 +1,3 @@
+/**
+ * Created by uzi on 11/7/15.
+ */
diff --git a/template/src/oj/account/change_password.html b/template/src/oj/account/change_password.html
index d69357fb..29be4561 100644
--- a/template/src/oj/account/change_password.html
+++ b/template/src/oj/account/change_password.html
@@ -1,41 +1,61 @@
 {% extends "oj_base.html" %}
 {% block title %}
-    用户修改密码
+用户设置
 {% endblock %}
 {% block body %}
-    <div class="container main">
-        <div class="col-md-6 col-md-offset-3">
-            <h2 class="text-center">修改密码</h2>
+<div class="container main">
 
-            <form id="change_password-form">
-                <div class="form-group">
-                    <label for="password">旧密码</label>
-                    <input type="password" class="form-control input-lg" id="password" name="password" placeholder="密码" data-error="请填写旧密码" maxlength="30" required>
-                    <div class="help-block with-errors"></div>
-                </div>
-                <div class="form-group">
-                    <label for="new_password">新密码</label>
-                    <input type="password" class="form-control input-lg" id="new_password" name="new_password" placeholder="新密码" maxlength="30" data-minlength="6" data-error="密码不得少于6位" required>
-                    <div class="help-block with-errors"></div>
-                </div>
-                <div class="form-group">
-                    <label for="confirm_password">确认密码</label>
-                    <input type="password" class="form-control input-lg" id="confirm_password" name="confirm_password" placeholder="确认密码" maxlength="30" data-match="#new_password" data-match-error="两个密码不一致" required>
-                    <div class="help-block with-errors"></div>
-                </div>
-                <div class="form-group">
-                    <label for="captcha">验证码</label>
-                    &nbsp;&nbsp;<img src="/captcha/" id="captcha-img">
-                    <small><p></p></small>
-                    <input type="text" class="form-control input-lg" id="captcha" name="captcha" placeholder="验证码" maxlength="4" data-error="请填写验证码" required>
-                    <div class="help-block with-errors"></div>
-                </div>
-                <div class="form-group">
-                    <button type="submit" class="btn btn-primary">提交</button>
-                </div>
-            </form>
-        </div>
+    <div class="col-lg-2">
+        <ul class="list-group">
+            <li class="list-group-header">通用设置</li>
+            <li class="list-group-item"><a href="/account/settings/">个人信息</a></li>
+            <li class="list-group-item"><a href="/account/settings/avatar/">更换头像</a></li>
+            <li class="list-group-item active"><a href="/change_password/">修改密码</a></li>
+        </ul>
     </div>
+    <div class="col-lg-3">
+        <img src="https://coding.net/static/fruit_avatar/Fruit-1.png" class="img-responsive"
+             style="height: 200px;width: 200px;">
+    </div>
+    <div class="col-lg-6">
+        <form id="change_password-form">
+            <div class="form-group">
+                <label for="password">旧密码</label>
+                <input type="password" class="form-control input-lg" id="password" name="password" placeholder="密码"
+                       data-error="请填写旧密码" maxlength="30" required>
+
+                <div class="help-block with-errors"></div>
+            </div>
+            <div class="form-group">
+                <label for="new_password">新密码</label>
+                <input type="password" class="form-control input-lg" id="new_password" name="new_password"
+                       placeholder="新密码" maxlength="30" data-minlength="6" data-error="密码不得少于6位" required>
+
+                <div class="help-block with-errors"></div>
+            </div>
+            <div class="form-group">
+                <label for="confirm_password">确认密码</label>
+                <input type="password" class="form-control input-lg" id="confirm_password" name="confirm_password"
+                       placeholder="确认密码" maxlength="30" data-match="#new_password" data-match-error="两个密码不一致" required>
+
+                <div class="help-block with-errors"></div>
+            </div>
+            <div class="form-group">
+                <label for="captcha">验证码</label>
+                &nbsp;&nbsp;<img src="/captcha/" id="captcha-img">
+                <small><p></p></small>
+                <input type="text" class="form-control input-lg" id="captcha" name="captcha" placeholder="验证码"
+                       maxlength="4" data-error="请填写验证码" required>
+
+                <div class="help-block with-errors"></div>
+            </div>
+            <div class="form-group">
+                <button type="submit" class="btn btn-primary">提交</button>
+            </div>
+        </form>
+    </div>
+</div>
+</div>
 {% endblock %}
 {% block js_block %}
     <script src="/static/js/app/oj/account/changePassword.js"></script>