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 pull request #3408 from alchemy-fr/PHRAS-2978_feedback_basket-change_date-format

Browse Source 
PHRAS-2978 #comment merge of  Feedback basket - Change date format lib for translation and UI fix
This commit is contained in:
Nicolas Maillat
2020-03-23 14:32:17 +01:00
committed by GitHub
parent 556409392c b6b2a4aae6
commit caaa565c10
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.153-d", "phraseanet-production-client": "0.34.156-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

18
templates/web/prod/WorkZone/Basket.html.twig
View File

@@ -111,7 +111,8 @@
<input type="hidden" name="feedbackId" value={{ basket.getId}} /> <input type="hidden" name="feedbackId" value={{ basket.getId}} />
<input type="hidden" name="feedbackDate" class="alternate" /> <input type="hidden" name="feedbackDate" class="alternate" />
<input type="text" class="btn feed-datepicker" name="feedback-deadline" value="{{ dateExpired }}"> <input type="text" class="btn feed-datepicker" name="feedback-deadline" value="{{ dateExpired }}">
<button type="submit" class="submit hidden submit-validation" title="{{ 'workzone:feedback:update' | trans }}"><i class="fa fa-save"></i></button> <button type="submit" class="submit submit-validation btn-not-shown" title="{{ 'workzone:feedback:update' | trans }}"><svg width="22" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="calendar-check" class="svg-inline--fa fa-calendar-check fa-w-14" role="img" viewBox="0 0 448 512"><path fill="currentColor" d="M436 160H12c-6.627 0-12-5.373-12-12v-36c0-26.51 21.49-48 48-48h48V12c0-6.627 5.373-12 12-12h40c6.627 0 12 5.373 12 12v52h128V12c0-6.627 5.373-12 12-12h40c6.627 0 12 5.373 12 12v52h48c26.51 0 48 21.49 48 48v36c0 6.627-5.373 12-12 12zM12 192h424c6.627 0 12 5.373 12 12v260c0 26.51-21.49 48-48 48H48c-26.51 0-48-21.49-48-48V204c0-6.627 5.373-12 12-12zm333.296 95.947l-28.169-28.398c-4.667-4.705-12.265-4.736-16.97-.068L194.12 364.665l-45.98-46.352c-4.667-4.705-12.266-4.736-16.971-.068l-28.397 28.17c-4.705 4.667-4.736 12.265-.068 16.97l82.601 83.269c4.667 4.705 12.265 4.736 16.97.068l142.953-141.805c4.705-4.667 4.736-12.265.068-16.97z"/></svg></button>
<span class="cancel-date btn-not-shown"><i class="fa fa-times"></i></span>
</form> </form>
<p class="message text-right" style="opacity: 0;transition: all 0.2s; color: green; display: block; ">{{ 'prod:workzone:basket:updated-message' | trans }}</p> <p class="message text-right" style="opacity: 0;transition: all 0.2s; color: green; display: block; ">{{ 'prod:workzone:basket:updated-message' | trans }}</p>
</div> </div>
@@ -150,13 +151,10 @@
basket_id: formData[0].value, basket_id: formData[0].value,
date: formData[1].value date: formData[1].value
}, },
beforeSend: function() {
console.log(formData[0].value);
console.log(formData[1].value);
},
success: function (data) { success: function (data) {
$('.message').css('opacity',1); $('.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); setTimeout(function(){ $('.message').css('opacity',0); }, 2000);
}, },
}); });
@@ -180,7 +178,13 @@
$(".feed-datepicker" ).datepicker( $.datepicker.regional[ 'default' ]); $(".feed-datepicker" ).datepicker( $.datepicker.regional[ 'default' ]);
$(".feed-datepicker" ).change(function() { $(".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);
}) })
}) })

8
yarn.lock
View File

@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@0.34.153-d: phraseanet-production-client@0.34.156-d:
version "0.34.153-d" version "0.34.156-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.153-d.tgz#3014c7345cad2f3f106975805e5b8db5e8db3d56" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.156-d.tgz#a8a4773bf49eab663fd42b0e5bc41df039895292"
integrity sha512-IX5oVB4MmI/PE9iDkeuuXdjfoJd4q4SdFxHuGLswyT0PWxZhIzLT7D2zNc77ULpcnX9KnvCs6wIEIn4UbKC0pQ== integrity sha512-bwlvQSnwB5GcCJYiQoXRUG2FAw3UYWC+q8/Bqa1/p65Wr8YZwUqVW0uzY20cctCnkUNLOxexa2wOPomjo4k9LQ==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"