aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWeitian LI <liweitianux@gmail.com>2014-04-29 00:37:32 +0800
committerWeitian LI <liweitianux@gmail.com>2014-04-29 00:37:32 +0800
commit0f3c82eb7219a5bddf2609087df1472717225d5c (patch)
tree584bf3c4e12df9c7c989a8220fe7b11b3b22a579
parentc3dd549d0001151333d1daf82a358b64a46fad29 (diff)
downloaddjango-skaschool-0f3c82eb7219a5bddf2609087df1472717225d5c.tar.bz2
* updated login.html with 'password-reset' style
* updated profile.html with transcript display * updated about.html with alert warning information * updated introduction with poster download link
-rw-r--r--account/templates/account/login.html14
-rw-r--r--account/templates/account/profile.html2
-rw-r--r--page/templates/page/about.html4
-rw-r--r--page/templates/page/introduction.html1
4 files changed, 14 insertions, 7 deletions
diff --git a/account/templates/account/login.html b/account/templates/account/login.html
index fb14550..62b46df 100644
--- a/account/templates/account/login.html
+++ b/account/templates/account/login.html
@@ -10,9 +10,10 @@
{% endblock %}
{% block content %}
- <div class="container">
- <h2>登录</h2>
- <br>
+<div class="container">
+ <h2>登录</h2>
+ <br>
+ <div class="row">
<form role="form" class="form-horizontal" method="post">
{% csrf_token %}
{% bootstrap_form form layout='horizontal' %}
@@ -20,8 +21,11 @@
</form>
<br>
- <p>忘记密码了? <a href="{% url 'password_reset' %}" class="btn btn-default">重置密码</a></p>
- </div>
+ <div class="col-md-4 col-md-push-1">
+ <p>忘记密码了? <a href="{% url 'password_reset' %}" class="btn btn-default">重置密码</a></p>
+ </div> <!-- col-md-2 -->
+ </div> <!-- row -->
+</div>
{% endblock %}
{# vim: set ts=8 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: #}
diff --git a/account/templates/account/profile.html b/account/templates/account/profile.html
index f36c114..a615db5 100644
--- a/account/templates/account/profile.html
+++ b/account/templates/account/profile.html
@@ -67,7 +67,7 @@
<th class="profile-reason">为什么参加</th>
<td class="profile-reason-data">{% if profile.reason %}{{ profile.reason }}{% else %}<span class="label label-warning">请及时填写参加理由</span>{% endif %}</td>
</tr>
- {% if profile.is_transcript_required %}
+ {% if profile.is_transcript_required or profile.transcript %}
<tr>
<th class="profile-transcript">成绩单</th>
<td class="profile-transcript-data">{% if profile.transcript %}<a href="{{ profile.transcript.url }}">{{ profile.get_transcript_filename }}{% else %}<span class="label label-warning">请及时上传成绩单</span>{% endif %}</a></td>
diff --git a/page/templates/page/about.html b/page/templates/page/about.html
index 2f6369e..3205286 100644
--- a/page/templates/page/about.html
+++ b/page/templates/page/about.html
@@ -13,7 +13,9 @@
<div class="container">
<h2>关于</h2>
<br>
- TODO
+ <div class="alert alert-warning">
+ 很抱歉,暂时未能提供更多信息……
+ </div>
</div>
{% endblock %}
diff --git a/page/templates/page/introduction.html b/page/templates/page/introduction.html
index 9a40b29..b91f67e 100644
--- a/page/templates/page/introduction.html
+++ b/page/templates/page/introduction.html
@@ -82,6 +82,7 @@
<h3 id="poster">宣传海报</h3>
<img src="{% static 'images/skaschool-poster.jpg' %}" class="img-responsive" alt="2014 SKA Summer School Poster">
+ <p>海报下载请至<a href="{% url 'archive_all' %}">资料下载</a></p>
<br>
</div> <!-- col-md-9, content-col -->