diff options
Diffstat (limited to '97suifangqa/apps/sfaccount/templates')
7 files changed, 95 insertions, 9 deletions
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/activate.html b/97suifangqa/apps/sfaccount/templates/sfaccount/activate.html index a81af6d..1a6c6f9 100644 --- a/97suifangqa/apps/sfaccount/templates/sfaccount/activate.html +++ b/97suifangqa/apps/sfaccount/templates/sfaccount/activate.html @@ -13,7 +13,8 @@ {% block scripts %} <script type="text/javascript"> // activate account url - var activate_url = '{% url activate %}'; + var activate_key_url = '{{ activate_key_url }}'; + var send_activation_mail_url = '{% url send_activation_mail %}'; $(document).ready(function(){ // validate key input @@ -47,7 +48,7 @@ // submit var key_raw = $("#activation_key").val(); var key = htmlEscape(key_raw.toLowerCase()); - var target_url = activate_url + key + '/'; + var target_url = activate_key_url + key + '/'; //console.log(target_url); window.location.href = target_url; } @@ -63,6 +64,10 @@ } }); + // send_activation_mail + $("#send_activation_mail").bind("click", function() { + window.location.href = send_activation_mail_url; + }); }); function htmlEscape(str) { @@ -93,6 +98,12 @@ <input type="button" id="activate_account" value="激活账户" /> </div> + <div class="no-mail"> + 还未收到激活邮件？您可以尝试重发激活邮件。 + <br /> + <input type="button" id="send_activation_mail" value="重发激活邮件" /> + </div> + {% endblock body %} <!-- vim: set ts=8 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: --> diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/activate_done.html b/97suifangqa/apps/sfaccount/templates/sfaccount/activate_done.html new file mode 100644 index 0000000..8432a39 --- /dev/null +++ b/97suifangqa/apps/sfaccount/templates/sfaccount/activate_done.html @@ -0,0 +1,36 @@ +{% extends "picture-base.html" %} +{% load staticfiles %} + +{% block title %} +账户已激活 | 97 随访 +{% endblock %} + +{% block othercss %} +<link rel="stylesheet" href="{% static "stylesheets/sass/registration.css" %}"> +{% endblock %} + +{% block scripts %} + <script type="text/javascript"> + // login url + var login_url = '{% url login %}'; + + $(document).ready(function() { + $("#login").bind("click", function() { + window.location.href = login_url; + }); + }); + </script> +{% endblock %} + +{% block body %} + <h2>加入97随访   科学了解乙肝治疗</h2> + + <h4>欢迎加入97随访！</h4> + + <p>您的账户已成功激活，现在您可以登录使用。</p> + <p> + <input type="button" id="login" value="登录" /> + </p> +{% endblock body %} + +<!-- vim: set ts=8 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: --> diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/activate_send_mail.html b/97suifangqa/apps/sfaccount/templates/sfaccount/activate_send_mail.html new file mode 100644 index 0000000..e95a881 --- /dev/null +++ b/97suifangqa/apps/sfaccount/templates/sfaccount/activate_send_mail.html @@ -0,0 +1,36 @@ +{% extends "picture-base.html" %} +{% load staticfiles %} + +{% block title %} +重发激活邮件 | 97 随访 +{% endblock %} + +{% block othercss %} +<link rel="stylesheet" href="{% static "stylesheets/sass/registration.css" %}"> +{% endblock %} + +{% block body %} + <h2>加入97随访   科学了解乙肝治疗</h2> + + <p> + 还未收到激活邮件？ + </p> + <p> + 请在下面输入您注册时使用的邮箱地址， + 我们将为您重新发送激活邮件。 + </p> + + <form action="" method="post">{% csrf_token %} + <table class="send-activation-mail"> + <tr> + <td> + <input type="text" name="email" value="{{ form.email.value|default_if_none:"" }}" placeholder="您注册时的邮箱地址" class="email"> + </td> + <td class="error">{{ form.email.errors|join:"" }}</td> + </tr> + </table> + <input type="submit" value="重发激活邮件" /> + </form> +{% endblock %} + +<!-- vim: set ts=8 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: --> diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.html b/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.html index 9792ad5..51b1751 100644 --- a/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.html +++ b/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.html @@ -5,7 +5,7 @@ <p> 您的激活码为 {{ activation_key }}，请在 {{ expiration_days }} 天内激活账户，直接打开以下链接进行激活：<br /> -http://www.97suifang.com/accounts/activate/{{ activation_key }}/ +http://www.97suifang.com{{ activation_url }} </p> <br /> diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.txt b/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.txt index b479ff0..44a2c4d 100644 --- a/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.txt +++ b/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.txt @@ -3,7 +3,7 @@ 欢迎您加入97随访(97suifang.com)。 您的激活码为 {{ activation_key }}，请在 {{ expiration_days }} 天内激活账户，直接打开以下链接进行激活： -http://www.97suifang.com/accounts/activate/{{ activation_key }}/ +http://www.97suifang.com{{ activation_url }} 97随访 团队 diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/login.html b/97suifangqa/apps/sfaccount/templates/sfaccount/login.html index f5c7942..6e3be80 100644 --- a/97suifangqa/apps/sfaccount/templates/sfaccount/login.html +++ b/97suifangqa/apps/sfaccount/templates/sfaccount/login.html @@ -47,11 +47,14 @@ <input type="hidden" name="next" value="{{ next }}" /> <input type="submit" value="登 录" class="submit login"/> -   |   - <a href="{% url signup %}">还没有帐号?</a> -   |   - <a href="{% url password_reset %}">忘记密码?</a> </form> + <br /> + + <p> + <a href="{% url signup %}">还没有帐号?</a> +   |   + <a href="{% url password_reset %}">忘记密码?</a> + </p> {% endblock body%} {# vim: set ts=2 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: #} diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/password_change_done.html b/97suifangqa/apps/sfaccount/templates/sfaccount/password_change_done.html index ed91216..ac22668 100644 --- a/97suifangqa/apps/sfaccount/templates/sfaccount/password_change_done.html +++ b/97suifangqa/apps/sfaccount/templates/sfaccount/password_change_done.html @@ -11,7 +11,7 @@ {% block scripts %} <script type="text/javascript"> - // login url + // home url var home_url = '{% url go_home %}'; $(document).ready(function() { |