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

update dev
This commit is contained in:
sxw@401
2015-09-10 18:03:08 +08:00
12 changed files with 70 additions and 12 deletions

View File

@@ -17,7 +17,13 @@
</div>
<div class="form-group">
<label for="confirm_password">确认密码</label>
<input type="password" class="form-control input-lg" id="confirm_password" name="confirm_password" placeholder="确认密码" maxlength="30" data-match="#new_password" data-match-error="两个密码不一致" require>
<input type="password" class="form-control input-lg" id="confirm_password" name="confirm_password" placeholder="确认密码" maxlength="30" data-match="#new_password" data-match-error="两个密码不一致" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
<label for="confirm_password">验证码</label>
<img src="/captcha/" id="captcha-img">
<input type="text" class="form-control input-lg" id="captcha" name="captcha" placeholder="验证码" maxlength="4" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">

View File

@@ -71,7 +71,7 @@
<button class="btn btn-primary" id="share-code-btn">分享我的代码</button>
{% endif %}
<textarea class="form-control" id="share-code-textarea"
{% if not submission.shared %}style="display: none" {% endif %}>{{ problem.title }}】- {{ request.user.username }}的提交
{% if not submission.shared %}style="display: none" {% endif %}>{{ problem.title }}
{{ request.build_absolute_uri }}</textarea>
</div>
{% endifequal %}