Merge branch 'master' into PHRAS-2814-setup-install-elasticsearch-information

This commit is contained in:
Nicolas Maillat
2019-11-26 16:08:58 +01:00
committed by GitHub
28 changed files with 1191 additions and 388 deletions

View File

@@ -123,8 +123,8 @@ workflows:
dockerfile: Dockerfile
extra-build-args: "--target phraseanet-fpm"
region: AWS_DEFAULT_REGION
repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet"
tag: "alpha-0.1"
repo: "phraseanet-fpm"
tag: "${CIRCLE_BRANCH}"
- aws-ecr/build_and_push_image:
account-url: AWS_ACCOUNT_URL
aws-access-key-id: AWS_ACCESS_KEY_ID
@@ -134,8 +134,8 @@ workflows:
dockerfile: Dockerfile
extra-build-args: "--target phraseanet-nginx"
region: AWS_DEFAULT_REGION
repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet-nginx"
tag: "alpha-0.1"
repo: "phraseanet-nginx"
tag: "${CIRCLE_BRANCH}"
- aws-ecr/build_and_push_image:
account-url: AWS_ACCOUNT_URL
aws-access-key-id: AWS_ACCESS_KEY_ID
@@ -145,5 +145,5 @@ workflows:
dockerfile: Dockerfile
extra-build-args: "--target phraseanet-worker"
region: AWS_DEFAULT_REGION
repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet"
tag: "alpha-0.1"
repo: "phraseanet-worker"
tag: "${CIRCLE_BRANCH}"

View File

@@ -72,3 +72,7 @@ It will build and tag the following images :
local/phraseanet-worker:<TAG>
local/phraseanet-fpm:<TAG>
local/phraseanet-nginx:<TAG>
# Deploy the application
Once the images are built, you can deploy the entire phraseanet stack using the repository : https://github.com/alchemy-fr/phraseanet-docker and follow the instruction inside its `README.md` file.

View File

@@ -128,7 +128,7 @@ key:
| quoted_string()
group:
::space::? ::parenthese_:: primary() ::_parenthese:: ::space::?
::space::? ::parenthese_:: ::space::? primary() ::space::? ::_parenthese:: ::space::?
// Thesaurus terms

View File

@@ -341,10 +341,20 @@ class QueryController extends Controller
if ($result->getTotal() === 0) {
$template = 'prod/results/help.html.twig';
} else {
}
else {
$template = 'prod/results/records.html.twig';
}
$json['results'] = $this->render($template, ['results'=> $result]);
/** @var \Closure $filter */
$filter = $this->app['plugin.filter_by_authorization'];
$plugins = [
'workzone' => $filter('workzone'),
'actionbar' => $filter('actionbar'),
];
$json['results'] = $this->render($template, ['results'=> $result, 'plugins'=>$plugins]);
// add technical fields

View File

@@ -463,8 +463,8 @@ class databox extends base implements ThumbnailedElement
->set_type($type)
->set_tbranch(isset($field['tbranch']) ? (string) $field['tbranch'] : '')
->set_generate_cterms((isset($field['generate_cterms']) && (string) $field['generate_cterms'] == 1))
->set_gui_editable((isset($field['gui_editable']) && (string) $field['gui_editable'] == 1))
->set_gui_visible((isset($field['gui_editable']) && (string) $field['gui_visible'] == 1))
->set_gui_editable((!isset($field['gui_editable']) || (isset($field['gui_editable']) && (string) $field['gui_editable'] == 1)))
->set_gui_visible((!isset($field['gui_visible']) || (isset($field['gui_visible']) && (string) $field['gui_visible'] == 1)))
->set_thumbtitle(isset($field['thumbtitle']) ? (string) $field['thumbtitle'] : (isset($field['thumbTitle']) ? $field['thumbTitle'] : '0'))
->set_report(isset($field['report']) ? (string) $field['report'] : '1')
->save();

View File

@@ -79,7 +79,7 @@
<size>748</size>
<mediatype>video</mediatype>
<writeDatas>yes</writeDatas>
<acodec>libfaac</acodec>
<acodec>libmp3lame</acodec>
<vcodec>libx264</vcodec>
<devices>screen</devices>
<bitrate>1000</bitrate>

View File

@@ -79,7 +79,7 @@
<size>748</size>
<mediatype>video</mediatype>
<writeDatas>yes</writeDatas>
<acodec>libfaac</acodec>
<acodec>libmp3lame</acodec>
<vcodec>libx264</vcodec>
<devices>screen</devices>
<bitrate>1000</bitrate>

View File

@@ -79,7 +79,7 @@
<size>748</size>
<mediatype>video</mediatype>
<writeDatas>yes</writeDatas>
<acodec>libfaac</acodec>
<acodec>libmp3lame</acodec>
<vcodec>libx264</vcodec>
<devices>screen</devices>
<bitrate>1000</bitrate>

