This is a combination of 33 commits.

- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
This commit is contained in:
Benoît Burnichon
2016-04-19 19:21:04 +02:00
parent 01b06c5144
commit 1e18b3e69f
179 changed files with 5652 additions and 3030 deletions

View File

@@ -1,3 +1,22 @@
<h1>{{ 'ElasticSearch configuration' | trans }}</h1>
{{ form(form) }}
<form id="ElasticSearchDropIndexForm" action="{{ path('admin_searchengine_drop_index') }}" method="POST">
</form>
<form id="ElasticSearchCreateIndexForm" action="{{ path('admin_searchengine_create_index') }}" method="POST">
</form>
<div id="dropIndexConfirmDialog">Really drop index ?</div>
{% block javascript %}
<script type="text/javascript" src="{{ path('minifier', { 'f' : '/scripts/apps/admin/search-engine/views/es_config.js' }) }}"></script>
<script type="text/javascript">
{% if indexer.indexExists() %}
var elasticSearchIndexExists = true;
{% else %}
var elasticSearchIndexExists = false;
{% endif %}
searchEngineConfigurationFormInit(elasticSearchIndexExists);
</script>
{% endblock %}

View File

@@ -1,21 +0,0 @@
<div class="page-header">
<h1>{{ 'Phrasea search-engine configuration' | trans }}</h1>
</div>
<form method="post" action="{{ path('admin_searchengine_post') }}">
<fieldset>
<legend>{{ 'Stemming' | trans }}</legend>
{{ 'Enable stemming' | trans }} <input type="checkbox" name="stemming_enabled" value="1" {% if configuration['stemming_enabled'] %}checked="checked"{% endif %} />
</fieldset>
<fieldset>
<legend>{{ 'Default sort' | trans }}</legend>
<select name="default_sort">
{% for sort, sort_name in available_sort %}
<option value="{{ sort }}" {%if configuration['default_sort'] == sort %}selected="selected"{% endif %}>{{ sort_name }}</option>
{% endfor %}
</select>
</fieldset>
<div class="form-actions">
<button type="submit" class="btn btn-warning">{{ 'boutton::valider' | trans }}</button>
</div>
</form>

View File

@@ -1,26 +0,0 @@
<h1>{{ 'SphinxSearch search-engine configuration' | trans }}</h1>
<form method="post" action="{{ path('admin_searchengine_post') }}">
<div>{{ 'Sphinx Search connection configuration' | trans }}</div>
<div>{{ 'Sphinx Search server' | trans }}</div>
<input type="text" name="host" value="{{ configuration['host'] | default('127.0.0.1') }}"/>
<input type="text" name="port" value="{{ configuration['port'] | default('93') }}"/>
<div>{{ 'Sphinx Search RealTime server' | trans }}</div>
<input type="text" name="rt_host" value="{{ configuration['rt_host'] }}"/>
<input type="text" name="rt_port" value="{{ configuration['rt_port'] }}"/>
<div>{{ 'Charset to use for indexation' | trans }}</div>
{% for charset, charsetObject in charsets %}
<input type="checkbox" name="charset_tables[]" value="{{ charset }}" {% if charset in configuration['charset_tables'] %}checked="checked"{% endif %} > {{ charsetObject.get_name() }}
{% endfor %}
<br/><br/>
<div>{{ 'Date fields available for search' | trans }}</div>
{% for field in date_fields %}
<input type="checkbox" name="date_fields[]" value="{{ field }}" {% if field in configuration['date_fields'] %}checked="checked"{% endif %} > {{ field }}
{% endfor %}
<button type="submit" class="btn btn-warning" >{{ 'boutton::valider' | trans }}</button>
</form>
<textarea style="font-family: monospace;width:90%;height:70%">{{ configfile }}</textarea>