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

resolve conflict

Browse Source
This commit is contained in:
Mike Ng
2018-01-08 15:54:47 +04:00
parent 847c302863 c2603da5ad
commit bddc3781ba
60 changed files with 1908 additions and 843 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/ansible/roles/app/templates/configuration.tpl
View File

@@ -12,7 +12,7 @@ main:
port: 3306
user: '{{ mariadb.user }}'
password: '{{ mariadb.password }}'
dbname: '{{ mariadb.database }}'
dbname: '{{ mariadb.appbox_db }}'
driver: pdo_mysql
charset: UTF8
database-test:

2
resources/ansible/roles/mariadb/tasks/main.yml
View File

@@ -47,7 +47,7 @@
- "{{ mariadb.alt_databox_db }}"
- name: mariadb | Import dump
mysql_db: name={{ mariadb.database }} state=import login_user=root login_password={{ mariadb.root_password }} target=/vagrant/{{ mariadb.dump }}
mysql_db: name={{ mariadb.appbox_db }} state=import login_user=root login_password={{ mariadb.root_password }} target=/vagrant/{{ mariadb.dump }}
when: mariadb.dump
- name: mariadb | Create users

2
resources/ansible/roles/php/tasks/pecl.yml
View File

@@ -21,6 +21,6 @@
when: php.pecl_packages is defined
- name: Enable extension
shell: php5enmod {{ item.name }}
shell: phpenmod {{ item.name }}
with_items: '{{ php.pecl_packages }}'
when: php.pecl_packages is defined

2
resources/ansible/vars/all.yml
View File

@@ -41,7 +41,7 @@ nginx:
mariadb:
install: '1'
root_password: toor
database: ab_master
appbox_db: ab_master
databox_db: db_master
alt_databox_db: db_alt
user: phraseanet

34
resources/locales/messages.de.xlf
View File

