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

Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2504-ginga-subtitle

Browse Source
This commit is contained in:
aynsix
2020-07-08 18:04:47 +03:00
parent 8f3f3845c0 1cc45f9794
commit 1d243776e2
26 changed files with 811 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.env
View File

@@ -13,6 +13,8 @@ RABBITMQ_MANAGEMENT_PORT=10811
MYSQL_ROOT_PASSWORD=root
SERVER_NAME=phraseanet-docker
# --------------- GATEWAY TIMEOUT -----------------------
GATEWAY_SEND_TIMEOUT=120
# --------------- PHP CONFIGURATION --------------------
@@ -21,6 +23,9 @@ MAX_BODY_SIZE=2G
# Max input var
MAX_INPUT_VARS=12000
MAX_EXECUTION_TIME=120
MAX_INPUT_TIME=60
# Enable opcache ? (0/1)
OPCACHE_ENABLED=1
# session cache limiter (off/on)
@@ -34,6 +39,8 @@ PHP_LOG_LEVEL=warning
# These variables are used in the configuration.yml .
# set here the first user / email couple
#set to id of Phraseanet root account, if you want activate a sync for Phraseanet root account password provide by PHRASEANET_ADMIN_ACCOUNT_PASSWORD env value.
PHRASEANET_ADMIN_ACCOUNT_ID=
PHRASEANET_ADMIN_ACCOUNT_EMAIL=admin@alchemy.fr
PHRASEANET_ADMIN_ACCOUNT_PASSWORD=iJRqXU0MwbyJewQLBbra6IWHsWly
# Database parameters

4
docker-compose.yml
View File

@@ -19,6 +19,7 @@ services:
- phraseanet
environment:
- MAX_BODY_SIZE
- GATEWAY_SEND_TIMEOUT
ports:
- ${PHRASEANET_APP_PORT}:80
@@ -40,9 +41,12 @@ services:
- PHRASEANET_PROJECT_NAME
- MAX_BODY_SIZE
- MAX_INPUT_VARS
- MAX_EXECUTION_TIME
- MAX_INPUT_TIME
- OPCACHE_ENABLED
- SESSION_CACHE_LIMITER
- PHP_LOG_LEVEL
- PHRASEANET_ADMIN_ACCOUNT_ID
- PHRASEANET_ADMIN_ACCOUNT_EMAIL
- PHRASEANET_ADMIN_ACCOUNT_PASSWORD
- PHRASEANET_DB_HOST

2
docker/nginx/root/entrypoint.sh
View File

@@ -2,6 +2,6 @@
set -xe
cat /nginx.conf.sample | sed "s/\$MAX_BODY_SIZE/$MAX_BODY_SIZE/g" > /etc/nginx/conf.d/default.conf
cat /nginx.conf.sample | sed "s/\$MAX_BODY_SIZE/$MAX_BODY_SIZE/g" | sed "s/\$GATEWAY_SEND_TIMEOUT/$GATEWAY_SEND_TIMEOUT/g" > /etc/nginx/conf.d/default.conf
exec "$@"

1
docker/nginx/root/nginx.conf.sample
View File

@@ -1,3 +1,4 @@
send_timeout $GATEWAY_SEND_TIMEOUT;
upstream backend {
server phraseanet:9000;
}

6
docker/phraseanet/entrypoint.sh
View File

@@ -32,8 +32,8 @@ if [ -f "$FILE" ]; then
bin/setup system:config set registry.email.emitter-email $PHRASEANET_EMITTER_EMAIL
bin/setup system:config set registry.email.prefix $PHRASEANET_MAIL_OBJECT_PREFIX
fi
if [[ $PHRASEANET_ADMIN_ACCOUNT_PASSWORD ]]; then
bin/console user:password --user_id=1 --password $PHRASEANET_ADMIN_ACCOUNT_PASSWORD -y
if [[ -n ${PHRASEANET_ADMIN_ACCOUNT_ID} && $PHRASEANET_ADMIN_ACCOUNT_ID =~ ^[0-9]+$ ]]; then
bin/console user:password --user_id=$PHRASEANET_ADMIN_ACCOUNT_ID --password $PHRASEANET_ADMIN_ACCOUNT_PASSWORD -y
fi
else
@@ -58,7 +58,7 @@ chown -R app:app \
www
if [ -d "plugins/" ];then
chown -R app:app plugin;
chown -R app:app plugins;
fi
bash -e docker-php-entrypoint $@

4
docker/phraseanet/php.ini.sample
View File

