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

19 files changed, 394 insertions, 62 deletions

diff --git a/97suifangqa/templates/base.html b/97suifangqa/templates/base.html
index a93f207..a54037f 100644
--- a/97suifangqa/templates/base.html
+++ b/97suifangqa/templates/base.html
@@ -26,7 +26,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <title>{% block title %}97 随访{% endblock %}</title>
+    <title>{% block title %}医时代{% endblock %}</title>
     {% block css %}
       <link rel="stylesheet" href="{% static "stylesheets/base.css" %}">
     {% block othercss %}{% endblock %}
diff --git a/97suifangqa/templates/blog_list_backup.html b/97suifangqa/templates/blog_list_backup.html
new file mode 100644
index 0000000..9afadee
--- /dev/null
+++ b/97suifangqa/templates/blog_list_backup.html
@@ -0,0 +1,139 @@
+{% extends "picture-base.html" %}
+{% block bodyclasses %}{{ block.super }} blog blog-list{% endblock %}
+{% load staticfiles %}
+{% block othercss %}
+<link rel="stylesheet" href="{% static "stylesheets/sass/blog.css" %}">
+{% endblock %}
+{% block sidebar_first_content %}
+	{% include "sciblog/nav-ribbon.html" %}
+	<div class="region-wrap">
+		<div class="post-question">
+		  {% include "sciblog/blog_search_form.html" %}
+		</div>
+	</div>
+	<div class="hover-overlay">
+		<div class="region-wrap">
+			<div class="user-info">
+				<h3>{{ user.username }}</h3>
+			</div>
+			<div class="search-history">
+				<h3>搜索记录</h3>
+				<ul>
+				  {% for search in search_history %}
+				  <li><a href="{% url query_blogs %}?q={{ search }}">{{ search }}</a></li>
+				  {% endfor%}
+				</ul>
+			</div>
+			<div class="related-questions">
+				<h3>您可能对一下问题也感兴趣</h3>
+				<ul>
+				{% for query in questions%}
+				<li>
+				  <a href="{% url query_blogs %}?q={{ query.content }}" title="查询与此问题相关的文章">{{ query.content }}</a>
+				</li>
+				{% endfor %}
+				</ul>
+			</div>
+			<div class="search-history">
+				<h3><a href="{% url blog_collection %}" target="_blank">我的收藏</a></h3>
+				
+			</div>
+			
+		</div>
+	</div>
+{% endblock %}
+{% block body %}
+	
+	<section id="blog-list-top-nav">
+		{% include "login-menu.inc.html" %}
+		<nav class="search-type-nav">
+			<ul class="links inline">
+			  <li class="first-level"><!--a href="" class="{% if tab == 'list' %}active{% endif %}"-->搜索结果<!--/a--></li>
+				<!--li class="first-level"><a href="">术语</a></li-->
+				<li class="first-level"><a href="{% url blog_collection %}" class="{% if tab == 'collection' %}active{% endif %}">我的收藏</a></li>
+			</ul>
+		</nav>
+	</section>
+	<section id="blog-list-content">
+	
+	<div>
+		<div style="width:630px;height:1px;margin:40px 0 -5px 0;padding:0px;background-color:#b3b3b1;overflow:hidden;"></div>
+		<h2 class="section-name" style="color:#a8a8a8;font-weight:normal;">医学文章</h2>
+		<div style="width:630px;height:1px;margin:2px 0 30px 0;padding:0px;background-color:#b3b3b1;overflow:hidden;"></div>	
+	</div>
+	
+		{% if has_blogs %}
+		<div class="articles">
+			{% for blog in blogs %}
+			<div class="article">
+				<div class="article-title"><a href="{% url blog_detail blog.id %}" target="_blank">{{ blog.subhead }}</a></div>
+				<ul class="article-subtitles inline">
+					<!--li> 
+						<span>难度：</span>
+						{% load get_range %}
+						<ul class="difficulty inline rating-blocks">
+						{% for num in 5|get_range %}
+							{% if num < blog.level %}
+							<li class="filled"></li>
+							{% else %}
+							<li class="empty"></li>
+							{% endif %}
+						{% endfor %}
+						</ul>
+					</li>
+					<li> 
+						<span>权威：</span>
+						<ul class="difficulty inline rating-blocks">
+						{% for num in 5|get_range %}
+							{% if num < blog.quality_value %}
+							<li class="filled"></li>
+							{% else %}
+							<li class="empty"></li>
+							{% endif %}
+						{% endfor %}
+						</ul>
+					</li-->
+					<li> <span>杂志：</span><span>{{ blog.journal }}</span></li>
+					<li> <span>作者：</span><span>{{ blog.communication_author }}</span></li>
+				</ul>
+				<br />
+				<div class="excerpt">
+				{{ blog.conclusion|safe }}
+				</div>
+				<div style="width:630px;height:1px;margin:40px 0 20px 0;padding:0px;background-color:#f2f2f0;overflow:hidden;"></div>
+			</div>
+			{% endfor %}
+		</div>
+		{% else %}
+		<div class="not-found" style="margin-bottom:50px;">
+			<img src="{% static "images/blog-not-found.png" %}" alt="">
+			<div class="message">{% if tab == 'list'%}没有搜索到匹配的{% else %}暂时未收藏{% endif %}医学文章</div>
+		</div>
+		{% endif %}
+		
+		<div style="width:630px;height:1px;margin:-41px 0 40px 0;padding:0px;background-color:#fff;overflow:hidden;"></div>
+		<!--div style="width:150px;border:1px solid #d5d5d5;margin:-21px auto 40px auto;padding:0px;overflow:hidden;"></div-->
+		
+		<div style="margin-top:-15px;">
+		<div style="width:630px;height:1px;margin-bottom:-5px;padding:0px;background-color:#b3b3b1;overflow:hidden;"></div>
+		<h2 class="section-name" style="color:#a8a8a8;font-weight:normal;margin-bottom:5px;">专业术语</h2>
+		<div style="width:630px;height:1px;margin:0 0 30px 0;padding:0px;background-color:#b3b3b1;overflow:hidden;"></div>
+		</div>
+		
+	  {% for noun in ppnouns %}
+	  <ul class="articles">
+	  <li class="article">
+			<div class="article-title"><!--a href=""-->{{noun.firstkeyword }}<!--/a--></div>
+			<div class="excerpt">
+			{{ noun.detail|safe }}
+			</div>
+		</li>
+		<div style="width:630px;height:1px;margin:20px 0 35px 0;padding:0px;background-color:#f2f2f0;overflow:hidden;"></div>
+	  {% endfor %}
+	  </ul>
+		
+	</section>
+
+{% endblock %}
+
+{# vim: set ts=2 sw=2 tw=0 fenc=utf-8 ft=htmldjango: #}
diff --git a/97suifangqa/templates/picture-base.html b/97suifangqa/templates/picture-base.html
index 087d890..7b09f5a 100644
--- a/97suifangqa/templates/picture-base.html
+++ b/97suifangqa/templates/picture-base.html
@@ -6,9 +6,9 @@
 	<div class="background"></div>

 	{% block sidebar_first_content %}{% endblock %}

 	<header id="header">

-		<div id="logo">

+		<div id="logo" style="margin-left:40px;">

 			{% block logo %}

-			<img src="{% static "images/logo-overlay-white.png" %}" alt="">

+			<a href="/blog/index"><img src="{% static "images/slilogo-white.png" %}" alt=""></a>

 			{% endblock %}

 		</div>

 	</header>

diff --git a/97suifangqa/templates/sciblog/blog_detail.html b/97suifangqa/templates/sciblog/blog_detail.html
index d9e53c9..3273feb 100644
--- a/97suifangqa/templates/sciblog/blog_detail.html
+++ b/97suifangqa/templates/sciblog/blog_detail.html
@@ -11,9 +11,12 @@
 	  {% include "sciblog/blog_search_form.html" %}
 	</div>	
 	<div class="related-questions">
-		<h3>关联问题</h3>
+		<h3 style="margin-left:-5px;margin-bottom:25px;margin-top:2px;">相关问题</h3>
 		{% for query in blog.query.all %}
-		<div><a href="{% url query_blogs %}?q={{ query.content }}" title="查询与此问题相关的文章">{{ query.content }}</a></div>
+		<!--div style="width:260px;height:1px;margin:0 -12px 0 -14px;padding:0px;background-color:#f2f2f0;overflow:hidden;"></div-->
+		<ul style="margin-left:-18px;margin-right:-5px;">
+		<li style="margin:-20px 10px -15px auto;"><a href="{% url query_blogs %}?q={{ query.content }}" title="查询与此问题相关的文章">{{ query.content }}</a></li>
+		</ul>
 		{% endfor %}
 	</div>
 	<div class="toc">
@@ -42,9 +45,10 @@
 			</li>
 		</ul>
 	</div>
+	
 	<header id="header">
-		<div id="logo">
-			<img src="{% static "images/slilogo.png" %}" alt="">
+		<div id="logo" style="margin-left:35px;margin-bottom:-20px;">
+			<a href="../index"><img src="{% static "images/slilogo.png" %}" alt=""></a>
 		</div>
 	</header>
 </aside>
@@ -84,12 +88,12 @@
 	<div id="card-abstract"></div>
 	<div class="lists-container">
 		<nav class="comments expandable expanded" data-expand-group-selector="#sidebar-second .lists-container nav">
-			<h4 class="expand-heading">段落注释</h4>
+			<h4 class="expand-heading">文中注释</h4>
 			<ol class="expand-container jargon-links" id="paracomments-list">
 			</ol>
 		</nav>
 		<nav class="jargon-list expandable" data-expand-group-selector="#sidebar-second .lists-container nav">
-			<h4 class="expand-heading">专业名词</h4>
+			<h4 class="expand-heading">术语科普</h4>
 			<ul class="expand-container jargon-links" id="propernouns-list">
 			</ul>
 		</nav>
@@ -103,10 +107,11 @@
 		<div class="breadcrumb">
 			<ul class="links inline">
 				<!--li><a href="" class="button dark-grey-button first">更多文章</a></li-->
-				<li><a id="return-to-results-button" href="{% url blog_detail blog.id 'results'%}" class="button dark-grey-button">返回治疗结果</a></li>
+				<!--li><a id="return-to-results-button" href="{% url blog_detail blog.id 'results'%}" class="button dark-grey-button">返回</a></li-->
+				<br>
 			</ul>
 		</div>
-		<h1 class="blog-title">{{ blog.subhead }}</h1>
+		<h1 class="blog-title">{{ blog.subhead|safe }}</h1>
 		<h2 class="section-name">{% block sectionname %}临床策略{% endblock %}</h2>
 		<!-- if firstSection -->
 		{% block navigation %}
@@ -153,14 +158,14 @@
 		{% if user.is_authenticated %}
 		<a class="button like-button grey-button collect"><img src="{% static "images/grey-heart.png" %}" alt="">收藏该条注释</a>
 		{% else %}
-		<div class="button like-button disabled grey-button" disabled="disabled"><a href="{% url login %}?next={{ request.path }}" class="login-button">登陆</a>97随访网站搜索此条目</div>
+		<div class="button like-button disabled grey-button" disabled="disabled"><a href="{% url login %}?next={{ request.path }}" class="login-button">登陆</a>医时代网站搜索此条目</div>
 		{% endif %}
 	</div>
 	<!-- else -->
 	<!-- for ... -->
 	<div id="back-to-top-button" title="返回顶部"></div>
 	<div id="related-questions-confirm" class="dialog-content confirm-dialog">
-		<p>我们将要帮您重新搜索医学文章，会离开本文页面，您确定吗？</p>
+		<p>我们将要帮您重新搜索临床治疗经验，会离开本文页面，您确定吗？</p>
 		<div class="controls">
 			<button class="dialog-ok">确认</button>
 			&nbsp;
diff --git a/97suifangqa/templates/sciblog/blog_detail_abstract.html b/97suifangqa/templates/sciblog/blog_detail_abstract.html
index 03a00f3..a9572c2 100644
--- a/97suifangqa/templates/sciblog/blog_detail_abstract.html
+++ b/97suifangqa/templates/sciblog/blog_detail_abstract.html
@@ -1,11 +1,12 @@
 {% extends "sciblog/blog_detail.html" %}
 
+
 {% block sectionname %}
-文章简读
+<span style="font-weight:normal;margin-top:0px;">文章简读</span>
 {% endblock %}
 
 {% block navigation %}
-<nav role="navigation" class="section-nav">
+<nav role="navigation" class="section-nav" >
 	<ul class="links inline">
 		<li><a href="#methods" class="active">治疗方案</a></li>
 		<li><a href="#objectives">研究目标</a></li>
diff --git a/97suifangqa/templates/sciblog/blog_detail_comment.html b/97suifangqa/templates/sciblog/blog_detail_comment.html
index 53dc07c..b64b6e6 100644
--- a/97suifangqa/templates/sciblog/blog_detail_comment.html
+++ b/97suifangqa/templates/sciblog/blog_detail_comment.html
@@ -1,7 +1,7 @@
 {% extends "sciblog/blog_detail.html" %}
 
 {% block sectionname %}
-学者科学评论
+<span style="font-weight:normal;">学者科学评论</span>
 {% endblock %}
 
 {% block navigation %}
@@ -11,5 +11,6 @@
 {% for piece in blog.konwledge_piece.comments %}
 <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 %}
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 %}
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 %}
diff --git a/97suifangqa/templates/sciblog/blog_detail_refrences.html b/97suifangqa/templates/sciblog/blog_detail_refrences.html
index a60935d..99ff7b2 100644
--- a/97suifangqa/templates/sciblog/blog_detail_refrences.html
+++ b/97suifangqa/templates/sciblog/blog_detail_refrences.html
@@ -1,7 +1,7 @@
 {% extends "sciblog/blog_detail.html" %}
 
 {% block sectionname %}
