QingdaoU/OnlineJudge
1
0
Fork 0
mirror of https://github.com/QingdaoU/OnlineJudge.git synced 2024-09-21 16:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
uzi 2015-11-24 18:59:41 +08:00
commit 43ac27ea08
3 changed files with 62 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
static/src/js/app/oj/account/avatar.js
View File

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

25
template/src/oj/account/avatar.html
View File

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

4
template/src/oj/account/settings.html
View File

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