hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRAS-2779_Account_enable-to_delete_application_in_developer-tab

Browse Source
This commit is contained in:
Nicolas Maillat
2020-02-18 16:27:19 +01:00
committed by GitHub
parent b5f1fd18f4 89925048a3
commit 8448e19ba7
28 changed files with 504 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/web/account/account.html.twig
View File

@@ -107,7 +107,7 @@
<div class="control-group">
<label class="form_label control-label" for="form_function"><strong>{{ "admin::compte-utilisateur poste" | trans }}</strong></label>
<div class="controls">
<input class="input_element input-xlarge" type="text" name="form_function" id="form_function" value="{{ app["authentication"].getUser().getActivity() }}" />
<input class="input_element input-xlarge" type="text" name="form_function" id="form_function" value="{{ app["authentication"].getUser().getJob() }}" />
<p class="form_alert help-block"></p>
</div>
</div>
@@ -121,7 +121,7 @@
<div class="control-group">
<label class="form_label control-label" for="form_activity"><strong>{{ "admin::compte-utilisateur activite" | trans }}</strong></label>
<div class="controls">
<input class="input_element input-xlarge" type="text" name="form_activity" id="form_activity" value="{{ app["authentication"].getUser().getJob() }}" />
<input class="input_element input-xlarge" type="text" name="form_activity" id="form_activity" value="{{ app["authentication"].getUser().getActivity() }}" />
<p class="form_alert help-block"></p>
</div>
</div>

14
templates/web/admin/fields/index.html.twig
View File