@@ -2352,7 +2352,7 @@
<trans-unit id="ac930a136ebd04a19bc5f2ce1769fc065efb7bdf" resname="Detailed view URL" approved="yes">
<source>Detailed view URL</source>
<target state="translated">Detailansicht URL</target>
<jms:reference-file line="32">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="44">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="dc3decbb93847518f1a049dcf49d0d7c6560bcc6" resname="Details" approved="yes">
<source>Details</source>
@@ -2677,7 +2677,7 @@
<trans-unit id="7884b9b422d77cabded5da8a9a56524a84481930" resname="Embed code" approved="yes">
<source>Embed code</source>
<target state="translated">Embed-Code</target>
<jms:reference-file line="41">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="53">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="e5afbbe7023486a123b45581f49820899571c415" resname="Empty a collection" approved="yes">
<source>Empty a collection</source>
@@ -4347,7 +4347,7 @@
<trans-unit id="8c123d8ad43d08cc48c3d6a7676e65f71eea59df" resname="No URL available" approved="yes">
<source>No URL available</source>
<target state="translated">keine verfügbare URL</target>
<jms:reference-file line="57">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="120">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="486829367591dc8209f3fc6960814c0bdd8930d1" resname="No account yet?" approved="yes">
<source>No account yet?</source>
@@ -5563,7 +5563,7 @@
<trans-unit id="8e78cff6cd2bb8595029060cb53dba7a4ba72b8a" resname="Resource URL" approved="yes">
<source>Resource URL</source>
<target state="translated">Resource URL</target>
<jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="34">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="2479ef7e025d9d4c6e5463dc366c2d6c79aaefbe" resname="Resquest access" approved="yes">
<source>Resquest access</source>
@@ -5841,12 +5841,12 @@
<trans-unit id="6ff7a49e36b0e5c8302603f98e4eb1c7dec4a56e" resname="Send to Facebook" approved="yes">
<source>Send to Facebook</source>
<target state="translated">Auf Facebook teilen</target>
<jms:reference-file line="16">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="29f82ee42eeecce87dfe9223d5d7ff716dc68ead" resname="Send to Twitter" approved="yes">
<source>Send to Twitter</source>
<target state="translated">Auf Twitter teilen</target>
<jms:reference-file line="10">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="35f49dcfbfb2e03fdce327671e82bf173b1ccb8b" resname="Sent" approved="yes">
<source>Sent</source>
@@ -9427,9 +9427,9 @@
<trans-unit id="a70a59b9120185471e5b45630f8ba24d5516f590" resname="copyClipboardLabel" approved="yes">
<source>copyClipboardLabel</source>
<target state="translated">in der Zwischenablage kopieren</target>
<jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="36">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="49">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="40">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="61">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="fc97186645dc71dae8e3221c8ce53c56e6d611bf" resname="dans %category%" approved="yes">
<source>dans %category%</source>
@@ -10754,9 +10754,9 @@
<trans-unit id="7ac5447a13806c0a2e2602b51644729fe8464e0e" resname="previewLinkLabel" approved="yes">
<source>previewLinkLabel</source>
<target state="translated">ansichten</target>
<jms:reference-file line="27">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="35">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="39">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="47">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="60">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="6f25fd9ac189dce63bc51d1eccc253051ada2bf4" resname="print:: image de choix et description" approved="yes">
<source>print:: image de choix et description</source>
@@ -11069,6 +11069,7 @@
<trans-unit id="6ad73c8fd370f62ccd3bf50cd9cc3563aed5273c" resname="prod::tools: document" approved="yes">
<source>prod::tools: document</source>
<target state="translated">Dokument</target>
<jms:reference-file line="41">Controller/Prod/ShareController.php</jms:reference-file>
<jms:reference-file line="70">Controller/Prod/ToolsController.php</jms:reference-file>
</trans-unit>
<trans-unit id="61c9b2b17db77a27841bbeeabff923448b0f6388" resname="public" approved="yes">
@@ -12269,6 +12270,15 @@
<source>setup::custom-link:title-custom-link</source>
<target state="new">setup::custom-link:title-custom-link</target>
<jms:reference-file line="56">web/admin/setup.html.twig</jms:reference-file>
<trans-unit id="5107f9819cd4c0812c1d78cc07d24aff304c58fa" resname="share::share-record: advance">
<source>share::share-record: advance</source>
<target state="new">share::share-record: advance</target>
<jms:reference-file line="9">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="f51d8ca24dc67572beccf115c79671ba1c3f545a" resname="share::share-record: select-shared-def">
<source>share::share-record: select-shared-def</source>
<target state="new">share::share-record: select-shared-def</target>
<jms:reference-file line="11">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8ab6a8a0cf069e3783c6f59163ad03a051310556" resname="sport" approved="yes">
<source>sport</source>

34
resources/locales/messages.en.xlf
View File

