xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge virusdefender-dev -> dev-s

Browse Source
This commit is contained in:
esp
2015-11-10 10:21:48 +08:00
parent c71c051c39 f24a8fb039
commit d64659ec6f
12 changed files with 140 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,21 +1,20 @@
{% 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">
<li class="list-group-header">通用设置</li>
<li class="list-group-item active"><a href="/account/settings/">个人信息</a></li>
<li class="list-group-item"><a href="/account/settings/avatar/">更换头像</a></li>
<li class="list-group-item"><a href="/change_password/">修改密码</a></li>
</ul>
</div>
<div class="col-lg-2">
<ul class="list-group">
<li class="list-group-header">通用设置</li>
<li class="list-group-item active"><a href="/account/settings/">个人信息</a></li>
<li class="list-group-item"><a href="/account/settings/avatar/">更换头像</a></li>
<li class="list-group-item"><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;">
<img src="{{ user.userprofile.avatar }}" class="img-responsive index-avatar">
</div>
<div class="col-lg-6">
<form>
@@ -23,62 +22,78 @@
<div class="form-group col-md-6"><label>用户名</label>
<input name="username" type="text" class="form-control"
value="{{ request.user.username }}" readonly>
</div>
<div class="form-group col-md-6"><label>真实姓名</label>
<input name="real_name" type="text" class="form-control"
value="{{ request.user.real_name }}" readonly>
</div>
</div>
<div class="row">
<div class="form-group col-md-6"><label>电子邮箱</label>
<input name="email" type="email" class="form-control"
value="{{ request.user.email }}" readonly>
<div class="help-block with-errors"></div>
</div>
<div class="form-group col-md-6"><label>手机</label>
<input name="phone" type="text" class="form-control"
data-error="请填写手机号码" value="{{ request.user.phone }}">
<div class="help-block with-errors"></div>
<input name="phone" type="text" maxlength="11" id="phone"
class="form-control"
value="{% if request.user.userprofile.phone %}{{ request.user.userprofile.phone }}{% endif %}">
</div>
<div class="help-block with-errors"></div>
</div>
<div class="row">
<div class="form-group col-md-6">
<label>学校</label>
<input name="school" type="text" class="form-control"
value="{{ request.user.hduoj_username }}">
<div class="help-block with-errors"></div>
</div>
<div class="form-group col-md-6">
<label>hduoj 用户名</label>
<input name="hduoj" type="text" class="form-control"
value="{{ request.user.hduoj_username }}">
<div class="help-block with-errors"></div>
</div>
<div class="form-group col-md-6">
<label>BestCoder 用户名</label>
<input name="bestcoder" type="text" class="form-control"
value="{{ request.user.bestcoder_username }}">
<div class="help-block with-errors"></div>
</div>
<div class="form-group col-md-6">
<label>Codeforces 用户名</label>
<input name="codeforces" type="text" class="form-control"
value="{{ request.user.bestcoder_username }}">
<div class="help-block with-errors"></div>
</div>
<div class="form-group col-md-12"><label>blog</label>
<input name="blog" type="url" class="form-control"
value="{{ request.user.blog }}">
<div class="help-block with-errors"></div>
</div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">提交</button>
<div class="help-block with-errors"></div>
<div class="form-group col-md-12">
<label>签名</label>
<input name="mood" type="text" maxlength="60" class="form-control" id="mood"
value="{% if request.user.userprofile.mood %}{{ request.user.userprofile.mood }}{% endif %}"
data-error="字数限制在30字以内">
<div class="help-block with-errors"></div>
</div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">提交</button>
</div>
</div>
</form>
</div>
</div>
</div>
{% endblock %}
{% block js_block %}
<script src="/static/js/app/oj/account/settings.js"></script>
{% endblock %}

12
template/src/oj/account/user_index.html
View File

@@ -19,7 +19,9 @@
{% endifequal %}
</h2>
<p id="user-mood">{{ user.userprofile.mood }}</p>
{% if user.userprofile.mood %}
<p id="user-mood">{{ user.userprofile.mood }}</p>
{% endif %}
</div>
<div class="list-group col-lg-9">
@@ -32,7 +34,7 @@
{% if user.userprofile.hduoj_username %}
<p class="list-group-item">
<img src="/static/img/oj_logo/hdu_logo.png" id="oj-logo">
<a href="http://bestcoder.hdu.edu.cn/rating.php?user={{ user.userprofile.hduoj_username }}" target="_blank">
<a href="http://acm.hdu.edu.cn/userstatus.php?user={{ user.userprofile.hduoj_username }}" target="_blank">
{{ user.userprofile.hduoj_username }}
</a>
</p>
@@ -61,15 +63,17 @@
{{ user.create_time }}
</p>
<div class="rows">
<!--
<div class="col-lg-4 text-center">
<strong id="user-data-number">{{ user.userprofile.rank }}</strong>
<span id="user-data-text">Rank</span>
</div>
<div class="col-lg-4 text-center">
-->
<div class="col-lg-6 text-center">
<strong id="user-data-number">{{ user.userprofile.accepted_number }}</strong>
<span id="user-data-text">AC</span>
</div>
<div class="col-lg-4 text-center">
<div class="col-lg-6 text-center">
<strong id="user-data-number">{{ user.userprofile.submissions_number }}</strong>
<span id="user-data-text">Submissions</span>
</div>