From f04951f9a181b15b2944097e078d5c78d1d68a04 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Thu, 27 Aug 2015 22:30:55 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=E4=BF=AE=E6=94=B9=E5=89=8D?=
 =?UTF-8?q?=E5=8F=B0=E9=A1=B5=E9=9D=A2=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95,?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B3=A8=E9=94=80=E5=8A=9F=E8=83=BD,?=
 =?UTF-8?q?=E5=9C=A8=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/src/oj/account/login.html | 46 +++++++++++++++++-------------
 template/src/oj_base.html          | 46 ++++++++++++++++--------------
 2 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/template/src/oj/account/login.html b/template/src/oj/account/login.html
index 2f5f7cf4..5777fd3f 100644
--- a/template/src/oj/account/login.html
+++ b/template/src/oj/account/login.html
@@ -1,27 +1,33 @@
 {% extends "oj_base.html" %}
 {% block body %}
-    <div class="container main">
-        <div class="col-md-6 col-md-offset-3">
-            <h2 class="text-center">用户登录</h2>
+<div class="container main">
+    <div class="col-md-6 col-md-offset-3">
+        <h2 class="text-center">用户登录</h2>
 
-            <form id="login-form">
-                <div class="form-group">
-                    <label for="username">用户名</label>
-                    <input type="text" class="form-control input-lg" id="username" name="username" maxlength="30" data-error="请填写用户名" placeholder="用户名" autofocus required>
-                    <div class="help-block with-errors"></div>
-                </div>
-                <div class="form-group">
-                    <label for="password">密码</label>
-                    <input type="password" class="form-control input-lg" id="password" name="password" maxlength="30" data-error="请填写密码" placeholder="密码" required>
-                    <div class="help-block with-errors"></div>
-                </div>
-                <div class="form-group">
-                    <button type="submit" class="btn btn-primary">提交</button>
-                </div>
-            </form>
-        </div>
+        <form id="login-form">
+            <div class="form-group">
+                <label for="username">用户名</label>
+                <input type="text" class="form-control input-lg" id="username" name="username" maxlength="30"
+                       data-error="请填写用户名" placeholder="用户名" autofocus required>
+
+                <div class="help-block with-errors"></div>
+            </div>
+            <div class="form-group">
+                <label for="password">密码</label>
+                <input type="password" class="form-control input-lg" id="password" name="password" maxlength="30"
+                       data-error="请填写密码" placeholder="密码" required>
+
+                <div class="help-block with-errors"></div>
+            </div>
+            <div class="form-group">
+                <button type="submit" class="btn btn-primary">提交</button>
+            </div>
+            <a href="/register/">还没有帐号?点击注册</a>
+
+        </form>
     </div>
+</div>
 {% endblock %}
 {% block js_block %}
-    <script src="/static/js/app/oj/account/login.js"></script>
+<script src="/static/js/app/oj/account/login.js"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/template/src/oj_base.html b/template/src/oj_base.html
index 082cad5b..be8f3b0e 100644
--- a/template/src/oj_base.html
+++ b/template/src/oj_base.html
@@ -48,28 +48,28 @@
                 <li><a href="/about/">关于</a></li>
             </ul>
             {% if request.user.is_authenticated %}
-                <ul class="nav navbar-nav navbar-right">
-                    <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
-                           aria-expanded="false">
-                            李扬
-                            <span class="caret"></span></a>
-                        <ul class="dropdown-menu">
-                            <li><a href="#">我的提交</a></li>
-                            <li><a href="#">我的资料</a></li>
-                            <li role="separator" class="divider"></li>
-                            <li><a href="#">退出</a></li>
-                        </ul>
-                    </li>
-                </ul>
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
+                       aria-expanded="false">
+                        {{ request.user.username }}
+                        <span class="caret"></span></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="/submission/">我的提交</a></li>
+                        <li><a href="#">我的资料</a></li>
+                        <li role="separator" class="divider"></li>
+                        <li><a href="/logout/">退出</a></li>
+                    </ul>
+                </li>
+            </ul>
             {% else %}
-                <ul class="nav navbar-nav navbar-right">
-                    <li class="dropdown">
-                        <a href="/login/" class="dropdown-toggle">
-                            登录
-                        </a>
-                    </li>
-                </ul>
+            <ul class="nav navbar-nav navbar-right">
+                <li>
+                    <a href="/login/">
+                        登录
+                    </a>
+                </li>
+            </ul>
             {% endif %}
         </div>
     </div>
@@ -84,6 +84,10 @@
 <script src="/static/js/require.js"></script>
 <script>
     require(["bootstrap"]);
+
+
+
+
 </script>
 {% block js_block %}{% endblock %}
 <!-- footer begin -->