* updated activation_email subject and content template

* updated password_reset_email subject and content template
* fixed a typo in 400.html
* small update to profile_update_done btn style

7 files changed, 17 insertions, 17 deletions

diff --git a/account/templates/account/password_reset_email.html b/account/templates/account/password_reset_email.html
index 7ea9da6..2c03283 100644
--- a/account/templates/account/password_reset_email.html
+++ b/account/templates/account/password_reset_email.html
@@ -1,6 +1,7 @@
-Hello,
+您好，
 
-您收到这封邮件是因为您请求重置您在网站 {{ site_name }} （2014 SKA Summer School）上的账户密码。
+您正在请求重置您在"2014SKA暑期学校"网站(http://{{ site_name }})
+上的账户密码。
 
 请打开以下链接来重新设置新密码：
 
@@ -9,4 +10,6 @@ Hello,
 您的登录用户名为：{{ user.get_username }}
 
 
-2014 SKA Summer School Team
+祝好！
+2014SKA暑期学校团队
+
diff --git a/account/templates/account/password_reset_subject.txt b/account/templates/account/password_reset_subject.txt
index e36ec12..5d5b04d 100644
--- a/account/templates/account/password_reset_subject.txt
+++ b/account/templates/account/password_reset_subject.txt
@@ -1 +1 @@
-重置您的账户密码
+[2014SKA暑期学校]重置您的账户密码
diff --git a/account/templates/account/profile_update_done.html b/account/templates/account/profile_update_done.html
index 5b10eb2..added9d 100644
--- a/account/templates/account/profile_update_done.html
+++ b/account/templates/account/profile_update_done.html
@@ -14,7 +14,7 @@
     <h2>信息已更新</h2>
     <p class="lead">您的个人信息已更新。</p>
     <br>
-    <p><a href="{% url 'profile' %}" class="btn btn-default">返回个人主页</a></p>
+    <p><a href="{% url 'profile' %}" class="btn btn-primary">返回个人主页</a></p>
   </div>
 {% endblock %}
 
diff --git a/templates/400.html b/templates/400.html
index 89ce313..69bba66 100644
--- a/templates/400.html
+++ b/templates/400.html
@@ -10,7 +10,7 @@
 
 {% block content %}
   <div class="container">
-    <h2>404 Bad Request</h2>
+    <h2>400 Bad Request</h2>
     <p class="lead">Oops, 无效的请求……</p>
     <br>
     <p>如有问题，请与我们联系：<a href="mailto:skaschool2014@163.com"><code>skaschool2014@163.com</code></a></p>
diff --git a/templates/registration/activation_email.txt b/templates/registration/activation_email.txt
index 0667fa0..8bb5122 100644
--- a/templates/registration/activation_email.txt
+++ b/templates/registration/activation_email.txt
@@ -1,14 +1,14 @@
-Hello,
+您好，
 
-Please follow the link below to activate your account at
-"2014 SKA Summer School"({{ site }}).
+感谢您在"2014SKA暑期学校网站"(http://{{ site }})
+注册账户，请使用以下链接来激活您的账户，然后您便可以登录
+以及修改个人资料。
 
 http://{{ site }}/accounts/activate/{{ activation_key }}
 
-Note: this link will expire in {{ expiration_days }} days.
+注意：该链接将在{{ expiration_days }}天后过期失效。
 
 
-Best regards.
-
-2014 SKA Summer School Team
+祝好！
+2014SKA暑期学校团队
 
diff --git a/templates/registration/activation_email_subject.txt b/templates/registration/activation_email_subject.txt
index 215f006..43d2353 100644
--- a/templates/registration/activation_email_subject.txt
+++ b/templates/registration/activation_email_subject.txt
@@ -1 +1 @@
-激活您的账户
+[2014SKA暑期学校]激活您的账户
diff --git a/templates/test.html b/templates/test.html
deleted file mode 100644
index 85ec3e6..0000000
--- a/templates/test.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends 'base.html' %}
-
-{# vim: set ts=8 sw=4 tw=0 fenc=utf-8 ft=htmldjango.html: #}