-参考信息
+<span style="font-weight:normal;">参考信息</span>
 {% endblock %}
 
 {% block navigation %}
@@ -20,6 +20,7 @@
 <a href="" id="refrences"></a>
 <h3>参考文献</h3>
 {% for ref in blog.references.all %}
-<a href="{{ ref.link }}">{{ ref.description }}</a>
+{{ ref.description }}<br>
+<a href="{{ ref.link }}" target="_blank">阅读更多</a><br><br>
 {% endfor %}
 {% endblock %}
diff --git a/97suifangqa/templates/sciblog/blog_detail_results-detail.html b/97suifangqa/templates/sciblog/blog_detail_results-detail.html
index 3e6ed25..aafc4f4 100644
--- a/97suifangqa/templates/sciblog/blog_detail_results-detail.html
+++ b/97suifangqa/templates/sciblog/blog_detail_results-detail.html
@@ -1,23 +1,20 @@
 {% extends "sciblog/blog_detail.html" %}
-{% block bodyclasses %}{{ block.super }} blog-results blog-results-detail{% endblock %}
+{% block bodyclasses %}{{ block.super }} blog-results  blog-results-detail{% endblock %}
+
+
 {% block sectionname %}
-病友治疗结果
+<span style="font-weight:normal;">详细治疗结果</span>
 {% endblock %}
 
 {% block navigation %}
 {% endblock %}
 
