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' into PHRAS-2196-api-stories-pagination

Browse Source
This commit is contained in:
Nicolas Maillat
2019-12-05 20:26:12 +01:00
committed by GitHub
parent 276d5a8ce6 700d01226c
commit a59c163bf2
7 changed files with 164 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

180
lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php
View File

@@ -354,7 +354,7 @@ class SubdefsController extends Controller
Subdef::TYPE_VIDEO => [ Subdef::TYPE_VIDEO => [
"definitions" => [ "definitions" => [
"video codec H264" => null, "video codec H264" => null,
"144P H264 128 kbps ACC 128kbps" => [ "144P H264 128 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "128", Video::OPTION_BITRATE => "128",
@@ -362,10 +362,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "256", Video::OPTION_SIZE => "256",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libx264", Video::OPTION_VCODEC => "libx264",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"240P H264 256 kbps ACC 128kbps" => [ "240P H264 256 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "256", Video::OPTION_BITRATE => "256",
@@ -373,10 +373,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "426", Video::OPTION_SIZE => "426",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libx264", Video::OPTION_VCODEC => "libx264",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"360P H264 576 kbps ACC 128kbps" => [ "360P H264 576 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "576", Video::OPTION_BITRATE => "576",
@@ -384,10 +384,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "480", Video::OPTION_SIZE => "480",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libtheora", Video::OPTION_VCODEC => "libtheora",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"480P H264 750 kbps ACC 128kbps" => [ "480P H264 750 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "750", Video::OPTION_BITRATE => "750",
@@ -395,10 +395,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "854", Video::OPTION_SIZE => "854",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libx264", Video::OPTION_VCODEC => "libx264",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"720P H264 1492 kbps ACC 128kbps" => [ "720P H264 1492 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "1492", Video::OPTION_BITRATE => "1492",
@@ -406,10 +406,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "1280", Video::OPTION_SIZE => "1280",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libx264", Video::OPTION_VCODEC => "libx264",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"1080P H264 2420 kbps ACC 128kbps" => [ "1080P H264 2420 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "2420", Video::OPTION_BITRATE => "2420",
@@ -417,11 +417,77 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "1920", Video::OPTION_SIZE => "1920",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libx264", Video::OPTION_VCODEC => "libx264",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"]
],
"144P H264 128 kbps AAC 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "128",
Video::OPTION_GOPSIZE => "25",
Video::OPTION_SIZE => "256",
Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libx264",
Video::OPTION_ACODEC => "libfdk_aac",
Subdef::OPTION_DEVICE => ["all"]
],
"240P H264 256 kbps AAC 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "256",
Video::OPTION_GOPSIZE => "25",
Video::OPTION_SIZE => "426",
Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libx264",
Video::OPTION_ACODEC => "libfdk_aac",
Subdef::OPTION_DEVICE => ["all"]
],
"360P H264 576 kbps AAC 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "576",
Video::OPTION_GOPSIZE => "25",
Video::OPTION_SIZE => "480",
Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libtheora",
Video::OPTION_ACODEC => "libfdk_aac",
Subdef::OPTION_DEVICE => ["all"]
],
"480P H264 750 kbps AAC 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "750",
Video::OPTION_GOPSIZE => "25",
Video::OPTION_SIZE => "854",
Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libx264",
Video::OPTION_ACODEC => "libfdk_aac",
Subdef::OPTION_DEVICE => ["all"]
],
"720P H264 1492 kbps AAC 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "1492",
Video::OPTION_GOPSIZE => "25",
Video::OPTION_SIZE => "1280",
Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libx264",
Video::OPTION_ACODEC => "libfdk_aac",
Subdef::OPTION_DEVICE => ["all"]
],
"1080P H264 2420 kbps AAC 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "2420",
Video::OPTION_GOPSIZE => "25",
Video::OPTION_SIZE => "1920",
Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libx264",
Video::OPTION_ACODEC => "libfdk_aac",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"video codec libvpx" => null, "video codec libvpx" => null,
"144P webm 128 kbps ACC 128kbps" => [ "144P webm 128 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "128", Video::OPTION_BITRATE => "128",
@@ -429,10 +495,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "256", Video::OPTION_SIZE => "256",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx", Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"240P webm 256 kbps ACC 128kbps" => [ "240P webm 256 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "256", Video::OPTION_BITRATE => "256",
@@ -440,10 +506,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "426", Video::OPTION_SIZE => "426",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx", Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"360P webm 576 kbps ACC 128kbps" => [ "360P webm 576 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "576", Video::OPTION_BITRATE => "576",
@@ -451,10 +517,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "480", Video::OPTION_SIZE => "480",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx", Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"480P webm 750 kbps ACC 128kbps" => [ "480P webm 750 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "750", Video::OPTION_BITRATE => "750",
@@ -462,10 +528,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "854", Video::OPTION_SIZE => "854",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx", Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"720P webm 1492 kbps ACC 128kbps" => [ "720P webm 1492 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "1492", Video::OPTION_BITRATE => "1492",
@@ -473,10 +539,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "1280", Video::OPTION_SIZE => "1280",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx", Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"1080P webm 2420 kbps ACC 128kbps" => [ "1080P webm 2420 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "2420", Video::OPTION_BITRATE => "2420",
@@ -484,7 +550,73 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "1920", Video::OPTION_SIZE => "1920",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx", Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"]
],
"144P webm 128 kbps AAC 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "128",
Video::OPTION_GOPSIZE => "25",
Video::OPTION_SIZE => "256",
Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfdk_aac",
Subdef::OPTION_DEVICE => ["all"]
],
"240P webm 256 kbps AAC 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "256",
Video::OPTION_GOPSIZE => "25",
Video::OPTION_SIZE => "426",
Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfdk_aac",
Subdef::OPTION_DEVICE => ["all"]
],
"360P webm 576 kbps AAC 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "576",
Video::OPTION_GOPSIZE => "25",
Video::OPTION_SIZE => "480",
Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfdk_aac",
Subdef::OPTION_DEVICE => ["all"]
],
"480P webm 750 kbps AAC 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "750",
Video::OPTION_GOPSIZE => "25",
Video::OPTION_SIZE => "854",
Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfdk_aac",
Subdef::OPTION_DEVICE => ["all"]
],
"720P webm 1492 kbps AAC 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "1492",
Video::OPTION_GOPSIZE => "25",
Video::OPTION_SIZE => "1280",
Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfdk_aac",
Subdef::OPTION_DEVICE => ["all"]
],
"1080P webm 2420 kbps AAC 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "2420",
Video::OPTION_GOPSIZE => "25",
Video::OPTION_SIZE => "1920",
Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfdk_aac",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
], ],

