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-2581_twig-macro-explode_4.1

Browse Source
This commit is contained in:
Nicolas Maillat
2019-05-21 10:55:51 +02:00
committed by GitHub
parent ccb0829a36 ac628119c8
commit ff25eb226c
14 changed files with 175 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Dockerfile
View File

@@ -65,34 +65,35 @@ RUN mkdir /entrypoint /var/alchemy \
&& mkdir -p /home/app/.composer \
&& chown -R app: /home/app /var/alchemy
ADD ./docker/phraseanet/ /
WORKDIR /var/alchemy/
COPY config /var/alchemy/config
COPY grammar /var/alchemy/grammar
COPY lib /var/alchemy/lib
COPY resources /var/alchemy/resources
COPY templates-profiler /var/alchemy/templates-profiler
COPY templates /var/alchemy/templates
COPY tests /var/alchemy/tests
COPY tmp /var/alchemy/tmp
COPY www /var/alchemy/www
COPY composer.json /var/alchemy/
COPY composer.lock /var/alchemy/
COPY gulpfile.js /var/alchemy/
COPY Makefile /var/alchemy/
COPY package.json /var/alchemy/
COPY phpunit.xml.dist /var/alchemy/
COPY yarn.lock /var/alchemy/
COPY bin /var/alchemy/bin
COPY composer.json /var/alchemy/
COPY composer.lock /var/alchemy/
RUN make install_composer
COPY resources /var/alchemy/resources
COPY www /var/alchemy/www
RUN make clean_assets
RUN make install_asset_dependencies
RUN make install_assets
FROM php:7.1-fpm-stretch as phraseanet
COPY lib /var/alchemy/lib
COPY tmp /var/alchemy/tmp
COPY config /var/alchemy/config
COPY grammar /var/alchemy/grammar
COPY templates-profiler /var/alchemy/templates-profiler
COPY templates /var/alchemy/templates
COPY tests /var/alchemy/tests
# Phraseanet
FROM php:7.1-fpm-stretch as phraseanet
RUN apt-get update \
&& apt-get install -y \
apt-transport-https \
@@ -134,18 +135,26 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir -p /var/log/supervisor
RUN mkdir -p /var/alchemy/logs && chmod 777 /var/alchemy/logs \
&& mkdir -p /var/alchemy/cache && chmod 777 /var/alchemy/cache
COPY --from=builder [^(www)] /var/alchemy /var/alchemy
COPY --from=builder /var/alchemy /var/alchemy/Phraseanet
RUN mkdir -p /var/alchemy/Phraseanet/logs \
&& chmod -R 777 /var/alchemy/Phraseanet/logs \
&& mkdir -p /var/alchemy/Phraseanet/cache \
&& chmod -R 777 /var/alchemy/Phraseanet/cache \
&& mkdir -p /var/alchemy/Phraseanet/datas \
&& chmod -R 777 /var/alchemy/Phraseanet/datas \
&& mkdir -p /var/alchemy/Phraseanet/tmp \
&& chmod -R 777 /var/alchemy/Phraseanet/tmp \
&& mkdir -p /var/alchemy/Phraseanet/www/custom \
&& chmod -R 777 /var/alchemy/Phraseanet/www/custom \
&& mkdir -p /var/alchemy/Phraseanet/config \
&& chmod -R 777 /var/alchemy/Phraseanet/config
WORKDIR /var/alchemy/Phraseanet
CMD ["php-fpm"]
# phraseanet-nginx
FROM nginx:1.15 as phraseanet-nginx
RUN useradd -u 1000 app
ADD ./docker/nginx/ /
COPY --from=builder /var/alchemy/www /var/alchemy/Phraseanet/www

7
Dockerfile-nginx
View File

@@ -1,7 +0,0 @@
FROM nginx:1.15
RUN useradd -u 1000 app
ADD ./docker/nginx/ /
COPY www /var/alchemy/Phraseanet/