-{% block  cards_abstract %}
- <div class="cards-abstract">
-	 <div>
-	   <p>{{ result.abstract }}</p>
-	 </div>
-</div>
-{% endblock %}
+
+
 
 {% load group_list %}
 {% block block_pieces %}
-<div class="cards three-columns">
+<div class="cards three-columns" style="margin:5px 0  0 -5px;">
   <div class="column-first">
 	<div class="card {{ result.color }}" href="">
 	  <div class="front">
@@ -44,6 +41,9 @@
 	<p>{{ result.abstract }}</p>
   </div>
 </div>
-<br />
+<div style="width:645px;height:1px;margin:35px 0 10px -20px;padding:0px;background-color:#e6e6e6;overflow:hidden;"></div>
 {{ result.content }}
+<br><br>
+<a id="return-to-results-button" href="{% url blog_detail blog.id 'results'%}" class="button dark-grey-button" style="margin-left:245px;font-size:15px;height:30px;padding-bottom:9px;padding-top:8px;color:white;background-color:#242628;">返回治疗结果</a>
 {% endblock %}
+
diff --git a/97suifangqa/templates/sciblog/blog_detail_results.html b/97suifangqa/templates/sciblog/blog_detail_results.html
index 1427a01..4672a8a 100644
--- a/97suifangqa/templates/sciblog/blog_detail_results.html
+++ b/97suifangqa/templates/sciblog/blog_detail_results.html
@@ -1,7 +1,7 @@
 {% extends "sciblog/blog_detail.html" %}
 {% block bodyclasses %}{{ block.super }} blog-results{% endblock %}
 {% block sectionname %}
-病友治疗结果
+<span style="font-weight:normal;">治疗结果</span>
 {% endblock %}
 
 {% block navigation %}
@@ -9,6 +9,7 @@
 
 {% load group_list %}
 {% block block_pieces %}
+
 {% for chunk in blog.results.all|chunks:3 %}
 <div class="cards three-columns">
   {% for result in chunk %}
@@ -40,6 +41,7 @@
 
 {% endfor %}
 </div>
+
 <br />
 {% endfor %}
 {% endblock %}
diff --git a/97suifangqa/templates/sciblog/blog_detail_source.html b/97suifangqa/templates/sciblog/blog_detail_source.html
index 83be5f1..6f57b4e 100644
--- a/97suifangqa/templates/sciblog/blog_detail_source.html
+++ b/97suifangqa/templates/sciblog/blog_detail_source.html
@@ -1,7 +1,7 @@
 {% extends "sciblog/blog_detail.html" %}
 
 {% block sectionname %}
-文章来源
+<span style="font-weight:normal;">文章来源</span>
 {% endblock %}
 
 {% block navigation %}
@@ -24,7 +24,7 @@
 <p>{{ blog.authors }}</p>
 <h4>学者机构</h4>
 <p>{% for h in blog.hospital.all %}
-{{ h.name }}({{ h.city.nation.name }})
+{{ h.name }}({{ h.city.nation.name }})&nbsp;&nbsp;&nbsp;&nbsp;
 {% endfor %}
