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

Merge branch 'master' into PHRAS-2184-list-manager-email-domain-filter

Browse Source
This commit is contained in:
Nicolas Maillat
2020-04-21 14:41:14 +02:00
committed by GitHub
parent b4e47d45ec aead79f0c8
commit 26df189dcd
315 changed files with 26274 additions and 7029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/web/prod/actions/Push.html.twig
View File

@@ -218,8 +218,8 @@
</span>
</td>
<td class="options">
<button class="select-all round-blue-border-btn" style="width: 128px; margin-right: 10px;">{{ 'Select all' | trans }}</button>
<button class="unselect-all round-blue-border-btn" style="width: 128px;">{{ 'Deselect all' | trans }}</button>
<button class="select-all round-blue-border-btn" style="margin-right: 10px;">{{ 'Select all' | trans }}</button>
<button class="unselect-all round-blue-border-btn">{{ 'Deselect all' | trans }}</button>
<button class="delete-selection btn btn-inverse">{{ 'prod:push: delete selection' | trans }}</button>
</td>
</tr>

4
templates/web/prod/actions/Tools/videoEditor.html.twig
View File

@@ -115,7 +115,9 @@
<div class="frame_canva">
<div id="thumb_delete_button"/>
<div id="thumb_download_button"/>
<canvas id="thumb_canvas"></canvas>
<div class="canvas-wrap">
<canvas id="thumb_canvas"></canvas>
</div>
<div id="alt_canvas_container"
style="position:absolute;overflow:hidden;top:-1200px;visibility: hidden; width:0!important;height:0!important">
{% for subdef in outputFormats %}

77
templates/web/prod/actions/delete_records_confirm.html.twig
View File

@@ -1,67 +1,14 @@
{% set nbReceived = records.received().count() %}
{% set nbEligibleDocuments = records.count() %}
{% if with_children.records.stories().count() > 0 %}
<label class="checkbox">
<input type="checkbox" id="del_children" name="del_children"
value="1"> {{ "Also delete records that rely on groupings." | trans }}
</label>
{% endif %}
{% set nbTrash = filteredRecord.trash|length %}
{% set nbDelete = filteredRecord.delete|length %}
<div id="delete_records_parent_only">
{{ include('prod/actions/delete_records_confirm_form.html.twig', parents_only) }}
</div>
{% if nbEligibleDocuments > 0 %}
{% if nbReceived != records.count() %}
<div class="well-small" style="text-align:center;">
<span class="label label-info">{{ "You do not have rights to remove all selected documents. Are you sure ?" | trans }}</span>
</div>
{% endif %}
<form id="delete-record-form" style="margin: 0;" method="POST" action="{{ path('record_delete') }}">
<input type="hidden" value="{{ records.serializedList() }}" name="lst" />
{% if nbTrash > 0 %}
<div class="well-small label-important"
style="background-color: #ffef22;">
<div class="dialog-left-section">
<img src="/assets/common/images/icons/icon_collection_bin.png"/>
</div>
<div class="dialog-right-section" style="margin-top: 8px;">
<span>{{ nbTrash }} {{ "prod:app trash: record-move-to-trash" | trans }}</span>
</div>
{% if records.stories().count() %}
<label class="checkbox story">
<input type="checkbox" id="del_children" name="del_children"
value="1"> {{ "prod:app trash: also-move-record" | trans }}
</label>
{% endif %}
</div>
{% endif %}
{% if nbDelete > 0 %}
<div class="well-small label-important"
style="background-color: #ed1c24;">
<div class="dialog-left-section">
<img src="/assets/common/images/icons/icon_empty_bin.png"/>
</div>
<div class="dialog-right-section">
<span>{{ nbDelete }} {{ "prod:app trash: record-delete" | trans }}</span>
</div>
{% if records.stories().count() %}
<label class="checkbox story">
<input type="checkbox" id="del_children" name="del_children"
value="1"> {{ "Also delete records that rely on groupings." | trans }}
</label>
{% endif %}
</div>
{% endif %}
<div class="form-actions" style="background-color:transparent;">
<button type="button" class="btn btn-danger submiter">{{ "Ok" | trans }}</button>
<button type="button" class="btn cancel">{{ "Cancel" | trans }}</button>
<span class="form-action-loader" style="display:none;">
<img src="/assets/common/images/icons/loader000.gif"/>
</span>
</div>
</form>
{% elseif nbReceived == 0 %}
<div class="well-small" style="text-align:center;">
<span class="label label-important">{{ "No document selected" | trans }}</span>
</div>
{% else %}
<div class="well-small" style="text-align:center;">
<span class="label label-info">{{ "You do not have rights to remove selected documents" | trans }}</span>
</div>
{% endif %}
<div id="delete_records_with_children">
{{ include('prod/actions/delete_records_confirm_form.html.twig', with_children) }}
</div>

