aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--account/templates/account/login.html4
-rw-r--r--account/templates/account/password_change.html2
-rw-r--r--account/templates/account/password_change_done.html2
-rw-r--r--account/templates/account/profile.html52
-rw-r--r--templates/index.html6
-rw-r--r--templates/navbar.html2
-rw-r--r--templates/registration/activation_complete.html4
-rw-r--r--templates/registration/registration_complete.html2
-rw-r--r--templates/registration/registration_form.html4
9 files changed, 63 insertions, 15 deletions
diff --git a/account/templates/account/login.html b/account/templates/account/login.html
index b41844e..4fee972 100644
--- a/account/templates/account/login.html
+++ b/account/templates/account/login.html
@@ -12,11 +12,11 @@
{% block content %}
<div class="container">
<h2>登录</h2>
- <br />
+ <br>
<form role="form" class="form-horizontal" method="post">
{% csrf_token %}
{% bootstrap_form form layout='horizontal' %}
- {% buttons submit='提交' reset='取消' layout='horizontal' %}{% endbuttons %}
+ {% buttons submit='提交' reset='重置' layout='horizontal' %}{% endbuttons %}
</form>
</div>
{% endblock %}
diff --git a/account/templates/account/password_change.html b/account/templates/account/password_change.html
index 372bb0c..f4e2e90 100644
--- a/account/templates/account/password_change.html
+++ b/account/templates/account/password_change.html
@@ -12,7 +12,7 @@
{% block content %}
<div class="container">
<h2>修改密码</h2>
- <br />
+ <br>
<form role="form" class="form-horizontal" method="post">
{% csrf_token %}
{% bootstrap_form form layout='horizontal' %}
diff --git a/account/templates/account/password_change_done.html b/account/templates/account/password_change_done.html
index e003033..e8770ca 100644
--- a/account/templates/account/password_change_done.html
+++ b/account/templates/account/password_change_done.html
@@ -13,7 +13,7 @@
<div class="container">
<h2>密码修改成功</h2>
<p class="lead">您已成功修改密码。</p>
- <br />
+ <br>
<p><a href="{% url 'profile' %}" class="btn btn-default">返回个人主页</a></p>
</div>
{% endblock %}
diff --git a/account/templates/account/profile.html b/account/templates/account/profile.html
index aac992f..cb08717 100644
--- a/account/templates/account/profile.html
+++ b/account/templates/account/profile.html
@@ -12,9 +12,57 @@
{% block content %}
<div class="container">
<h2>个人主页</h2>
- <p class="lead">TODO ...</p>
+ <br>
- <br />
+ <table class="table table-striped table-bordered table-hover">
+ <tbody>
+ <tr>
+ <th class="profile-name">姓名</th>
+ <td class="profile-name-data">{{ profile.realname }}</td>
+ </tr>
+ <tr>
+ <th class="profile-email">邮箱</th>
+ <td class="profile-email-data">{{ user.email }}</td>
+ </tr>
+ <tr>
+ <th class="profile-institute">单位</th>
+ <td class="profile-institute-data">{{ profile.institute }}</td>
+ </tr>
+ <tr>
+ <th class="profile-approval">是否审定</th>
+ <td class="profile-approval-data">
+ {% if profile.is_approved == 'Y' %}
+ <span class="glyphicon glyphicon-ok"></span> <span class="label label-success">是</span>
+ {% elif profile.is_approved == 'N' %}
+ <span class="glyphicon glyphicon-remove"></span> <span class="label label-warning">否</span>
+ {% elif profile.is_approved == 'C' %}
+ <span class="glyphicon glyphicon-question-sign"></span> <span class="label label-default">审核中</span>
+ {% else %}
+ <span class="glyphicon glyphicon-warning-sign"></span> <span class="label label-danger">错误</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <th class="profile-sponsorship">是否资助</th>
+ <td class="profile-sponsorship-data">
+ {% if profile.is_sponsored == 'Y' %}
+ <span class="glyphicon glyphicon-ok"></span> <span class="label label-success">是</span>
+ {% elif profile.is_sponsored == 'N' %}
+ <span class="glyphicon glyphicon-remove"></span> <span class="label label-warning">否</span>
+ {% elif profile.is_sponsored == 'C' %}
+ <span class="glyphicon glyphicon-question-sign"></span> <span class="label label-default">审核中</span>
+ {% else %}
+ <span class="glyphicon glyphicon-warning-sign"></span> <span class="label label-danger">错误</span>
+ {% endif %}
+ </td>
+ </tr>
+ </table>
+
+ <br>
+ <p>
+ <a href="#" class="btn btn-default">编辑个人信息</a>
+ <a href="{% url 'password_change' %}" class="btn btn-default">修改密码</a>
+ </p>
</div>
{% endblock %}
diff --git a/templates/index.html b/templates/index.html
index 1904f8c..6b57b80 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -18,13 +18,13 @@
<h1>暨 中国-新西兰联合SKA暑期学校</h1>
<h2>China-New Zealand Joint SKA Summer School</h2>
- <br />
+ <br>
<p class="lead">
- 上海，2014，6月28日-7月5日 <br />
+ 上海，2014，6月28日-7月5日 <br>
June 28 - July 05, 2014, Shanghai
</p>
- <br />
+ <br>
<p>
<a href="#" class="btn btn-outline-inverse btn-lg">了解更多</a>
<a href="{% url 'registration_register' %}" class="btn btn-outline-inverse btn-lg">注册参加</a>
diff --git a/templates/navbar.html b/templates/navbar.html
index 56a231c..6296c6c 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -33,7 +33,7 @@
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
- <li><a href="#">English</a></li>
+ <!-- <li><a href="#">English</a></li> -->
{% if user.is_authenticated %}
<li><a href="{% url 'profile' %}" class="navbar-link">{{ user.username }}</a></li>
<li><div><a href="{% url 'logout' %}" class="btn btn-default navbar-btn">退出</a></div></li>
diff --git a/templates/registration/activation_complete.html b/templates/registration/activation_complete.html
index 11ca25e..d27622a 100644
--- a/templates/registration/activation_complete.html
+++ b/templates/registration/activation_complete.html
@@ -14,8 +14,8 @@
<h2>成功激活</h2>
<p class="lead">您已成功激活账户。</p>
- <br />
- <p><a href="#" class="btn btn-primary">登录</a></p>
+ <br>
+ <p><a href="{% url 'login' %}" class="btn btn-primary">登录</a></p>
</div>
{% endblock %}
diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html
index 21cb13d..553a154 100644
--- a/templates/registration/registration_complete.html
+++ b/templates/registration/registration_complete.html
@@ -16,7 +16,7 @@
您已顺利完成注册。我们已向您注册使用的邮箱发送了激活邮件，请留意查收，并使用其中的链接激活账户。
</p>
- <br />
+ <br>
<p>
还未收到激活邮件？
<a href="#" class="btn btn-default">重新发送激活邮件</a>
diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html
index 9404d68..31316fe 100644
--- a/templates/registration/registration_form.html
+++ b/templates/registration/registration_form.html
@@ -12,12 +12,12 @@
{% block content %}
<div class="container">
<h2>注册账户</h2>
- <br />
+ <br>
<form role="form" class="form-horizontal" method="post">
{% csrf_token %}
{% bootstrap_form form layout='horizontal' %}
- {% buttons submit='提交' reset='取消' layout='horizontal' %}{% endbuttons %}
+ {% buttons submit='提交' reset='重置' layout='horizontal' %}{% endbuttons %}
</form>
</div>
{% endblock %}
Copyright © 2017-2018 Aaron LI. All Rights Reserved.