-等等</p>
+等</p>
 {% endblock %}
diff --git a/97suifangqa/templates/sciblog/blog_detail_test.html b/97suifangqa/templates/sciblog/blog_detail_test.html
index b6823a9..b7d9f5b 100644
--- a/97suifangqa/templates/sciblog/blog_detail_test.html
+++ b/97suifangqa/templates/sciblog/blog_detail_test.html
@@ -47,8 +47,8 @@
 		</ul>
 	</div>
 	<header id="header">
-		<div id="logo">
-			<img src="{% static "images/slilogo.png" %}" alt="">
+		<div id="logo" >
+			<a href="/blog/index"><img src="{% static "images/slilogo.png" %}" alt=""></a>
 		</div>
 	</header>
 </aside>
diff --git a/97suifangqa/templates/sciblog/blog_list.html b/97suifangqa/templates/sciblog/blog_list.html
index e1eb542..ad5d069 100644
--- a/97suifangqa/templates/sciblog/blog_list.html
+++ b/97suifangqa/templates/sciblog/blog_list.html
@@ -14,10 +14,10 @@
 	<div class="hover-overlay">
 		<div class="region-wrap">
 			<div class="user-info">
-				<h3>用户姓名</h3>
+				<h3>{{ user.username }}</h3>
 			</div>
 			<div class="search-history">
-				<h3>搜索历史</h3>
+				<h3>搜索记录</h3>
 				<ul>
 				  {% for search in search_history %}
 				  <li><a href="{% url query_blogs %}?q={{ search }}">{{ search }}</a></li>
@@ -25,7 +25,7 @@
 				</ul>
 			</div>
 			<div class="related-questions">
-				<h3>相关问题</h3>
+				<h3>您可能对一下问题也感兴趣</h3>
 				<ul>
 				{% for query in questions%}
 				<li>
@@ -34,38 +34,59 @@
 				{% endfor %}
 				</ul>
 			</div>
+			<div class="search-history">
+				<h3><a href="{% url blog_collection %}" target="_blank">我的收藏</a></h3>
+				
+			</div>
+			
 		</div>
 	</div>
 {% endblock %}
 {% block body %}
 	<section id="blog-list-top-nav">
 		{% include "login-menu.inc.html" %}
-		<nav class="search-type-nav">
-			<ul class="links inline">
-			  <li class="first-level"><a href="" class="{% if tab == 'list' %}active{% endif %}">搜索结果</a></li>
-				<!--li class="first-level"><a href="">术语</a></li-->
-				<li class="first-level"><a href="{% url blog_collection %}" class="{% if tab == 'collection' %}active{% endif %}">我的收藏</a></li>
-			</ul>
-		</nav>
+		
 	</section>
 	<section id="blog-list-content">
