* merged commits from 'maxwell lou' by time '20131028_09:52';HEADmaster

* moved 'ValueKind' model from 'recommend/models' to 'indicator/models'
* added field 'type' for 'indicator.models.Indicator'
* added field 'kind' for 'indicator.models.IndicatorRecord',
  'InnateConfine'
* updated methods for models 'Indicator', 'IndicatorRecord',
  'InnateConfine'
* updated views and templates for 'apps/indicator'
* added 'INDICATOR_RECOMMEND_PERIOD' into 'settings.py'
* added 'type' field for 'indicator.models.Indicator' in
  'search_indexes.py'
* added a confirm step for 'EditHistoryData' page when delete a record

* removed dir 'backupdata'; 'queries.txt' moved to 'backup' dir
* moved *.json to 'backup' dir
* removed 'apps/managers*.py'
* updated 'indicator/popup/IndexDesc.html'
* created dir 'apps/indicator/obsolete';
* moved 'indicator/forms.py' to dir 'obsolete';
* splitted views related forms.py from 'views.py', and placed in
  'obsolete/views_forms.py'

* loadded newest data into database
* cleaned pervious data files in 'backup' dir
* updated 'README.txt'; added a solution to a redis problem

* added field 'type' of 'indicator.models.Indicator';
  for filtering search results and only returning 'NORMAL_TYPE'

18 files changed, 38 insertions, 38 deletions

diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/activate.html b/97suifangqa/apps/sfaccount/templates/sfaccount/activate.html
index 1a6c6f9..ab1fc6a 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/activate.html
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/activate.html
@@ -2,7 +2,7 @@
 {% load staticfiles %}
 
 {% block title %}
-激活账户 | 97 随访
+激活账户 | 医时代
 {% endblock %}
 
 {% block bodyclasses %}{{ block.super }} registration signup{% endblock %}
@@ -82,7 +82,7 @@
 {% endblock %}
 
 {% block body %}
-  <h2>加入97随访 &emsp; 科学了解乙肝治疗</h2>
+  <h2>加入医时代 &emsp; 科学了解乙肝治疗</h2>
 
   <div class="activate_failed" style="display: {% if activate_failed %}block{% else %}none{% endif %} ;">
     <h4>激活账户失败</h4>
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/activate_done.html b/97suifangqa/apps/sfaccount/templates/sfaccount/activate_done.html
index 8432a39..fc388aa 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/activate_done.html
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/activate_done.html
@@ -2,7 +2,7 @@
 {% load staticfiles %}
 
 {% block title %}
-账户已激活 | 97 随访
+账户已激活 | 医时代
 {% endblock %}
 
 {% block othercss %}
@@ -23,9 +23,9 @@
 {% endblock %}
 
 {% block body %}
-  <h2>加入97随访 &emsp; 科学了解乙肝治疗</h2>
+  <h2>加入医时代 &emsp; 科学了解乙肝治疗</h2>
 
-  <h4>欢迎加入97随访！</h4>
+  <h4>欢迎加入医时代！</h4>
 
   <p>您的账户已成功激活，现在您可以登录使用。</p>
   <p>
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/activate_send_mail.html b/97suifangqa/apps/sfaccount/templates/sfaccount/activate_send_mail.html
index e95a881..5072ae4 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/activate_send_mail.html
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/activate_send_mail.html
@@ -2,7 +2,7 @@
 {% load staticfiles %}
 
 {% block title %}
-重发激活邮件 | 97 随访
+重发激活邮件 | 医时代
 {% endblock %}
 
 {% block othercss %}
@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block body %}
-  <h2>加入97随访 &emsp; 科学了解乙肝治疗</h2>
+  <h2>加入医时代 &emsp; 科学了解乙肝治疗</h2>
 
   <p>
   还未收到激活邮件？
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.html b/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.html
index 51b1751..5dd1a58 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.html
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.html
@@ -1,13 +1,13 @@
 {% autoescape off %}
 <p>尊敬的 {{ username }}，<p>
 
-<p>欢迎您加入97随访(97suifang.com)。<p>
+<p>欢迎您加入医时代(yishidai.org)。<p>
 
 <p>
 您的激活码为 {{ activation_key }}，请在 {{ expiration_days }} 天内激活账户，直接打开以下链接进行激活：<br />
-http://www.97suifang.com{{ activation_url }}
+http://www.yishidai.org{{ activation_url }}
 </p>
 <br />
 
