* improved 'indicator.views.follow_indicator()',

  renamed to 'indicator_fanduf()' due to name conflict
* finished 'search' function for page indicator NewDeleteIndex.html
* added 'apps/utils/search_tools.py': some tools to process search results
* renamed 'sciblog/templatetags/tools.py' to 'get_range.py'
* added 'format_data()' to indicator.tools': to format data of
  record/confine, make it properly display in html page;
* 'indicator/javascripts/new_delete_index.js':
  added global 'var added_indexes_id' to track the already added indexes
* added 'indicator/templatetags/divisible_by.py' filter to check
  if a number can be extactly divide by another number;
* fixed the 'index_card_fir/index_card_sec' problem of
  'act_card_container' of page 'SheetDefault.html'
* indicator/static/css/new_delete_index.css:
  added 'index_search_error' and 'index_error'

* fixed 'unit.dump' problems in 'indicator.models'
* 'indicator.tools':
  o added 'RI_TYPES', 'RI_WEIGHTS'
  o added 'type' in the return value of 'calc_indicator_weight()'
    and 'recommend_indicator()'
* added field 'followedHistories' in 'indicator.models.UserIndicator'
* moved 'follow_indicator()' and 'unfollow_indicator()' from
  'indicator.views' to 'indicator.tools'

TODO:
* highcharts: draw chart for indicator records;
* add/edit data, and submit (page format design)
* followed indicator submit buttion

4 files changed, 209 insertions, 268 deletions

diff --git a/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html b/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html
index c2a219a..f4e9a18 100644
--- a/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html
+++ b/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html
@@ -52,19 +52,8 @@
       <div style="clear: both;"></div>
     </div>
     <div class="index_navigation">
-      <!-- 根据url的参数tab，给对应div的class加 selected 样式 -->
-      <!--
-      <div class="index_type selected" id="index_all"><a href="?tab=all">所有指标</a></div>
-      <div class="index_type"><a href="?tab=1">血常规</a></div>
-      <div class="index_type"><a href="?tab=2">两对半</a></div>
-      <div class="index_type"><a href="?tab=3">肝功能</a></div>
-      <div class="index_type"><a href="?tab=4">肝穿刺</a></div>
-      <div class="index_type"><a href="?tab=5">血常规</a></div>
-      <div class="index_type"><a href="?tab=6">两对半</a></div>
-      <div class="index_type"><a href="?tab=7">肝功能</a></div>
-      -->
       <!-- 所有指标 -->
-      <div class="index_type {% if selected_catid == "all" %}selected{% endif %}">
+      <div class="index_type {% if page_condition == "all" %}selected{% endif %}">
         <a href="?tab=all">所有指标</a>
       </div>
       <!-- 指标类别，页面只能容纳 7 个 -->
@@ -146,6 +135,7 @@
             <div style="clear:both;"></div>
           </div>
           <!-- list of indicators of the category -->
+          {% if page_condition == "category" %}
           <div class="index_lines left">
             {% for ind in indicators %}
               <div class="index_line" index_id="{{ ind.id }}">
@@ -156,6 +146,7 @@
               </div>
             {% endfor %}
           </div> <!-- end: index_lines left -->