View File

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

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2019-11-15T08:02:31Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<file date="2019-11-19T08:48:52Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -9940,6 +9940,21 @@
<target state="translated">Änderungen wurden hergestellt</target>
<jms:reference-file line="14">admin/databox/databox.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="30fd9aaccb427181468696921afdef907567a5fa" resname="generate_cterms">
<source>generate_cterms</source>
<target state="new">generate_cterms</target>
<jms:reference-file line="267">admin/fields/templates.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="aef8d82707701b3e01b408fb013669040af1bdf1" resname="gui_editable">
<source>gui_editable</source>
<target state="new">gui_editable</target>
<jms:reference-file line="196">admin/fields/templates.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="83e4a406813db28238114f37fc57d1e055584ce5" resname="gui_visible">
<source>gui_visible</source>
<target state="new">gui_visible</target>
<jms:reference-file line="204">admin/fields/templates.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="45b162f3c09db4eb9ecea5e048393a7ccaab4f7d" resname="help::help-section-bullet: check-spelling" approved="yes">
<source>help::help-section-bullet: check-spelling</source>
<target state="translated">Vergewissern Sie sich, dass kein Schreibfehler oder Tippfehler vorliegt</target>
@@ -10082,9 +10097,15 @@
<target state="translated">Die Dienstleistung wird in einige Minuten wieder verfügbar sein.</target>
<jms:reference-file line="8">actions/Bridge/deactivated.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="08dffae30f5e0bfb179632f591a0ffb3daaffe6d" resname="lightbox::list">
<source>lightbox::list</source>
<target state="new">lightbox::list</target>
<jms:reference-file line="63">mobile/lightbox/validate.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="49956c0a16703da1e642ef7ea5f5d56ddb026c9b" resname="lightbox::recaptitulatif" approved="yes">
<source>lightbox::recaptitulatif</source>
<target state="translated">Übersicht</target>
<jms:reference-file line="58">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="9">web/lightbox/agreement_box.html.twig</jms:reference-file>
<jms:reference-file line="127">web/lightbox/validate.html.twig</jms:reference-file>
</trans-unit>
@@ -13131,7 +13152,7 @@
<trans-unit id="8deb6b7dccd9c71fb22c18e3c53dcf609494cfb4" resname="validation:: note" approved="yes">
<source>validation:: note</source>
<target state="translated">Kommentare</target>
<jms:reference-file line="13">mobile/lightbox/sc_note.html.twig</jms:reference-file>
<jms:reference-file line="11">mobile/lightbox/sc_note.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="f5f4a6635a3e9ae6101f5d281d0e002535ee504e" resname="validation:: votre note" approved="yes">
<source>validation:: votre note</source>
@@ -13141,8 +13162,8 @@
<trans-unit id="276c62d9460692fb7b96721bea12a028339dd99c" resname="validation::envoyer mon rapport" approved="yes">
<source>validation::envoyer mon rapport</source>
<target state="translated">Meinen Bericht senden</target>
<jms:reference-file line="58">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="59">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="90">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="91">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="2">web/lightbox/basket_options.html.twig</jms:reference-file>
<jms:reference-file line="4">web/lightbox/basket_options.html.twig</jms:reference-file>
</trans-unit>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2019-11-15T08:02:57Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<file date="2019-11-19T08:49:17Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -9940,6 +9940,21 @@
<target state="translated">Modifications done</target>
<jms:reference-file line="14">admin/databox/databox.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="30fd9aaccb427181468696921afdef907567a5fa" resname="generate_cterms">
<source>generate_cterms</source>
<target state="new">generate_cterms</target>
<jms:reference-file line="267">admin/fields/templates.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="aef8d82707701b3e01b408fb013669040af1bdf1" resname="gui_editable">
<source>gui_editable</source>
<target state="new">gui_editable</target>
<jms:reference-file line="196">admin/fields/templates.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="83e4a406813db28238114f37fc57d1e055584ce5" resname="gui_visible">
<source>gui_visible</source>
<target state="new">gui_visible</target>
<jms:reference-file line="204">admin/fields/templates.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="45b162f3c09db4eb9ecea5e048393a7ccaab4f7d" resname="help::help-section-bullet: check-spelling" approved="yes">
<source>help::help-section-bullet: check-spelling</source>
<target state="translated">Check that there are no misspellings or typing errors.</target>
@@ -10083,9 +10098,15 @@ See documentation for more examples https://docs.phraseanet.com</target>
<target state="translated">Service will be available again in a few minutes</target>
<jms:reference-file line="8">actions/Bridge/deactivated.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="08dffae30f5e0bfb179632f591a0ffb3daaffe6d" resname="lightbox::list">
<source>lightbox::list</source>
<target state="new">lightbox::list</target>
<jms:reference-file line="63">mobile/lightbox/validate.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="49956c0a16703da1e642ef7ea5f5d56ddb026c9b" resname="lightbox::recaptitulatif" approved="yes">
<source>lightbox::recaptitulatif</source>
<target state="translated">Summary</target>
<jms:reference-file line="58">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="9">web/lightbox/agreement_box.html.twig</jms:reference-file>
<jms:reference-file line="127">web/lightbox/validate.html.twig</jms:reference-file>
</trans-unit>
@@ -13135,7 +13156,7 @@ It is possible to place several search areas</target>
<trans-unit id="8deb6b7dccd9c71fb22c18e3c53dcf609494cfb4" resname="validation:: note" approved="yes">
<source>validation:: note</source>
<target state="translated">Comments</target>
<jms:reference-file line="13">mobile/lightbox/sc_note.html.twig</jms:reference-file>
<jms:reference-file line="11">mobile/lightbox/sc_note.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="f5f4a6635a3e9ae6101f5d281d0e002535ee504e" resname="validation:: votre note" approved="yes">
<source>validation:: votre note</source>
@@ -13145,8 +13166,8 @@ It is possible to place several search areas</target>
<trans-unit id="276c62d9460692fb7b96721bea12a028339dd99c" resname="validation::envoyer mon rapport" approved="yes">
<source>validation::envoyer mon rapport</source>
<target state="translated">Send my feedback</target>
<jms:reference-file line="58">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="59">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="90">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="91">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="2">web/lightbox/basket_options.html.twig</jms:reference-file>
<jms:reference-file line="4">web/lightbox/basket_options.html.twig</jms:reference-file>
</trans-unit>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2019-11-15T08:03:23Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<file date="2019-11-19T08:49:43Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -9940,6 +9940,21 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<target state="translated">Modifications effectuées</target>
<jms:reference-file line="14">admin/databox/databox.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="30fd9aaccb427181468696921afdef907567a5fa" resname="generate_cterms">
<source>generate_cterms</source>
<target state="new">generate_cterms</target>
<jms:reference-file line="267">admin/fields/templates.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="aef8d82707701b3e01b408fb013669040af1bdf1" resname="gui_editable">
<source>gui_editable</source>
<target state="new">gui_editable</target>
<jms:reference-file line="196">admin/fields/templates.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="83e4a406813db28238114f37fc57d1e055584ce5" resname="gui_visible">
<source>gui_visible</source>
<target state="new">gui_visible</target>
<jms:reference-file line="204">admin/fields/templates.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="45b162f3c09db4eb9ecea5e048393a7ccaab4f7d" resname="help::help-section-bullet: check-spelling">
<source>help::help-section-bullet: check-spelling</source>
<target state="new">help::help-section-bullet: check-spelling</target>
@@ -10082,9 +10097,15 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<target state="translated">Le service sera de nouveau disponible dans quelques minutes.</target>
<jms:reference-file line="8">actions/Bridge/deactivated.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="08dffae30f5e0bfb179632f591a0ffb3daaffe6d" resname="lightbox::list">
<source>lightbox::list</source>
<target state="new">lightbox::list</target>
<jms:reference-file line="63">mobile/lightbox/validate.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="49956c0a16703da1e642ef7ea5f5d56ddb026c9b" resname="lightbox::recaptitulatif" approved="yes">
<source>lightbox::recaptitulatif</source>
<target state="translated">Récapitulatif</target>
<jms:reference-file line="58">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="9">web/lightbox/agreement_box.html.twig</jms:reference-file>
<jms:reference-file line="127">web/lightbox/validate.html.twig</jms:reference-file>
</trans-unit>
@@ -13131,7 +13152,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<trans-unit id="8deb6b7dccd9c71fb22c18e3c53dcf609494cfb4" resname="validation:: note" approved="yes">
<source>validation:: note</source>
<target state="translated">Annotation</target>
<jms:reference-file line="13">mobile/lightbox/sc_note.html.twig</jms:reference-file>
<jms:reference-file line="11">mobile/lightbox/sc_note.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="f5f4a6635a3e9ae6101f5d281d0e002535ee504e" resname="validation:: votre note" approved="yes">
<source>validation:: votre note</source>
@@ -13141,8 +13162,8 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<trans-unit id="276c62d9460692fb7b96721bea12a028339dd99c" resname="validation::envoyer mon rapport" approved="yes">
<source>validation::envoyer mon rapport</source>
<target state="translated">Envoyer mon rapport</target>
<jms:reference-file line="58">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="59">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="90">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="91">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="2">web/lightbox/basket_options.html.twig</jms:reference-file>
<jms:reference-file line="4">web/lightbox/basket_options.html.twig</jms:reference-file>
</trans-unit>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2019-11-15T08:03:50Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<file date="2019-11-19T08:50:13Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -9947,6 +9947,21 @@
<target state="translated">Bewerking correct uitgevoerd</target>
<jms:reference-file line="14">admin/databox/databox.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="30fd9aaccb427181468696921afdef907567a5fa" resname="generate_cterms">
<source>generate_cterms</source>
<target state="new">generate_cterms</target>
<jms:reference-file line="267">admin/fields/templates.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="aef8d82707701b3e01b408fb013669040af1bdf1" resname="gui_editable">
<source>gui_editable</source>
<target state="new">gui_editable</target>
<jms:reference-file line="196">admin/fields/templates.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="83e4a406813db28238114f37fc57d1e055584ce5" resname="gui_visible">
<source>gui_visible</source>
<target state="new">gui_visible</target>
<jms:reference-file line="204">admin/fields/templates.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="45b162f3c09db4eb9ecea5e048393a7ccaab4f7d" resname="help::help-section-bullet: check-spelling">
<source>help::help-section-bullet: check-spelling</source>
<target state="new">help::help-section-bullet: check-spelling</target>
@@ -10089,9 +10104,15 @@
<target state="translated">de service zal binnen enkele minuten opnieuw beschibaar zijn</target>
<jms:reference-file line="8">actions/Bridge/deactivated.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="08dffae30f5e0bfb179632f591a0ffb3daaffe6d" resname="lightbox::list">
<source>lightbox::list</source>
<target state="new">lightbox::list</target>
<jms:reference-file line="63">mobile/lightbox/validate.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="49956c0a16703da1e642ef7ea5f5d56ddb026c9b" resname="lightbox::recaptitulatif" approved="yes">
<source>lightbox::recaptitulatif</source>
<target state="translated">Beknopt</target>
<jms:reference-file line="58">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="9">web/lightbox/agreement_box.html.twig</jms:reference-file>
<jms:reference-file line="127">web/lightbox/validate.html.twig</jms:reference-file>
</trans-unit>
@@ -13138,7 +13159,7 @@
<trans-unit id="8deb6b7dccd9c71fb22c18e3c53dcf609494cfb4" resname="validation:: note" approved="yes">
<source>validation:: note</source>
<target state="translated">Nota</target>
<jms:reference-file line="13">mobile/lightbox/sc_note.html.twig</jms:reference-file>
<jms:reference-file line="11">mobile/lightbox/sc_note.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="f5f4a6635a3e9ae6101f5d281d0e002535ee504e" resname="validation:: votre note" approved="yes">
<source>validation:: votre note</source>
@@ -13148,8 +13169,8 @@
<trans-unit id="276c62d9460692fb7b96721bea12a028339dd99c" resname="validation::envoyer mon rapport" approved="yes">
<source>validation::envoyer mon rapport</source>
<target state="translated">stuur mijn rapport</target>
<jms:reference-file line="58">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="59">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="90">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="91">mobile/lightbox/validate.html.twig</jms:reference-file>
<jms:reference-file line="2">web/lightbox/basket_options.html.twig</jms:reference-file>
<jms:reference-file line="4">web/lightbox/basket_options.html.twig</jms:reference-file>
</trans-unit>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2019-11-15T08:02:31Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<file date="2019-11-19T08:48:53Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2019-11-15T08:02:57Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<file date="2019-11-19T08:49:17Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2019-11-15T08:03:50Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<file date="2019-11-19T08:50:13Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

View File

@@ -1,4 +1,5 @@
$iconsPath: '../../../assets/common/images/icons/';
ul.image_set{
padding:0;
margin:0;
@@ -6,26 +7,57 @@ ul.image_set{
width:100%;
border:none;
list-style-type: none;
display: flex;
flex-wrap: wrap;
}
li.image_box a img{
position:relative;
vertical-align:middle;
border:none;
width: auto!important;
height: 100% !important;
top: 0 !important;
object-fit: contain;
}
li.image_box a{
padding:0;
text-shadow:0;
margin:0;
width: 100%;
}
li.image_box{
width:80px;
height:80px;
position:relative;
float:left;
margin:0px 15px 15px 0px;
padding:0px;
text-align:center;
width: 18%;
position: relative;
margin: 0 2.5% 15px 0;
padding: 0;
display: flex;
align-items: center;
text-align: center;
background: #ededed;
&:nth-child(5n) {
margin-right: 0;
}
.thumb_wrapper {
background: #ededed;
width: 100%!important;
height: 160px!important;
@media screen and (max-width: 767px) {
height: 130px !important;
}
}
}
@media screen and (max-width: 767px) {
li.image_box{
width: 32%;
margin: 0 2% 15px 0;
&:nth-child(5n) {
margin-right: 2% ;
}
&:nth-child(3n) {
margin-right: 0;
}
}
}
a.no.active_choice{
background-color:red;
color: #fff;
@@ -45,10 +77,12 @@ a.active_choice{
}
.valid_choice.agree{
background-image: url('#{$iconsPath}ok.png');
background: #7ed321;
border-top-left-radius: 100px;
}
.valid_choice.disagree{
background-image: url('#{$iconsPath}delete.png');
background: #d0021b;
border-top-left-radius: 100px;
}
.thumb_wrapper {
@@ -70,3 +104,7 @@ a.active_choice{
}
}
.ui-footer .ui-title, .ui-header .ui-title {
font-size: 18px;
}

View File

@@ -1,5 +1,28 @@
@import './jquery-mobile/jquery-validator';
@font-face {
font-family: 'icomoon';
src: url("../../common/fonts/PhraseanetIcomoon/fonts/icomoon.eot?xt8hfo");
src: url("../../common/fonts/PhraseanetIcomoon/fonts/icomoon.eot?xt8hfo#iefix") format("embedded-opentype"), url("../../common/fonts/PhraseanetIcomoon/fonts/icomoon.ttf?xt8hfo") format("truetype"), url("../../common/fonts/PhraseanetIcomoon/fonts/icomoon.woff?xt8hfo") format("woff"), url("../../common/fonts/PhraseanetIcomoon/fonts/icomoon.svg?xt8hfo#icomoon") format("svg");
font-weight: normal;
font-style: normal;
}
[class^="icon-"], [class*=" icon-"] {
/* use !important to prevent issues with browser extensions that change fonts */
font-family: 'icomoon' !important;
speak: none;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.nav_button {
width: 90%;
margin: 0px auto;
@@ -25,3 +48,668 @@
#right-btn {
float: right;
}
.report-modal, .ui-dialog .ui-dialog-content {
background: linear-gradient(#3c3c3c, #111);
}
.ui-bar-c, .ui-body-c, .ui-btn-down-c, .ui-btn-hover-c, .ui-btn-up-c, .ui-overlay-c {
text-shadow: none;
}
@import '../../_shared/styles/variables';
$lightboxPath: '../images/';
$imagesPath: '/assets/vendors/jquery-ui/images/dark-hive/';
$mainMenuBackgroundColor: #c7c7c7; //BFBFBF;
$mainMenuBottomBorder: 1px solid #c7c7c7;
$mainMenuLinkColor: #212121;
$mainMenuLinkHoverColor: #000000;
$mainMenuLinkActiveColor: #BFBFBF;
$mainMenuLinkBackgroundHoverColor: transparent;
body {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
}
ul {
list-style-type: none;
margin: 0;
padding: 0;
}
img {
border: none;
vertical-align: middle;
}
.title15 {
font-size: 15px;
font-weight: bold;
}
.record_display_box {
width: 100%;
height: 100%;
display: block;
table {
vertical-align: middle;
table-layout: fixed;
}
.title {
margin: 0 10px;
}
.record {
position: relative;
max-width: none;
max-height: none;
}
.header {
color: #BFBFBF;
height: 30px;
bottom: auto;
overflow: hidden;
.title {
overflow: hidden;
line-height: 20px;
height: 20px;
}
}
.lightbox_container {
top: 30px;
overflow: hidden;
}
.display_id {
top: 5px;
margin: 0 0 0 5px;
background: #bebebe;
}
}
#sc_wrapper {
left: 20px;
right: 20px;
overflow-x: scroll;
overflow-y: hidden;
}
#sc_container {
position: relative;
height: 100%;
}
.basket_element_wrapper {
position: relative;
float: left;
padding: 0 5px;
}
.basket_element {
position: relative;
float: left;
width: 114px;
height: 130px;
border: 1px solid #212121;
text-align: left;
padding: 5px 8px;
&.selected {
background-color: #212121;
}
.display_id {
top: 4px;
left: 8px;
}
.agreement {
position: absolute;
top: 4px;
right: 8px;
z-index: 99;
}
.image {
position: relative;
z-index: 90;
}
.previewTips {
background-image: url('#{$iconsPath}zoom.gif');
background-position: center center;
background-repeat: no-repeat;
cursor: help;
position: absolute;
bottom: 4px;
right: 8px;
height: 18px;
width: 18px;
z-index: 99;
}
}
#report .display_id {
top: 0;
left: 0;
border-radius: 0;
background-color: rgba(216, 216, 216, 0.7);
font-weight: 700;
z-index: 99;
color: #333333;
position: absolute;
width: 22px;
padding: 2px 0;
font-size: 12px;
}
#report .CHIM.diapo {
text-align: center;
}
.display_id {
background-color: #FFFFFF;
padding: 3px 6px;
font-weight: bold;
z-index: 99;
color: #212121;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
border-radius: 50%;
position: absolute;
}
.not_decided {
opacity: 0.30;
filter: alpha(opacity=30);
}
#sc_wrapper .not_decided {
display: none;
}
#right_scroller {
width: 30px;
right: -10px;
left: auto;
background-image: url('#{$lightboxPath}right_arrow.png');
background-position: center center;
background-repeat: no-repeat;
}
#left_scroller {
width: 30px;
left: -10px;
right: auto;
background-image: url('#{$lightboxPath}left_arrow.png');
background-position: center center;
background-repeat: no-repeat;
}
#basket_infos {
overflow: hidden;
background-color: #1F1E1B;
color: #BFBFBF;
}
#basket_options {
height: 35px;
top: auto;
background-color: #1F1E1B;
text-align: center;
}
#basket_options .confirm_report {
margin: 5px auto;
}
#basket_infos .user_infos {
height: 120px;
top: auto;
}
#basket_infos {
table {
width: 100%;
margin: 5px 0;
.title {
width: 100%;
}
.report_wrapper {
text-align: right;
}
}
}
#right_column {
left: auto;
right: 0;
width: 240px;
}
#right_column_validation_toggle {
bottom: 45px;
background-color: #1F1E1B;
height: 30px;
top: auto;
text-align: center;
display: none;
line-height: 25px;
color: #BFBFBF;
}
#right_column .right_column_title {
height: 30px;
bottom: auto;
}
#right_column .right_column_title img.expanded {
display: none;
}
#right_column .right_column_title img.collapsed {
display: inline;
}
#right_column .right_column_title.expanded img.expanded {
display: inline;
}
#right_column .right_column_title.expanded img.collapsed {
display: none;
}
#right_column .right_column_wrapper {
top: 30px;
bottom: 45px;
}
#right_column .right_column_wrapper.caption {
bottom: 85px;
}
#record_infos {
overflow-x: hidden;
overflow-y: auto;
}
#record_compare {
visibility: hidden;
top: auto;
left: auto;
}
#record_compare .header, #record_compare .lightbox_container {
left: 5px;
}
#record_wrapper.comparison #record_main .header, #record_wrapper.comparison #record_main .lightbox_container {
right: 5px;
}
.agreement_selector {
position: absolute;
bottom: 10px;
right: 10px;
}
.clickable {
cursor: pointer;
}
.big_box.agree {
border: 2px solid #35AC00;
background-color: #35AC00;
}
.big_box.disagree {
border: 2px solid #DE1200;
background-color: #DE1200;
}
.big_box, .big_box.not_decided {
width: 95px;
margin: 0 auto;
padding: 6px 10px;
height: 30px;
color: #1F1E1B;
background-color: #353430;
border: 2px solid #353430;
text-align: center;
opacity: 1;
filter: alpha(opacity=100);
}
.big_box span {
margin: 0 10px;
}
li.userchoice {
margin: 5px 0 0px 20px;
}
.userchoice.disagree {
color: #DE1200;
}
.userchoice.agree {
color: #35AC00;
}
.basket_report_user {
padding: 7px 10px;
}
.basket_report_user_wrapper {
margin: 0;
border-bottom: 1px solid #b2b2b2;
border-radius: 0;
display: inline-block;
padding: 10px 15px;
width: 100%;
box-sizing: border-box;
background: #e5e5e5;
text-shadow: none;
float: left;
}
.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text {
padding: 0.2em 1em 0.2em 2.1em;
}
/*******
*
* Index
*
* ******/
#main_index {
position: relative;
width: 600px;
margin: 0 auto;
}
#main_wrapper {
width: 100%;
}
#main_wrapper h1 {
font-weight: bold;
font-size: 25px;
}
table th {
text-align: right;
vertical-align: bottom;
height: 60px;
border-bottom: 1px solid #8F8F8F;
}
table th.title {
text-align: left;
}
table th h1 {
margin-left: 20px;
}
table th i {
margin-right: 20px;
}
.ui-state-default.note_closer, .ui-state-default.note_saver {
background-color: #353430;
padding: 5px;
margin: 0 10px;
}
.ui-state-default.note_saver {
background-color: #1F1E1B;
}
.record_display_box form .buttons {
margin: 5px;
text-align: right;
}
.record_display_box form {
margin: 15px 0;
width: 90%;
}
.record_display_box form textarea {
width: 100%;
height: 75px;
}
#navigation {
width: 200px;
}
.basket_downloader {
background-color: #1F1E1B;
margin: 0 10px;
padding: 2px;
border: 0;
}
hr {
width: 100%;
height: 1px;
background-color: #212121;
border: none;
}
.report {
margin: 0 10px;
vertical-align: bottom;
}
/*
*
* Overrides JqueryUI
*
*/
.ui-button {
background: transparent;
border: none;
margin: 0;
padding: 0;
}
.ui-button-text-only .ui-button-text {
padding: 0.15em;
}
.ui-dialog {
.ui-dialog-titlebar {
padding: 1em 1em;
}
}
.videoTips {
width: 100%;
height: 100%;
}
#basket_infos {
margin-bottom: 20px;
.mobile_aggreement_box {
padding: 20px;
}
}
.ui-button-icon.ui-icon.ui-icon-closethick {
background-position: -73px 0px;
background-color: rgba(0, 0, 0, .9);
padding: 0;
}
.btn-container {
padding: 0 20px;
}
button.confirm_report {
background: #38c !important;
color: #fff !important;
font-size: 16px;
font-weight: bold;
padding: 6px;
display: inline-block;
border: 1px solid #38c;
text-shadow: 0 1px 0 #111;
border-radius: 16px;
font-family: Roboto, sans-serif;
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2) !important;
}
.report_wrapper {
position: relative;
margin-bottom: 20px;
}
.report_btn {
position: absolute;
top: -41px;
right: 0;
z-index: 1;
background: #8bc34a;
border: 1px solid #8bc34a;
box-sizing: border-box;
padding: 8px 13px;
min-width: 110px;
border-radius: 4px;
color: #fff !important;
text-decoration: none;
text-align: center;
transition: all 0.3s;
&:hover, &:focus {
background: darken(#8bc34a, 0.2);
border-color: darken(#8bc34a, 0.3);
}
&.report_list {
background: #f44336;
border-color: #f44336;
&:hover, &:focus {
background: darken(#f44336, 0.2);
border-color: darken(#f44336, 0.3);
}
}
}
.report_list {
display: none;
}
.report_summary_backup, .report_list_backup {
display: none;
}
.chim-wrapper-block {
margin-bottom: 15px;
.chim-block {
margin: 0;
}
.chim-inner {
width: 100%;
display: inline-block;
min-width: 296px;
}
.chim-left {
display: inline-block;
width: 100%;
background: #ededed;
text-align: center;
position: relative;
.diapo {
display: inline-block;
div {
max-width: 100%;
}
}
}
.chim-right {
width: 100%;
.validate-icon {
float: left;
height: 25px;
vertical-align: middle;
display: flex;
flex-wrap: wrap;
align-items: center;
}
h3 {
font-size: 16px;
margin: 0;
padding-top: 3px;
}
}
}
.thumb_wrapper img.record_image {
max-width: 100%;
}
/*header lightbox*/
.ui-footer .ui-title, .ui-header .ui-title {
min-height: 26px;
padding: 10px 0;
}
.ui-listview.lightbox-list-view {
& > .ui-li-static {
padding: .7em 1em;
text-overflow: inherit;
white-space: inherit;
}
& > li {
border-color: #b2b2b2;
background: none;
p {
text-overflow: inherit;
white-space: inherit;
line-height: 15px;
font-size: 13px;
color: #141414;
}
}
h3 {
font-family: Roboto, sans-serif;;
font-size: 16px;
font-weight: bold;
font-stretch: normal;
font-style: normal;
line-height: 0.94;
letter-spacing: normal;
color: #141414;
}
}
.ui-footer.ui-bar-inherit {
border: 0;
}
.center-image {
text-align: center;
}
/*validate page*/
.validate-icon {
float: left;
position: absolute;
.icomoon {
color: #fff;
font-size: 17px;
padding: 3px;
border-radius: 50px;
display: inline-block;
}
.icon-disagree {
background: #cd2f2f;
}
.icon-agree {
background: #8bc34a;
}
}
.validate-info {
float: left;
padding-left: 36px;
}

View File

@@ -50,7 +50,6 @@
class="ui-btn-right jqm-home">{{ 'Home' | trans }}</a>
</div>
<div id="content" data-role="content">
{{ thumbnail.format100percent(record.get_preview()) }}
<div class="nav_button">
{% if prevId != NULL %}
<a data-ajax="false" id="left-btn"
@@ -64,13 +63,14 @@
{% endif %}
<div style="clear: both;"></div>
</div>
<div class="center-image">{{ thumbnail.format100percent(record.get_preview()) }}</div>
{% if basket_element.getBasket().getValidation() %}
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %}
<fieldset data-role="controlgroup" data-type="horizontal" style="text-align:center;">
<input {% if basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() == true%}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-yes_{{basket_element.getId()}}" value="yes" />
<input onclick="window.location.reload();" {% if basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() == true%}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-yes_{{basket_element.getId()}}" value="yes" />
<label class="agreement_radio" style="width:110px;text-align:center;"
for="radio-view-yes_{{ basket_element.getId() }}">{{ 'validation:: OUI' | trans }}</label>
<input {% if basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() == false and basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() is not null %}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-no_{{basket_element.getId()}}" value="no" />
<input onclick="window.location.reload();" {% if basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() == false and basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() is not null %}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-no_{{basket_element.getId()}}" value="no" />
<label class="agreement_radio" style="width:110px;text-align:center;"
for="radio-view-no_{{ basket_element.getId() }}">{{ 'validation:: NON' | trans }}</label>
</fieldset>
@@ -81,7 +81,7 @@
</a>
</div>
<div>
<ul data-role="listview" id="notes_{{basket_element.getId()}}">
<ul data-role="listview" class="lightbox-list-view" id="notes_{{basket_element.getId()}}">
{% include 'lightbox/sc_note.html.twig' %}
</ul>
</div>

View File

@@ -1,17 +1,21 @@
{% for validationDatas in basket_element.getValidationDatas() %}
{% set is_mine = validationDatas.getParticipant().getUser().getId() == app.getAuthenticatedUser().getId() %}
{% if validationDatas.getNote() != '' or (validationDatas.getAgreement() is not null and is_mine) %}
<li>
<h3 style="text-align:left;">
{% if is_mine == false and validationDatas.getAgreement() is not null %}
<img style="vertical-align:middle;"
src="/assets/lightbox/images/{% if validationDatas.getAgreement() == true %}agree.png{% else %}disagree.png{% endif %}" />
<div class="validate-icon">
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
{% if validationDatas.getAgreement() == true %}<span class="icomoon icon-agree">&#xe95f;</span>{% endif %}
{% if validationDatas.getAgreement() == false and validationDatas.getAgreement() is not null %}<span class="icomoon icon-disagree">&#xe971; {{ validationDatas.getAgreement() }}</span>{% endif %}
{% endif %}
</div>
<div class="validate-info">
<h3>
{{ validationDatas.getParticipant().getUser().getDisplayName() }}
</h3>
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
{% if validationDatas.getNote() != '' %}
<p style="text-align:left;">{{ 'validation:: note' | trans }} : {{ validationDatas.getNote()|nl2br }}</p>
<p style="text-align:left;">{{ 'validation:: note' | trans }} : {{ validationDatas.getNote()|nl2br }} </p>
{% endif %}
{% endif %}
</div>
</li>
{% endif %}
{% endfor %}

View File

@@ -38,22 +38,56 @@
{% set basket_length = basket.getElements().count() %}
{% trans with {'%basket_length%' : basket_length} %}%basket_length% documents{% endtrans %}
</p>
{% if basket.getValidation() %}
<div class="report_wrapper">
<a id="report_summary" class="report_btn report_summary" href="#" onclick="$.ajax({
type: 'GET',
url: '/lightbox/ajax/LOAD_REPORT/' + $('#navigation').val() + '/',
dataType: 'html',
success: function (data) {
$('#report_list_backup').empty().append($('#report').html());
$('#report').empty().append(data);
$('#report .record_image').css('height','auto');
return;
}
});
$(this).hide();
$('#report_list').show();">
{{ 'lightbox::recaptitulatif' | trans }}
</a>
<a id="report_list" class="report_btn report_list" href="#" onclick=" $(this).hide();
$('#report_summary').show();
$('#report').empty().append($('#report_list_backup').html());">
{{ 'lightbox::list' | trans }}
</a>
</div>
<div class="report_list_backup" id="report_list_backup">&nbsp;</div>
<div class="report_summary_backup " id="report_summary_backup">&nbsp;</div>
{% endif %}
<input type="hidden" id="navigation" value="{{ basket.getId() }}">
<div id="report" class="summary_block">
<ul class="image_set">
{% for basket_element in basket.getElements() %}
<li class="image_box" id="sselcontid_{{basket_element.getId()}}">
<div class="display_id">
{{basket_element.getOrd()}}
</div>
{% if basket_element.getBasket().getValidation() and basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %}
<div class="valid_choice valid_choice_{{basket_element.getId()}} {% if basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() == true %}agree{% elseif basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() == false and basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() is not null %}disagree{% endif %}">
</div>
{% endif %}
<a href="{{ path('lightbox_ajax_load_basketelement', { 'sselcont_id' : basket_element.getId() }) }}">
{{thumbnail.format(basket_element.getRecord(app).get_thumbnail(), 80, 80, '', true, false)}}
{{thumbnail.format(basket_element.getRecord(app).get_thumbnail(), 300, 300, '', true, false)}}
</a>
<input type="hidden" class="display_id" name="display_id" value="{{basket_element.getOrd()}}" />
</li>
{% endfor %}
</ul>
</div>
<div data-role="footer">
</div>
<div class="btn-container">
{% if basket.getValidation() and basket.getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %}
<button class="confirm_report" style="width:100%;" title="{{ 'validation::envoyer mon rapport' | trans }}">
{{ 'validation::envoyer mon rapport' | trans }}
@@ -61,6 +95,8 @@
</button>
{% endif %}
</div>
</div>
</div>
{% endblock %}

View File

@@ -4,48 +4,50 @@
<div style="margin:0 7px;overflow:hidden;">
{% for basket_element in basket.getElements() %}
{% set record = basket_element.getRecord(app) %}
<div class="chim-wrapper wrapCHIM_{{basket_element.getId()}} valid">
<div style="margin:20px;">
<table style="width: 100%; min-width: 330px;">
<tr valign="top">
<td style="width:165px;">
<div id="CHIM_{{basket_element.getId()}}_{{record.get_serialize_key()}}"
class="CHIM diapo">
<div class="chim-wrapper-block chim-wrapper wrapCHIM_{{basket_element.getId()}} valid">
<div class="chim-block">
<div class="chim-inner">
<div class="chim-left">
<div id="CHIM_{{basket_element.getId()}}_{{record.get_serialize_key()}}" class="CHIM diapo">
<div class="display_id">
{{basket_element.getOrd()}}
</div>
{{thumbnail.format(record.get_thumbnail(),165, 125, '', true, false)}}
</div>
</td>
<td style="width:10px;">
</td>
<td>
</div>
<div class="chim-right">
{% for validationDatas in basket_element.getValidationDatas()%}
<div class="basket_report_user_wrapper ui-corner-all">
<div class="basket_report_user">
{% if validationDatas.getAgreement() == true %}
{% set imguser = '<img src="/assets/lightbox/images/agree.png" />' %}
{% set imguser = '<span class="icomoon icon-agree">&#xe95f;</span>' %}
{% set styleuser = '' %}
{% elseif validationDatas.getAgreement() is null %}
{% set imguser = '' %}
{% set imguser = '&nbsp;' %}
{% set styleuser = 'margin-left:18px;' %}
{% else %}
{% set imguser = '<img src="/assets/lightbox/images/disagree.png" />' %}
{% set imguser = '<span class="icomoon icon-disagree">&#xe971;</span>' %}
{% set styleuser = '' %}
{% endif %}
<b style="{{styleuser}}">{{imguser|raw}} {{validationDatas.getParticipant().getUser().getDisplayName()}}</b>
<div class="validate-icon">
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
{{imguser|raw}}
{% endif %}
</div>
<div class="validate-info">
<h3> {{validationDatas.getParticipant().getUser().getDisplayName()}}</h3>
{% if validationDatas.getNote() != '' %}
: {{validationDatas.getNote()|nl2br}}
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
<p> {{validationDatas.getNote()|nl2br}}</p>
{% endif %}
{% endif %}
</div>
</div>
{% endfor %}
</td>
</tr>
</table>
</div>
</div>
<div><hr/></div>
</div>
</div>
{% endfor %}
</div>

View File

@@ -1,4 +1,5 @@
{% include 'prod/results/record.html.twig' with {
'record': record,
'settings': settings
'settings': settings,
'plugins': plugins
} %}

View File

@@ -7,7 +7,8 @@
<td valign="top" style='width:{{ settings.images_size + 50 }}px'>
{% include 'prod/results/record.html.twig' with {
'record': record,
'settings': settings
'settings': settings,
'plugins': plugins
} %}
</td>
<td valign="middle">

View File

@@ -155,6 +155,29 @@
</div>
{% endif %}
{% endif %}
{# add plugins entries #}
{% for plugin in plugins.actionbar|default([]) %}
{% set menu = plugin.ActionBar['_context_']|default([]) %}
{% for k, action in menu %}
{% if plugin.isContextMenuOptionAvailable(k, record) %}
<div title="" class="context-menu-item"
onclick="{{ plugin.getContextMenuJS(k) }}('{{ k }}', '{{record.baseId}}', '{{record.recordId}}', '{{ record.id }}');">
<div class="context-menu-item-inner">
{% set icon = (action.icon ?? false) ? plugin_asset(plugin.PluginName, action.icon) : null %}
{% set label = (action.label ?? false) ? (action.label|trans({}, plugin.PluginLocale)) : 'undefined label' %}
<a title="{{ label }}" href="#">
{% if icon %}
<img style="cursor:pointer;" src="{{ icon }}" alt="{{ label }}">
{% endif %}
<span>{{ label }}</span>
</a>
</div>
</div>
{% endif %}
{% endfor %}
{% endfor %}
</div>
</td>
</tr>

View File

@@ -31,7 +31,8 @@
'doctype_display': doctype_display,
'handle_dblclick' : true,
'show_context_menu': true
}
},
'plugins': plugins
} %}
{% endblock %}
{% endfor %}