-<p>97随访 团队</p>
+<p>医时代 团队</p>
 {% endautoescape %}
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.txt b/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.txt
index 44a2c4d..890f827 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.txt
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_body.txt
@@ -1,9 +1,9 @@
 尊敬的 {{ username }}，
 
-欢迎您加入97随访(97suifang.com)。
+欢迎您加入医时代(yishidai.org)。
 
 您的激活码为 {{ activation_key }}，请在 {{ expiration_days }} 天内激活账户，直接打开以下链接进行激活：
-http://www.97suifang.com{{ activation_url }}
+http://www.yishidai.org{{ activation_url }}
 
 
-97随访 团队
+医时代 团队
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_subject.txt b/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_subject.txt
index 9a9a040..98fb815 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_subject.txt
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/activation_email_subject.txt
@@ -1 +1 @@
-97随访(97suifang.com)账户激活
+医时代(yishidai.org)账户激活
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/login.html b/97suifangqa/apps/sfaccount/templates/sfaccount/login.html
index 46e4bb6..ac5fcae 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/login.html
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/login.html
@@ -6,11 +6,11 @@
 {% endblock %}
 
 {% block title %}
-登录 | 97随访
+登录 | 医时代
 {% endblock %}
 
 {% block body %}
-<h2>加入97随访 &emsp; 科学了解乙肝治疗</h2>
+<h2>加入医时代 &emsp; 科学了解乙肝治疗</h2>
 <p></p>
 <p>
   <img src="{% static "images/sinalogo.png" %}" alt="" style="width: 2.5em; vertical-align: middle;">
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/logout.html b/97suifangqa/apps/sfaccount/templates/sfaccount/logout.html
index 0d05ae5..bbd727f 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/logout.html
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/logout.html
@@ -2,7 +2,7 @@
 {% load staticfiles %}
 
 {% block title %}
-注销 | 97 随访
+注销 | 医时代
 {% endblock %}
 
 {% block othercss %}
@@ -23,9 +23,9 @@
 {% endblock %}
 
 {% block body %}
-  <h2>加入97随访 &emsp; 科学了解乙肝治疗</h2>
+  <h2>加入医时代 &emsp; 科学了解乙肝治疗</h2>
 
-  <p>感谢您使用97随访！</p>
+  <p>感谢您使用医时代！</p>
 
   <p>
   <input type="button" id="re-login" value="重新登录" />
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/password_change.html b/97suifangqa/apps/sfaccount/templates/sfaccount/password_change.html
index 7918016..33f318b 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/password_change.html
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/password_change.html
@@ -6,11 +6,11 @@
 {% endblock %}
 
 {% block title %}
-修改密码 | 97随访
+修改密码 | 医时代
 {% endblock %}
 
 {% block body %}
-  <h2>加入97随访 &emsp; 科学了解乙肝治疗</h2>
+  <h2>加入医时代 &emsp; 科学了解乙肝治疗</h2>
 
   <h3>修改密码</h3>
   <form action="" method="post">{% csrf_token %}
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/password_change_done.html b/97suifangqa/apps/sfaccount/templates/sfaccount/password_change_done.html
index ac22668..1c843b5 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/password_change_done.html
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/password_change_done.html
@@ -2,7 +2,7 @@
 {% load staticfiles %}
 
 {% block title %}
-修改密码 | 97 随访
+修改密码 | 医时代
 {% endblock %}
 
 {% block othercss %}
@@ -23,7 +23,7 @@
 {% endblock %}
 
 {% block body %}
-  <h2>加入97随访 &emsp; 科学了解乙肝治疗</h2>
+  <h2>加入医时代 &emsp; 科学了解乙肝治疗</h2>
 
   <h4>密码修改成功！</h4>
 
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset.html b/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset.html
index 87421d3..667f7c3 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset.html
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset.html
@@ -2,7 +2,7 @@
 {% load staticfiles %}
 
 {% block title %}
-重设密码 | 97 随访
+重设密码 | 医时代
 {% endblock %}
 
 {% block othercss %}
@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block body %}
-  <h2>加入97随访 &emsp; 科学了解乙肝治疗</h2>
+  <h2>加入医时代 &emsp; 科学了解乙肝治疗</h2>
 
   <p>
   忘记了密码？
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_complete.html b/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_complete.html
index 2027cd2..89f2d27 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_complete.html
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_complete.html
@@ -2,7 +2,7 @@
 {% load staticfiles %}
 
 {% block title %}