+          {% endif %} {# end: page_condition == "category" #}
         </div> <!-- end: category_condition -->
 
         <!-- 搜索后左边的展示 -->
@@ -164,36 +155,42 @@
         <div class="search_condition" style="display: {% if page_condition == "search" %}block{% else %}none{% endif %};">
           <div class="index_title_container">
             <div class="index_title">搜索指标</div>
-            <div class="example_sheet">仿真化验单</div>
+            <div class="example_sheet"></div>
             <div style="clear:both;"></div>
           </div>
           <!-- list of indicators returned by search -->
+          {% if page_condition == "search" %}
           <div class="index_lines left">
             {# 'indicators': list made up by the dumps of indicator #}
-            {% for ind in indicators %}
-              <!-- TODO -->
-              <div class="index_line" index_id="{{ ind|dict_get:"id" }}">
-                <div class="index_name">{{ ind|dict_get:"name" }}</div>
-                <div class="index_category">
-                  <a href="?tab={{ ind|dict_get:"categories_id"|first }}">{{ ind|dict_get:"categories_name"|first }}</a>
+            {# check if search keyword empty & if search result empty #}
+            {% if search_kw_empty %}
+              {# search keyword empty #}
+                <div class="index_search_error">
+                  <div class="index_error">您未输入搜索关键词</div>
+                  <div class="icon"></div>
+                  <div style="clear:both"></div>
                 </div>
-                <div class="icon"></div>
-                <div style="clear:both"></div>
-              </div>
-            {% endfor %}
-            <div class="index_line" index_id="2">
-              <div class="index_name">乙肝病毒S蛋白定量</div>
-              <div class="index_category">血常规</div>
-              <div class="icon"></div>
-              <div style="clear:both"></div>
-            </div>
-            <div class="index_line" index_id="3">
-              <div class="index_name">乙肝病毒表面抗体</div>
-              <div class="index_category">血常规</div>
-              <div class="icon"></div>
-              <div style="clear:both"></div>
-            </div>
+            {% elif search_result_empty %}
+              {# search result empty #}
+                <div class="index_search_error">
+                  <div class="index_error">未搜索到符合的结果</div>
+                  <div class="icon"></div>
+                  <div style="clear:both"></div>
+                </div>
+            {% else %}
+              {% for ind in indicators %}
+                <div class="index_line" index_id="{{ ind|dict_get:"id" }}">
+                  <div class="index_name">{{ ind|dict_get:"name" }}</div>
+                  <div class="index_category">
+                    <a href="?tab={{ ind|dict_get:"categories_id"|first }}">{{ ind|dict_get:"categories_name"|first }}</a>
+                  </div>
+                  <div class="icon"></div>
+                  <div style="clear:both"></div>
+                </div>
+              {% endfor %}
+            {% endif %}
           </div> <!-- end: index_lines left -->
+          {% endif %} {# end: page_condition == "search" #}
         </div> <!-- end: search_condition -->
       </div> <!-- end: index_container -->
 
@@ -219,49 +216,6 @@
               <div style="clear:both"></div>
             </div>
           {% endfor %}
-
-          {% comment %}{# vim: {{{ #}
-          <div class="index_line" index_id="1">
-            <div class="index_name">V-谷丙氨酰转氨酶</div>
-            <div class="icon"></div>
-            <div style="clear:both"></div>
-          </div>
-          <div class="index_line" index_id="2">
-            <div class="index_name">总胆红素</div>
-            <div class="icon"></div>
-            <div style="clear:both"></div>
-          </div>
-          <div class="index_line" index_id="3">
-            <div class="index_name">乙肝病毒表面抗原</div>
-            <div class="icon"></div>
-            <div style="clear:both"></div>
-          </div>
-          <div class="index_line" index_id="4">
-            <div class="index_name">乙肝病毒表面抗体</div>
-            <div class="icon"></div>
-            <div style="clear:both"></div>
-          </div>
-          <div class="index_line" index_id="5">
-            <div class="index_name">乙肝病毒e抗体</div>
-            <div class="icon"></div>
-            <div style="clear:both"></div>
-          </div>
-          <div class="index_line" index_id="6">
-            <div class="index_name">乙肝病毒核算定量（PCR）</div>
-            <div class="icon"></div>
-            <div style="clear:both"></div>
-          </div>
-          <div class="index_line" index_id="7">
-            <div class="index_name">乙肝病毒基因型C型</div>
-            <div class="icon"></div>
-            <div style="clear:both"></div>
-          </div>
-          <div class="index_line" index_id="8">
-            <div class="index_name">乙肝病毒型混合型</div>
-            <div class="icon"></div>
-            <div style="clear:both"></div>
-          </div>
-          {% endcomment %}{# vim: }}} #}
         </div> <!-- end: index_lines right -->
 
       </div>
diff --git a/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html b/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html
index 56d0e6a..88a8d82 100644
--- a/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html
+++ b/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
+{% load dict_get %}
+{% load divisible_by %}
 
 {% block title %}
 指标状态 | 随访工具 | 97 随访
@@ -33,200 +35,183 @@
     var static_url = "{{ STATIC_URL }}";
     var indicator_url = "/indicator/";
   </script>
+
+  <!-- Highcharts related, draw records chart -->
+  <script>
+    {% for ind in indicators %}
+      {% if not ind|dict_get:"record_empty" %} {# indicator has records #}
+        var chart_{{ ind|dict_get:"id" }};
+      {% endif %}
+    {% endfor %}
+  </script>
 {% endblock %}
 
 {% block page %}
-  <!--
-	<iframe align="left" width="420" height="720" src="SideBar.html" style="position:fixed;left:0;top:0" frameborder="no" border="0" marginwidth="0" marginheight="0" scrolling="no"></iframe>
-  -->
   <iframe align="left" width="420" height="720" src="{% url indicator_sidebar %}" style="position:fixed;left:0;top:0" frameborder="no" border="0" marginwidth="0" marginheight="0" scrolling="no"></iframe>
-	<div id="right_container">
-		<div id="index_status_container">
-			<div class="index_title">指标状态</div>
-			<!-- 这里需要后端读取cookie，来判断用户是否已经点击大叉。若否，则显示；若是，则隐藏 -->
-			<div class="index_sub_title">
-				<div class="content">以下可能是您感兴趣的指标，您可以点击卡片右上角“X”，取消关注。</div>
-				<div class="close_icon" id="index_title_closed_icon"></div>
-			</div>
-			
-			<!-- 左边的卡片加一个class "index_card_fir"， 右边的卡片加一个class "index_card_sec"  -->
-			<!-- 卡片div的id为 "index_card_卡片id"，方便后续操作 -->
-			<div class="index_card index_card_fir" id="index_card_1">
-				<div class="card_title">乙肝病毒核算定量 (PCR)1</div>
-				<div class="refer_range">
-					<span class="refer_text">参考范围</span>
-					<span>100 x 10^4 拷贝 /mL</span>
-				</div>
-				<div class="edit_data">
-					<div class="last_edit_data" style="display:none;"><span class="data_fir">0</span> x 10^<span class="data_sec">0</span> 拷贝 /mL</div>
-          <img src="{% static "images/pen.png" %}" class="small_edit_icon">
-          <img class="explain_icon" src="{% static "images/nodata.png" %}">
-				</div>
-				<div class="editing_data">
-					<div class="input_container">
-						<input class="edit_input_main" type="text" value="98" /> x 10^
-						<input class="edit_input_sub" type="text" value="4" />
-					</div>
-					<div class="add_minus_icon">
-						<div class="add_icon"></div>
-						<div class="minus_icon"></div>
-					</div>
-					 拷贝 /mL
-				 	<div class="confirm_edit_icon"></div>
-				 	<div class="cancel_edit_icon"></div>
-				</div>
-				<div class="edit_icon_container">
-					<div class="edit_icon"></div>
-					<div class="curve_icon"></div>
-					<div style="clear:both;"></div>
-				</div>
-				<div class="edit_text">点击右上角的按钮可以编辑数据</div>
-				<div class="card_bottom">
-				  <!--
-					<div class="understand_index"><a class="thickbox" href="popup/IndexDesc.html?TB_iframe=true&no1_title&transfer_params&height=351&width=630&card_id=1">了解该指标</a></div>
-          -->
-          <div class="understand_index"><a class="thickbox" href="{% url indicator_indexdesc %}?TB_iframe=true&no1_title&transfer_params&height=351&width=630&card_id=1">了解该指标</a></div>
-          <div class="simulation_sheet"><a href="{% static "images/demo_sheet.png" %}" class="thickbox">仿真化验单</a></div>
-					<div class="detail_history"><a href="javascript:void(0)">详细历史记录</a></div>
-					<div style="clear:both;"></div>
-				</div>
-				<!-- thickbox插件，方便父级页面与子级弹出层的MVC隔离，方便子级弹出层的复杂需求，如：搜索、分页… -->
-				<!-- height参数为弹出层页面高度+2，width参数为弹出层页面宽度+2，card_id参数为卡片id -->
-        <!--
-				<a class="card_delete_icon card_delete thickbox" href="popup/DeleteCardTip.html?TB_iframe=true&no1_title&transfer_params&height=166&width=630&card_id=1"></a>
-        -->
-        <a class="card_delete_icon card_delete thickbox" href="{% url indicator_deletecardtip %}?TB_iframe=true&no1_title&transfer_params&height=166&width=630&card_id=1"></a>
-			</div>
-			
-			<!-- 右边的卡片 -->
-			<div class="index_card index_card_sec" id="index_card_2">
-				<div class="card_title">乙肝病毒核算定量 (PCR)2</div>
-				<div class="refer_range">
-					<span class="refer_text">参考范围</span>
-					<span>100 x 10^4 拷贝 /mL</span>
-				</div>
-				<div class="edit_data">
-					<div class="last_edit_data" style="display:none;"><span class="data_fir">0</span> x 10^<span class="data_sec">0</span> 拷贝 /mL</div>
-          <img src="{% static "images/pen.png" %}" class="small_edit_icon">
-          <img class="explain_icon" src="{% static "images/nodata.png" %}">
-				</div>
-				<div class="editing_data">
-					<div class="input_container">
-						<input class="edit_input_main" type="text" value="98" /> x 10^
-						<input class="edit_input_sub" type="text" value="4" />
-					</div>
-					<div class="add_minus_icon">
-						<div class="add_icon"></div>
-						<div class="minus_icon"></div>
-					</div>
-					 拷贝 /mL
-				 	<div class="confirm_edit_icon"></div>
-				 	<div class="cancel_edit_icon"></div>
-				</div>
-				<div class="edit_icon_container">
-					<div class="edit_icon"></div>
-					<div class="curve_icon"></div>
-					<div style="clear:both;"></div>
-				</div>
-				<div class="edit_text">点击右上角的按钮可以编辑数据</div>
-				<div class="card_bottom">
-				  <!--
-					<div class="understand_index"><a class="thickbox" href="popup/IndexDesc.html?TB_iframe=true&no1_title&transfer_params&height=351&width=630&card_id=2">了解该指标</a></div>
-          -->
-          <div class="understand_index"><a class="thickbox" href="{% url indicator_indexdesc %}?TB_iframe=true&no1_title&transfer_params&height=351&width=630&card_id=2">了解该指标</a></div>
-          <div class="simulation_sheet"><a href="{% static "images/demo_sheet.png" %}" class="thickbox">仿真化验单</a></div>
-					<div class="detail_history"><a href="javascript:void(0)">详细历史记录</a></div>
-					<div style="clear:both;"></div>
-				</div>
-				<!--
-				<a class="card_delete_icon card_delete thickbox" href="popup/DeleteCardTip.html?TB_iframe=true&no1_title&transfer_params&height=166&width=630&card_id=2"></a>
-        -->
-        <a class="card_delete_icon card_delete thickbox" href="{% url indicator_deletecardtip %}?TB_iframe=true&no1_title&transfer_params&height=166&width=630&card_id=2"></a>
-			</div>
-			
-			<div class="index_card index_card_fir" id="index_card_3">
-				<div class="card_title">乙肝病毒核算定量 (PCR)3</div>
-				<div class="refer_range">
-					<span class="refer_text">参考范围</span>
-					<span>100 x 10^4 拷贝 /mL</span>
-				</div>
-				<div class="edit_data">
-					<div class="last_edit_data"><span class="data_fir">98</span> x 10^<span class="data_sec">4</span> 拷贝 /mL</div>
-          <img src="{% static "images/pen.png" %}" class="small_edit_icon">
-          <img src="{% static "images/last_edit_data.png" %}" class="explain_icon">
-				</div>
-				<div class="editing_data">
-					<div class="input_container">
-						<input class="edit_input_main" type="text" value="" autocomplete="off" /> x 10^
-						<input class="edit_input_sub" type="text" value="" autocomplete="off" />
-					</div>
-					<div class="add_minus_icon">
-						<div class="add_icon"></div>
-						<div class="minus_icon"></div>
-					</div>
-					 拷贝 /mL
-				 	<div class="confirm_edit_icon"></div>
-				 	<div class="cancel_edit_icon"></div>
-				</div>
-				<div class="refresh_data">
-					<div class="refresh_text">这是2013-07-01 化验单上的记录</div>
-					<div class="refresh_icon"></div>
-					<div style="clear:both;"></div>
-				</div>
-				<div class="select_date">
-					<input class="datepicker" type="text" autocomplete="off" />
-				</div>
-				<div id="chart_3" class="chart"></div>
-				<div class="card_bottom">
-				  <!--
-					<div class="understand_index"><a class="thickbox" href="popup/IndexDesc.html?TB_iframe=true&no1_title&transfer_params&height=351&width=630&card_id=3">了解该指标</a></div>
-          -->
-          <div class="understand_index"><a class="thickbox" href="{% url indicator_indexdesc %}?TB_iframe=true&no1_title&transfer_params&height=351&width=630&card_id=3">了解该指标</a></div>
-          <div class="simulation_sheet"><a href="{% static "images/demo_sheet.png" %}" class="thickbox">仿真化验单</a></div>
-					<div class="detail_history"><a href="javascript:void(0)">详细历史记录</a></div>
-					<div style="clear:both;"></div>
-				</div>
-				<!--
-				<a class="card_delete_icon card_delete thickbox" href="popup/DeleteCardTip.html?TB_iframe=true&no1_title&transfer_params&height=166&width=630&card_id=3"></a>
-        -->
-        <a class="card_delete_icon card_delete thickbox" href="{% url indicator_deletecardtip %}?TB_iframe=true&no1_title&transfer_params&height=166&width=630&card_id=3"></a>
-			</div>
-			
-			<div class="detail_card_info">
-				<div class="card_title">乙肝病毒核算定量 (PCR)4<input class="collapse_btn" type="button" value="收 起" /></div>
-				<div class="search_data_div">
-					<input class="recent_one_week shift_week" start_date="2013-08-04" end_date="2013-08-10" type="button" value="最近1周" />
-					<input class="recent_two_week shift_week unselected" start_date="2013-07-28" end_date="2013-08-10" type="button" value="最近2周" />
-					<div class="datepicker_container end_date_container">
-						<label>截至日期</label>
-						<input class="datepicker end_date" id="search_end_date" type="text" value="" />
-					</div>
-					<div class="datepicker_container">
-						<label class="start_label">起始日期</label>
-						<input class="datepicker start_date" id="search_start_date" type="text" value="" />
-					</div>
-					<div style="clear:both;"></div>
-				</div>
-				<div id="detail_chart"></div>
-				<div class="table_div">
-					<table width="100%">
-						<tr class="first_line">
-							<td width="122px">日期</td>
-							<td width="124px">时间</td>
-							<td width="312px">记录</td>
-						</tr>
-					</table>
-				</div>
-				<div class="see_more"><input class="see_more_btn" type="button" value="浏览更多记录" /></div>
-			</div>
-			
-			<div class="act_card_container index_card_sec">
+
+  <div id="right_container">
+    <div id="index_status_container">
+      <div class="index_title">指标状态</div>
+
+      <!-- 这里需要后端读取cookie，来判断用户是否已经点击大叉。
+           若否，则显示；若是，则隐藏
+      -->
+      <div class="index_sub_title">
+        <div class="content">以下可能是您感兴趣的指标，您可以点击卡片右上角“X”，取消关注。</div>
+        <div class="close_icon" id="index_title_closed_icon"></div>
+      </div>
+
+      <!-- 左边的卡片加一个class "index_card_fir"，
+           右边的卡片加一个class "index_card_sec"
+      -->
+      <!-- 卡片div的id为 "index_card_卡片id"，方便后续操作 -->
+      {% for ind in indicators %}
+        <div class="index_card {% cycle 'index_card_fir' 'index_card_sec' %}" id="index_card_{{ ind|dict_get:"id" }}">
+          <div class="card_title">{{ ind|dict_get:"name" }}</div>
+          <div class="refer_range">
+            <span class="refer_text">{{ ind|dict_get:"ref_text" }}</span>
+            <span class="refer_value">{{ ind|dict_get:"ref_value"|safe }}</span>
+            <span class="data_unit">{{ ind|dict_get:"std_unit_symbol" }}</span>
+          </div>
+          {% if ind|dict_get:"record_empty" %} {# vim: {{{ #}
+            {# if no record, then hide 'last_edit_data' #}
+            <!-- "record_empty": True -->
+            <div class="edit_data">
+                <div class="last_edit_data" style="display: none;">
+                  <span class="last_data">Null</span>
+                  <span class="data_unit">{{ ind|dict_get:"std_unit_symbol" }}</span>
+                </div>
+                <img class="small_edit_icon" src="{% static "images/pen.png" %}" />
+                <img class="explain_icon" src="{% static "images/nodata.png" %}" />
+            </div> <!-- end: edit_data -->
+            <div class="editing_data">
+              <div class="input_container">
+                <input class="edit_input_main" type="text" value="0" />
+                x 10^
+                <input class="edit_input_sub" type="text" value="0" />
+              </div>
+              <div class="add_minus_icon">
+                <div class="add_icon"></div>
+                <div class="minus_icon"></div>
+              </div>
+              <div class="data_unit">{{ ind|dict_get:"std_unit_symbol" }}</div>
+              <div class="confirm_edit_icon"></div>
+              <div class="cancel_edit_icon"></div>
+            </div> <!-- end: editing_data -->
+            <!-- hints to get started, display when has no record -->
+            <div class="edit_icon_container">
+              <div class="edit_icon"></div>
+              <div class="curve_icon"></div>
+              <div style="clear:both;"></div>
+            </div>
+            <div class="edit_text">点击右上角的按钮开始添加数据</div>
+          {# vim: }}} #}
+          {% else %} {# record_empty == False; vim: {{{ #}
+            {# indicator has records #}
+            <!-- "record_empty": False -->
+            <div class="edit_data">
+                <div class="last_edit_data" style="display: block;">
+                  <span class="last_data">{{ ind|dict_get:"last_record"|dict_get:"value_str" }}</span>
+                  <span class="data_unit">{{ ind|dict_get:"std_unit_symbol" }}</span>
+                </div>
+                <img class="small_edit_icon" src="{% static "images/pen.png" %}" />
+                <img class="explain_icon" src="{% static "images/last_edit_data.png" %}" />
+            </div> <!-- end: edit_data -->
+            <div class="editing_data">
+              <div class="input_container">
+                <input class="edit_input_main" type="text" value="" autocomplete="off" />
+                x 10^
+                <input class="edit_input_sub" type="text" value="" autocomplete="off" />
+              </div>
+              <div class="add_minus_icon">
+                <div class="add_icon"></div>
+                <div class="minus_icon"></div>
+              </div>
+              <div class="data_unit">{{ ind|dict_get:"std_unit_symbol" }}</div>
+              <div class="confirm_edit_icon"></div>
+              <div class="cancel_edit_icon"></div>
+            </div> <!-- end: editing_data -->
+            <div class="refresh_data">
+              <div class="refresh_text">
+                记录日期: {{ ind|dict_get:"last_record"|dict_get:"date" }}
+              </div>
+              <div class="refresh_icon"></div>
+              <div style="clear:both;"></div>
+            </div>
+            <div class="select_date">
+              <input class="datepicker" type="text" autocomplete="off" />
+            </div>
+            <!-- chart rendered by Highcharts -->
+            <div id="chart_{{ ind|dict_get:"id" }}" class="chart"></div>
+          {% endif %} {# end: record_empty; vim: }}} #}
+
+          <div class="card_bottom">
+            <div class="understand_index"><a class="thickbox" href="{% url indicator_indexdesc %}?TB_iframe=true&no1_title&transfer_params&height=351&width=630&card_id={{ ind|dict_get:"id" }}">了解该指标</a></div>
+            <!-- TODO -->
+            <div class="simulation_sheet"><a href="{% static "images/demo_sheet.png" %}" class="thickbox">仿真化验单</a></div>
+            <div class="detail_history">
+              <a href="javascript:void(0)">详细历史记录</a>
+            </div>
+            <div style="clear:both;"></div>
+          </div>
+
+          {% comment %}
+            thickbox插件:
+            方便父级页面与子级弹出层的MVC隔离，
+            方便子级弹出层的复杂需求，如：搜索、分页…
+            height参数为弹出层页面高度+2，
+            width参数为弹出层页面宽度+2，
+            card_id参数为 "卡片id"
+          {% endcomment %}
+          <a class="card_delete_icon card_delete thickbox" href="{% url indicator_deletecardtip %}?TB_iframe=true&no1_title&transfer_params&height=166&width=630&card_id={{ ind|dict_get:"id" }}"></a>
+        </div> <!-- end: index_card -->
+      {% endfor %} {# end: indicators #}
+
+      <!-- detail card info -->
+      <div class="detail_card_info">
+        <div class="card_title">乙肝病毒核算定量 (PCR)4<input class="collapse_btn" type="button" value="收 起" /></div>
+        <div class="search_data_div">
+          <input class="recent_one_week shift_week" start_date="2013-08-04" end_date="2013-08-10" type="button" value="最近1周" />
+          <input class="recent_two_week shift_week unselected" start_date="2013-07-28" end_date="2013-08-10" type="button" value="最近2周" />
+          <div class="datepicker_container end_date_container">
+            <label>截止日期</label>
+            <input class="datepicker end_date" id="search_end_date" type="text" value="" />
+          </div>
+          <div class="datepicker_container">
+            <label class="start_label">起始日期</label>
+            <input class="datepicker start_date" id="search_start_date" type="text" value="" />
+          </div>
+          <div style="clear:both;"></div>
+        </div>
+        <div id="detail_chart"></div>
+        <div class="table_div">
+          <table width="100%">
+            <tr class="first_line">
+              <td width="122px">日期</td>
+              <td width="124px">时间</td>
+              <td width="312px">记录</td>
+            </tr>
+          </table>
+        </div>
+        <div class="see_more">
+          <input class="see_more_btn" type="button" value="浏览更多记录" />
+        </div>
+      </div> <!-- end: detail card info -->
+
+      <!-- goto follow/unfollow indicator -->
+      {% if indicators|length|divisible_by:"2" %}
+      {# number of followed indicators: even #}
+      <div class="act_card_container index_card_fir">
+      {% else %}
+      <div class="act_card_container index_card_sec">
+      {% endif %}
         <div class="act_card">
-          <a href="{% url follow_indicator %}">添加或删除关注指标</a>
+          <a href="{% url indicator_fanduf %}">添加或删除关注指标</a>
         </div>
-			</div>
-		</div>
-	</div>
+      </div> <!-- end: follow/unfollow indicator -->
+
+    </div>
+  </div>
 {% endblock page %}
 
 {# vim: set ts=2 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: #}
diff --git a/97suifangqa/apps/indicator/templates/indicator/index.html b/97suifangqa/apps/indicator/templates/indicator/index.html
index 7c280f7..408ce67 100644
--- a/97suifangqa/apps/indicator/templates/indicator/index.html
+++ b/97suifangqa/apps/indicator/templates/indicator/index.html
@@ -8,7 +8,7 @@
 {% block body %}
   <ul>
     <li><a href="{% url indicator_status %}">指标状态</a></li>
-    <li><a href="{% url follow_indicator %}">关注指标</a></li>
+    <li><a href="{% url indicator_fanduf %}">关注指标</a></li>
   </ul>
 {% endblock %}
 
diff --git a/97suifangqa/apps/indicator/templates/indicator/popup/DeleteCardTip.html b/97suifangqa/apps/indicator/templates/indicator/popup/DeleteCardTip.html
index 7424930..c978f8a 100644
--- a/97suifangqa/apps/indicator/templates/indicator/popup/DeleteCardTip.html
+++ b/97suifangqa/apps/indicator/templates/indicator/popup/DeleteCardTip.html
@@ -24,7 +24,9 @@
 			<div class="delete_card_tip_title">提示</div>
 			<div class="delete_card_tip_close"></div>
 		</div>
-		<div class="delete_card_tip_content">取消关注指标后，该指标卡片将从本页面消失，您确定需要取消关注？</div>
+		<div class="delete_card_tip_content">
+		  取消关注指标后，该指标卡片将从本页面消失，您确定需要取消关注？
+		</div>
 		<div class="delete_card_tip_action">
 			<a class="action_confirm_cancel">取消关注</a>
 			<a class="action_confirm_ignore">继续关注</a>