diff --git a/package.json b/package.json index 7ce6d01a66..61e736233a 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.150-d", + "phraseanet-production-client": "0.34.156-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig index 9f9995d634..a307ba572b 100644 --- a/templates/web/prod/WorkZone/Basket.html.twig +++ b/templates/web/prod/WorkZone/Basket.html.twig @@ -111,7 +111,8 @@ - + +
@@ -150,13 +151,10 @@ basket_id: formData[0].value, date: formData[1].value }, - beforeSend: function() { - console.log(formData[0].value); - console.log(formData[1].value); - }, success: function (data) { $('.message').css('opacity',1); - $('.submit-validation').addClass('hidden'); + $('.submit-validation').addClass ('btn-not-shown'); + $('.cancel-date').addClass ('btn-not-shown'); setTimeout(function(){ $('.message').css('opacity',0); }, 2000); }, }); @@ -180,7 +178,13 @@ $(".feed-datepicker" ).datepicker( $.datepicker.regional[ 'default' ]); $(".feed-datepicker" ).change(function() { - $('.submit-validation').removeClass('hidden'); + $('.submit-validation').removeClass('btn-not-shown'); + $('.cancel-date').removeClass('btn-not-shown'); + }); + $(".cancel-date" ).click(function() { + $('.cancel-date').removeClass('btn-not-shown'); + $('.feed-datepicker').val('{{ dateExpired }}'); + setTimeout(function(){ $('.cancel-date').addClass('btn-not-shown');$('.submit-validation').addClass('btn-not-shown'); }, 1000); }) }) diff --git a/templates/web/prod/preview/appears_in.html.twig b/templates/web/prod/preview/appears_in.html.twig index e6087d49ab..988bcde86d 100644 --- a/templates/web/prod/preview/appears_in.html.twig +++ b/templates/web/prod/preview/appears_in.html.twig @@ -23,19 +23,19 @@ data-position="0" data-id="{{basket.getId()}}" data-reload="true" - class="otherBaskToolTip open-preview-action" title="{{basket.getDescription()}}"> + class="otherBaskToolTip to-open-preview-action" title="{{basket.getDescription()}}"> {#{{hour}}