diff options
33 files changed, 33 insertions, 103 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"> diff --git a/archive/templates/archive/archive.html b/archive/templates/archive/archive.html index 96a93c4..2410dcb 100644 --- a/archive/templates/archive/archive.html +++ b/archive/templates/archive/archive.html @@ -6,9 +6,7 @@ {# template to show notice list #} -{% block title %} -资料下载 | 2014 SKA Summer School -{% endblock %} +{% block pagetitle %}资料下载{% endblock %} {% block css_extra %} <link href="{% static 'css/sidebar.css' %}" rel="stylesheet"> diff --git a/notice/templates/notice/list_notice.html b/notice/templates/notice/list_notice.html index e0f2011..e1f39bd 100644 --- a/notice/templates/notice/list_notice.html +++ b/notice/templates/notice/list_notice.html @@ -7,9 +7,7 @@ {# template to show notice list #} -{% block title %} -全部通知 | 2014 SKA Summer School -{% endblock %} +{% block pagetitle %}全部通知{% endblock %} {% block css_extra %} <link href="{% static 'css/list_notice.css' %}" rel="stylesheet"> diff --git a/page/templates/page/about.html b/page/templates/page/about.html index 3205286..8b2fa53 100644 --- a/page/templates/page/about.html +++ b/page/templates/page/about.html @@ -5,9 +5,7 @@ {# about template #} -{% block title %} -关于 | 2014 SKA Summer School -{% endblock %} +{% block pagetitle %}关于{% endblock %} {% block content %} <div class="container"> diff --git a/page/templates/page/accommodation.html b/page/templates/page/accommodation.html index d3e419c..d8f8369 100644 --- a/page/templates/page/accommodation.html +++ b/page/templates/page/accommodation.html @@ -5,9 +5,7 @@ {# accommodation template #} -{% block title %} -住宿 | 2014 SKA Summer School -{% endblock %} +{% block pagetitle %}住宿{% endblock %} {% block content %} <div class="container"> diff --git a/page/templates/page/committee.html b/page/templates/page/committee.html index 349d0b5..ffbd83f 100644 --- a/page/templates/page/committee.html +++ b/page/templates/page/committee.html @@ -5,9 +5,7 @@ {# committee template #} -{% block title %} -组委会 | 2014 SKA Summer School -{% endblock %} +{% block pagetitle %}组委会{% endblock %} {% block content %} <div class="container"> diff --git a/page/templates/page/contact.html b/page/templates/page/contact.html index dd6d8bc..c437061 100644 --- a/page/templates/page/contact.html +++ b/page/templates/page/contact.html @@ -5,9 +5,7 @@ {# contact template #} -{% block title %} -联系我们 | 2014 SKA Summer School -{% endblock %} +{% block pagetitle %}联系我们{% endblock %} {% block content %} <div class="container"> diff --git a/page/templates/page/introduction.html b/page/templates/page/introduction.html index a804f0b..ccc1a1a 100644 --- a/page/templates/page/introduction.html +++ b/page/templates/page/introduction.html @@ -5,9 +5,7 @@ {# introduction template #} -{% block title %} -介绍 | 2014 SKA Summer School -{% endblock %} +{% block pagetitle %}介绍{% endblock %} {% block css_extra %} <link href="{% static 'css/sidebar.css' %}" rel="stylesheet"> diff --git a/page/templates/page/program.html b/page/templates/page/program.html index bff6de0..c0b68d7 100644 --- a/page/templates/page/program.html +++ b/page/templates/page/program.html @@ -5,9 +5,7 @@ {# program template #} -{% block title %} -日程 | 2014 SKA Summer School -{% endblock %} +{% block pagetitle %}日程{% endblock %} {% block content %} <div class="container"> diff --git a/page/templates/page/sponsor.html b/page/templates/page/sponsor.html index d5b8606..c62b8b1 100644 --- a/page/templates/page/sponsor.html +++ b/page/templates/page/sponsor.html @@ -5,9 +5,7 @@ {# sponsor template #} -{% block title %} -赞助方 | 2014 SKA Summer School -{% endblock %} +{% block pagetitle %}赞助方{% endblock %} {% block content %} <div class="container"> diff --git a/page/templates/page/traffic.html b/page/templates/page/traffic.html index 5f20e94..8d77bac 100644 --- a/page/templates/page/traffic.html +++ b/page/templates/page/traffic.html @@ -5,9 +5,7 @@ {# traffic template #} -{% block title %} -交通 | 2014 SKA Summer School -{% endblock %} +{% block pagetitle %}交通{% endblock %} {% block content %} <div class="container"> 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"> |