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

14 files changed, 14 insertions, 46 deletions

diff --git a/account/templates/account/email_resend.html b/account/templates/account/email_resend.html
index bdb2f30..cb261d3 100644
--- a/account/templates/account/email_resend.html
+++ b/account/templates/account/email_resend.html
@@ -5,9 +5,7 @@
 
 {# resend activation email done #}
 
-{% block title %}
-重新发送激活邮件 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}重新发送激活邮件{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/account/templates/account/email_resend_done.html b/account/templates/account/email_resend_done.html
index ff7ad6b..4566509 100644
--- a/account/templates/account/email_resend_done.html
+++ b/account/templates/account/email_resend_done.html
@@ -5,9 +5,7 @@
 
 {# resend activation email done #}
 
-{% block title %}
-已重新发送激活邮件 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}已重新发送激活邮件{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/account/templates/account/list_approved.html b/account/templates/account/list_approved.html
index a58312b..7e68c0f 100644
--- a/account/templates/account/list_approved.html
+++ b/account/templates/account/list_approved.html
@@ -6,9 +6,7 @@
 
 {# template to show the approved user list #}
 
-{% block title %}
-审定名单 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}审定名单{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/account/templates/account/login.html b/account/templates/account/login.html
index 62b46df..d5e3498 100644
--- a/account/templates/account/login.html
+++ b/account/templates/account/login.html
@@ -5,9 +5,7 @@
 
 {# login template #}
 
-{% block title %}
-登录 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}登录{% endblock %}
 
 {% block content %}
 <div class="container">
diff --git a/account/templates/account/logout.html b/account/templates/account/logout.html
index 7e3ac4a..2270e20 100644
--- a/account/templates/account/logout.html
+++ b/account/templates/account/logout.html
@@ -5,9 +5,7 @@
 
 {# login template #}
 
-{% block title %}
-已退出 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}已退出{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/account/templates/account/password_change.html b/account/templates/account/password_change.html
index f4e2e90..f178b41 100644
--- a/account/templates/account/password_change.html
+++ b/account/templates/account/password_change.html
@@ -5,9 +5,7 @@
 
 {# login template #}
 
-{% block title %}
-修改密码 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}修改密码{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/account/templates/account/password_change_done.html b/account/templates/account/password_change_done.html
index e8770ca..dd5b012 100644
--- a/account/templates/account/password_change_done.html
+++ b/account/templates/account/password_change_done.html
@@ -5,9 +5,7 @@
 
 {# login template #}
 
-{% block title %}
-密码修改成功 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}密码修改成功{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/account/templates/account/password_reset_complete.html b/account/templates/account/password_reset_complete.html
index f4705e9..daafa49 100644
--- a/account/templates/account/password_reset_complete.html
+++ b/account/templates/account/password_reset_complete.html
@@ -5,9 +5,7 @@
 
 {# step4: password reset complete template #}
 
-{% block title %}
-成功设置新密码 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}成功设置新密码{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/account/templates/account/password_reset_confirm.html b/account/templates/account/password_reset_confirm.html
index 2ae2711..60480df 100644
--- a/account/templates/account/password_reset_confirm.html
+++ b/account/templates/account/password_reset_confirm.html
@@ -5,13 +5,7 @@
 
 {# step3: password reset confirm template #}
 
-{% block title %}
-{% if validlink %}
-设置新密码 | 2014 SKA Summer School
-{% else %}
-重置密码失败 | 2014 SKA Summer School
-{% endif %}
-{% endblock %}
+{% block pagetitle %}{% if validlink %}设置新密码{% else %}重置密码失败{% endif %}{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/account/templates/account/password_reset_done.html b/account/templates/account/password_reset_done.html
index 98c513b..5e1e90d 100644
--- a/account/templates/account/password_reset_done.html
+++ b/account/templates/account/password_reset_done.html
@@ -5,9 +5,7 @@
 
 {# step2: password reset done template #}
 
-{% block title %}
-已发送重置邮件 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}已发送重置邮件{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/account/templates/account/password_reset_form.html b/account/templates/account/password_reset_form.html
index ec8491d..da4e4b1 100644
--- a/account/templates/account/password_reset_form.html
+++ b/account/templates/account/password_reset_form.html
@@ -5,9 +5,7 @@
 
 {# step1: password reset template #}
 
-{% block title %}
-重置密码 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}重置密码{% endblock %}
 
 {% block content %}
   <div class="container">
diff --git a/account/templates/account/profile.html b/account/templates/account/profile.html
index 0eb70d2..ad367f1 100644
--- a/account/templates/account/profile.html
+++ b/account/templates/account/profile.html
@@ -6,9 +6,7 @@
 
 {# login template #}
 
-{% block title %}
-个人主页 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}个人主页{% endblock %}
 
 {% block css_extra %}
   <link href="{% static 'css/account_profile.css' %}" rel="stylesheet">
diff --git a/account/templates/account/profile_update.html b/account/templates/account/profile_update.html
index 608f581..9316ac3 100644
--- a/account/templates/account/profile_update.html
+++ b/account/templates/account/profile_update.html
@@ -6,9 +6,7 @@
 
 {# login template #}
 
-{% block title %}
-更新个人信息 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}更新个人信息{% endblock %}
 
 {% block css_extra %}
   <link href="{% static 'css/account_profile_update.css' %}" rel="stylesheet">
diff --git a/account/templates/account/profile_update_done.html b/account/templates/account/profile_update_done.html
index added9d..6d4de83 100644
--- a/account/templates/account/profile_update_done.html
+++ b/account/templates/account/profile_update_done.html
@@ -5,9 +5,7 @@
 
 {# login template #}
 
-{% block title %}
-信息已更新 | 2014 SKA Summer School
-{% endblock %}
+{% block pagetitle %}信息已更新{% endblock %}
 
 {% block content %}
   <div class="container">