@@ -2352,7 +2352,7 @@
<trans-unit id="ac930a136ebd04a19bc5f2ce1769fc065efb7bdf" resname="Detailed view URL" approved="yes">
<source>Detailed view URL</source>
<target state="translated">URL of the detailed view</target>
<jms:reference-file line="32">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="44">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="dc3decbb93847518f1a049dcf49d0d7c6560bcc6" resname="Details" approved="yes">
<source>Details</source>
@@ -2677,7 +2677,7 @@
<trans-unit id="7884b9b422d77cabded5da8a9a56524a84481930" resname="Embed code" approved="yes">
<source>Embed code</source>
<target state="translated">Embed code</target>
<jms:reference-file line="41">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="53">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="e5afbbe7023486a123b45581f49820899571c415" resname="Empty a collection" approved="yes">
<source>Empty a collection</source>
@@ -4347,7 +4347,7 @@
<trans-unit id="8c123d8ad43d08cc48c3d6a7676e65f71eea59df" resname="No URL available" approved="yes">
<source>No URL available</source>
<target state="translated">No URL available</target>
<jms:reference-file line="57">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="120">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="486829367591dc8209f3fc6960814c0bdd8930d1" resname="No account yet?" approved="yes">
<source>No account yet?</source>
@@ -5563,7 +5563,7 @@
<trans-unit id="8e78cff6cd2bb8595029060cb53dba7a4ba72b8a" resname="Resource URL" approved="yes">
<source>Resource URL</source>
<target state="translated">Resource URL</target>
<jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="34">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="2479ef7e025d9d4c6e5463dc366c2d6c79aaefbe" resname="Resquest access" approved="yes">
<source>Resquest access</source>
@@ -5841,12 +5841,12 @@
<trans-unit id="6ff7a49e36b0e5c8302603f98e4eb1c7dec4a56e" resname="Send to Facebook" approved="yes">
<source>Send to Facebook</source>
<target state="translated">Send to Facebook</target>
<jms:reference-file line="16">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="29f82ee42eeecce87dfe9223d5d7ff716dc68ead" resname="Send to Twitter" approved="yes">
<source>Send to Twitter</source>
<target state="translated">Send to Twitter</target>
<jms:reference-file line="10">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="35f49dcfbfb2e03fdce327671e82bf173b1ccb8b" resname="Sent" approved="yes">
<source>Sent</source>
@@ -9428,9 +9428,9 @@
<trans-unit id="a70a59b9120185471e5b45630f8ba24d5516f590" resname="copyClipboardLabel" approved="yes">
<source>copyClipboardLabel</source>
<target state="translated">Copy to clipboard</target>
<jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="36">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="49">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="40">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="61">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="fc97186645dc71dae8e3221c8ce53c56e6d611bf" resname="dans %category%" approved="yes">
<source>dans %category%</source>
@@ -10755,9 +10755,9 @@
<trans-unit id="7ac5447a13806c0a2e2602b51644729fe8464e0e" resname="previewLinkLabel" approved="yes">
<source>previewLinkLabel</source>
<target state="translated">Preview</target>
<jms:reference-file line="27">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="35">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="39">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="47">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="60">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="6f25fd9ac189dce63bc51d1eccc253051ada2bf4" resname="print:: image de choix et description" approved="yes">
<source>print:: image de choix et description</source>
@@ -11070,6 +11070,7 @@
<trans-unit id="6ad73c8fd370f62ccd3bf50cd9cc3563aed5273c" resname="prod::tools: document" approved="yes">
<source>prod::tools: document</source>
<target state="translated">Document</target>
<jms:reference-file line="41">Controller/Prod/ShareController.php</jms:reference-file>
<jms:reference-file line="70">Controller/Prod/ToolsController.php</jms:reference-file>
</trans-unit>
<trans-unit id="61c9b2b17db77a27841bbeeabff923448b0f6388" resname="public" approved="yes">
@@ -12270,6 +12271,15 @@
<source>setup::custom-link:title-custom-link</source>
<target state="new">setup::custom-link:title-custom-link</target>
<jms:reference-file line="56">web/admin/setup.html.twig</jms:reference-file>
<trans-unit id="5107f9819cd4c0812c1d78cc07d24aff304c58fa" resname="share::share-record: advance">
<source>share::share-record: advance</source>
<target state="new">share::share-record: advance</target>
<jms:reference-file line="9">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="f51d8ca24dc67572beccf115c79671ba1c3f545a" resname="share::share-record: select-shared-def">
<source>share::share-record: select-shared-def</source>
<target state="new">share::share-record: select-shared-def</target>
<jms:reference-file line="11">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8ab6a8a0cf069e3783c6f59163ad03a051310556" resname="sport" approved="yes">
<source>sport</source>

34
resources/locales/messages.fr.xlf
View File

@@ -2352,7 +2352,7 @@
<trans-unit id="ac930a136ebd04a19bc5f2ce1769fc065efb7bdf" resname="Detailed view URL" approved="yes">
<source>Detailed view URL</source>
<target state="translated">URL de la vue détaillée</target>
<jms:reference-file line="32">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="44">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="dc3decbb93847518f1a049dcf49d0d7c6560bcc6" resname="Details" approved="yes">
<source>Details</source>
@@ -2677,7 +2677,7 @@
<trans-unit id="7884b9b422d77cabded5da8a9a56524a84481930" resname="Embed code" approved="yes">
<source>Embed code</source>
<target state="translated">Code d'intégration (Embed code)</target>
<jms:reference-file line="41">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="53">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="e5afbbe7023486a123b45581f49820899571c415" resname="Empty a collection" approved="yes">
<source>Empty a collection</source>
@@ -4347,7 +4347,7 @@
<trans-unit id="8c123d8ad43d08cc48c3d6a7676e65f71eea59df" resname="No URL available" approved="yes">
<source>No URL available</source>
<target state="translated">Aucune URL de disponible</target>
<jms:reference-file line="57">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="120">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="486829367591dc8209f3fc6960814c0bdd8930d1" resname="No account yet?" approved="yes">
<source>No account yet?</source>
@@ -5565,7 +5565,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
<trans-unit id="8e78cff6cd2bb8595029060cb53dba7a4ba72b8a" resname="Resource URL" approved="yes">
<source>Resource URL</source>
<target state="translated">URL de la ressource</target>
<jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="34">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="2479ef7e025d9d4c6e5463dc366c2d6c79aaefbe" resname="Resquest access" approved="yes">
<source>Resquest access</source>
@@ -5843,12 +5843,12 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
<trans-unit id="6ff7a49e36b0e5c8302603f98e4eb1c7dec4a56e" resname="Send to Facebook" approved="yes">
<source>Send to Facebook</source>
<target state="translated">Envoyer vers Facebook</target>
<jms:reference-file line="16">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="29f82ee42eeecce87dfe9223d5d7ff716dc68ead" resname="Send to Twitter" approved="yes">
<source>Send to Twitter</source>
<target state="translated">Envoyer vers Twitter</target>
<jms:reference-file line="10">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="35f49dcfbfb2e03fdce327671e82bf173b1ccb8b" resname="Sent" approved="yes">
<source>Sent</source>
@@ -9431,9 +9431,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<trans-unit id="a70a59b9120185471e5b45630f8ba24d5516f590" resname="copyClipboardLabel" approved="yes">
<source>copyClipboardLabel</source>
<target state="translated">Copier dans le presse-papier</target>
<jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="36">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="49">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="40">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="61">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="fc97186645dc71dae8e3221c8ce53c56e6d611bf" resname="dans %category%" approved="yes">
<source>dans %category%</source>
@@ -10758,9 +10758,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<trans-unit id="7ac5447a13806c0a2e2602b51644729fe8464e0e" resname="previewLinkLabel" approved="yes">
<source>previewLinkLabel</source>
<target state="translated">Prévisualiser</target>
<jms:reference-file line="27">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="35">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="39">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="47">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="60">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="6f25fd9ac189dce63bc51d1eccc253051ada2bf4" resname="print:: image de choix et description" approved="yes">
<source>print:: image de choix et description</source>
@@ -11073,6 +11073,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<trans-unit id="6ad73c8fd370f62ccd3bf50cd9cc3563aed5273c" resname="prod::tools: document" approved="yes">
<source>prod::tools: document</source>
<target state="translated">Document</target>
<jms:reference-file line="41">Controller/Prod/ShareController.php</jms:reference-file>
<jms:reference-file line="70">Controller/Prod/ToolsController.php</jms:reference-file>
</trans-unit>
<trans-unit id="61c9b2b17db77a27841bbeeabff923448b0f6388" resname="public" approved="yes">
@@ -12273,6 +12274,15 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<source>setup::custom-link:title-custom-link</source>
<target state="new">setup::custom-link:title-custom-link</target>
<jms:reference-file line="56">web/admin/setup.html.twig</jms:reference-file>
<trans-unit id="5107f9819cd4c0812c1d78cc07d24aff304c58fa" resname="share::share-record: advance">
<source>share::share-record: advance</source>
<target state="new">share::share-record: advance</target>
<jms:reference-file line="9">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="f51d8ca24dc67572beccf115c79671ba1c3f545a" resname="share::share-record: select-shared-def">
<source>share::share-record: select-shared-def</source>
<target state="new">share::share-record: select-shared-def</target>
<jms:reference-file line="11">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8ab6a8a0cf069e3783c6f59163ad03a051310556" resname="sport" approved="yes">
<source>sport</source>

34
resources/locales/messages.nl.xlf
View File

@@ -2356,7 +2356,7 @@
<trans-unit id="ac930a136ebd04a19bc5f2ce1769fc065efb7bdf" resname="Detailed view URL" approved="yes">
<source>Detailed view URL</source>
<target state="translated">Gedetailleerde weergave URL</target>
<jms:reference-file line="32">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="44">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="dc3decbb93847518f1a049dcf49d0d7c6560bcc6" resname="Details">
<source>Details</source>
@@ -2681,7 +2681,7 @@
<trans-unit id="7884b9b422d77cabded5da8a9a56524a84481930" resname="Embed code" approved="yes">
<source>Embed code</source>
<target state="translated">Sluit de code in</target>
<jms:reference-file line="41">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="53">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="e5afbbe7023486a123b45581f49820899571c415" resname="Empty a collection">
<source>Empty a collection</source>
@@ -4351,7 +4351,7 @@
<trans-unit id="8c123d8ad43d08cc48c3d6a7676e65f71eea59df" resname="No URL available" approved="yes">
<source>No URL available</source>
<target state="translated">Geen URL beschikbaar</target>
<jms:reference-file line="57">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="120">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="486829367591dc8209f3fc6960814c0bdd8930d1" resname="No account yet?" approved="yes">
<source>No account yet?</source>
@@ -5567,7 +5567,7 @@
<trans-unit id="8e78cff6cd2bb8595029060cb53dba7a4ba72b8a" resname="Resource URL" approved="yes">
<source>Resource URL</source>
<target state="translated">Bron URL</target>
<jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="34">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="2479ef7e025d9d4c6e5463dc366c2d6c79aaefbe" resname="Resquest access" approved="yes">
<source>Resquest access</source>
@@ -5845,12 +5845,12 @@
<trans-unit id="6ff7a49e36b0e5c8302603f98e4eb1c7dec4a56e" resname="Send to Facebook" approved="yes">
<source>Send to Facebook</source>
<target state="translated">Verstuur naar Facebook</target>
<jms:reference-file line="16">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="29f82ee42eeecce87dfe9223d5d7ff716dc68ead" resname="Send to Twitter" approved="yes">
<source>Send to Twitter</source>
<target state="translated">Verstuur naar Twitter</target>
<jms:reference-file line="10">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="22">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="35f49dcfbfb2e03fdce327671e82bf173b1ccb8b" resname="Sent" approved="yes">
<source>Sent</source>
@@ -9431,9 +9431,9 @@
<trans-unit id="a70a59b9120185471e5b45630f8ba24d5516f590" resname="copyClipboardLabel">
<source>copyClipboardLabel</source>
<target state="new">copyClipboardLabel</target>
<jms:reference-file line="28">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="36">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="49">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="40">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="61">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="fc97186645dc71dae8e3221c8ce53c56e6d611bf" resname="dans %category%" approved="yes">
<source>dans %category%</source>
@@ -10758,9 +10758,9 @@
<trans-unit id="7ac5447a13806c0a2e2602b51644729fe8464e0e" resname="previewLinkLabel">
<source>previewLinkLabel</source>
<target state="new">previewLinkLabel</target>
<jms:reference-file line="27">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="35">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="48">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="39">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="47">prod/Share/record.html.twig</jms:reference-file>
<jms:reference-file line="60">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="6f25fd9ac189dce63bc51d1eccc253051ada2bf4" resname="print:: image de choix et description" approved="yes">
<source>print:: image de choix et description</source>
@@ -11073,6 +11073,7 @@
<trans-unit id="6ad73c8fd370f62ccd3bf50cd9cc3563aed5273c" resname="prod::tools: document">
<source>prod::tools: document</source>
<target state="new">prod::tools: document</target>
<jms:reference-file line="41">Controller/Prod/ShareController.php</jms:reference-file>
<jms:reference-file line="70">Controller/Prod/ToolsController.php</jms:reference-file>
</trans-unit>
<trans-unit id="61c9b2b17db77a27841bbeeabff923448b0f6388" resname="public" approved="yes">
@@ -12273,6 +12274,15 @@
<source>setup::custom-link:title-custom-link</source>
<target state="new">setup::custom-link:title-custom-link</target>
<jms:reference-file line="56">web/admin/setup.html.twig</jms:reference-file>
<trans-unit id="5107f9819cd4c0812c1d78cc07d24aff304c58fa" resname="share::share-record: advance">
<source>share::share-record: advance</source>
<target state="new">share::share-record: advance</target>
<jms:reference-file line="9">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="f51d8ca24dc67572beccf115c79671ba1c3f545a" resname="share::share-record: select-shared-def">
<source>share::share-record: select-shared-def</source>
<target state="new">share::share-record: select-shared-def</target>
<jms:reference-file line="11">prod/Share/record.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8ab6a8a0cf069e3783c6f59163ad03a051310556" resname="sport">
<source>sport</source>