2
README.md
View File

@@ -45,6 +45,8 @@ Phraseanet is licensed under GPL-v3 license.
# Docker build
WARNING : still in a work-in-progress status and can be used only for test purposes.
The docker distribution come with 2 differents containers :
* an nginx that act as the front http server.
* the php-fpm who serves the php files through nginx.

23
lib/Alchemy/Phrasea/CLI.php
View File

@@ -73,9 +73,26 @@ class CLI extends Application
$this->bindRoutes();
$this['logger'] = $this->extend('logger', function () {
return new Console\Logger\ConsoleLogger(new Console\Output\ConsoleOutput(Console\Output\ConsoleOutput::VERBOSITY_DEBUG));
});
$logger = false;
if ($this['configuration.store']->isSetup()){
$config = $this['configuration.store']->getConfig();
if ((isset($config['console_logger_enabled_environments']) && in_array($environment, $config['console_logger_enabled_environments']))){
$logger = true;
}
}
if ($environment == self::ENV_DEV){
$logger = true;
}
if ($logger){
$this['logger'] = $this->extend('logger', function () {
return new Console\Logger\ConsoleLogger(new Console\Output\ConsoleOutput(Console\Output\ConsoleOutput::VERBOSITY_DEBUG));
});
}
error_reporting(-1);
ErrorHandler::register();

52
resources/locales/messages.de.xlf
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-05-15T13:26:45Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<file date="2019-05-21T05:53:02Z" 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>
@@ -8908,6 +8908,31 @@
<target state="needs-translation">Aggregateinstellungen</target>
<jms:reference-file line="5">admin/search-engine/search-engine-settings.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="08772ff0da8ce970d5fac07a7afb6f855401d235" resname="admin::setup:personalisation_logo: download gabari">
<source>admin::setup:personalisation_logo: download gabari</source>
<target state="new">admin::setup:personalisation_logo: download gabari</target>
<jms:reference-file line="18">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="a051f8357ca68bd96210d071cdfacfe8a54de2af" resname="admin::setup:personalisation_logo: error text dimension">
<source>admin::setup:personalisation_logo: error text dimension</source>
<target state="new">admin::setup:personalisation_logo: error text dimension</target>
<jms:reference-file line="44">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="4499d392aa84b8bf806252937b820281034ffd0c" resname="admin::setup:personalisation_logo: error text file type">
<source>admin::setup:personalisation_logo: error text file type</source>
<target state="new">admin::setup:personalisation_logo: error text file type</target>
<jms:reference-file line="45">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="78a276b502761ddad6d621bf315ed17362b12748" resname="admin::setup:personalisation_logo: help text">
<source>admin::setup:personalisation_logo: help text</source>
<target state="new">admin::setup:personalisation_logo: help text</target>
<jms:reference-file line="16">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="1ae037eda66d81b87705cdbdc04e4d8c0a953755" resname="admin::setup:personalisation_logo: select file">
<source>admin::setup:personalisation_logo: select file</source>
<target state="new">admin::setup:personalisation_logo: select file</target>
<jms:reference-file line="31">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8fb48b51ad1962dc1b6a3643964f38fc48853161" resname="admin::status: case A" approved="yes">
<source>admin::status: case A</source>
<target state="translated">Off</target>
@@ -11267,31 +11292,6 @@
<target state="translated">Achtung : Die ausgewählte Datenbanken Liste für die Suche wurde verändert</target>
<jms:reference-file line="33">Controller/Prod/LanguageController.php</jms:reference-file>
</trans-unit>
<trans-unit id="93e6180a1f0f64a4dfc76fd640c4dc0049be00fc" resname="prod::setup: download gabari">
<source>prod::setup: download gabari</source>
<target state="new">prod::setup: download gabari</target>
<jms:reference-file line="10">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="7751e538494c3f8ed3f5518422715b60b28d306a" resname="prod::setup: error text dimension">
<source>prod::setup: error text dimension</source>
<target state="new">prod::setup: error text dimension</target>
<jms:reference-file line="41">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="a9f8a6a629117e38936d41b34cbb3dbcc13353fa" resname="prod::setup: error text file type">
<source>prod::setup: error text file type</source>
<target state="new">prod::setup: error text file type</target>
<jms:reference-file line="42">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="7950ac5291b8ffafd5cfa55c429cada508a2fdd1" resname="prod::setup: help text">
<source>prod::setup: help text</source>
<target state="new">prod::setup: help text</target>
<jms:reference-file line="16">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="acd399272f9331ebe8c669752339051f920a4084" resname="prod::setup: select file">
<source>prod::setup: select file</source>
<target state="new">prod::setup: select file</target>
<jms:reference-file line="29">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="df147d680e0fab108bc7a6a1c878c55428ecd3ea" resname="prod::thesaurusTab:candidats" approved="yes">
<source>prod::thesaurusTab:candidats</source>
<target state="translated">mögliche Begriffe</target>

