aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorWeitian LI <liweitianux@gmail.com>2014-04-20 17:01:42 +0800
committerWeitian LI <liweitianux@gmail.com>2014-04-20 17:01:42 +0800
commit733a218f0c807dd6c6c60addca1cb3c512207993 (patch)
tree0a2a1a1a546fffb56d1afd6f2dcfa31ffc105f8a /templates
parent81ee68feef68804dce99c37c79f91e392bea800d (diff)
downloaddjango-skaschool-733a218f0c807dd6c6c60addca1cb3c512207993.tar.bz2
small updated navbar.html and registration templates
Diffstat (limited to 'templates')
-rw-r--r--templates/activation_complete.html22
-rw-r--r--templates/navbar.html8
-rw-r--r--templates/registration/registration_closed.html10
-rw-r--r--templates/registration/registration_form.html5
4 files changed, 16 insertions, 29 deletions
diff --git a/templates/activation_complete.html b/templates/activation_complete.html
deleted file mode 100644
index 11ca25e..0000000
--- a/templates/activation_complete.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends 'base.html' %}
-{% load staticfiles %}
-{% load url from future %}
-{% load bootstrap3 %}
-
-{# step 4. activation complete #}
-
-{% block title %}
-成功激活 | 2014 SKA Summer School
-{% endblock %}
-
-{% block content %}
- <div class="container">
- <h2>成功激活</h2>
- <p class="lead">您已成功激活账户。</p>
-
- <br />
- <p><a href="#" class="btn btn-primary">登录</a></p>
- </div>
-{% endblock %}
-
-{# vim: set ts=8 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: #}
diff --git a/templates/navbar.html b/templates/navbar.html
index 00d285f..56a231c 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -35,14 +35,12 @@
<ul class="nav navbar-nav navbar-right">
<li><a href="#">English</a></li>
{% if user.is_authenticated %}
- <li>
- <a href="#" class="navbar-link">{{ user.username }}</a> |
- <a href="#" class="navbar-link">退出</a>
- </li>
+ <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>
{% else %}
<!-- wrap 'navbar-btn' within 'div' -->
<li><div><a href="{% url 'registration_register' %}" class="btn btn-default navbar-btn">注册</a></div></li>
- <li><div><a href="#" class="btn btn-primary navbar-btn">登录</a></div></li>
+ <li><div><a href="{% url 'login' %}" class="btn btn-primary navbar-btn">登录</a></div></li>
{% endif %}
</ul>
</div> <!-- /.navbar-collapse -->
diff --git a/templates/registration/registration_closed.html b/templates/registration/registration_closed.html
index 3501f3e..7368c71 100644
--- a/templates/registration/registration_closed.html
+++ b/templates/registration/registration_closed.html
@@ -5,7 +5,15 @@
{# registration closed #}
{% block title %}
-已关闭注册 | 2014 SKA Summer School
+注册已关闭 | 2014 SKA Summer School
+{% endblock %}
+
+{% block content %}
+ <div class="container">
+ <h2>注册已关闭</h2>
+ <p class="lead">很抱歉,暑期学校注册已经关闭。</p>
+ <p>如果您有需要,请与我们联系:<a href="mailto:skaschool2014@163.com"><code>skaschool2014@163.com</code></a></p>
+ </div>
{% endblock %}
{# vim: set ts=8 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: #}
diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html
index 90144ec..9404d68 100644
--- a/templates/registration/registration_form.html
+++ b/templates/registration/registration_form.html
@@ -11,10 +11,13 @@
{% block content %}
<div class="container">
+ <h2>注册账户</h2>
+ <br />
+
<form role="form" class="form-horizontal" method="post">
{% csrf_token %}
{% bootstrap_form form layout='horizontal' %}
- {% buttons submit='OK' reset='Cancel' layout='horizontal' %}{% endbuttons %}
+ {% buttons submit='提交' reset='取消' layout='horizontal' %}{% endbuttons %}
</form>
</div>
{% endblock %}