BIN
resources/www/account/images/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 198 B

95
resources/www/admin/styles/main.scss
View File

@@ -336,6 +336,93 @@ div.switch_right.unchecked {
margin-top: 5px;
}
.alert .close {
text-decoration: none;
}
.subdefs [id^="box"] {
display: none;
}
.subdefs .subviews-submit {
position: fixed;
top: 75px;
right: 40px;
z-index: 1;
}
h2.subdefName {
display: inline-block;
margin-right: 1.5rem;
}
.reload, .loader, .status {
display: inline-block;
}
.langTab {
display: inline-block;
vertical-align: top;
}
.langTab h3{
font-weight: 700;
font-size: 13px;
margin: 4px 0;
line-height: 11px;
text-align: center;
}
.toggle{
display: block;
margin: 15px 0;
color: #08c;
cursor: pointer;
}
.subdefTab input, .langTab input{
margin: 0;
}
label[for="elasticsearch_settings_highlight"] {
display: inline-block;
margin-left: 0.5rem;
margin-bottom: 1rem;
}
input[id="elasticsearch_settings_highlight"] {
float: left;
}
#downbutton {
margin: 1rem 0;
}
#upbutton {
width: 100%;
text-align: left;
}
#upbutton i {
position: relative;
left: -5px;
}
#downbutton i {
position: relative;
left: -5px;
}
.form-horizontal .controls + div {
margin-left: 180px;
font-style: italic;
}
.ui-dialog .ui-dialog-content {
position: relative;
border: 0;
padding: .5em 1em;
background: none;
margin-bottom: 7rem;
overflow: visible;
}
/******* SETUP *******************************************************************/
#custom-link-table {
width: 100%;
@@ -433,6 +520,12 @@ span.simplecolorpicker.picker {
background-position: center center;
}
@media screen and (max-width: 1150px) {
.langTab{
display: block;
}
}
@import './databases';
@import './fields';
@import './tables';
@import './tables';

BIN
resources/www/common/images/icons/browse_basket.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 995 B

BIN
resources/www/common/images/icons/icon_audio.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 670 B

After

Width:  |  Height:  |  Size: 894 B

BIN
resources/www/common/images/icons/icon_collection_bin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
resources/www/common/images/icons/icon_document.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 382 B

BIN
resources/www/common/images/icons/icon_empty_bin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
resources/www/common/images/icons/icon_image.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 714 B

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resources/www/common/images/icons/icon_video.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 478 B

After

Width:  |  Height:  |  Size: 764 B

BIN
resources/www/common/images/icons/new_basket.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
resources/www/common/images/icons/new_report.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
resources/www/common/images/icons/sort_alpha.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 552 B

BIN
resources/www/common/images/icons/sort_date.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 321 B

10
resources/www/common/js/components/common.js
View File

@@ -31,11 +31,11 @@ var commonModule = (function ($, p4) {
$(this).removeClass('context-menu-item-hover');
});
$('#help-trigger').contextMenu('#mainMenu .helpcontextmenu', {openEvt: 'click', dropDown: true, theme: 'vista', dropDown: true,
showTransition: 'slideDown',
hideTransition: 'hide',
shadow: false
});
// $('#help-trigger').contextMenu('#mainMenu .helpcontextmenu', {openEvt: 'click', dropDown: true, theme: 'vista', dropDown: true,
// showTransition: 'slideDown',
// hideTransition: 'hide',
// shadow: false
// });
});
function showOverlay(n, appendto, callback, zIndex) {