@@ -27,3 +27,17 @@
{# bootstrap admin field backbone application #}
<script type="text/javascript" src="{{ path('minifier', { 'f' : '/scripts/apps/admin/fields/main.js' }) }}"></script>
<script type="text/javascript">
$(document).ready(function () {
$('#admin-field-app').on('change', '#tbranch', function () {
if ($(this).val() === '') {
$('#generate_cterms').prop('checked', false);
$('.generate-cterms').addClass('hidden');
} else {
$('.generate-cterms').removeClass('hidden');
}
return false;
});
});
</script>

27
templates/web/admin/fields/templates.html.twig
View File

@@ -238,14 +238,12 @@
<label for="aggregable">{% trans %}Aggregation{% endtrans %}</label>
</td>
<td>
<select id="aggregable">
<option <%= field['aggregable'] == "0" ? 'selected' : '' %> value='0'>{% trans %}Not aggregated{% endtrans %}</option>
<option <%= field['aggregable'] == "10" ? 'selected' : '' %> value='10'>10 values</option>
<option <%= field['aggregable'] == "20" ? 'selected' : '' %> value='20'>20 values</option>
<option <%= field['aggregable'] == "50" ? 'selected' : '' %> value='50'>50 values</option>
<option <%= field['aggregable'] == "100" ? 'selected' : '' %> value='100'>100 values</option>
<option <%= field['aggregable'] == "-1" ? 'selected' : '' %> value='-1'>{% trans %}All values{% endtrans %}</option>
</select>
<%= field['aggregable'] == "0" ? '{% trans %}Not aggregated{% endtrans %}' : '' %>
<%= field['aggregable'] == "10" ? '10 values' : '' %>
<%= field['aggregable'] == "20" ? '20 values' : '' %>
<%= field['aggregable'] == "50" ? '50 values' : '' %>
<%= field['aggregable'] == "100" ? '100 values' : '' %>
<%= field['aggregable'] == "-1" ? 'All values' : '' %>
</td>
</tr>
<tr>
@@ -261,11 +259,14 @@
</tr>
<tr>
<td><label for="tbranch">{% trans %}Thesaurus branch{% endtrans %}</label></td>
<td><input id="tbranch" type="text" value="<%= field.tbranch %>"/></td>
</tr>
<tr>
<td><label for="generate_cterms" class="checkbox">{% trans %}Generate-cterms{% endtrans %}</label></td>
<td><input id="generate_cterms" type="checkbox" <%= field.generate_cterms ? "checked='checked'" : "" %> /></td>
<td>
<input id="tbranch" type="text" value="<%= field.tbranch %>"/>
<div style="display: inline-block;" <%= (field.tbranch == "") ? "class='generate-cterms hidden'" : "class='generate-cterms'" %> >
<label for="generate_cterms" class="checkbox">
<input id="generate_cterms" type="checkbox" <%= field.generate_cterms ? "checked='checked'" : "" %> />
{% trans %}Generate-cterms{% endtrans %}</label>
</div>
</td>
</tr>
</table>
</div>

66
templates/web/admin/search-engine/general-aggregation.html.twig
View File

@@ -1,12 +1,37 @@
<div class="general-aggregation-layout">
<button type="submit" id="elasticsearch_settings_save_facets" name="elasticsearch_settings[save]"
class="btn btn-primary">{{ 'Save' | trans }}</button>
<div id="basket-filter" class="facet-filter unstyled" style="float: right; padding-top: 27px;">
{#<span class="filter-title">{{ 'See' | trans }} : </span>#}
<span class="filter-item">
<label id="aggregated-list" class="checkbox inline" for="basketFilter">
<input type="checkbox" class="checkbox " value="aggregated" checked
style="margin-top: 1px">
{{ 'Aggregated' | trans }}
</label>
</span>
<span class="filter-item" style="margin-left: 10px">
<label id="not-aggregated-list" class="checkbox inline" for="basketFilter">
<input type="checkbox" class="checkbox " value="not-aggregated" checked
style="margin-top: 1px">
{{ 'Not aggregated' | trans }}
</label>
</span>
</div>
<ul class="unstyled aggregation-collection">
{% for formdata in form %}
{% set attr = formdata.vars['attr']|join(',') %}
{% set label = formdata.vars['label']|join(',') %}
{% if attr == 'aggregate' %}
<li>
<li id="{{ label }}" class="field-row {% if label starts with '#_' %}lightblue{% endif %}">
<table>
<tbody>
<tr>
<td class="handle">
<i class="fa fa-arrows" aria-hidden="true"></i>
</td>
<td>
{{ form_label(formdata, null, {
'label_attr': {'class': 'label-aggregation'}
@@ -22,6 +47,39 @@
{% endif %}
{% endfor %}
</ul>
<button type="submit" id="elasticsearch_settings_save" name="elasticsearch_settings[save]"
class="btn btn-primary">{{ 'Save' | trans }}</button>
</div>
<input type="hidden" id="listValues" name="facet_list_values"/>
</div>
<script type="text/javascript">
/*Add a sort for the list*/
function filterFacet() {
$.each($(".aggregate option:selected"), function () {
if ($(this).val() == 0) {
$(this).closest('.field-row').addClass('not-aggregated')
}
else {
$(this).closest('.field-row').addClass('aggregated')
}
});
$('#aggregated-list input').click(function () {
$('.aggregated').toggleClass('hidden');
});
$('#not-aggregated-list input').click(function () {
$('.not-aggregated').toggleClass('hidden');
});
}
/*Get the order of new list*/
var sortEventHandler = function (event, ui) {
$('#listValues').val(JSON.stringify($('form').serializeArray()));
};
$(document).ready(function () {
$('.lightblue .label-aggregation').css('color','mediumblue');
$('.aggregation-collection').sortable({
handle: ".handle",
stop: sortEventHandler
});
// sortEventHandler(null, null); // enforce build list
filterFacet();
$("#elasticsearch_settings_save_facets").click(function(){sortEventHandler(null, null);});
});
</script>

8
templates/web/prod/results/help.html.twig
View File

@@ -30,7 +30,11 @@
<li><p>{{ 'help::help-section-bullet: search-in-a-specific-field' | trans }}</p></li>
</ul>
</div>
<p>
<span class="btn btn-info btn-lg trigger-reload-search" onclick="jQuery('.reload-search').trigger('click');">{{ 'help::help-search: relaunch search without filter' | trans }}</span></p>
<br>
<p class="text-center">{{ 'help::help-search: OR' | trans }}</p>
<br>
<p class="text-center">
<span class="btn btn-info btn-lg trigger-reload-search" onclick="jQuery('.reload-search').trigger('click');">{{ 'help::help-search: relaunch search without filter' | trans }}</span>
</p>
</div>
{% endblock %}