View File

@@ -44,270 +44,159 @@
</div>
</span>
<span class="dropdownButton">
<div class="btn-group">
<button id="TOOL_disktt" class="default_action TOOL_disktt_btn results_window btn btn-inverse" data-selection-source="search-result">
<img src="/assets/common/images/icons/disktt_history.png" height="16" width="16" class="btn-image"/> {{ 'action : exporter' | trans }}
</button>
<button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li>
<a class="TOOL_print_btn results_window" data-selection-source="search-result">
<img src="/assets/common/images/icons/print_history.png" height="16" width="16" class="btn-image"/>
{{ 'action : print' | trans }}
</a>
</li>
</ul>
</div>
</span>
{% set menus = {
'export': [
{
'class':'TOOL_disktt_btn',
'icon':'/assets/common/images/icons/disktt_history.png',
'label':'action : exporter' | trans },
{
'class':'TOOL_print_btn',
'icon':'/assets/common/images/icons/print_history.png',
'label':'action : print' | trans }
],
'edit': [],
'push': [],
'tools': [],
'delete': []
} %}
{% set actions = {} %}
{# menu "edit" #}
{% set m = [] %}
{% if acl.has_right(constant('\\ACL::CANMODIFRECORD')) %}
{% set label %}
{{ 'action : editer' | trans }}
{% endset %}
{% set actions = actions|merge( { 'edit' : {'icon': "/assets/common/images/icons/ppen_history.png", 'class':'TOOL_ppen_btn', 'label' : label} }) %}
{% set label %}
{{ 'prod::toolbar : video editor' | trans }}
{% endset %}
{% set actions = actions|merge( { 'video' : {'icon': "/assets/common/images/icons/icon-video-editor.png", 'class':'TOOL_videoeditor_btn', 'label' : label} }) %}
{% set m = m|merge([
{
'class':'TOOL_ppen_btn',
'icon':'/assets/common/images/icons/ppen_history.png',
'label':'action : editer' | trans },
{
'class':'TOOL_videoeditor_btn',
'icon':'/assets/common/images/icons/icon-video-editor.png',
'label':'prod::toolbar : video editor' | trans }
]) %}
{% endif %}
{% if acl.has_right(constant('\\ACL::CHGSTATUS')) %}
{% set label %}
{{ 'action : status' | trans }}
{% endset %}
{% set actions = actions|merge( { 'status' : {'icon': "/assets/common/images/icons/chgstatus_history.png", 'class':'TOOL_chgstatus_btn', 'label' : label} }) %}
{% if acl.has_right(constant('\\\ACL::CHGSTATUS')) %}
{% set m = m|merge([
{
'class':'TOOL_chgstatus_btn',
'icon':'/assets/common/images/icons/chgstatus_history.png',
'label':'action : status' | trans }
]) %}
{% endif %}
{% if acl.has_right(constant('\\ACL::CANDELETERECORD')) and acl.has_right(constant('\\ACL::CANADDRECORD')) %}
{% set label %}
{{ 'action : collection' | trans }}
{% endset %}
{% set actions = actions|merge( { 'move' : {'icon': "/assets/common/images/icons/chgcoll_history.png", 'class':'TOOL_chgcoll_btn', 'label' : label} }) %}
{% set m = m|merge([
{
'class':'TOOL_chgcoll_btn',
'icon':'/assets/common/images/icons/chgcoll_history.png',
'label':'action : collection' | trans }
]) %}
{% endif %}
{% set menus = menus|merge({'edit' : m}) %}
{% set n_actions = actions|length %}
{% if n_actions > 1 %}
<span class="dropdownButton">
<div class="btn-group">
{% for action in actions %}
{% if loop.first %}
<button class="default_action {{ action.class }} results_window btn btn-inverse" data-selection-source="search-result">
<img src="{{ action.icon }}" height="16" width="16" class="btn-image"/> {{ action.label }}
</button>
{# menu "push" #}
{% set m = [] %}
{% if acl.has_right(constant('\\ACL::CANPUSH')) %}
{% set m = m|merge([
{
'class':'TOOL_pushdoc_btn',
'icon':'/assets/common/images/icons/push16.png',
'label':'action : push' | trans },
{
'class':'TOOL_feedback_btn',
'icon':'/assets/common/images/icons/feedback16.png',
'label':'Feedback' | trans }
]) %}
{% endif %}
{% endfor %}
<button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span
class="caret"></span></button>
<ul class="dropdown-menu">
{% for action in actions %}
{% if not loop.first %}
<li>
<a class="{{ action.class }} results_window" data-selection-source="search-result">
<img src="{{ action.icon }}" height="16" width="16" class="btn-image"/>
{{ action.label }}
</a>
</li>
{% if not loop.last %}
<li class="divider"></li>
{% endif %}
{% endif %}
{% endfor %}
</ul>
</div>
</span>
{% elseif n_actions == 1 %}
<span class="classicButton">
<div class="btn-group">
{% for action in actions %}
<button class="{{ action.class }} results_window btn btn-inverse" data-selection-source="search-result">
<img src="{{ action.icon }}" height="16" width="16" class="btn-image"/> {{ action.label }}
</button>
{% endfor %}
</div>
</span>
{% endif %}
{% if acl.has_right(constant('\\ACL::CANPUSH')) and acl.has_right(constant('\\ACL::BAS_CHUPUB')) %}
<span class="dropdownButton">
<div class="btn-group">
<button class="TOOL_pushdoc_btn default_action results_window btn btn-inverse" data-selection-source="search-result">
<img src="/assets/common/images/icons/push16.png" height="16" width="16" class="btn-image"/> {{ 'action : push' | trans }}
</button>
<button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span
class="caret"></span></button>
<ul class="dropdown-menu">
<li>
<a class="TOOL_feedback_btn results_window" data-selection-source="search-result">
<img src="/assets/common/images/icons/feedback16.png" height="16" width="16" class="btn-image"/>
{{ 'Feedback' | trans }}
</a>
</li>
{#<li class="divider"></li>#}
{#<li>#}
{#<a class="TOOL_bridge_btn results_window" href="{{ path("prod_bridge_manager") }}" data-selection-source="search-result">#}
{#<img src="/assets/common/images/icons/door.png" height="16" width="16" class="btn-image"/>#}
{#{{ 'action : bridge' | trans }}#}
{#</a>#}
{#</li>#}
<li class="divider"></li>
<li>
<a class="TOOL_publish_btn results_window" data-selection-source="search-result">
<img src="/assets/common/images/icons/rss16.png" height="16" width="16" class="btn-image"/>
{{ 'action : publier' | trans }}
</a>
</li>
{% if plugins.actionbar is not empty %}
{% for plugin in plugins.actionbar %}
<li class="divider"></li>
{% for key, action in plugin.getActionBar().push|default([]) %}
<li>
<a class="results_window {{ action.classes|default('') }}" data-selection-source="search-result">
{% if action.icon %}
<img src="{{ plugin_asset(plugin.PluginName, action.icon) }}" height="16" width="16" class="btn-image"/>
{% endif %}
{{ action.label|trans({}, plugin.PluginLocale) }}
</a>
</li>
{% endfor %}
{% endfor %}
{% endif %}
</ul>
</div>
</span>
{% elseif acl.has_right(constant('\\ACL::CANPUSH')) %}
<span class="dropdownButton">
<div class="btn-group">
<button class="TOOL_pushdoc_btn default_action results_window btn btn-inverse" data-selection-source="search-result">
<img src="/assets/common/images/icons/push16.png" height="16" width="16" class="btn-image"/> {{ 'action : push' | trans }}
</button>
<button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span
class="caret"></span></button>
<ul class="submenu dropdown-menu">
<li>
<a class="TOOL_feedback_btn results_window" data-selection-source="search-result">
<img src="/assets/common/images/icons/feedback16.png" height="16" width="16" class="btn-image"/>
{{ 'Feedback' | trans }}
</a>
</li>
{% if plugins.actionbar is not empty %}
{% for plugin in plugins.actionbar %}
<li class="divider"></li>
{% for key, action in plugin.getActionBar().push|default([]) %}
<li>
<a class="results_window {{ action.classes|default('') }}" data-selection-source="search-result">
{% if action.icon %}
<img src="{{ plugin_asset(plugin.PluginName, action.icon) }}" height="16" width="16" class="btn-image"/>
{% endif %}
{{ action.label|trans({}, plugin.PluginLocale) }}
</a>
</li>
{% endfor %}
{% endfor %}
{% endif %}
</ul>
</div>
</span>
{% elseif acl.has_right(constant('\\ACL::BAS_CHUPUB')) %}
<span class="dropdownButton">
<div class="btn-group">
{#<button class="TOOL_pushdoc_btn default_action results_window btn btn-inverse" data-selection-source="search-result">#}
{#<img src="/assets/common/images/icons/door.png" height="16" width="16" class="btn-image"/> {{ 'action : bridge' | trans }}#}
{#</button>#}
<button class="TOOL_publish_btn results_window btn btn-inverse">
<img src="/assets/common/images/icons/rss16.png" height="16" width="16" class="btn-image"/>
{{ 'action : publier' | trans }}
</button>
<button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span
class="caret"></span></button>
{% if plugins.actionbar is not empty %}
<button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span
class="caret"></span></button>
<ul class="submenu dropdown-menu">
{% for plugin in plugins.actionbar %}
<li class="divider"></li>
{% for key, action in plugin.getActionBar().push|default([]) %}
<li>
<a class="results_window {{ action.classes|default('') }}">
{% if action.icon %}
<img src="{{ plugin_asset(plugin.PluginName, action.icon) }}"
height="16" width="16" class="btn-image"/>
{% endif %}
{{ action.label|trans({}, plugin.PluginLocale) }}
</a>
</li>
{% endfor %}
{% endfor %}
</ul>
{% endif %}
</div>
</span>
{% elseif plugins.actionbar is not empty %}
<span class="dropdownButton">
<div class="btn-group">
{% set firstButton = true %}
{% for plugin in plugins.actionbar %}
{% for key, action in plugin.getActionBar().push|default([]) %}
{% if firstButton %}
<button class="default_action results_window btn btn-inverse" data-selection-source="search-result">
<a class="results_window {{ action.classes|default('') }}" data-selection-source="search-result">
{% if action.icon %}
<img src="{{ plugin_asset(plugin.PluginName, action.icon) }}" height="16" width="16"/>
{% endif %}
{{ action.label|trans({}, plugin.PluginLocale) }}
</a>
</button>
{% if not (loop.last and loop.parent.loop.last) %}
<button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
<ul class="submenu dropdown-menu">
{% endif %}
{% if not loop.first %}<li class="divider"></li>{% endif %}
{% if not firstButton %}
<li>
<a class="results_window {{ action.classes|default('') }}" data-selection-source="search-result">
{% if action.icon %}
<img src="{{ plugin_asset(plugin.PluginName, action.icon) }}" height="16" width="16" class="btn-image"/>
{% endif %}
{{ action.label|trans({}, plugin.PluginLocale) }}
</a>
</li>
{% else %}
{% set firstButton = false %}
{% endif %}
{% endif %}
{% endfor %}
{% endfor %}
{% if not firstButton %}
</ul>
{% endif %}
</div>
</span>
{% if acl.has_right(constant('\\ACL::BAS_CHUPUB')) %}
{% set m = m|merge([
{
'class':'TOOL_publish_btn',
'icon':'/assets/common/images/icons/rss16.png',
'label':'action : publier' | trans }
]) %}
{% endif %}
{% set menus = menus|merge({'push' : m}) %}
{# menu "tools" #}
{% if acl.has_right(constant('\\ACL::IMGTOOLS')) %}
<span class="classicButton">
<div class="btn-group">
<button class="TOOL_imgtools_btn results_window btn btn-inverse" data-selection-source="search-result">
<img src="/assets/common/images/icons/imgtools_history.png" height="16" width="16" class="btn-image"/> {{ 'action : outils' | trans }}
</button>
</div>
</span>
{% set menus = menus|merge({'tools' : [
{
'class':'TOOL_imgtools_btn',
'icon':'/assets/common/images/icons/imgtools_history.png',
'label':'action : outils' | trans }
]}) %}
{% endif %}
{# menu "delete" #}
{% if acl.has_right(constant('\\ACL::CANDELETERECORD')) %}
<span class="classicButton">
{% set menus = menus|merge({'delete' : [
{
'class':'TOOL_trash_btn',
'icon':'/assets/common/images/icons/delete.png',
'label':'action : supprimer' | trans }
]}) %}
{% endif %}
{# add plugins entries #}
{% if plugins.actionbar is not empty %}
{% for plugin in plugins.actionbar %}
{% for k, menu in plugin.getActionBar() %}
{% if k != '_context_' %}
{% set m = menus[k]|default([]) %}
{% for action in menu %}
{% set m = m|merge([{
'class':action.classes|default(''),
'icon':plugin_asset(plugin.PluginName, action.icon),
'label':action.label|trans({}, plugin.PluginLocale) }])
%}
{% endfor %}
{% set menus = menus|merge({(k) : m}) %}
{% endif %}
{% endfor %}
{% endfor %}
{% endif %}
{# print #}
{% for menu_entries in menus %}
{% if menu_entries|length > 0 %}
<span class="dropdownButton">
<div class="btn-group">
<button class="TOOL_trash_btn results_window btn btn-inverse" data-selection-source="search-result">
<img src="/assets/common/images/icons/delete.png" height="16" width="16" class="btn-image"/> {{ 'action : supprimer' | trans }}
{% set menu_entry = menu_entries[0] %}
<button class="results_window btn btn-inverse {{ menu_entry.class }}" data-selection-source="search-result">
<img src="{{ menu_entry.icon }}" class="btn-image"/>
{{ menu_entry.label }}
</button>
{% set menu_entries = menu_entries|slice(1) %}
{% if menu_entries|length > 0 %}
<button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span
class="caret"></span></button>
<ul class="dropdown-menu">
{% for menu_entry in menu_entries %}
<li>
<a class="results_window {{ menu_entry.class }}" data-selection-source="search-result">
<img src="{{ menu_entry.icon }}" class="btn-image"/>
{{ menu_entry.label }}
</a>
</li>
{% endfor %}
</ul>
{% endif %}
</div>
</span>
{% endif %}
{% endfor %}
{% endblock %}
{% block toolbarJS %}
{% if plugins.actionbar is not empty %}
{% for plugin in plugins.actionbar %}
{{ (plugin.JS|default(''))|raw }}
{% for pluginId, plugin in plugins.actionbar %}
{% if plugin.getActionBarTemplate is defined %}
{% set template = plugin.getActionBarTemplate() %}
{% if template %}
{% include template with {'app': app, 'plugin_id': pluginId, 'plugin': plugin} only %}
{% endif %}
{% endif %}
{% endfor %}
{% endif %}
{% endblock %}

View File

@@ -3815,9 +3815,9 @@ fsevents@^1.0.0, fsevents@^1.1.2, fsevents@^1.2.7:
node-pre-gyp "^0.12.0"
fstream@^1.0.0, fstream@^1.0.2:
version "1.0.11"
resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
version "1.0.12"
resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
dependencies:
graceful-fs "^4.1.2"
inherits "~2.0.0"
@@ -4049,7 +4049,7 @@ glob@^5.0.15:
once "^1.3.0"
path-is-absolute "^1.0.0"
glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
version "7.1.4"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
@@ -4061,6 +4061,18 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
once "^1.3.0"
path-is-absolute "^1.0.0"
glob@^7.1.3:
version "7.1.6"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
inherits "2"
minimatch "^3.0.4"
once "^1.3.0"
path-is-absolute "^1.0.0"
glob@~3.1.21:
version "3.1.21"
resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
@@ -4166,10 +4178,10 @@ graceful-fs@^3.0.0:
dependencies:
natives "^1.1.0"
graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~4.1.4:
version "4.1.15"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
version "4.2.3"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
graceful-fs@~1.2.0:
version "1.2.3"
@@ -4181,6 +4193,11 @@ graceful-fs@~2.0.0:
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-2.0.3.tgz#7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"
integrity sha1-fNLNsiiko/Nule+mzBQt59GhNtA=
graceful-fs@~4.1.4:
version "4.1.15"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
"graceful-readlink@>= 1.0.0":
version "1.0.1"
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
@@ -4757,7 +4774,12 @@ inherits@1:
resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
integrity sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=
inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
version "2.0.4"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
inherits@2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
@@ -6483,9 +6505,9 @@ mitt@^1.1.3:
integrity sha512-mUDCnVNsAi+eD6qA0HkRkwYczbLHJ49z17BGe2PYRhZL4wpZUFZGJHU7/5tmvohoma+Hdn0Vh/oJTiPEmgSruA==
mixin-deep@^1.2.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
version "1.3.2"
resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
dependencies:
for-in "^1.0.2"
is-extendable "^1.0.1"
@@ -7555,10 +7577,10 @@ phraseanet-common@^0.4.1:
js-cookie "^2.1.0"
pym.js "^1.3.1"
phraseanet-production-client@0.34.77-d:
version "0.34.77-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.77-d.tgz#5dfb4abf25a37b64b8bdf793cf4033ccff55e5ad"
integrity sha512-+ak+Nx0zsvrzVgqc6s/sdVznDuGc2hRadxhISLmLPqCOw3CC1F+lCk5wG/TjhfYzFw1AKSszgLKqWj5ab7KPWQ==
phraseanet-production-client@0.34.80-d:
version "0.34.80-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.80-d.tgz#1e54bee4306ab11528377cb63c19d8c7491ef0f3"
integrity sha512-ilGs7ndDNztwlyeW9MA2TMiMhZC+P1/lNNeIsIuh+KuJH8M3Y3SWBcmsN2lqu5iM1Xg5FbWJ6iXcCSrLWHTqsw==
dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6"
@@ -8296,9 +8318,9 @@ right-align@^0.1.1:
align-text "^0.1.1"
rimraf@2, rimraf@^2.2.8, rimraf@^2.5.0, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
version "2.6.3"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
version "2.7.1"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
dependencies:
glob "^7.1.3"