@@ -380,7 +380,7 @@ expose_php = On
; Maximum execution time of each script, in seconds
; http://php.net/max-execution-time
; Note: This directive is hardcoded to 0 for the CLI SAPI
max_execution_time = 9999
max_execution_time = $MAX_EXECUTION_TIME
; Maximum amount of time each script may spend parsing request data. It's a good
; idea to limit this time on productions servers in order to eliminate unexpectedly
@@ -390,7 +390,7 @@ max_execution_time = 9999
; Development Value: 60 (60 seconds)
; Production Value: 60 (60 seconds)
; http://php.net/max-input-time
max_input_time = 60
max_input_time = $MAX_INPUT_TIME
; Maximum input variable nesting level
; http://php.net/max-input-nesting-level

2
lib/Alchemy/Phrasea/Application.php
View File

@@ -617,7 +617,7 @@ class Application extends SilexApplication
);
$this['tmp.lazaret.path'] = $factory->createDefinition(
['main', 'storage', 'quarantine'],
['main', 'storage', 'lazaret'],
function (Application $app) {
return $app['tmp.path'].'/lazaret';
}

2
lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusController.php
View File

@@ -1242,7 +1242,7 @@ class ThesaurusController extends Controller
$this->getDispatcher()->dispatch(WorkerEvents::POPULATE_INDEX, new PopulateIndexEvent($data));
return $this->app->json($data);
return $this->app->json(["status" => "success"]);
}
/**

2
package.json
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.241-d",
"phraseanet-production-client": "0.34.254-d",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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="2020-07-01T13:41:49Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<file date="2020-07-08T13:05:50Z" 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="2020-07-01T13:42:13Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<file date="2020-07-08T13:06:14Z" 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="2020-07-01T13:42:38Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<file date="2020-07-08T13:06:42Z" 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="2020-07-01T13:43:06Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<file date="2020-07-08T13:07:11Z" 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>

17
resources/www/common/styles/main.scss
View File

@@ -164,3 +164,20 @@ $mainMenuLinkBackgroundHoverColor: transparent;
}
.acceptDl-info {
background-color: #d9edf7;
border: 1px solid #bce8f1;
border-radius: 3px;
color: #3a87ad;
display: inline-block;
padding: 9px 24px 5px 9px;
margin-bottom: 20px;
text-shadow: 0 1px 0 rgba(255,255,255,.5);
a, label {
color: #3a87ad!important;
}
a {
text-decoration: underline;
}
}

22
resources/www/lightbox/styles/main.scss
View File

@@ -713,3 +713,25 @@ a.btn-info {
}
/** End Lightbox summary modal**/
.humane{
position: fixed;
z-index: 100000;
font-family: Ubuntu, Arial, sans-serif;
text-align: center;
font-size: 15px;
top: 100px;
right: 70px;
width: 400px;
background: #2d2d72;
color: rgb(255, 255, 255);
box-shadow: rgb(0, 0, 0) 0px 4px 4px -4px;
transform: translateY(-40px);
transition: all 0.3s ease-out 0s;
padding: 10px;
border-radius: 5px;
}
.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text {
padding: 0!important;
}

19
templates/web/common/dialog_export.html.twig
View File

@@ -152,9 +152,8 @@
</div>
{% endif %}
{{ _self.choose_title('download', choose_export_title, default_export_title) }}
{% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %}
<div class="well-small">
<div class="well-small acceptDl-info">
<label for="TOU_acceptDL" class="checkbox">
<input type="checkbox" name="TOU_accept" id="TOU_acceptDL" value="1" />
{% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}
@@ -177,9 +176,14 @@
<input type="hidden" name="lst" value="{{lst}}"/>
<input type="hidden" name="ssttid" value="{{ssttid}}"/>
<div>
{{ 'export::mail: destinataire' | trans }}
<span style="min-width: 21px;display: inline-block; ">
{{ 'export::mail: destinataire' | trans }}</span>
<input type="text" value="" name="destmail" class="required span4">
<div class="acceptDl-info" style="padding-top: 4px; margin-left: 25px;">
<span style="font-style: italic">{{ 'Entrez plusieurs adresses email en les separant par des points-virgules' | trans }}</span>
</div>
{% set my_email = app.getAuthenticatedUser().getEmail() %}
<div class="acceptDl-info">
{% if my_email != '' %}
<label class="checkbox">
<input type="checkbox" name="reading_confirm" value="1" />
@@ -191,7 +195,8 @@
<input type="checkbox" name="reading_confirm" value="1" readonly />
</label>
{% endif %}
<span style="font-style: italic; color: #999999;">{{ 'Entrez plusieurs adresses email en les separant par des points-virgules' | trans }}</span>
<span style="font-style: italic; color: #999999;">{{ 'export:email:: acknowledgement info' | trans }}</span>
</div>
</div>
<div>
<p>{{ 'export::mail: contenu du mail' | trans }}</p>
@@ -235,7 +240,7 @@
{{ _self.choose_title('sendmail', choose_export_title, default_export_title) }}
{% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %}
<div class="well-small">
<div class="well-small acceptDl-info">
<label for="TOU_acceptMail" class="checkbox">
<input type="checkbox" name="TOU_accept" id="TOU_acceptMail" value="1" />
{% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}
@@ -388,7 +393,7 @@
</div>
{% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %}
<div class="well-small">
<div class="well-small acceptDl-info">
<label for="TOU_acceptOrder" class="checkbox">
<input type="checkbox" name="TOU_accept" id="TOU_acceptOrder" value="1" />
{% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}
@@ -469,7 +474,7 @@
{% endif %}
{% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %}
<div class="well-small">
<div class="well-small acceptDl-info">
<label for="TOU_acceptFTP" class="checkbox">
<input type="checkbox" name="TOU_accept" id="TOU_acceptFTP" value="1" />
{% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}