2
lib/Alchemy/Phrasea/Controller/Prod/PushController.php
View File

@@ -193,7 +193,7 @@ class PushController extends Controller
'Validation from %user%', [ 'Validation from %user%', [
'%user%' => $this->getAuthenticatedUser()->getDisplayName(), '%user%' => $this->getAuthenticatedUser()->getDisplayName(),
])); ]));
$validation_description = $request->request->get('validation_description'); $validation_description = $request->request->get('message');
$participants = $request->request->get('participants'); $participants = $request->request->get('participants');

2
lib/Alchemy/Phrasea/Media/Subdef/Video.php
View File

@@ -33,7 +33,7 @@ class Video extends Audio
$this->registerOption(new OptionType\Range($this->translator->trans('Frame Rate'), self::OPTION_FRAMERATE, 1, 200, 20)); $this->registerOption(new OptionType\Range($this->translator->trans('Frame Rate'), self::OPTION_FRAMERATE, 1, 200, 20));
$this->registerOption(new OptionType\Enum($this->translator->trans('Video Codec'), self::OPTION_VCODEC, ['libx264', 'libvpx', 'libtheora'], 'libx264')); $this->registerOption(new OptionType\Enum($this->translator->trans('Video Codec'), self::OPTION_VCODEC, ['libx264', 'libvpx', 'libtheora'], 'libx264'));
$this->unregisterOption(self::OPTION_ACODEC); $this->unregisterOption(self::OPTION_ACODEC);
$this->registerOption(new OptionType\Enum($this->translator->trans('Audio Codec'), self::OPTION_ACODEC, ['libfaac', 'libvo_aacenc', 'libmp3lame', 'libvorbis'], 'libfaac')); $this->registerOption(new OptionType\Enum($this->translator->trans('Audio Codec'), self::OPTION_ACODEC, ['libfaac', 'libvo_aacenc', 'libmp3lame', 'libvorbis', 'libfdk_aac'], 'libmp3lame'));
} }
public function getType() public function getType()

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

10
resources/www/common/styles/fonts/PhraseanetIcomoon/style.css
View File

@@ -1,13 +1,3 @@
@font-face {
font-family: 'icomoon';
src: url('fonts/icomoon.eot?81kpnc');
src: url('fonts/icomoon.eot?81kpnc#iefix') format('embedded-opentype'),
url('fonts/icomoon.ttf?81kpnc') format('truetype'),
url('fonts/icomoon.woff?81kpnc') format('woff'),
url('fonts/icomoon.svg?81kpnc#icomoon') format('svg');
font-weight: normal;
font-style: normal;
}
[class^="icon-"], [class*=" icon-"] { [class^="icon-"], [class*=" icon-"] {
/* use !important to prevent issues with browser extensions that change fonts */ /* use !important to prevent issues with browser extensions that change fonts */

13
templates/web/prod/WorkZone/Macros.html.twig
View File

@@ -16,9 +16,10 @@
<a class="workzone-menu-title" href="{{ path('prod_baskets_basket', { 'basket' : basket.getId() }) }}"> <a class="workzone-menu-title" href="{{ path('prod_baskets_basket', { 'basket' : basket.getId() }) }}">
<span> <span>
{% if not basket.isRead() %} {% if not basket.isRead() %}
<img src='/assets/common/images/icons/basket_push_unread.png' title=''/> <img src='/assets/common/images/icons/basket_feedback_unread.png' title=''/>
{% else %}
<img src='/assets/common/images/icons/basket_feedback_read.png' title=''/>
{% endif %} {% endif %}
<img src='/assets/common/images/icons/basket.png' title=''/>
{{basket.getName()|e}} {{basket.getName()|e}}
</span> </span>
</a> </a>
@@ -26,11 +27,9 @@
<table> <table>
<tr> <tr>
<td> <td>
<img <img title="{{ basket.getDescription()|e }}"
title="{{ basket.getDescription() }}" class="basket_title"
class="basketTips basket_title" src="/assets/common/images/icons/valid.png" />
src="/assets/common/images/icons/valid.png"
/>
</td> </td>
<td> <td>
<a class="contextMenuTrigger icon-display-grid" href="#"></a> <a class="contextMenuTrigger icon-display-grid" href="#"></a>