* 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'

1 files changed, 18 insertions, 3 deletions

diff --git a/97suifangqa/templates/sciblog/blog_detail_follow.html b/97suifangqa/templates/sciblog/blog_detail_follow.html
index 3635f9b..a5cdad6 100644
--- a/97suifangqa/templates/sciblog/blog_detail_follow.html
+++ b/97suifangqa/templates/sciblog/blog_detail_follow.html
@@ -1,7 +1,7 @@
 {% extends "sciblog/blog_detail.html" %}
 
 {% block sectionname %}
-随访与用药
+<span style="font-weight:normal;">随访与用药</span>
 {% endblock %}
 
 {% block navigation %}
@@ -19,7 +19,7 @@
 <h3>用药与随访历史</h3>
 <p>{{ blog.treatment_content }}</p>
 <a href="" id="endpoints"></a>
-<h3>判别疗效的指标</h3>
+<br><div class="panbiezhibiao"><h3>判别疗效的指标</h3>
 <h4>主要</h4>
 {% for end in blog.endpoints.all %}
   {% if end.type == 1 %}
@@ -32,8 +32,23 @@
   {{ end.content }}
   {% endif %}
 {% endfor %}
-<div></div>
+</div>
+
+{% if blog.endpoint_content %}
+<h4>注意</h4>
+{{ blog.endpoint_content }}
+{% else %}
+<br>
+{% endif %}
+<br><br>
 <a href="" id="guideline"></a>
+
+
+
 <h3>治疗策略</h3>
+{% if blog.guidline %}
 {{ blog.guidline.content }}
+{% else %}
+暂无详细资料
+{% endif%}
 {% endblock %}