-	<h2 class="section-name">专业术语</h2>
-	  {% for noun in ppnouns %}
+	
+	<div style="margin-top:-25px;">
+		<div style="width:630px;height:1px;margin:40px 0 -3px 0;padding:0px;background-color:#b3b3b1;overflow:hidden;"></div>
+		<h2 class="section-name" style="color:#a8a8a8;font-weight:normal;">术语科普</h2>
+		<div style="width:630px;height:1px;margin:2px 0 30px 0;padding:0px;background-color:#b3b3b1;overflow:hidden;"></div>	
+	</div>
+	
+		{% for noun in ppnouns %}
 	  <ul class="articles">
 	  <li class="article">
 			<div class="article-title"><!--a href=""-->{{noun.firstkeyword }}<!--/a--></div>
 			<div class="excerpt">
-			{{ noun.firstparagraph }}
+			{{ noun.detail|safe }}
 			</div>
 		</li>
+		<div style="width:630px;height:1px;margin:20px 0 35px 0;padding:0px;background-color:#f2f2f0;overflow:hidden;"></div>
 	  {% endfor %}
 	  </ul>
-	  <h2 class="section-name">医学文章</h2>
+		
+		
+		
+		
+		
+		<div style="width:630px;height:1px;margin:-41px 0 40px 0;padding:0px;background-color:#fff;overflow:hidden;"></div>
+		<!--div style="width:150px;border:1px solid #d5d5d5;margin:-21px auto 40px auto;padding:0px;overflow:hidden;"></div-->
+		
+		<div style="margin-top:-35px;">
+		<div style="width:630px;height:1px;margin-bottom:-5px;padding:0px;background-color:#b3b3b1;overflow:hidden;"></div>
+		<h2 class="section-name" style="color:#a8a8a8;font-weight:normal;margin-bottom:5px;">临床治疗经验</h2>
+		<div style="width:630px;height:1px;margin:0 0 30px 0;padding:0px;background-color:#b3b3b1;overflow:hidden;"></div>
+		</div>
+		
+		
+		
 		{% if has_blogs %}
 		<div class="articles">
 			{% for blog in blogs %}
 			<div class="article">
-				<div class="article-title"><a href="{% url blog_detail blog.id %}">{{ blog.subhead }}</a></div>
+				<div class="article-title"><a href="{% url blog_detail blog.id %}" target="_blank">{{ blog.subhead|safe }}</a></div>
 				<ul class="article-subtitles inline">
 					<!--li> 
 						<span>难度：</span>
@@ -92,22 +113,28 @@
 						{% endfor %}
 						</ul>
 					</li-->
-					<li> <span>杂志：</span><span>{{ blog.journal }}</span></li>
+					<li> <span>杂志：</span><span>{{ blog.journal|safe }}</span></li>
 					<li> <span>作者：</span><span>{{ blog.communication_author }}</span></li>
 				</ul>
 				<br />
 				<div class="excerpt">
 				{{ blog.conclusion|safe }}
 				</div>
+				<div style="width:630px;height:1px;margin:40px 0 20px 0;padding:0px;background-color:#f2f2f0;overflow:hidden;"></div>
 			</div>
 			{% endfor %}
 		</div>
 		{% else %}
-		<div class="not-found">
+		<div class="not-found" style="margin-bottom:50px;">
 			<img src="{% static "images/blog-not-found.png" %}" alt="">
-			<div class="message">没有搜索到{% if tab == 'list'%}文章{% else %}收藏{% endif %}</div>
+			<div class="message">{% if tab == 'list'%}没有搜索到匹配的{% else %}暂时未收藏{% endif %}医学文章</div>
 		</div>
 		{% endif %}
+		
+		
+		
+	  
+		
 	</section>
 
 {% endblock %}
