Commit 18c88b0a authored by Matthieu Boileau's avatar Matthieu Boileau
Browse files

Merge branch 'develop' into 'dev-boileau'

# Conflicts:
#   themes/calcul/static/css/style.css
parents f2061cdb 9ef360cd
Pipeline #4214 passed with stages
in 39 seconds
......@@ -44,19 +44,19 @@ Rechercher sur le site du groupe Calcul
<script>
$(document).ready(function () {
$('#tipue_search_input').tipuesearch({
{% if 'tipue_search' in PLUGINS %}
'mode' : 'json',
{% if 'tipue_search' in PLUGINS %}
'mode' : 'json',
{% else %}
'mode': 'live',
'mode': 'live',
{% endif %}
'show': 10,
'newWindow': false,
'wholeWords': false,
{ # I cannot place following statements in the conditionals above because then Tipue Search fails to work.Possibly a bug in Tipue Search.# }
{% if not 'tipue_search' in PLUGINS %}
'liveDescription': '.article-content'
{% endif %}
});
});
'show': 10,
'newWindow': false,
'wholeWords': false,
{# I cannot place following statements in the conditionals above because then Tipue Search fails to work.Possibly a bug in Tipue Search. #}
{% if not 'tipue_search' in PLUGINS %}
'liveDescription': '.article-content'
{% endif %}
});
});
</script>
{% endblock script %}
\ No newline at end of file
{% endblock script %}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment