Merge branch 'virusdefender-dev' of git.coding.net:virusdefender/qduoj into dev-s

static/src/js/app/oj/account/avatar.js

@@ -1,5 +1,6 @@
 require(["jquery", "bsAlert", "csrfToken"], function ($, bsAlert, csrfTokenHeader) {
-    var avatar="";
+    var avatar = "";
+
     function changeAvatar(event) {
         avatar = $(event.target).attr('src');
         $('#current_avatar').attr('src', avatar);
@@ -7,7 +8,7 @@ require(["jquery", "bsAlert", "csrfToken"], function ($, bsAlert, csrfTokenHeade
 
     $('.avatar-item').click(changeAvatar);
 
-    $('#save_avatar').click(function(){
+    $('#save_avatar').click(function () {
         if (avatar)
             $.ajax({
                 beforeSend: csrfTokenHeader,
@@ -21,7 +22,7 @@ require(["jquery", "bsAlert", "csrfToken"], function ($, bsAlert, csrfTokenHeade
                     if (!data.code) {
                         bsAlert("已保存!");
                     }
-                        else{
+                    else {
                         bsAlert(data.data);
                     }
                 },

template/src/oj/account/avatar.html

@@ -1,9 +1,9 @@
 {% extends "oj_base.html" %}
 {% block title %}
-更换头像
+    更换头像
 {% endblock %}
 {% block body %}
-<div class="container main">
+    <div class="container main">
 
         <div class="col-lg-2">
             <ul class="list-group">
@@ -17,17 +17,15 @@
             <img src="{{ user.userprofile.avatar }}" class="img-responsive"
                  style="height: 200px;width: 200px;" id="current_avatar">
             <br>
-        <div class="form-group left">
-            <button id="save_avatar" type="submit" class="btn btn-primary">保存</button>
-        </div>
+
         </div>
         <div class="col-lg-6">
-        <form>
+            <div>
                 <div class="row">
                     {% for i in "aaaaaaaaaaaaaaaaaaaa" %}
                         <div class="col-lg-2 avatar-item">
-                    <div style="border: 1px solid red;">
-                        <img src="/static/img/avatar/avatar-{{ forloop.counter }}.png">
+                            <div>
+                                <img src="/static/img/avatar/avatar-{{ forloop.counter }}.png" style="cursor:pointer">
                             </div>
                         </div>
                     {% endfor %}
@@ -39,12 +37,15 @@
                          style="height: 100px;width: 150px">
                     水果头像由<a href="https://coding.net">coding.net</a>提供。
                 </div>
-
-        </form>
+                <div class="form-group left">
+                    <button id="save_avatar" type="submit" class="btn btn-primary">保存</button>
+                </div>
+
+            </div>
+        </div>
     </div>
-</div>
 {% endblock %}
 
 {% block js_block %}
-<script src="/static/js/app/oj/account/avatar.js"></script>
+    <script src="/static/js/app/oj/account/avatar.js"></script>
 {% endblock %}

template/src/oj/account/settings.html

@@ -36,7 +36,7 @@
                 <div class="form-group col-md-6"><label>手机</label>
                     <input name="phone" type="text" maxlength="11" id="phone"
                            class="form-control"
-                           value="{{ request.user.userprofile.phone_number }}">
+                           value="{% if request.user.userprofile.phone_number %}{{ request.user.userprofile.phone_number }}{% endif %}">
                 </div>
                 <div class="help-block with-errors"></div>
             </div>
@@ -44,7 +44,7 @@
                 <div class="form-group col-md-6">
                     <label>学校</label>
                     <input name="school" type="text" class="form-control" id="school"
-                           value="{{ request.user.userprofile.school }}">
+                           value="{% if request.user.userprofile.school %}{{ request.user.userprofile.school }}{% endif %}">
 
                     <div class="help-block with-errors"></div>
                 </div>