48
templates/web/prod/actions/delete_records_confirm_form.html.twig Normal file
View File

@@ -0,0 +1,48 @@
{% if records.count() > 0 %}
{% if records.rejected().count() > 0 %}
<div class="well-small" style="text-align:center;">
{{ "You do not have rights to remove all selected documents. Are you sure ?" | trans }}
</div>
{% endif %}
<form id="delete-record-form" style="margin: 0;" method="POST" action="{{ path('record_delete') }}">
<input type="hidden" value="{{ records.serializedList() }}" name="lst"/>
{% if trashableCount > 0 %}
<div class="well-small label-important"
style="background-color: #ffef22;">
<div class="dialog-left-section">
<img src="/assets/common/images/icons/icon_collection_bin.png"/>
</div>
<div class="dialog-right-section" style="margin-top: 8px;">
<span class="to_trash_count">{{ trashableCount }}</span> {{ "prod:app trash: record-move-to-trash" | trans }}
</div>
</div>
{% endif %}
{% if deletableCount > 0 %}
<div class="well-small label-important"
style="background-color: #ed1c24;">
<div class="dialog-left-section">
<img src="/assets/common/images/icons/icon_empty_bin.png"/>
</div>
<div class="dialog-right-section">
<span class="to_delete_count">{{ deletableCount }}</span> {{ "prod:app trash: record-to-delete" | trans }}
</div>
</div>
{% endif %}
<div class="form-actions" style="background-color:transparent;">
<button type="button" class="btn btn-danger submiter">{{ "Ok" | trans }}</button>
<button type="button" class="btn cancel">{{ "Cancel" | trans }}</button>
<span class="form-action-loader" style="display:none;">
<img src="/assets/common/images/icons/loader000.gif"/>
</span>
</div>
</form>
{% elseif records.received().count() == 0 %}
<div class="well-small" style="text-align:center;">
<span class="label label-important">{{ "No document selected" | trans }}</span>
</div>
{% else %}
<div class="well-small" style="text-align:center;">
<span class="label label-info">{{ "You do not have rights to remove selected documents" | trans }}</span>
</div>
{% endif %}

52
templates/web/prod/actions/edit_default.html.twig
View File

