* changed block 'title' to 'pagetitle' for every page template

9 files changed, 9 insertions, 27 deletions

diff --git a/templates/400.html b/templates/400.html
index 69bba66..5c987e0 100644
--- a/templates/400.html
+++ b/templates/400.html
@@ -4,9 +4,7 @@
 
 {# 400 bad request template #}
 
-{% block title %}
-400无效的请求 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}400: 无效的请求{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/templates/403.html b/templates/403.html
index 2e7259e..1211110 100644
--- a/templates/403.html
+++ b/templates/403.html
@@ -4,9 +4,7 @@
 
 {# 403 HTTP Forbidden template #}
 
-{% block title %}
-403禁止访问 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}403: 禁止访问{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/templates/404.html b/templates/404.html
index 1a75d8c..67fedd7 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -4,9 +4,7 @@
 
 {# 404 page not found template #}
 
-{% block title %}
-404页面未找到 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}404: 页面未找到{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/templates/index.html b/templates/index.html
index 0f13556..661dbae 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,9 +4,7 @@
 
 {# index page for skaschool #}
 
-{% block title %}
-首页 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}首页{% endblock %}
 
 {% block css_extra %}
   <link href="{% static 'css/index.css' %}" rel="stylesheet">
diff --git a/templates/registration/activate.html b/templates/registration/activate.html
index 113d1b3..965e160 100644
--- a/templates/registration/activate.html
+++ b/templates/registration/activate.html
@@ -9,9 +9,7 @@ Note: This page is showed when activation failed.
       Otherwise, it will be redirect to 'registration_activation_complete'
 {% endcomment %}
 
-{% block title %}
-激活失败 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}激活失败{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/templates/registration/activation_complete.html b/templates/registration/activation_complete.html
index fb03a7e..5d071f2 100644
--- a/templates/registration/activation_complete.html
+++ b/templates/registration/activation_complete.html
@@ -5,9 +5,7 @@
 
 {# step 4. activation complete #}
 
-{% block title %}
-成功激活 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}成功激活{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/templates/registration/registration_closed.html b/templates/registration/registration_closed.html
index 7368c71..b4b035c 100644
--- a/templates/registration/registration_closed.html
+++ b/templates/registration/registration_closed.html
@@ -4,9 +4,7 @@
 
 {# registration closed #}
 
-{% block title %}
-注册已关闭 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}注册已关闭{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html
index 49ea090..8154747 100644
--- a/templates/registration/registration_complete.html
+++ b/templates/registration/registration_complete.html
@@ -5,9 +5,7 @@
 
 {# step 2. registration complete #}
 
-{% block title %}
-注册完成 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}注册完成{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html
index 31316fe..61de0ff 100644
--- a/templates/registration/registration_form.html
+++ b/templates/registration/registration_form.html
@@ -5,9 +5,7 @@
 
 {# step 1. registration #}
 
-{% block title %}
-注册 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}注册{% endblock %}
 
 {% block content %}
   <div class="container">