-重设密码 | 97 随访
+重设密码 | 医时代
 {% endblock %}
 
 {% block othercss %}
@@ -23,7 +23,7 @@
 {% endblock %}
 
 {% block body %}
-  <h2>加入97随访 &emsp; 科学了解乙肝治疗</h2>
+  <h2>加入医时代 &emsp; 科学了解乙肝治疗</h2>
 
   <h4>重设密码成功！</h4>
 
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_confirm.html b/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_confirm.html
index 8522af5..3212c17 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_confirm.html
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_confirm.html
@@ -2,7 +2,7 @@
 {% load staticfiles %}
 
 {% block title %}
-重设密码 | 97随访
+重设密码 | 医时代
 {% endblock %}
 
 {% block othercss %}
@@ -23,7 +23,7 @@
 {% endblock %}
 
 {% block body %}
-  <h2>加入97随访 &emsp; 科学了解乙肝治疗</h2>
+  <h2>加入医时代 &emsp; 科学了解乙肝治疗</h2>
 
   {% if validlink %}
   <h4>请设置新密码</h4>
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_done.html b/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_done.html
index c7bd9a3..9f5a492 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_done.html
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_done.html
@@ -2,7 +2,7 @@
 {% load staticfiles %}
 
 {% block title %}
-重设密码 | 97 随访
+重设密码 | 医时代
 {% endblock %}
 
 {% block othercss %}
@@ -23,7 +23,7 @@
 {% endblock %}
 
 {% block body %}
-  <h2>加入97随访 &emsp; 科学了解乙肝治疗</h2>
+  <h2>加入医时代 &emsp; 科学了解乙肝治疗</h2>
 
   <h4>
   密码重设邮件已发送！
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_email.html b/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_email.html
index beae46f..bec013a 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_email.html
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_email.html
@@ -4,7 +4,7 @@
   <body>
     <p>尊敬的 {{ user.username }},</p>
 
-    <p>您收到该邮件是因为您已请求重设97随访({{ domain }})账户的密码。</p>
+    <p>您收到该邮件是因为您已请求重设医时代({{ domain }})账户的密码。</p>
 
     <p>请打开以下链接来为您的账户设置新密码：<br />
     {% block reset_link %}
@@ -19,7 +19,7 @@
     <p>感谢您使用我们的产品！</p>
     <br />
 
-    <p>97随访 团队</p>
+    <p>医时代 团队</p>
   </body>
 </html>
 {% endautoescape %}
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_email.txt b/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_email.txt
index 20c817c..a1031d5 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_email.txt
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_email.txt
@@ -1,6 +1,6 @@
 尊敬的 {{ user.username }},
 
-您收到该邮件是因为您已请求重设97随访({{ domain }})账户的密码。
+您收到该邮件是因为您已请求重设医时代({{ domain }})账户的密码。
 
 请打开以下链接来为您的账户设置新密码：
 {{ protocol }}://{{ domain }}{% url django.contrib.auth.views.password_reset_confirm uidb36=uid, token=token %}
@@ -10,4 +10,4 @@
 
 感谢您使用我们的产品！
 
-97随访 团队
+医时代 团队
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_subject.txt b/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_subject.txt
index b980ba1..d0d914b 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_subject.txt
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/password_reset_subject.txt
@@ -1 +1 @@
-97随访(97suifang.com)密码重设
+医时代(yishidai.org)密码重设
diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/signup.html b/97suifangqa/apps/sfaccount/templates/sfaccount/signup.html
index bf6c193..6e7bf7d 100644
--- a/97suifangqa/apps/sfaccount/templates/sfaccount/signup.html
+++ b/97suifangqa/apps/sfaccount/templates/sfaccount/signup.html
@@ -2,7 +2,7 @@
 {% load staticfiles %}
 
 {% block title %}
-注册账户 | 97随访
+注册账户 | 医时代
 {% endblock %}
 
 {% block bodyclasses %}{{ block.super }} registration signup{% endblock %}
@@ -10,7 +10,7 @@
 <link rel="stylesheet" href="{% static "stylesheets/sass/registration.css" %}">
 {% endblock %}
 {% block body %}
-<h2>加入97随访 &emsp; 科学了解乙肝治疗</h2>
+<h2>加入医时代 &emsp; 科学了解乙肝治疗</h2>
 <form action="" method="post">{% csrf_token %}
   	<table class="reg-form register-form">
   		{% for item in form %}