52
resources/locales/messages.en.xlf
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-05-15T13:27:52Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<file date="2019-05-21T05:54:15Z" 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>
@@ -8908,6 +8908,31 @@
<target state="translated">Aggregates settings</target>
<jms:reference-file line="5">admin/search-engine/search-engine-settings.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="08772ff0da8ce970d5fac07a7afb6f855401d235" resname="admin::setup:personalisation_logo: download gabari">
<source>admin::setup:personalisation_logo: download gabari</source>
<target state="new">admin::setup:personalisation_logo: download gabari</target>
<jms:reference-file line="18">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="a051f8357ca68bd96210d071cdfacfe8a54de2af" resname="admin::setup:personalisation_logo: error text dimension">
<source>admin::setup:personalisation_logo: error text dimension</source>
<target state="new">admin::setup:personalisation_logo: error text dimension</target>
<jms:reference-file line="44">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="4499d392aa84b8bf806252937b820281034ffd0c" resname="admin::setup:personalisation_logo: error text file type">
<source>admin::setup:personalisation_logo: error text file type</source>
<target state="new">admin::setup:personalisation_logo: error text file type</target>
<jms:reference-file line="45">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="78a276b502761ddad6d621bf315ed17362b12748" resname="admin::setup:personalisation_logo: help text">
<source>admin::setup:personalisation_logo: help text</source>
<target state="new">admin::setup:personalisation_logo: help text</target>
<jms:reference-file line="16">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="1ae037eda66d81b87705cdbdc04e4d8c0a953755" resname="admin::setup:personalisation_logo: select file">
<source>admin::setup:personalisation_logo: select file</source>
<target state="new">admin::setup:personalisation_logo: select file</target>
<jms:reference-file line="31">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8fb48b51ad1962dc1b6a3643964f38fc48853161" resname="admin::status: case A" approved="yes">
<source>admin::status: case A</source>
<target state="translated">Off</target>
@@ -11268,31 +11293,6 @@ See documentation for more examples https://docs.phraseanet.com</target>
<target state="translated">Warning, list of collections to search in has been changed</target>
<jms:reference-file line="33">Controller/Prod/LanguageController.php</jms:reference-file>
</trans-unit>
<trans-unit id="93e6180a1f0f64a4dfc76fd640c4dc0049be00fc" resname="prod::setup: download gabari">
<source>prod::setup: download gabari</source>
<target state="new">prod::setup: download gabari</target>
<jms:reference-file line="10">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="7751e538494c3f8ed3f5518422715b60b28d306a" resname="prod::setup: error text dimension">
<source>prod::setup: error text dimension</source>
<target state="new">prod::setup: error text dimension</target>
<jms:reference-file line="41">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="a9f8a6a629117e38936d41b34cbb3dbcc13353fa" resname="prod::setup: error text file type">
<source>prod::setup: error text file type</source>
<target state="new">prod::setup: error text file type</target>
<jms:reference-file line="42">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="7950ac5291b8ffafd5cfa55c429cada508a2fdd1" resname="prod::setup: help text">
<source>prod::setup: help text</source>
<target state="new">prod::setup: help text</target>
<jms:reference-file line="16">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="acd399272f9331ebe8c669752339051f920a4084" resname="prod::setup: select file">
<source>prod::setup: select file</source>
<target state="new">prod::setup: select file</target>
<jms:reference-file line="29">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="df147d680e0fab108bc7a6a1c878c55428ecd3ea" resname="prod::thesaurusTab:candidats" approved="yes">
<source>prod::thesaurusTab:candidats</source>
<target state="translated">Candidates</target>

