Merge pull request #311 from lioman/master
check for new neighbor and seo namespace plugins
This commit is contained in:
commit
faec6935e9
5 changed files with 7 additions and 8 deletions
|
@ -1,4 +1,4 @@
|
|||
{% if not PLUGINS or 'seo' not in PLUGINS %}
|
||||
{% if not PLUGINS or 'seo' not in PLUGINS or 'pelican.plugins.seo' not in PLUGINS%}
|
||||
{% if SITELOGO %}
|
||||
{% set default_cover = SITELOGO %}
|
||||
{% else %}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{% if PLUGINS and 'neighbors' in PLUGINS %}
|
||||
{% if PLUGINS and ('neighbors' in PLUGINS or 'pelican.plugins.neighbors' in PLUGINS) %}
|
||||
<div class="neighbors">
|
||||
{% if article.prev_article %}
|
||||
<a class="btn float-left" href="{{ SITEURL }}/{{ article.prev_article.url }}" title="{{ article.prev_article.title|striptags }}">
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{% if not PLUGINS or 'seo' not in PLUGINS %}
|
||||
{% if not PLUGINS or 'seo' not in PLUGINS or 'pelican.plugins.seo' not in PLUGINS %}
|
||||
{% if OG_LOCALE %}
|
||||
{% set default_locale = OG_LOCALE %}
|
||||
{% else %}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{% if not PLUGINS or 'seo' not in PLUGINS %}
|
||||
{% if not PLUGINS or 'seo' not in PLUGINS or 'pelican.plugins.seo' not in PLUGINS %}
|
||||
{% if OG_LOCALE %}
|
||||
{% set default_locale = OG_LOCALE %}
|
||||
{% else %}
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
{% extends 'base.html' %}
|
||||
{% block title %}{{ _('Search') }} - {{ SITENAME|striptags }}{% endblock title %}
|
||||
{% block content %}
|
||||
|
||||
<article class="single">
|
||||
<header>
|
||||
<h1 id="categories">{{ _('Search Results') }}</h1>
|
||||
</header>
|
||||
<div id="tipue_search_content"></div>
|
||||
</article>
|
||||
{% endblock content %}
|
||||
{% block additional_js %}
|
||||
{% endblock content %} {% block additional_js %}
|
||||
<script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/tipuesearch/jquery.min.js"></script>
|
||||
<script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/tipuesearch/tipuesearch.min.js"></script>
|
||||
<script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/tipuesearch/tipuesearch_set.min.js"></script>
|
||||
|
@ -23,5 +23,4 @@
|
|||
});
|
||||
});
|
||||
</script>
|
||||
{% endblock additional_js %}
|
||||
{% endif %}
|
||||
{% endblock %} {% endif %}
|
||||
|
|
Loading…
Reference in a new issue