4
templates/web/lightbox/index.html.twig
View File

@@ -11,10 +11,6 @@
<link type="text/css" rel="stylesheet" href="/assets/lightbox/css/lightbox{% if not app.debug %}.min{% endif %}.css" media="screen"/>
{% endblock %}
{% block icon %}
<link rel="shortcut icon" type="image/x-icon" href="/assets/lightbox/images/favicon.ico">
{% endblock %}
{% block content %}
<div id="main_index" style="margin-top:50px;">
<table id="main_wrapper" cellspacing="0" cellpadding="0">

3
templates/web/lightbox/index_layout.html.twig
View File

@@ -1,5 +1,8 @@
{% extends "common/index_bootstrap.html.twig" %}
{% block icon %}
<link rel="shortcut icon" type="image/x-icon" href="/assets/lightbox/images/favicon.ico">
{% endblock %}
{% block extra_content %}
<div id="DIALOG"></div>
{% endblock %}

1
templates/web/lightbox/validate.html.twig
View File

@@ -15,6 +15,7 @@
{% block content %}
{% set basket_element = basket.getElements().first() %}
<div class="PNB10">
<input type="hidden" id="export-send-mail-notif" value="{{ 'prod::export: send mail notification' | trans }} ">
<div class="PNB" id="top_container">
<div id="record_wrapper" class="PNB single" style="right:250px;">
<div id="record_main" class="PNB record_display_box" style="bottom:auto;right:auto;">

4
templates/web/prod/actions/Tools/videoEditor.html.twig
View File

@@ -92,7 +92,9 @@
</video>
</div>
<div class="videotools-spinner ui-widget-overlay ui-front hidden" id="videotools-spinner" style="opacity: 0.9">
<img src="/assets/common/images/icons/loading.svg" alt="" id="gif-loader">
</div>
<div id="thumb_camera_button"></div>
<div class="vertical-divider"></div>

2
templates/web/prod/actions/publish/publish.html.twig
View File

@@ -45,7 +45,7 @@
<label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b> &nbsp;<span>( {{ 'publication : title warning' | trans }} )</span></label>
<input class="required_text input-block-level" style="max-width:500px" type="text" name="title" id="feed_add_title" value="{{title}}" />
<label><span class="feed_title_warning feed_warning">{{ 'publication : title alert' | trans }}</span></label>
<label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b> &nbsp;<span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle warning' | trans }}</span></label>
<label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b> &nbsp;<span>( {{ 'publication : subtitle warning' | trans }} )</span></label>
<textarea id="feed_add_subtitle" style="max-width:500px" class="input-block-level" name="subtitle" rows="5">{{desc}}</textarea>
<label><span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle alert' | trans }}</span></label>
<label for="feed_add_author_name"><b>{{ 'publication : autheur' | trans }}</b></label>

8
yarn.lock
View File

@@ -7678,10 +7678,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0"
pym.js "^1.3.1"
phraseanet-production-client@0.34.241-d:
version "0.34.241-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.241-d.tgz#a23d12ccb8f41ee86bb6acb4c56524c0415090fa"
integrity sha512-iEnl9MIPNM6+9ZYn0J6OB6SWABql94xMPfL/Mi3NKQbK8UQumKK2styQmuiDRTgdGjdyyUo+B+96KlMuiS/L6w==
phraseanet-production-client@0.34.254-d:
version "0.34.254-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.254-d.tgz#52a798b8c1f9994cf677db6ad6aeb9909c811f80"
integrity sha512-EvTbTbDbdoWGfqZtqJGEl6xeE6vyk43IF5eVMCy7c6qkaYjTuyiTqvI8eMXSJ2gKvsEidaa6AsHigUL9lKuVcA==
dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6"