52
resources/locales/messages.fr.xlf
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-05-15T13:29:10Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<file date="2019-05-21T05:55:28Z" 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>
@@ -8908,6 +8908,31 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<target state="translated">Réglage d'agrégation</target>
<jms:reference-file line="5">admin/search-engine/search-engine-settings.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="08772ff0da8ce970d5fac07a7afb6f855401d235" resname="admin::setup:personalisation_logo: download gabari">
<source>admin::setup:personalisation_logo: download gabari</source>
<target state="new">admin::setup:personalisation_logo: download gabari</target>
<jms:reference-file line="18">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="a051f8357ca68bd96210d071cdfacfe8a54de2af" resname="admin::setup:personalisation_logo: error text dimension">
<source>admin::setup:personalisation_logo: error text dimension</source>
<target state="new">admin::setup:personalisation_logo: error text dimension</target>
<jms:reference-file line="44">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="4499d392aa84b8bf806252937b820281034ffd0c" resname="admin::setup:personalisation_logo: error text file type">
<source>admin::setup:personalisation_logo: error text file type</source>
<target state="new">admin::setup:personalisation_logo: error text file type</target>
<jms:reference-file line="45">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="78a276b502761ddad6d621bf315ed17362b12748" resname="admin::setup:personalisation_logo: help text">
<source>admin::setup:personalisation_logo: help text</source>
<target state="new">admin::setup:personalisation_logo: help text</target>
<jms:reference-file line="16">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="1ae037eda66d81b87705cdbdc04e4d8c0a953755" resname="admin::setup:personalisation_logo: select file">
<source>admin::setup:personalisation_logo: select file</source>
<target state="new">admin::setup:personalisation_logo: select file</target>
<jms:reference-file line="31">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8fb48b51ad1962dc1b6a3643964f38fc48853161" resname="admin::status: case A" approved="yes">
<source>admin::status: case A</source>
<target state="translated">Off</target>
@@ -11267,31 +11292,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<target state="translated">Attention : la liste des collections sélectionnées pour la recherche a été changée</target>
<jms:reference-file line="33">Controller/Prod/LanguageController.php</jms:reference-file>
</trans-unit>
<trans-unit id="93e6180a1f0f64a4dfc76fd640c4dc0049be00fc" resname="prod::setup: download gabari">
<source>prod::setup: download gabari</source>
<target state="new">prod::setup: download gabari</target>
<jms:reference-file line="10">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="7751e538494c3f8ed3f5518422715b60b28d306a" resname="prod::setup: error text dimension">
<source>prod::setup: error text dimension</source>
<target state="new">prod::setup: error text dimension</target>
<jms:reference-file line="41">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="a9f8a6a629117e38936d41b34cbb3dbcc13353fa" resname="prod::setup: error text file type">
<source>prod::setup: error text file type</source>
<target state="new">prod::setup: error text file type</target>
<jms:reference-file line="42">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="7950ac5291b8ffafd5cfa55c429cada508a2fdd1" resname="prod::setup: help text">
<source>prod::setup: help text</source>
<target state="new">prod::setup: help text</target>
<jms:reference-file line="16">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="acd399272f9331ebe8c669752339051f920a4084" resname="prod::setup: select file">
<source>prod::setup: select file</source>
<target state="new">prod::setup: select file</target>
<jms:reference-file line="29">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="df147d680e0fab108bc7a6a1c878c55428ecd3ea" resname="prod::thesaurusTab:candidats" approved="yes">
<source>prod::thesaurusTab:candidats</source>
<target state="translated">Candidats</target>