@@ -41,7 +41,7 @@
<div style='position:absolute; top:0px; left:0px; height:20px'>
<img class="require_alert" src="/assets/common/images/icons/alert.png" style="display:none;cursor:help;" title="{{ 'edit::Certains champs doivent etre remplis pour valider cet editing' | trans }}">
</div>
<div style='position:absolute; bottom:0px; left:0px; height:20px' class="bottom actions">
<div style='position:absolute; bottom:7px; left:8px; height:20px' class="bottom actions">
<span class="fa-stack previewTips"
tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id() }) }}">
@@ -73,9 +73,9 @@
</tbody>
</table>
</div>
<div class="editDiaButtons" style="position:absolute; bottom:0px; right:0px; width:30px; height:12px; display:none">
<img id="idEditDiaButtonsP_{{i}}" style="cursor:pointer" src="/assets/common/images/icons/plus11.png"/>
<img id="idEditDiaButtonsM_{{i}}" style="cursor:pointer" src="/assets/common/images/icons/minus11.png"/>
<div class="editDiaButtons" style="position:absolute; bottom:8px; right:3px; width:30px; display:none">
<span id="idEditDiaButtonsP_{{i}}" style="cursor:pointer"><i class="fa fa-plus editIcon">&nbsp;</i></span>
<span id="idEditDiaButtonsM_{{i}}" style="cursor:pointer"><i class="fa fa-minus editIcon">&nbsp;</i></span>
</div>
</div>
{% endmacro %}
@@ -90,14 +90,14 @@
{% endif %}
{% for field in fields %}
{% set i = field.get_id() %}
{% if field.is_readonly() is empty %}
{% if field.is_readonly() is empty and field.get_gui_editable()== 1 %}
<div class="edit_field edit-field-action" id="EditFieldBox_{{i}}"
data-id="{{i}}"
data-name="{{field.get_name()}}">
{#<i id="editSGtri_{{ i }}" style="visibility:hidden;" class="fa fa-caret-right" aria-hidden="true"></i>#}
<span class="fa-stack fieldTips"
tooltipsrc="{{ path('prod_tooltip_metadata', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}">
<i class="fa fa-circle fa-stack-2x" aria-hidden="true"></i>
<i class="fa fa-circle fa-stack-2x fa-inverse-bg" aria-hidden="true"></i>
<i class="fa fa-info fa-stack-1x fa-inverse" aria-hidden="true"></i>
</span>
{% if field.get_dces_element %}
@@ -126,6 +126,7 @@
{% set actionable = recordsRequest|length %}
{% set not_actionable = recordsRequest.received|length - actionable %}
{% set editing_top_box_height = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'editing_top_box') %}
<div id="EDIT_ALL">
@@ -135,16 +136,21 @@
<input style="font-size:2px; width:5px;" type="text" id="editFakefocus" />
</form>
</div>
<div id="EDIT_TOP" style="height:{{app['settings'].getUserSetting(app.getAuthenticatedUser(), 'editing_top_box')
}}%;">
<div id="EDIT_TOP" style="height:{{editing_top_box_height}}%; min-height: {{ editing_top_box_height }}">
<div id="EDIT_MENU">
<i class="fa fa-image fa-stack-1x zoom-menu-icon zoom-menu-left" aria-hidden="true"></i>
<div id="EDIT_ZOOMSLIDER" >
</div>
<i class="fa fa-image fa-stack-1x zoom-menu-icon zoom-menu-right" aria-hidden="true"></i>
</div>
{% if recordsRequest.isSingleStory() %}
<div class="GRP_IMAGE_REP">
<div id="EDIT_GRPDIAPO">
{{_self.format_diapo(recordsRequest.singleStory(), false)}}
<div class="story-select-all-block">
<input class="styled-checkbox" id="select-all-diapo" type="checkbox" value="" checked="" >
<label for="select-all-diapo">{{ 'prod::edit:story select all' | trans }}</label>
</div>
</div>
</div>
<div id="EDIT_FILM2" style="left:170px;">
@@ -198,7 +204,7 @@
</div>
<div style="position:absolute; top:4px; width:60px; right:6px; height:24px;">
<button type="submit" class="submit-multivalued">
<img id="EditButAddMultiValued" style="cursor:pointer" src="/assets/common/images/icons/plus16.png" />
<i id="EditButAddMultiValued" class="icon-round-add_box-24px icomoon" style="font-size: 24px;color: grey;">&nbsp;</i>
</button>
</div>
</form>
@@ -410,13 +416,39 @@
</p>
</div>
<div id="dialog-edit_lat_lon" title=" {{ 'prod::edit:confirm: Edition latitude longitude' | trans }}" style="display: none">
<p><span class="ui-icon ui-icon-alert" style="float:left; margin:12px 12px 20px 0;"></span>{{ 'prod::edit: Confirmation Edition latitude longitude' | trans }}</p>
</div>
<input type="hidden" id="dialog-edit-yes" value="{{ 'prod::edit:confirm: Yes' | trans }}" />
<input type="hidden" id="dialog-edit-no" value="{{ 'prod::edit:confirm: No' | trans }}" />
<script type="text/javascript">
{% if multipleDataboxes == 1 %}
$(function() {
$('#EDITWINDOW').hide();
// a workaround for a flaw in the demo system (http://dev.jqueryui.com/ticket/4375), ignore!
$( "#dialog-edit-many-sbas:ui-dialog" ).dialog( "destroy" );
$( "#dialog-edit-many-sbas" ).dialog({
modal: true,
resizable:false,
buttons: {
Ok: function() {
$( this ).dialog( "close" );
}
}
});
$('#dialog-edit-many-sbas').on('dialogclose', function(event) {
location.reload();
});
});
{% else %}
{% set notActionableMsg = '' %}
{% if not_actionable > 1 %}
{% set notActionableMsg = 'prod::editing: %not_actionable% documents ne peuvent etre edites car vos droits sont induffisants' | trans({'%not_actionable%' : not_actionable}) %}
{% elseif not_actionable == 1 %}
{% set notActionableMsg = 'prod::editing: 1 document ne peut etre edite car vos droits sont induffisants' | trans | e('js')%}
{% endif %}
var recordEditorConfig = {
hasMultipleDatabases: {% if multipleDataboxes or recordsRequest|length == 0 %}true{% else %}false{% endif %},
databoxId: {{ databox.get_sbas_id }},
@@ -477,4 +509,6 @@
{% endfor %}
]
};
{% endif %}
</script>

