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

Merge branch 'master' into PHRAS-3272_cli-plinks-creation_MASTER

Browse Source
This commit is contained in:
jygaulier
2020-11-17 10:01:53 +01:00
committed by GitHub
parent 4b34dd1626 de65988171
commit 35dee831a0
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Phraseanet-production-client/dist/production.js vendored
View File

@@ -2588,7 +2588,7 @@ var leafletMap = function leafletMap(services) {
if (editable) { if (editable) {
$noticeButton = (0, _jquery2.default)('<button id="map-info-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>'); $noticeButton = (0, _jquery2.default)('<button id="map-info-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBox = (0, _jquery2.default)('<div id="notice-info-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("prod:mapboxgl: title info") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxgl: description info : right click to add position") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>'); $noticeBox = (0, _jquery2.default)('<div id="notice-info-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("mapboxgl title info") + '</span></span><span class="notice-desc">' + localeService.t("mapboxgl description info") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerEdit.append($noticeButton); controlContainerEdit.append($noticeButton);
controlContainerEdit.append($noticeBox); controlContainerEdit.append($noticeBox);
@@ -2628,7 +2628,7 @@ var leafletMap = function leafletMap(services) {
if (drawable) { if (drawable) {
$noticeButtonJs = (0, _jquery2.default)('<button id="map-noticeJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>'); $noticeButtonJs = (0, _jquery2.default)('<button id="map-noticeJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBoxJs = (0, _jquery2.default)('<div id="noticeJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("prod:mapboxjs: title notice") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxjs: description notice") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>'); $noticeBoxJs = (0, _jquery2.default)('<div id="noticeJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("mapboxjs title notice") + '</span></span><span class="notice-desc">' + localeService.t("mapboxjs description notice") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerSearch.append($noticeButtonJs); controlContainerSearch.append($noticeButtonJs);
controlContainerSearch.append($noticeBoxJs); controlContainerSearch.append($noticeBoxJs);
@@ -2637,7 +2637,7 @@ var leafletMap = function leafletMap(services) {
if (editable) { if (editable) {
$noticeButtonJs = (0, _jquery2.default)('<button id="map-infoJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>'); $noticeButtonJs = (0, _jquery2.default)('<button id="map-infoJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBoxJs = (0, _jquery2.default)('<div id="notice-infoJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("prod:mapboxjs: title info") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxjs: description info : right click to add position") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>'); $noticeBoxJs = (0, _jquery2.default)('<div id="notice-infoJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("mapboxjs title info") + '</span></span><span class="notice-desc">' + localeService.t("mapboxjs description info") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerEdit.append($noticeButtonJs); controlContainerEdit.append($noticeButtonJs);
controlContainerEdit.append($noticeBoxJs); controlContainerEdit.append($noticeBoxJs);

6
Phraseanet-production-client/dist/production.min.js vendored
View File

@@ -2588,7 +2588,7 @@ var leafletMap = function leafletMap(services) {
if (editable) { if (editable) {
$noticeButton = (0, _jquery2.default)('<button id="map-info-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>'); $noticeButton = (0, _jquery2.default)('<button id="map-info-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBox = (0, _jquery2.default)('<div id="notice-info-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("prod:mapboxgl: title info") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxgl: description info : right click to add position") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>'); $noticeBox = (0, _jquery2.default)('<div id="notice-info-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("mapboxgl title info") + '</span></span><span class="notice-desc">' + localeService.t("mapboxgl description info") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerEdit.append($noticeButton); controlContainerEdit.append($noticeButton);
controlContainerEdit.append($noticeBox); controlContainerEdit.append($noticeBox);
@@ -2628,7 +2628,7 @@ var leafletMap = function leafletMap(services) {
if (drawable) { if (drawable) {
$noticeButtonJs = (0, _jquery2.default)('<button id="map-noticeJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>'); $noticeButtonJs = (0, _jquery2.default)('<button id="map-noticeJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBoxJs = (0, _jquery2.default)('<div id="noticeJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("prod:mapboxjs: title notice") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxjs: description notice") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>'); $noticeBoxJs = (0, _jquery2.default)('<div id="noticeJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("mapboxjs title notice") + '</span></span><span class="notice-desc">' + localeService.t("mapboxjs description notice") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerSearch.append($noticeButtonJs); controlContainerSearch.append($noticeButtonJs);
controlContainerSearch.append($noticeBoxJs); controlContainerSearch.append($noticeBoxJs);
@@ -2637,7 +2637,7 @@ var leafletMap = function leafletMap(services) {
if (editable) { if (editable) {
$noticeButtonJs = (0, _jquery2.default)('<button id="map-infoJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>'); $noticeButtonJs = (0, _jquery2.default)('<button id="map-infoJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBoxJs = (0, _jquery2.default)('<div id="notice-infoJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("prod:mapboxjs: title info") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxjs: description info : right click to add position") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>'); $noticeBoxJs = (0, _jquery2.default)('<div id="notice-infoJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("mapboxjs title info") + '</span></span><span class="notice-desc">' + localeService.t("mapboxjs description info") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerEdit.append($noticeButtonJs); controlContainerEdit.append($noticeButtonJs);
controlContainerEdit.append($noticeBoxJs); controlContainerEdit.append($noticeBoxJs);

6
Phraseanet-production-client/src/components/geolocalisation/providers/mapbox.js
View File

@@ -454,7 +454,7 @@ const leafletMap = (services) => {
$noticeButton = $('<button id="map-info-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>'); $noticeButton = $('<button id="map-info-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBox = $('<div id="notice-info-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + $noticeBox = $('<div id="notice-info-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' +
localeService.t("prod:mapboxgl: title info") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxgl: description info : right click to add position") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>'); localeService.t("mapboxgl title info") + '</span></span><span class="notice-desc">' + localeService.t("mapboxgl description info") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerEdit.append($noticeButton); controlContainerEdit.append($noticeButton);
controlContainerEdit.append($noticeBox); controlContainerEdit.append($noticeBox);
@@ -495,7 +495,7 @@ const leafletMap = (services) => {
$noticeButtonJs = $('<button id="map-noticeJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>'); $noticeButtonJs = $('<button id="map-noticeJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBoxJs = $('<div id="noticeJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + $noticeBoxJs = $('<div id="noticeJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' +
localeService.t("prod:mapboxjs: title notice") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxjs: description notice") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>'); localeService.t("mapboxjs title notice") + '</span></span><span class="notice-desc">' + localeService.t("mapboxjs description notice") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerSearch.append($noticeButtonJs); controlContainerSearch.append($noticeButtonJs);
controlContainerSearch.append($noticeBoxJs); controlContainerSearch.append($noticeBoxJs);
@@ -505,7 +505,7 @@ const leafletMap = (services) => {
$noticeButtonJs = $('<button id="map-infoJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>'); $noticeButtonJs = $('<button id="map-infoJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBoxJs = $('<div id="notice-infoJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + $noticeBoxJs = $('<div id="notice-infoJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' +
localeService.t("prod:mapboxjs: title info") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxjs: description info : right click to add position") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>'); localeService.t("mapboxjs title info") + '</span></span><span class="notice-desc">' + localeService.t("mapboxjs description info") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerEdit.append($noticeButtonJs); controlContainerEdit.append($noticeButtonJs);
controlContainerEdit.append($noticeBoxJs); controlContainerEdit.append($noticeBoxJs);

12
lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php
View File

@@ -159,12 +159,12 @@ class LanguageController
'description notice' => $translator->trans('prod:mapboxgl: description notice'), 'description notice' => $translator->trans('prod:mapboxgl: description notice'),
'title-map-dialog' => $translator->trans('prod:mapboxgl: title map dialog'), 'title-map-dialog' => $translator->trans('prod:mapboxgl: title map dialog'),
'create new user' => $translator->trans('prod:push: create new user'), 'create new user' => $translator->trans('prod:push: create new user'),
'prod:mapboxjs: title notice' => $translator->trans('prod:mapboxjs: title notice'), 'mapboxjs title notice' => $translator->trans('prod:mapboxjs: title notice'),
'prod:mapboxjs: description notice' => $translator->trans('prod:mapboxjs: description notice'), 'mapboxjs description notice' => $translator->trans('prod:mapboxjs: description notice'),
'prod:mapboxjs: title info' => $translator->trans('prod:mapboxjs: title info'), 'mapboxjs title info' => $translator->trans('prod:mapboxjs: title info'),
'prod:mapboxjs: description info : right click to add position' => $translator->trans('prod:mapboxjs: description info : right click to add position'), 'mapboxjs description info' => $translator->trans('prod:mapboxjs: description info : right click to add position'),
'prod:mapboxgl: title info' => $translator->trans('prod:mapboxgl: title info'), 'mapboxgl title info' => $translator->trans('prod:mapboxgl: title info'),
'prod:mapboxgl: description info : right click to add position' => $translator->trans('prod:mapboxgl: description info : right click to add position'), 'mapboxgl description info' => $translator->trans('prod:mapboxgl: description info : right click to add position'),
'prod:videoeditor:subtitletab:message:: error' => $translator->trans('prod:videoeditor:subtitletab:message:: error'), 'prod:videoeditor:subtitletab:message:: error' => $translator->trans('prod:videoeditor:subtitletab:message:: error'),
'prod:videoeditor:subtitletab:message:: success' => $translator->trans('prod:videoeditor:subtitletab:message:: success'), 'prod:videoeditor:subtitletab:message:: success' => $translator->trans('prod:videoeditor:subtitletab:message:: success'),
'Edit expose title' => $translator->trans('prod:workzone:expose:modal:: title'), 'Edit expose title' => $translator->trans('prod:workzone:expose:modal:: title'),