From 1e4a9c0565c3d2f52ec205ae7627ebfc84278735 Mon Sep 17 00:00:00 2001 From: Alvin Li 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' --- 97suifangqa/templates/base.html | 2 +- 97suifangqa/templates/blog_list_backup.html | 139 +++++++++++++++++++++ 97suifangqa/templates/picture-base.html | 4 +- 97suifangqa/templates/sciblog/blog_detail.html | 25 ++-- .../templates/sciblog/blog_detail_abstract.html | 5 +- .../templates/sciblog/blog_detail_comment.html | 3 +- .../templates/sciblog/blog_detail_follow.html | 21 +++- .../templates/sciblog/blog_detail_knowledge.html | 4 +- .../templates/sciblog/blog_detail_refrences.html | 5 +- .../sciblog/blog_detail_results-detail.html | 22 ++-- .../templates/sciblog/blog_detail_results.html | 4 +- .../templates/sciblog/blog_detail_source.html | 6 +- .../templates/sciblog/blog_detail_test.html | 4 +- 97suifangqa/templates/sciblog/blog_list.html | 63 +++++++--- .../templates/sciblog/blog_list_collection.html | 137 ++++++++++++++++++++ .../templates/sciblog/blog_search_form.html | 2 +- 97suifangqa/templates/sciblog/index.html | 2 +- 97suifangqa/templates/sciblog/nav-ribbon.html | 6 +- .../search/indexes/sciblog/blogannotation_text.txt | 2 + 19 files changed, 394 insertions(+), 62 deletions(-) create mode 100644 97suifangqa/templates/blog_list_backup.html create mode 100644 97suifangqa/templates/sciblog/blog_list_collection.html (limited to '97suifangqa/templates') 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 @@ - {% block title %}97 随访{% endblock %} + {% block title %}医时代{% endblock %} {% block 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 %} + +{% endblock %} +{% block sidebar_first_content %} + {% include "sciblog/nav-ribbon.html" %} +
+
+ {% include "sciblog/blog_search_form.html" %} +
+
+
+
+ +
+

搜索记录

+
    + {% for search in search_history %} +
  • {{ search }}
    • + {% endfor%} +
+
+
+

您可能对一下问题也感兴趣

+ +
+
+

我的收藏

+ +
+ +
+
+{% endblock %} +{% block body %} + +
+ {% include "login-menu.inc.html" %} + +
+
+ +
+
+

医学文章

+
+
+ + {% if has_blogs %} +
+ {% for blog in blogs %} +
+
{{ blog.subhead }}
+
    + +
  • 杂志：{{ blog.journal }}
    • +
  • 作者：{{ blog.communication_author }}
    • +
+
+
+ {{ blog.conclusion|safe }} +
+
+
+ {% endfor %} +
+ {% else %} +
+ +
{% if tab == 'list'%}没有搜索到匹配的{% else %}暂时未收藏{% endif %}医学文章
+
+ {% endif %} + +
+ + +
+
+

专业术语

+
+
+ + {% for noun in ppnouns %} + + +
+ +{% 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 @@
{% block sidebar_first_content %}{% endblock %} 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" %}
-

关联问题

+

相关问题

{% for query in blog.query.all %} -
{{ query.content }}
+ + {% endfor %}
@@ -42,9 +45,10 @@
+ @@ -84,12 +88,12 @@
@@ -103,10 +107,11 @@
-

{{ blog.subhead }}

+

{{ blog.subhead|safe }}

{% block sectionname %}临床策略{% endblock %}

{% block navigation %} @@ -153,14 +158,14 @@ {% if user.is_authenticated %} {% else %} - + {% endif %}
-

我们将要帮您重新搜索医学文章，会离开本文页面，您确定吗？

+

我们将要帮您重新搜索临床治疗经验，会离开本文页面，您确定吗？

  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 %} -文章简读 +文章简读 {% endblock %} {% block navigation %} -
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 @@
-

搜索历史

+

搜索记录

    {% for search in search_history %}
  • {{ search }}
    • @@ -25,7 +25,7 @@
-

相关问题

+

您可能对一下问题也感兴趣

    {% for query in questions%}
  • @@ -34,38 +34,59 @@ {% endfor %}
+
+

我的收藏

+ +
+
{% endblock %} {% block body %}
{% include "login-menu.inc.html" %} - +
-

专业术语

- {% for noun in ppnouns %} + +
+
+

术语科普

+
+
+ + {% for noun in ppnouns %}
  • {{noun.firstkeyword }}
    - {{ noun.firstparagraph }} + {{ noun.detail|safe }}
    • +
    {% endfor %}
-

医学文章

+ + + + + +
+ + +
+
+

临床治疗经验

+
+
+ + + {% if has_blogs %}
{% for blog in blogs %}
-
{{ blog.subhead }}
+
{{ blog.subhead|safe }}
    -
  • 杂志：{{ blog.journal }}
    • +
  • 杂志：{{ blog.journal|safe }}
  • 作者：{{ blog.communication_author }}

{{ blog.conclusion|safe }}
+
{% endfor %}
{% else %} -
+
-
没有搜索到{% if tab == 'list'%}文章{% else %}收藏{% endif %}
+
{% if tab == 'list'%}没有搜索到匹配的{% else %}暂时未收藏{% endif %}医学文章
{% endif %} + + + + +
{% 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 %} + +{% endblock %} +{% block sidebar_first_content %} + {% include "sciblog/nav-ribbon.html" %} +
+
+ {% include "sciblog/blog_search_form.html" %} +
+
+ +{% endblock %} +{% block body %} +
+ {% include "login-menu.inc.html" %} + +
+
+ +
+
+

临床治疗经验

+
+
+ + {% if has_blogs %} +
+ {% for blog in blogs %} +
+
{{ blog.subhead }}
+
    + +
  • 杂志：{{ blog.journal }}
    • +
  • 作者：{{ blog.communication_author }}
    • +
+
+
+ {{ blog.conclusion|safe }} +
+
+
+ {% endfor %} +
+ {% else %} +
+ +
{% if tab == 'list'%}没有搜索到匹配的{% else %}暂时未收藏{% endif %}临床治疗经验
+
+ {% endif %} + +
+ + +
+
+

术语科普

+
+
+ + {% for noun in ppnouns %} +
    +
  • +
    {{noun.firstkeyword }}
    +
    + {{ noun.detail|safe }} +
    +
    • +
    + {% endfor %} +
+ +
+ +{% 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 @@
- +
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 @@ 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 @@
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 %} -- cgit v1.2.2