52
resources/locales/messages.nl.xlf
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-05-15T13:30:32Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<file date="2019-05-21T05:56:46Z" 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>
@@ -8915,6 +8915,31 @@
<target state="new">admin::search-engine: general-aggregation</target>
<jms:reference-file line="5">admin/search-engine/search-engine-settings.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="08772ff0da8ce970d5fac07a7afb6f855401d235" resname="admin::setup:personalisation_logo: download gabari">
<source>admin::setup:personalisation_logo: download gabari</source>
<target state="new">admin::setup:personalisation_logo: download gabari</target>
<jms:reference-file line="18">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="a051f8357ca68bd96210d071cdfacfe8a54de2af" resname="admin::setup:personalisation_logo: error text dimension">
<source>admin::setup:personalisation_logo: error text dimension</source>
<target state="new">admin::setup:personalisation_logo: error text dimension</target>
<jms:reference-file line="44">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="4499d392aa84b8bf806252937b820281034ffd0c" resname="admin::setup:personalisation_logo: error text file type">
<source>admin::setup:personalisation_logo: error text file type</source>
<target state="new">admin::setup:personalisation_logo: error text file type</target>
<jms:reference-file line="45">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="78a276b502761ddad6d621bf315ed17362b12748" resname="admin::setup:personalisation_logo: help text">
<source>admin::setup:personalisation_logo: help text</source>
<target state="new">admin::setup:personalisation_logo: help text</target>
<jms:reference-file line="16">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="1ae037eda66d81b87705cdbdc04e4d8c0a953755" resname="admin::setup:personalisation_logo: select file">
<source>admin::setup:personalisation_logo: select file</source>
<target state="new">admin::setup:personalisation_logo: select file</target>
<jms:reference-file line="31">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8fb48b51ad1962dc1b6a3643964f38fc48853161" resname="admin::status: case A" approved="yes">
<source>admin::status: case A</source>
<target state="translated">Case A</target>
@@ -11274,31 +11299,6 @@
<target state="translated">Opgepast : de lijst met de geslecteerde databases is veranderd.</target>
<jms:reference-file line="33">Controller/Prod/LanguageController.php</jms:reference-file>
</trans-unit>
<trans-unit id="93e6180a1f0f64a4dfc76fd640c4dc0049be00fc" resname="prod::setup: download gabari">
<source>prod::setup: download gabari</source>
<target state="new">prod::setup: download gabari</target>
<jms:reference-file line="10">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="7751e538494c3f8ed3f5518422715b60b28d306a" resname="prod::setup: error text dimension">
<source>prod::setup: error text dimension</source>
<target state="new">prod::setup: error text dimension</target>
<jms:reference-file line="41">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="a9f8a6a629117e38936d41b34cbb3dbcc13353fa" resname="prod::setup: error text file type">
<source>prod::setup: error text file type</source>
<target state="new">prod::setup: error text file type</target>
<jms:reference-file line="42">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="7950ac5291b8ffafd5cfa55c429cada508a2fdd1" resname="prod::setup: help text">
<source>prod::setup: help text</source>
<target state="new">prod::setup: help text</target>
<jms:reference-file line="16">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="acd399272f9331ebe8c669752339051f920a4084" resname="prod::setup: select file">
<source>prod::setup: select file</source>
<target state="new">prod::setup: select file</target>
<jms:reference-file line="29">web/admin/personalisation_logo.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="df147d680e0fab108bc7a6a1c878c55428ecd3ea" resname="prod::thesaurusTab:candidats" approved="yes">
<source>prod::thesaurusTab:candidats</source>
<target state="translated">Kandidaten</target>

