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-2885-Prod-Add_missing_warning

Browse Source
This commit is contained in:
Nicolas Maillat
2020-01-29 16:49:08 +01:00
committed by GitHub
parent 55f4678c2f 80f3d8f65f
commit 729291ba01
12 changed files with 2039 additions and 1976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -414,6 +414,7 @@
{% 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,

2
templates/web/prod/templates/push.html.twig
View File

@@ -150,6 +150,8 @@
<div class="control-group">
<input id="PushSendFormName" placeholder="{% trans %}Name{% endtrans %}" type="text" name="name"
class="input-block-level"/>
<input id="feedbackTitle" type="hidden" value="{% trans %}prod::feedback:feedback_set_title{% endtrans %}" />
<input id="pushTitle" type="hidden" value="{% trans %}prod::push:push_set_title{% endtrans %}" />
</div>
<div class="control-group">
<textarea id="PushSendFormMessage" placeholder="{% trans %}Message{% endtrans %}" name="message"