* 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, 3 insertions, 1 deletions

diff --git a/97suifangqa/templates/sciblog/blog_detail_knowledge.html b/97suifangqa/templates/sciblog/blog_detail_knowledge.html
index 6ab749d..15c230a 100644
--- a/97suifangqa/templates/sciblog/blog_detail_knowledge.html
+++ b/97suifangqa/templates/sciblog/blog_detail_knowledge.html
@@ -1,7 +1,7 @@
 {% extends "sciblog/blog_detail.html" %}
 
 {% block sectionname %}
-科普扫盲
+<span style="font-weight:normal;">科普扫盲</span>
 {% endblock %}
 
 {% block navigation %}
@@ -11,5 +11,7 @@
 {% for piece in blog.konwledge_piece.knowledges %}
 <h4>{{ piece.title }}</h4>
 <p>{{ piece.content }}</p>
+
+<div style="width:645px;height:1px;margin:30px 0 40px -20px;padding:0px;background-color:#f2f2f0;overflow:hidden;"></div>
 {% endfor %}
 {% endblock %}