* 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

3 files changed, 8 insertions, 5 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 %}