diff --git a/blogs/templates/blogs/themes/default/base.html b/blogs/templates/blogs/themes/default/base.html index 6b41e52..e699f3d 100644 --- a/blogs/templates/blogs/themes/default/base.html +++ b/blogs/templates/blogs/themes/default/base.html @@ -1,11 +1,5 @@ {% extends "base.html" %} -{% block meta %} - {% if 'page' in request.get_full_path %} - - {% endif %} -{% endblock %} - {% block body-class %}blog-site{% endblock %} {% block html-class %}blog-site{% endblock %} diff --git a/blogs/templates/blogs/themes/default/list.html b/blogs/templates/blogs/themes/default/list.html index d53599d..735793e 100644 --- a/blogs/templates/blogs/themes/default/list.html +++ b/blogs/templates/blogs/themes/default/list.html @@ -2,12 +2,6 @@ {% load pagination_tags %} -{% block meta %} - {% if 'page' in request.get_full_path %} - - {% endif %} -{% endblock %} - {% block body-class %}{{ block.super }} blog-list{% endblock %} {% block js %} diff --git a/snipts/templates/snipts/list.html b/snipts/templates/snipts/list.html index 8b6a9cf..30eeb9f 100644 --- a/snipts/templates/snipts/list.html +++ b/snipts/templates/snipts/list.html @@ -2,12 +2,6 @@ {% load pagination_tags %} -{% block meta %} - {% if 'page' in request.get_full_path %} - - {% endif %} -{% endblock %} - {% block body-class %}{{ block.super }}{% if user.username == 'blog' %} blog{% endif %}{% endblock %} {% block page-title %}/ {% if public and not public_user %}public{% else %}{{ user.username }}{% endif %}{% if tag %} / {{ tag }}{% endif %} - {{ block.super }}{% endblock %} diff --git a/snipts/views.py b/snipts/views.py index 1b8bd47..c71da4c 100644 --- a/snipts/views.py +++ b/snipts/views.py @@ -201,6 +201,7 @@ def search(request, template='search/search.html', load_all=True, form_class=Mod context = { 'form': form, + 'has_snipts': True, 'page': page, 'paginator': paginator, 'query': query, diff --git a/templates/base.html b/templates/base.html index 68af8e1..214f51a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -10,7 +10,9 @@ {% endblock %} - {% block meta %}{% endblock %} + {% if has_snipts and not detail and not request.blog_user %} + + {% endif %} {% compress css %} diff --git a/templates/search/search.html b/templates/search/search.html index 0f92c57..f11c0c7 100644 --- a/templates/search/search.html +++ b/templates/search/search.html @@ -4,10 +4,6 @@ {% block html-class %}search{% endblock %} {% block body-class %}search static{% endblock %} -{% block meta %} - -{% endblock %} - {% block js %} {{ block.super }} window.detail = false;