{% if query %}
- -

搜索:{{ query }}

+ {% if suggestion %} +

+ 已显示 “{{ suggestion }}” 的搜索结果。   + 仍然搜索:{{ query }}
+

+ {% else %} +

+ 搜索:{{ query }}    +

+ {% endif %}
{% endif %} {% if query and page.object_list %} diff --git a/templates/share_layout/analyticscode.html b/templates/share_layout/analyticscode.html deleted file mode 100644 index 90ae9b801..000000000 --- a/templates/share_layout/analyticscode.html +++ /dev/null @@ -1,24 +0,0 @@ - -百度统计 \ No newline at end of file diff --git a/templates/share_layout/base.html b/templates/share_layout/base.html index d04469e93..bb17933a3 100644 --- a/templates/share_layout/base.html +++ b/templates/share_layout/base.html @@ -1,5 +1,6 @@ {% load static %} {% load cache %} +{% load i18n %} {% load compress %} - + + + + {% load blog_tags %} + {% head_meta %} {% block header %} + {% endblock %} + + + + + + - - - {% compress css %} + + + + + + + + {% compress css %} @@ -42,7 +56,16 @@ {% block compress_css %} {% endblock %} + + {% plugin_compressed_css %} {% endcompress %} + + {% if GLOBAL_HEADER %} + {{ GLOBAL_HEADER|safe }} + {% endif %} + + + {% plugin_head_resources %} @@ -53,10 +76,9 @@

{{ SITE_NA

{{ SITE_DESCRIPTION }}

+ {% load i18n %} + {% include 'share_layout/nav.html' %} - {% cache 36000 nav %} - {% include 'share_layout/nav.html' %} - {% endcache %}
@@ -73,17 +95,25 @@

{{ SITE_DESCRIPTION }}

{% include 'share_layout/footer.html' %}
- -
- {% compress js %} - - - - - {% block compress_js %} - {% endblock %} - {% endcompress %} - {% block footer %} + +{% compress js %} + + + + + {% block compress_js %} {% endblock %} -
+ + {% plugin_compressed_js %} +{% endcompress %} + + + + +{% block footer %} +{% endblock %} + + +{% plugin_body_resources %} + diff --git a/templates/share_layout/footer.html b/templates/share_layout/footer.html index 4e38c8e22..cd86a2959 100644 --- a/templates/share_layout/footer.html +++ b/templates/share_layout/footer.html @@ -21,7 +21,6 @@ | 
百度统计 - {% comment %}{% include 'share_layout/analyticscode.html' %}{% endcomment %}