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

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

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,27 +8,27 @@ 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,
url: "/api/account/userprofile/", url: "/api/account/userprofile/",
data: { data: {
avatar: avatar avatar: avatar
}, },
dataType: "json", dataType: "json",
method: "put", method: "put",
success: function (data) { success: function (data) {
if (!data.code) { if (!data.code) {
bsAlert("已保存!"); bsAlert("已保存!");
}
else{
bsAlert(data.data);
}
},
error: function () {
bsAlert("额 好像出错了,请刷新页面重试。如还有问题,请填写页面导航栏上的反馈。")
} }
else {
bsAlert(data.data);
}
},
error: function () {
bsAlert("额 好像出错了,请刷新页面重试。如还有问题,请填写页面导航栏上的反馈。")
}
}); });
else else

View File

@ -1,50 +1,51 @@
{% 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">
<li class="list-group-header">通用设置</li> <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/">个人信息</a></li>
<li class="list-group-item active"><a href="/account/settings/avatar/">更换头像</a></li> <li class="list-group-item active"><a href="/account/settings/avatar/">更换头像</a></li>
<li class="list-group-item"><a href="/change_password/">修改密码</a></li> <li class="list-group-item"><a href="/change_password/">修改密码</a></li>
</ul> </ul>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<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 class="col-lg-6">
<div>
<div class="row">
{% for i in "aaaaaaaaaaaaaaaaaaaa" %}
<div class="col-lg-2 avatar-item">
<div>
<img src="/static/img/avatar/avatar-{{ forloop.counter }}.png" style="cursor:pointer">
</div>
</div>
{% endfor %}
</div>
<div title="Coding.net 是深圳市扣钉网络科技有限公司打造的国内最大的一站式云端开发平台提供包括代码托管项目管理产品演示WebIDE 等工具。">
<img src="https://coding.net/static/d0aa9dd75e2500930b9e6ef61d9bcfa0.jpg"
style="height: 100px;width: 150px">
水果头像由<a href="https://coding.net">coding.net</a>提供。
</div>
<div class="form-group left">
<button id="save_avatar" type="submit" class="btn btn-primary">保存</button>
</div>
</div>
</div> </div>
</div> </div>
<div class="col-lg-6">
<form>
<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>
</div>
{% endfor %}
</div>
<div title="Coding.net 是深圳市扣钉网络科技有限公司打造的国内最大的一站式云端开发平台提供包括代码托管项目管理产品演示WebIDE 等工具。">
<img src="https://coding.net/static/d0aa9dd75e2500930b9e6ef61d9bcfa0.jpg"
style="height: 100px;width: 150px">
水果头像由<a href="https://coding.net">coding.net</a>提供。
</div>
</form>
</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 %}

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>