aboutsummaryrefslogtreecommitdiffstats
path: root/account
diff options
context:
space:
mode:
authorWeitian LI <liweitianux@gmail.com>2014-06-07 14:00:41 +0800
committerWeitian LI <liweitianux@gmail.com>2014-06-07 14:00:41 +0800
commit0d0f12f76606009c7dc85da46e0531b5d155499e (patch)
treedfc1f8312e68a1233dd275a3ec5d4a2926080114 /account
parentbd5a374373581e16dc6489ba6216cd3743acc3e7 (diff)
downloaddjango-skaschool-0d0f12f76606009c7dc85da46e0531b5d155499e.tar.bz2
Updated 'profile.html' and zh_CN locale messages
* updated profile.html to show 'sjtu_id' and 'sjtu_initpass' info and show a related alert * updated zh_CN locale messages
Diffstat (limited to 'account')
-rw-r--r--account/templates/account/profile.html40
1 files changed, 34 insertions, 6 deletions
diff --git a/account/templates/account/profile.html b/account/templates/account/profile.html
index d2b73e7..f739930 100644
--- a/account/templates/account/profile.html
+++ b/account/templates/account/profile.html
@@ -19,14 +19,21 @@
{# display alert if 'reason' empty, or transcript required but not provided #}
{% if not profile.reason %}
- <div class="alert alert-warning">
- “为什么参加”的信息是我们审核的重要参考,请您请及时填写。
- </div>
+ <div class="alert alert-warning">
+ “为什么参加”的信息是我们审核的重要参考,请您请及时填写。
+ </div>
{% endif %}
{% if profile.is_transcript_required and not profile.transcript %}
- <div class="alert alert-warning">
- “成绩单”是我们审核本科生(大三及以下)和决定资助的重要参考,请您请及时上传。
- </div>
+ <div class="alert alert-warning">
+ “成绩单”是我们审核本科生(大三及以下)和决定资助的重要参考,请您请及时上传。
+ </div>
+ {% endif %}
+ {% if profile.sjtu_id and profile.sjtu_initpass %}
+ <div class="alert alert-info">
+ <p><strong>欢迎参加第二届中国SKA暑期学校</strong></p>
+ <p>上海交通大学教务处已为您分配了<strong>学号</strong>和<strong>初始密码</strong>。请您尽快访问<a href="http://summer.jwc.sjtu.edu.cn/" class="alert-link" target="_blank">上海交通大学夏季学期(http://summer.jwc.sjtu.edu.cn/)</a>,点击<a href="http://i.jwc.sjtu.edu.cn/summerlogin.aspx" class="alert-link" target="_blank">校外同学报名</a>并登录,然后根据要求补充个人资料。其他操作请等待我们的后续通知。</p>
+ <p>在上海交通大学夏季学期系统中注册并完善资料,能够帮助我们将您添加到学校的课程安排中,并帮助您在完成SKA暑期学校学习后顺利办理<strong>结业证书</strong>和<strong>课程学分证明</strong>。</p>
+ </div>
{% endif %}
<table class="table table-striped table-bordered table-hover">
@@ -117,6 +124,27 @@
{% endif %}
</td>
</tr>
+ {# sjtu student id & inital password #}
+ <tr>
+ <th class="profile-sjtuid">SJTU学号</th>
+ <td class="profile-sjtuid-data">
+ {% if profile.sjtu_id %}
+ {{ profile.sjtu_id }}
+ {% else %}
+ <span class="glyphicon glyphicon-remove"></span> <span class="label label-warning">无</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <th class="profile-sjtuinitpass">SJTU初始密码</th>
+ <td class="profile-sjtuinitpass-data">
+ {% if profile.sjtu_initpass %}
+ {{ profile.sjtu_initpass }}
+ {% else %}
+ <span class="glyphicon glyphicon-remove"></span> <span class="label label-warning">无</span>
+ {% endif %}
+ </td>
+ </tr>
{# user uploaded files #}
{% if userfiles %}
<tr>