diff --git a/97suifangqa/templates/sciblog/blog_list_collection.html b/97suifangqa/templates/sciblog/blog_list_collection.html
new file mode 100644
index 0000000..0eb951d
--- /dev/null
+++ b/97suifangqa/templates/sciblog/blog_list_collection.html
@@ -0,0 +1,137 @@
+{% extends "picture-base.html" %}
+{% block bodyclasses %}{{ block.super }} blog blog-list{% endblock %}
+{% load staticfiles %}
+{% block othercss %}
+<link rel="stylesheet" href="{% static "stylesheets/sass/blog.css" %}">
+{% endblock %}
+{% block sidebar_first_content %}
+	{% include "sciblog/nav-ribbon.html" %}
+	<div class="region-wrap">
+		<div class="post-question">
+		  {% include "sciblog/blog_search_form.html" %}
+		</div>
+	</div>
+	<!--div class="hover-overlay">
+		<div class="region-wrap">
+			<div class="user-info">
+				<h3>{{ user.username }}</h3>
+			</div>
+			<div class="search-history">
+				<h3>搜索记录</h3>
+				<ul>
+				  {% for search in search_history %}
+				  <li><a href="{% url query_blogs %}?q={{ search }}">{{ search }}</a></li>
+				  {% endfor%}
+				</ul>
+			</div>
+			<div class="related-questions">
+				<h3>您可能对一下问题也感兴趣</h3>
+				<ul>
+				{% for query in questions%}
+				<li>
+				  <a href="{% url query_blogs %}?q={{ query.content }}" title="查询与此问题相关的文章">{{ query.content }}</a>
+				</li>
+				{% endfor %}
+				</ul>
+			</div>
+			<div class="search-history">
+				<h3><a href="{% url blog_collection %}" target="_blank">我的收藏</a></h3>
+				
+			</div>
+			
+		</div>
+	</div-->
+{% endblock %}
+{% block body %}
+	<section id="blog-list-top-nav">
+		{% include "login-menu.inc.html" %}
+		<nav class="search-type-nav">
+			<ul class="links inline">
+			  
+				<li class="first-level"><!--a href="{% url blog_collection %}"-->我的收藏</a></li>
+			</ul>
+		</nav>
+	</section>
+	<section id="blog-list-content">
+	
+	<div style="margin-top:-15px;">
+		<div style="width:630px;height:1px;margin:40px 0 -5px 0;padding:0px;background-color:#b3b3b1;overflow:hidden;"></div>
+		<h2 class="section-name" style="color:#a8a8a8;font-weight:normal;">临床治疗经验</h2>
+		<div style="width:630px;height:1px;margin:2px 0 30px 0;padding:0px;background-color:#b3b3b1;overflow:hidden;"></div>	
+	</div>
+	
+		{% if has_blogs %}
+		<div class="articles">
+			{% for blog in blogs %}
+			<div class="article">
+				<div class="article-title"><a href="{% url blog_detail blog.id %}" target="_blank">{{ blog.subhead }}</a></div>
+				<ul class="article-subtitles inline">
+					<!--li> 
+						<span>难度：</span>
+						{% load get_range %}
+						<ul class="difficulty inline rating-blocks">
+						{% for num in 5|get_range %}
+							{% if num < blog.level %}
+							<li class="filled"></li>
+							{% else %}
+							<li class="empty"></li>
+							{% endif %}
+						{% endfor %}
+						</ul>
+					</li>
+					<li> 
+						<span>权威：</span>
+						<ul class="difficulty inline rating-blocks">
+						{% for num in 5|get_range %}
+							{% if num < blog.quality_value %}
+							<li class="filled"></li>
+							{% else %}
+							<li class="empty"></li>
+							{% endif %}
+						{% endfor %}
+						</ul>
+					</li-->
+					<li> <span>杂志：</span><span>{{ blog.journal }}</span></li>
+					<li> <span>作者：</span><span>{{ blog.communication_author }}</span></li>
+				</ul>
+				<br />
+				<div class="excerpt">
+				{{ blog.conclusion|safe }}
+				</div>
+				<div style="width:630px;height:1px;margin:40px 0 20px 0;padding:0px;background-color:#f2f2f0;overflow:hidden;"></div>
+			</div>
+			{% endfor %}
+		</div>
+		{% else %}
+		<div class="not-found" style="margin-bottom:50px;">
+			<img src="{% static "images/blog-not-found.png" %}" alt="">
+			<div class="message">{% if tab == 'list'%}没有搜索到匹配的{% else %}暂时未收藏{% endif %}临床治疗经验</div>
+		</div>
+		{% endif %}
+		
+		<div style="width:630px;height:1px;margin:-41px 0 40px 0;padding:0px;background-color:#fff;overflow:hidden;"></div>
+		<!--div style="width:150px;border:1px solid #d5d5d5;margin:-21px auto 40px auto;padding:0px;overflow:hidden;"></div-->
+		
+		<div style="margin-top:-15px;">
+		<div style="width:630px;height:1px;margin-bottom:-5px;padding:0px;background-color:#b3b3b1;overflow:hidden;"></div>
+		<h2 class="section-name" style="color:#a8a8a8;font-weight:normal;margin-bottom:5px;">术语科普</h2>
+		<div style="width:630px;height:1px;margin:0 0 30px 0;padding:0px;background-color:#b3b3b1;overflow:hidden;"></div>
+		</div>
+		
+	  {% for noun in ppnouns %}
+	  <ul class="articles">
+	  <li class="article">
+			<div class="article-title"><!--a href=""-->{{noun.firstkeyword }}<!--/a--></div>
+			<div class="excerpt">
+			{{ noun.detail|safe }}
+			</div>
+		</li>
+		<div style="width:630px;height:1px;margin:20px 0 35px 0;padding:0px;background-color:#f2f2f0;overflow:hidden;"></div>
+	  {% endfor %}
+	  </ul>
+		
+	</section>
+
+{% endblock %}
+
+{# vim: set ts=2 sw=2 tw=0 fenc=utf-8 ft=htmldjango: #}
diff --git a/97suifangqa/templates/sciblog/blog_search_form.html b/97suifangqa/templates/sciblog/blog_search_form.html
index e2869e9..a55f27c 100644
--- a/97suifangqa/templates/sciblog/blog_search_form.html
+++ b/97suifangqa/templates/sciblog/blog_search_form.html
@@ -1,5 +1,5 @@
 <form method="get" class="searchdiv" action="{% url query_blogs %}">
-	<input type="text" name="q" placeholder="在这里搜索关键词" class="question" value="{{ q }}">
+	<input type="text" name="q" placeholder=" 在这里搜索关键词" class="question" value="{{ q }}">
 	<input type="submit" value="搜 索" class="submit">
 </form>
 
diff --git a/97suifangqa/templates/sciblog/index.html b/97suifangqa/templates/sciblog/index.html
index 86769c2..39e8896 100644
--- a/97suifangqa/templates/sciblog/index.html
+++ b/97suifangqa/templates/sciblog/index.html
@@ -13,7 +13,7 @@
 

 	<header id="header">

 		<div id="logo">

-			<img src="{% static "images/logo-overlay-white.png" %}" alt="">

+			<a href="/blog/index"><img src="{% static "images/logo-overlay-white.png" %}" alt=""></a>

 		</div>

 	</header>

 

diff --git a/97suifangqa/templates/sciblog/nav-ribbon.html b/97suifangqa/templates/sciblog/nav-ribbon.html
index 16b2bc1..4505693 100644
--- a/97suifangqa/templates/sciblog/nav-ribbon.html
+++ b/97suifangqa/templates/sciblog/nav-ribbon.html
@@ -3,9 +3,9 @@
 		<div class="head-background"></div>

 		<div class="links-wrap">

 			<ul class="links inline">

-				<li class="first"><a href="/blog/index">首页</a></li>

-				<li><a href="{% url list_blogs %}">知识库</a></li>

-				<!--li><a href="">随访工具</a></li-->

+				<li class="first"><a href="/blog/index" target="_blank">返回首页</a></li>

+				<!--li><a href="{% url list_blogs %}">知识库</a></li-->

+				<li><a href="/indicator/status" target="_blank">随访工具</a></li>

 				<!--li class="last"><a href="">我的花费</a></li-->

 			</ul>

 		</div>

diff --git a/97suifangqa/templates/search/indexes/sciblog/blogannotation_text.txt b/97suifangqa/templates/search/indexes/sciblog/blogannotation_text.txt
index a347fc0..ceb9fd7 100644
--- a/97suifangqa/templates/search/indexes/sciblog/blogannotation_text.txt
+++ b/97suifangqa/templates/search/indexes/sciblog/blogannotation_text.txt
@@ -1,5 +1,7 @@
+{%if object.type == 1 %}
 {{ object.brief_content }}
 {{ object.detail }}
 {% for keyword in object.keywords.all %}
 {{ keyword.content }} 
 {% endfor %}
+{% endif %}