* 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, 137 insertions, 0 deletions

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: #}