From 1e4a9c0565c3d2f52ec205ae7627ebfc84278735 Mon Sep 17 00:00:00 2001
From: Alvin Li <liweitianux@gmail.com>
Date: Wed, 30 Oct 2013 10:16:21 +0800
Subject: * merged commits from 'maxwell lou' by time '20131028_09:52';

* 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'
---
 .../sciblog/blog_detail_results-detail.html        | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to '97suifangqa/templates/sciblog/blog_detail_results-detail.html')

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 %}
+
-- 
cgit v1.2.2