26
templates/web/prod/actions/printer_default.html.twig
View File

@@ -2,6 +2,21 @@
<form target="_blank" name="formprintpage" method="POST" action="{{ path('prod_printer_print') }}">
<div id="printBox">
<div style="padding:10px;">
{% if basketFeedbackId %}
<h4>{{ 'phraseanet:: basket feedback' | trans }}</h4>
<input type="hidden" name="ssel" value="{{ basketFeedbackId }}" />
<div style="margin: 10px 0 20px 0; padding: 0 10px;">
<label for="RADI_PRE_FBO" class="radio">
<input type="radio" name="lay" checked value="feedbackOnly" id="RADI_PRE_FBO" />
{{ 'print:: basket feedback only' | trans }}
</label>
<label for="RADI_PRE_BF" class="radio">
<input type="radio" name="lay" value="feedback" id="RADI_PRE_BF" />
{{ 'print:: basket feedback' | trans }}
</label>
</div>
{% endif %}
{% if printer.get_count_actionable() > 0 %}
{% if printer.get_count_preview() > 0 %}
<h4>{{ 'phraseanet:: preview' | trans }}</h4>
@@ -32,7 +47,7 @@
{{ 'print:: liste d\'imagettes' | trans }}
</label>
<label for="RADI_PRE_THUMGRI" class="radio">
<input type="radio" name="lay" checked value="thumbnailGrid" id="RADI_PRE_THUMGRI" />
<input type="radio" name="lay" {% if not basketFeedbackId %} checked {% endif %} value="thumbnailGrid" id="RADI_PRE_THUMGRI" />
{{ 'print:: planche contact (mosaique)' | trans }}
</label>
</div>
@@ -52,3 +67,12 @@
</div>
</div>
</form>
<script type="text/javascript">
$(document).ready(function() {
var $form = $("form[name=formprintpage]");
$form.bind('submit', function(){
$("#DIALOG").dialog('destroy');
});
});
</script>