2
resources/locales/validators.de.xlf
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-05-15T13:26:45Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<file date="2019-05-21T05:53:02Z" 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>

2
resources/locales/validators.en.xlf
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-05-15T13:27:53Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<file date="2019-05-21T05:54:16Z" 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>

2
resources/locales/validators.fr.xlf
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-05-15T13:29:11Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<file date="2019-05-21T05:55:28Z" 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>

2
resources/locales/validators.nl.xlf
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-05-15T13:30:32Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<file date="2019-05-21T05:56:47Z" 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>

27
templates/web/admin/personalisation_logo.html.twig
View File

@@ -5,16 +5,18 @@
{{ form_label(form.logoChoice[0]) }}
<div class="image-container">
<img id="original-image-placeholder" alt="gabari"
src="data:image/png;base64,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"/>
src="/assets/common/images/logo.png"/>
</div>
<a id="download-image-template" href="#">{{ 'prod::setup: download gabari' | trans }}</a>
</td>
<td>
{{ form_widget(form.logoChoice[1]) }}
{{ form_label(form.logoChoice[1]) }}
<br>
<span id="help-text">{{ 'prod::setup: help text' | trans }}</span>
<span id="error-text"></span>
<span id="help-text">{{ 'admin::setup:personalisation_logo: help text' | trans }}</span>
<br>
<a id="download-image-template" href="#">{{ 'admin::setup:personalisation_logo: download gabari' | trans }}</a>
<br>
<div class="image-container" id="personalize-image-container">
{% if app['conf'].get(['registry', 'general', 'personalize-logo-choice', 'personalizeFile']) == 'true' %}
{% set extension = app['conf'].get(['registry', 'general', 'personalize-logo-choice', 'fileType']) %}
@@ -26,8 +28,9 @@
<div>
{{ form_widget(form.personalizeLogoInput) }}
<label for="general_personalize-logo-choice_personalizeLogoInput"
id="select-logo-btn">{{ 'prod::setup: select file' | trans }}</label>
id="select-logo-btn">{{ 'admin::setup:personalisation_logo: select file' | trans }}</label>
</div>
<span id="error-text"></span>
</td>
{{ form_widget(form.personalizeFile) }}
{{ form_widget(form.fileType) }}
@@ -38,8 +41,8 @@
$(document).ready(function () {
var fileToUpload = null;
var errorDimension = '{{ 'prod::setup: error text dimension' | trans }}';
var errorFileType = '{{ 'prod::setup: error text file type' | trans }}';
var errorDimension = '{{ 'admin::setup:personalisation_logo: error text dimension' | trans }}';
var errorFileType = '{{ 'admin::setup:personalisation_logo: error text file type' | trans }}';
$('#help-text').show();
@@ -54,7 +57,7 @@
$("#download-image-template").on('click', function (event) {
event.preventDefault();
var imageInBase64 = $('#original-image-placeholder').attr('src');
var imageInBase64 = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHgAAAApCAYAAAGJsd0WAAAAAXNSR0IArs4c6QAAB+dJREFUeAHtm2lsVFUUgDvtdLphAVEECi0pjUDYiqBWimaqSPgBRSOiaICofwiRGDF0U5FEoLSFok1UIv1DxB82igaUxRhttC4YRWNKAlUQSEWkbAJtp3TzO8O745t2OtNOZ95MX+ckZ8695557zzl3X95YoqKiOkG/wVvmVF+lSubffAl5SrfAlMxCXVBYWDiira1takxMzF8dHR2O0tLS+g0bNljBNpeQFvBmdldZt7jS7MbsbaRfmX0p2YNAli8hnwKeCojRmPVCCwoK5s+bN+90dXV1R35+/gM1NTVnLBbLELvdnpiVlWUn/oenQvzi9bvC/GnnWzFVuu5WzeSP/THdH8X+6HHLE63FMqCGGqDaSWg3kB7T3t6+JykpaVhjY2M1vaWus7PTXlZWlr5u3bodcXFxZS0tLTnwt1qt1onILk9ISKhsamqSnrQN3r7NmzfXditYYxjqqTJCeaziYU/PYOFQsA7ssSqD4cV0rdAkaBE4OhhKDCkz1xAtKFHjOF1TOMwoxR7Hr1LOWP1HZnrW11mss4lQWRmS4uPjf4Bam5ubsxm3PzPG72Fs78/LyxuTmJh4yeFw2BnvMSUlJZ+psrpS5XFXvjNOYXcQyEHpUiaRYyzux5gkdjNBrIJvo/D9LPIXSDsiGYgXYMzILVu2HExJSflCeBFQNRDSmSskc7Xy3GjqtVMHwRiZafV77r81Hcuh48GpWjyoxMgWVg5PwiPRKzgK/BVsAA0BIx02xCFvSrp26V8QVhUgaSu8ZR6IaXqHp+HASzonOnThbsGKioq48vLyBElgcepxCecMNaVb5j4yWPC8rtx9KU4tD30uULb5GDIhPT298sSJE4tY+vey9I9ntd7FUTyb7cBpaBrbiJMYZGNVHwvvZcKT2VYUs3U4ztahifhq0ipJa4yOjp7B9uI8FXiVfKdiY2MX2my2elb3ZOTPQkvRmYJcIXpepPw1fXFWyaourOJ+06qqKnVa9lkGTtl8CvUgQN74HpJ6xQ6Yw73SFmIh/RgOsSnGqFdj2BhtES2G10CnkV36Au6p+eI64WzwFfBN8EFQdlumA+WwOHY7uBKUihDQp93kBP7XCB1uViuFsnx9r6XIXZGASrsZC86vETrcLFcKhSpMI9wOzneTDE5E6Q9O6WFYqqGTVlj433WWfk1n1du6sCmDVrz6QPPsLuglE3rpNoYv4uAinZOmdFjfpR/H2RmgXed0j0GOc2NVoj6seEL7e6qRMjgmSm8LGEg3VvAlAUEF8lLYI3AurcOhZM6oUzibyi7JguOPcEb9RA79pMsFgvQaB2fn4cRTkRvH2fdT4gvk9lryc4aeCH80t+11PJWdhHdDlFLGIq7U98EfSXgOZ+hkzsqip4Ob8EYqolHk+gr6Fu5TXgy4ygG+CmM/l4y8x0/i7e4kTr+KcxthbefKfo5WqLwJVIqzpG/lOv+A8Em/k/w7KatdnCXeLHycWcYh/3xRUVGmyOL4d9D1VMY5ZDY1NDRI+X6B3w6jLQlDHdBC0YxBJZmZmUdxLJFoJtR15UpaC7xrIgfIY1g7FXSvRJCTFr0mLUvYZU9xcfHh1tZW55UTlZRLBTwp8oA8oqnJ1ckI2Q9GuwzurxGUJRUXaHCbpQNdeDiW938XCkfrgmFTwLpgMIwLRpmDzuFBeac16GauYAyVMC3TtJN0LBW+GNwD6j/2kXtD+RbjGFgOjgAF5GnsffAU+BXY7+cwyggbMNsIllcn2dROB8W3VFBgAvgGOEQiwA5wrzMUFXUUul4LPwSVfLdp8YFMnG1rtgZWDdK1gRU/jkA1+JFiQC+B8pGJQBoodTJNIgMcBl0D76TBZHqWmxo5iQnKxmsXWAPKZ3gyyv8EhT/QwdQN7E/jJPuTKYzzRBo4jBsnEKaZdhcdiMoxRRnebjpm42Eb6BzmmrdyQS9fvraCKzRehIR5DegbUJmaT+AQmAt6SpddZ6SBqYQwB49rsBz4r4CHwTpQhGSHqYdIA+trI3zDnVYPtj2t48mruFwGzNXx+hWUb415UTvE61s576muj7J5JTvCC9pM3j9jeUySpcEnkCcHoY2UIzdUIQFsHcLTaS3fN9/HXx1l+QorkLOejFDDznxaA++ggeWB/HUaZy8NtZ3wGBpY/gYWy7vvE4RLkDkIfynhWYQnE36Xd+eZ/F3sJ3hr4bVAy3lrlv+b1mtxuZVaAP4InpMw/MXgOd6fa1UHQv4GvDnkz0RmG3gEHAfPAZUvAuXGqxn77oc6gcf4VORFTp5oHwVX8TH81zTwZZ5w00h7HkyHPwrMxta5xB3oPUD8G3A2j/pP8fz7LWEjIGS76BFUzMM4/x6N+xz0brwtUx4Tv0xFXyXeDErDPSMdAbqWd/Gz8NbTqN3ewcm3Bn4ucjXgh4SXILsbFOoNjiObQyM9i9BYdNmxbyHlzeXDA7n8cAL/PKiHtwmUjuF8u1dpQsmXh95TYExGRoZNGpLZ6i1kpTMPBX+ncy4TWaPA2y46aDZQAdFMbVfozY+h5A1GlYw4ly2kW6mU4fCyoS3Q8Yy4EsKraAgLdAnxCvi9Br4MkZH9DqOtgU61n3CvlgG9AvnbCrathHcL+C8d4ro+nXJrib8ATuGvLheJr8a3XOIy40wTJI+MZkPBudMyVGNEmVE1ELIp2igHB70e17Q46GvCpBUQaWCTNqxyK9LAqiZMSv8DHKUE8H/9oh8AAAAASUVORK5CYII=';
var mimeInfo = base64MimeType(imageInBase64);
var ext = mimeInfo.split('/').pop();
var filename = $('#original-image-placeholder').attr('alt') + "." + ext;
@@ -95,7 +98,7 @@
$('#general_personalize-logo-choice_personalizeLogoInput').val("");
$('#error-text').text(errorFileType);
$('#error-text').show();
$('#help-text').hide();
/*$('#help-text').hide();*/
$('#personalize-image-container').hide();
return false;
}
@@ -109,7 +112,7 @@
if (h > 41 || w > 120 ) {
$('#error-text').text(errorDimension);
$('#error-text').show();
$('#help-text').hide();
/*$('#help-text').hide();*/
$('#personalize-image-container').hide();
$('#general_personalize-logo-choice_personalizeLogoInput').val("");
return false;
@@ -121,7 +124,7 @@
loadImage(file, function (img) {
$('#personalize-image-container').show();
$('#error-text').hide();
$('#help-text').hide();
/*$('#help-text').hide();*/
$('#personalize-image-container').empty().append(img);
}, {
maxSize: 5242880, // 5MB
@@ -150,7 +153,7 @@
$('#general_personalize-logo-choice_personalizeFile').val(false);
}
console.log(data);
/* console.log(data);*/
}
});

2
templates/web/prod/results/record.html.twig
View File

@@ -86,7 +86,7 @@
{% endif %}
{% endif %}
{% if settings.rollover_thumbnail == 'preview' %}
<span class="fa-stack fa-lg captionRolloverTips"
<span class="fa-stack fa-lg captionRolloverTips" title="{{ macro.caption(record, can_see_business, false) | e }}"
tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId, 'context' : 'answer', 'number' : record.position|default(0) }) }}">
<i class="fa fa-circle fa-stack-2x" aria-hidden="true"></i>
<i class="fa fa-list fa-stack-1x fa-inverse" aria-hidden="true"></i>