From 2288c7f4dca08aa4519b80ace852be8c0526d992 Mon Sep 17 00:00:00 2001
From: Weitian LI <liweitianux@gmail.com>
Date: Tue, 3 Jun 2014 00:22:28 +0800
Subject: Fixed a type 'identify' and updated 'list_approved' display contents

* changed 'identify' to 'identity' in Model 'UserProfile'
* updated forms.py, admin.py, profile.html related to 'identity'
* added South migration for renaming field 'identify' to 'identity'
* updated display contents of 'list_approved': removed 'identity' column
* updated 'institute' field name to 'institute (and major)'
* updated related translations
---
 account/templates/account/list_approved.html | 4 ++--
 account/templates/account/profile.html       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'account/templates')

diff --git a/account/templates/account/list_approved.html b/account/templates/account/list_approved.html
index 8c2587d..0db16af 100644
--- a/account/templates/account/list_approved.html
+++ b/account/templates/account/list_approved.html
@@ -25,7 +25,7 @@
           <tr>
             <th class="col-md-1 list-number">序号</th>
             <th class="col-md-2 list-name">姓名</th>
-            {# <th class="col-md-3 list-identify">身份</th> #}
+            {# <th class="col-md-3 list-identity">身份</th> #}
             <th class="col-md-6 list-institute">单位(及专业)</th>
           </tr>
         </thead>
@@ -35,7 +35,7 @@
           <tr{% if approved_profile.user == user %} class="success"{% endif %}>
             <td>{{ forloop.counter }}</td>
             <td>{{ approved_profile.realname }}</td>
-            {# <td>{% trans approved_profile.get_identify_value %}</td> #}
+            {# <td>{% trans approved_profile.get_identity_value %}</td> #}
             <td>{{ approved_profile.institute }}</td>
           </tr>
         {% endfor %}
diff --git a/account/templates/account/profile.html b/account/templates/account/profile.html
index 88e938f..d2b73e7 100644
--- a/account/templates/account/profile.html
+++ b/account/templates/account/profile.html
@@ -58,8 +58,8 @@
           <td class="profile-institute-data">{{ profile.institute }}</td>
         </tr>
         <tr>
-          <th class="profile-identify">身份</th>
-          <td class="profile-identify-data">{% trans profile.get_identify_value %}</td>
+          <th class="profile-identity">身份</th>
+          <td class="profile-identity-data">{% trans profile.get_identity_value %}</td>
         </tr>
         <tr>
           <th class="profile-reason">为什么参加</th>
-- 
cgit v1.2.2