From fdb67c74d9a1bdd3a9602ec7a5dbe60294dc5769 Mon Sep 17 00:00:00 2001 From: aynsix Date: Wed, 17 Jul 2019 17:16:29 +0400 Subject: [PATCH 01/26] fix port to 4.1 extract xmp:PageImage indesign --- composer.lock | 12 ++++----- lib/Alchemy/Phrasea/Media/SubdefGenerator.php | 26 ++++++++++++++----- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/composer.lock b/composer.lock index 5721974b41..194fd91634 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "64830cb4d53b32b47e02d4a19df9cef2", + "content-hash": "6341722edcd5bfa22e933f5411225144", "packages": [ { "name": "alchemy-fr/tcpdf-clone", @@ -383,16 +383,16 @@ }, { "name": "alchemy/phpexiftool", - "version": "0.7.0", + "version": "0.7.2", "source": { "type": "git", "url": "https://github.com/alchemy-fr/PHPExiftool.git", - "reference": "7372ca4e43473328bf06bca810558fbad7bb2f95" + "reference": "ba1cb51eceb6562d7996023478977a8739de188b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/PHPExiftool/zipball/7372ca4e43473328bf06bca810558fbad7bb2f95", - "reference": "7372ca4e43473328bf06bca810558fbad7bb2f95", + "url": "https://api.github.com/repos/alchemy-fr/PHPExiftool/zipball/ba1cb51eceb6562d7996023478977a8739de188b", + "reference": "ba1cb51eceb6562d7996023478977a8739de188b", "shasum": "" }, "require": { @@ -452,7 +452,7 @@ "exiftool", "metadata" ], - "time": "2017-05-18T19:04:04+00:00" + "time": "2019-02-13T13:06:43+00:00" }, { "name": "alchemy/queue-bundle", diff --git a/lib/Alchemy/Phrasea/Media/SubdefGenerator.php b/lib/Alchemy/Phrasea/Media/SubdefGenerator.php index 2dede228c5..88867551a1 100644 --- a/lib/Alchemy/Phrasea/Media/SubdefGenerator.php +++ b/lib/Alchemy/Phrasea/Media/SubdefGenerator.php @@ -61,7 +61,7 @@ class SubdefGenerator public function generateSubdefs(\record_adapter $record, array $wanted_subdefs = null) { - if ($record->get_hd_file() !== null) { + if ($record->get_hd_file() !== null && $record->get_hd_file()->getMimeType() == "application/x-indesign") { $mediaSource = $this->mediavorus->guess($record->get_hd_file()->getPathname()); $metadatas = $mediaSource->getMetadatas(); @@ -69,15 +69,27 @@ class SubdefGenerator if(!isset($this->tmpFilesystem)){ $this->tmpFilesystem = Manager::create(); } - $tmpDir = $this->tmpFilesystem->createTemporaryDirectory(); + $tmpDir = $this->tmpFilesystem->createTemporaryDirectory(0777, 500); - try { - $this->app['filesystem']->dumpFile($tmpDir.'/file.jpg', $metadatas->get('XMP-xmp:PageImage')->getValue()->asString()); - $this->tmpFilePath = $tmpDir.'/file.jpg'; - } catch (\Exception $e) { - $this->logger->error(sprintf('Unable to write temporary file : %s', $e->getMessage())); + $files = $this->app['exiftool.preview-extractor']->extract($record->get_hd_file()->getPathname(), $tmpDir); + + $selected = null; + $size = null; + + foreach ($files as $file) { + if ($file->isDir() || $file->isDot()) { + continue; + } + + if (is_null($selected) || $file->getSize() > $size) { + $selected = $file->getPathname(); + $size = $file->getSize(); + } } + if ($selected) { + $this->tmpFilePath = $selected; + } } } From f185558de74f846cfa68d05399f828f8453ce533 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 2 Aug 2019 13:48:48 +0400 Subject: [PATCH 02/26] PHRAS-2688 #comment Port 41 of Prod workzone: Change type of numbering #time 1h --- lib/Alchemy/Phrasea/Controller/Prod/QueryController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php b/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php index a362540935..12685f1119 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php @@ -317,7 +317,7 @@ class QueryController extends Controller ' . '' - . $this->app->trans('%total% reponses', ['%total%' => ''.$result->getTotal().'']) . ''; + . $this->app->trans('%total% reponses', ['%total%' => ''.number_format($result->getTotal(),null, null, ' ').'']) . ''; $json['infos'] = $infoResult; $json['navigationTpl'] = $string; From 366c48673397dc537de4a6d209df5a17354fd0c0 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 7 Aug 2019 16:43:53 +0400 Subject: [PATCH 03/26] PHRAS-2282 #comment add new design #time 24h --- .../prod/WorkZone/Browser/Browser.html.twig | 6 ++-- .../prod/WorkZone/Browser/Results.html.twig | 32 ++++++------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/templates/web/prod/WorkZone/Browser/Browser.html.twig b/templates/web/prod/WorkZone/Browser/Browser.html.twig index 7ba9370ec7..ce831a2b42 100644 --- a/templates/web/prod/WorkZone/Browser/Browser.html.twig +++ b/templates/web/prod/WorkZone/Browser/Browser.html.twig @@ -1,7 +1,7 @@ -
+
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig index 47ba7802dd..71e43ef98c 100644 --- a/templates/web/prod/WorkZone/Browser/Results.html.twig +++ b/templates/web/prod/WorkZone/Browser/Results.html.twig @@ -7,24 +7,9 @@ {% if Total == 0 %} {{ 'No results' | trans }} {% elseif Total == 1 %} - {{ '1 result' | trans }} + {{ 'Result' | trans }} {% else %} - {% trans with {'%Total%' : Total} %}%Total% results{% endtrans %} - {% endif %} - - - {% if Page - 1 > 0 %} - - - - {% endif %} - - Page {{ Page }} / {{ MaxPage }} - - {% if Page + 1 <= MaxPage %} - - - + {{ 'Results' | trans }} {% endif %} @@ -35,18 +20,16 @@ {% for Basket in Baskets %}
× -
+
+
{% set BasketElement = Basket.getElements().first() %} {% if BasketElement %} - {{thumbnail.format(BasketElement.getRecord(app).get_thumbnail(), 80, 80, '', true, false)}} + {{thumbnail.format(BasketElement.getRecord(app).get_thumbnail(), 150, 106, '', true, false)}} {% endif %} -
- {{ Basket.getElements().count() }} -
 

@@ -64,9 +47,12 @@ {% endif %} {{ Basket.getName() }} - +
+ {{ Basket.getElements().count() }} {{ ' records' }} +

+ {% if Basket.getPusher() %}

{% set user_name = '' ~ Basket.getPusher(app).get_display_name() ~ '' %} From e7ec57346a46ce366f02a632038f6a696c1e5b2f Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Thu, 8 Aug 2019 13:56:44 +0400 Subject: [PATCH 04/26] PRHAS-2282 #comment fix JY comments --- templates/web/prod/WorkZone/Browser/Results.html.twig | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig index 71e43ef98c..908de424c2 100644 --- a/templates/web/prod/WorkZone/Browser/Results.html.twig +++ b/templates/web/prod/WorkZone/Browser/Results.html.twig @@ -4,13 +4,9 @@
- {% if Total == 0 %} - {{ 'No results' | trans }} - {% elseif Total == 1 %} - {{ 'Result' | trans }} - {% else %} - {{ 'Results' | trans }} - {% endif %} + {% transchoice Total %} + {0} No results|{1} Result|]1,Inf[ Results + {% endtranschoice %}
From 772b1026320c652c2cf99d3fbb65632a9379c90b Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 12 Aug 2019 16:40:58 +0400 Subject: [PATCH 05/26] PHRAS-2282 #time 4h --- templates/web/prod/WorkZone/Browser/Browser.html.twig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/web/prod/WorkZone/Browser/Browser.html.twig b/templates/web/prod/WorkZone/Browser/Browser.html.twig index ce831a2b42..5ca65cf7e4 100644 --- a/templates/web/prod/WorkZone/Browser/Browser.html.twig +++ b/templates/web/prod/WorkZone/Browser/Browser.html.twig @@ -84,3 +84,8 @@

+ From 947b97ee0ba84677aaff2a781a0143e50ee45f81 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 13 Aug 2019 11:06:57 +0400 Subject: [PATCH 06/26] PHRAS-2706 --- lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php index 6304f3eaa6..ee65e0bd1e 100644 --- a/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php +++ b/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php @@ -212,8 +212,7 @@ class BasketRepository extends EntityRepository case self::RECEIVED: $dql = 'SELECT b FROM Phraseanet:Basket b - JOIN b.elements e - WHERE b.user = :usr_id AND b.pusher_id IS NOT NULL'; + JOIN b.elements e'; $params = [ 'usr_id' => $user->getId() ]; From 074e1cf9ea66b0963e466347f5c65140fbc27cfd Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 13 Aug 2019 11:35:06 +0400 Subject: [PATCH 07/26] PHRAS-2282 commit to run circle ci test --- templates/web/prod/WorkZone/Browser/Browser.html.twig | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/web/prod/WorkZone/Browser/Browser.html.twig b/templates/web/prod/WorkZone/Browser/Browser.html.twig index 5ca65cf7e4..1545366eac 100644 --- a/templates/web/prod/WorkZone/Browser/Browser.html.twig +++ b/templates/web/prod/WorkZone/Browser/Browser.html.twig @@ -88,4 +88,5 @@ .dialog-Medium { height: 523px!important; } + From 8987e2dba5cf066c8b69dba4dd51e0d16c6fef54 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 13 Aug 2019 11:39:57 +0400 Subject: [PATCH 08/26] PHRAS-2688 commit to run ccircle ci test --- lib/Alchemy/Phrasea/Controller/Prod/QueryController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php b/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php index 12685f1119..1e8724c0ee 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php @@ -179,7 +179,6 @@ class QueryController extends Controller }; $userManipulator->setUserSetting($user, 'last_jsonquery', (string)$request->request->get('jsQuery')); - $jsQuery = @json_decode((string)$request->request->get('jsQuery'), true); if(($ft = $findFulltext($jsQuery['query'])) !== null) { $userManipulator->setUserSetting($user, 'start_page_query', $ft); From 0d84aa040afb2c77a83604799e01d84b77cb99e2 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 14 Aug 2019 16:18:15 +0400 Subject: [PATCH 09/26] PHRAS-2282 #comment fix next page or previous page display for results #time 3h --- .../prod/WorkZone/Browser/Browser.html.twig | 9 ++++++- .../prod/WorkZone/Browser/Results.html.twig | 24 +++++++++++++++---- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/templates/web/prod/WorkZone/Browser/Browser.html.twig b/templates/web/prod/WorkZone/Browser/Browser.html.twig index 1545366eac..fad351dc25 100644 --- a/templates/web/prod/WorkZone/Browser/Browser.html.twig +++ b/templates/web/prod/WorkZone/Browser/Browser.html.twig @@ -88,5 +88,12 @@ .dialog-Medium { height: 523px!important; } - +.paginator a { + background: none!important; + border: 0; + border-radius: 0; + padding: 0 9px; + font-weight: bold; +} + diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig index 908de424c2..041a246a41 100644 --- a/templates/web/prod/WorkZone/Browser/Results.html.twig +++ b/templates/web/prod/WorkZone/Browser/Results.html.twig @@ -99,19 +99,35 @@ 		{% if Page - 1 > 0 %} - - + + < {% endif %} Page {{ Page }} / {{ MaxPage }} {% if Page + 1 <= MaxPage %} - - + + > {% endif %}
+ From 816225036f0c96eb90de58d8d11fe500ec90d33e Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 14 Aug 2019 16:26:16 +0400 Subject: [PATCH 10/26] PHRAS-2282 add loader on results display --- templates/web/prod/WorkZone/Browser/Browser.html.twig | 6 ++++++ templates/web/prod/WorkZone/Browser/Results.html.twig | 2 ++ 2 files changed, 8 insertions(+) diff --git a/templates/web/prod/WorkZone/Browser/Browser.html.twig b/templates/web/prod/WorkZone/Browser/Browser.html.twig index fad351dc25..91ca5054c5 100644 --- a/templates/web/prod/WorkZone/Browser/Browser.html.twig +++ b/templates/web/prod/WorkZone/Browser/Browser.html.twig @@ -95,5 +95,11 @@ padding: 0 9px; font-weight: bold; } +.result_loader { + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); +} diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig index 041a246a41..1985bcaec4 100644 --- a/templates/web/prod/WorkZone/Browser/Results.html.twig +++ b/templates/web/prod/WorkZone/Browser/Results.html.twig @@ -119,6 +119,7 @@ //load the next result page jQuery(document).ready(function(){ jQuery('.next_res').click(function(){ + jQuery('.results').append(''); jQuery('.results').load($(this).attr('href')); return false; }); @@ -126,6 +127,7 @@ //load the prev result page jQuery(document).ready(function(){ jQuery('.prev_res').click(function(){ + jQuery('.results').append(''); jQuery('.results').load($(this).attr('href')); return false; }); From 80b4c9a6a6c9e844a5c187471c595f334346b6b3 Mon Sep 17 00:00:00 2001 From: Xavier Rousset Date: Wed, 14 Aug 2019 15:45:04 +0200 Subject: [PATCH 11/26] PHRAS-2127 | Add https in default geoname server url, remove url formatter in register controller --- lib/Alchemy/Phrasea/Application.php | 2 +- lib/Alchemy/Phrasea/Controller/Root/LoginController.php | 2 +- .../Phrasea/Core/Configuration/RegistryFormManipulator.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php index f586a4f93a..743f9cc664 100644 --- a/lib/Alchemy/Phrasea/Application.php +++ b/lib/Alchemy/Phrasea/Application.php @@ -653,7 +653,7 @@ class Application extends SilexApplication private function setupGeonames() { $this['geonames.server-uri'] = $this->share(function (Application $app) { - return $app['conf']->get(['registry', 'webservices', 'geonames-server'], 'http://geonames.alchemyasp.com/'); + return $app['conf']->get(['registry', 'webservices', 'geonames-server'], 'https://geonames.alchemyasp.com/'); }); } diff --git a/lib/Alchemy/Phrasea/Controller/Root/LoginController.php b/lib/Alchemy/Phrasea/Controller/Root/LoginController.php index ecb65abc47..c0a05be25f 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/LoginController.php +++ b/lib/Alchemy/Phrasea/Controller/Root/LoginController.php @@ -265,7 +265,7 @@ class LoginController extends Controller return $this->render('login/register-classic.html.twig', array_merge( $this->getDefaultTemplateVariables($request), [ - 'geonames_server_uri' => str_replace(sprintf('%s:', parse_url($url, PHP_URL_SCHEME)), '', $url), + 'geonames_server_uri' => $url, 'form' => $form->createView() ])); } diff --git a/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php b/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php index fbf4526d05..fbce72ccc7 100644 --- a/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php +++ b/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php @@ -146,7 +146,7 @@ class RegistryFormManipulator ], 'webservices' => [ 'google-charts-enabled' => true, - 'geonames-server' => 'http://geonames.alchemyasp.com/', + 'geonames-server' => 'https://geonames.alchemyasp.com/', 'captchas-enabled' => false, 'recaptcha-public-key' => '', 'recaptcha-private-key' => '', From 80dcf98e1f34abbabce54b470845319deaf7051e Mon Sep 17 00:00:00 2001 From: aynsix Date: Mon, 19 Aug 2019 15:24:04 +0400 Subject: [PATCH 12/26] fix basket browser windows nok --- templates/web/prod/WorkZone/Browser/Results.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig index 47ba7802dd..71c0cc038a 100644 --- a/templates/web/prod/WorkZone/Browser/Results.html.twig +++ b/templates/web/prod/WorkZone/Browser/Results.html.twig @@ -69,7 +69,7 @@ {% if Basket.getPusher() %}

- {% set user_name = '' ~ Basket.getPusher(app).get_display_name() ~ '' %} + {% set user_name = '' ~ Basket.getPusher(app).getDisplayName() ~ '' %} {% trans with {'%user_name%' : user_name} %}Received from %user_name%{% endtrans %}

{% endif %} From 645ae0e7779839d71a3e4993d8bbcabd3c7541c3 Mon Sep 17 00:00:00 2001 From: aynsix Date: Wed, 28 Aug 2019 16:41:34 +0400 Subject: [PATCH 13/26] fix api: remove temporary file when upload --- .../Phrasea/Controller/Api/V1Controller.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php b/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php index 54c246a897..d8c085fb62 100644 --- a/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php +++ b/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php @@ -944,7 +944,7 @@ class V1Controller extends Controller } $originalName = $pi['filename'] . '.' . $pi['extension']; - $newPathname = $tempfile; + $uploadedFilename = $newPathname = $tempfile; } } else { @@ -956,8 +956,11 @@ class V1Controller extends Controller if (!$file->isValid()) { return $this->getBadRequestAction($request, 'Data corrupted, please try again'); } + + $uploadedFilename = $file->getPathname(); $originalName = $file->getClientOriginalName(); $newPathname = $file->getPathname() . '.' . $file->getClientOriginalExtension(); + if (false === rename($file->getPathname(), $newPathname)) { return Result::createError($request, 403, 'Error while renaming file')->createResponse(); } @@ -1010,6 +1013,11 @@ class V1Controller extends Controller $nosubdef = $request->get('nosubdefs') === '' || \p4field::isyes($request->get('nosubdefs')); $this->getBorderManager()->process($session, $Package, $callback, $behavior, $nosubdef); + // remove $newPathname on temporary directory + if ($newPathname !== $uploadedFilename) { + @rename($newPathname, $uploadedFilename); + } + $ret = ['entity' => null]; if ($output instanceof \record_adapter) { @@ -1081,6 +1089,11 @@ class V1Controller extends Controller } } + // remove $newPathname on temporary directory + if ($renamedFilename !== $uploadedFilename) { + @rename($renamedFilename, $uploadedFilename); + } + return Result::create($request, $ret)->createResponse(); } From fe087a9dc5d6ed4ff97e428eb6eb8f524f1b7d09 Mon Sep 17 00:00:00 2001 From: aynsix Date: Wed, 4 Sep 2019 12:09:53 +0400 Subject: [PATCH 14/26] fix user creation from push and feedback window --- .../Phrasea/Controller/Prod/PushController.php | 11 ++++++++--- templates/web/admin/editusers.html.twig | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php index 569537fed3..f9ce528e41 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php @@ -463,6 +463,8 @@ class PushController extends Controller } try { + $manager = $this->getEntityManager(); + $password = $this->getRandomGenerator()->generateString(128); $user = $this->getUserManipulator()->createUser($email, $password, $email); @@ -476,12 +478,15 @@ class PushController extends Controller $user->setCompany($request->request->get('company')); } if ($request->request->get('job')) { - $user->setCompany($request->request->get('job')); + $user->setJob($request->request->get('job')); } - if ($request->request->get('form_geonameid')) { - $this->getUserManipulator()->setGeonameId($user, $request->request->get('form_geonameid')); + if ($request->request->get('city')) { + $this->getUserManipulator()->setGeonameId($user, $request->request->get('city')); } + $manager->persist($user); + $manager->flush(); + $result['message'] = $this->app->trans('User successfully created'); $result['success'] = true; $result['user'] = $this->formatUser($user); diff --git a/templates/web/admin/editusers.html.twig b/templates/web/admin/editusers.html.twig index 4b07dea1d3..2421976775 100644 --- a/templates/web/admin/editusers.html.twig +++ b/templates/web/admin/editusers.html.twig @@ -512,7 +512,7 @@ {{ 'admin::compte-utilisateur poste' | trans }} - + @@ -528,7 +528,7 @@ {{ 'admin::compte-utilisateur activite' | trans }} - + From 16d14462686b053a253cd8efdd971221648cde14 Mon Sep 17 00:00:00 2001 From: aynsix Date: Thu, 5 Sep 2019 18:15:07 +0400 Subject: [PATCH 15/26] fix unit test setstatus --- .../Phrasea/Controller/Api/ApiJsonTest.php | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php index d78194c4d7..10737230f8 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php @@ -1301,6 +1301,27 @@ class ApiJsonTest extends ApiTestCase $this->assertEquals(substr($record_status, ($n), 1), $tochange[$n]); } + // test record_status in string + $record_status_expected = $record_status; + unset($tochange); + + $pos = strpos($record_status, '1'); + $tochange[$pos] = '1'; + + $response = $this->request('POST', $route, $this->getParameters(['status' => $tochange]), ['HTTP_Accept' => $this->getAcceptMimeType()]); + $content = $this->unserialize($response->getContent()); + + // Get fresh record_1 + $testRecord = new \record_adapter($app, $testRecord->getDataboxId(), $testRecord->getRecordId()); + + $this->evaluateResponse200($response); + $this->evaluateMeta200($content); + + $this->evaluateRecordsStatusResponse($testRecord, $content); + + $record_new_status = strrev($testRecord->getStatus()); + $this->assertEquals($record_status_expected, $record_new_status); + $record1->setStatus(str_repeat('0', 32)); } From 4d4e5368b1c1c107397d5936ce36c1d113068e54 Mon Sep 17 00:00:00 2001 From: aynsix Date: Fri, 6 Sep 2019 11:14:20 +0400 Subject: [PATCH 16/26] fix --- tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php index 10737230f8..a9f974abc9 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php @@ -1305,6 +1305,7 @@ class ApiJsonTest extends ApiTestCase $record_status_expected = $record_status; unset($tochange); + $tochange = []; $pos = strpos($record_status, '1'); $tochange[$pos] = '1'; From 432eb7c2554d3c2d3391c56986fe496485e25d84 Mon Sep 17 00:00:00 2001 From: aynsix Date: Fri, 6 Sep 2019 12:26:11 +0400 Subject: [PATCH 17/26] fix unit test setstatus --- .../Phrasea/Controller/Api/ApiJsonTest.php | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php index a9f974abc9..bad05dccc7 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php @@ -1281,6 +1281,27 @@ class ApiJsonTest extends ApiTestCase $this->assertEquals(substr($record_status, ($n), 1), $tochange[$n]); } + // test record_status in string + $record_status_expected = $record_status; + + $pos = strpos($record_status, '1'); + $bitToChange[$pos] = '1'; + + $response = $this->request('POST', $route, $this->getParameters(['status' => $bitToChange]), ['HTTP_Accept' => $this->getAcceptMimeType()]); + $content = $this->unserialize($response->getContent()); + + // Get fresh record_1 + $testRecord = new \record_adapter($app, $testRecord->getDataboxId(), $testRecord->getRecordId()); + + $this->evaluateResponse200($response); + $this->evaluateMeta200($content); + + $this->evaluateRecordsStatusResponse($testRecord, $content); + + $record_new_status = strrev($testRecord->getStatus()); + $this->assertEquals($record_status_expected, $record_new_status); + + foreach ($tochange as $n => $value) { $tochange[$n] = $value == '0' ? '1' : '0'; } @@ -1301,28 +1322,6 @@ class ApiJsonTest extends ApiTestCase $this->assertEquals(substr($record_status, ($n), 1), $tochange[$n]); } - // test record_status in string - $record_status_expected = $record_status; - unset($tochange); - - $tochange = []; - $pos = strpos($record_status, '1'); - $tochange[$pos] = '1'; - - $response = $this->request('POST', $route, $this->getParameters(['status' => $tochange]), ['HTTP_Accept' => $this->getAcceptMimeType()]); - $content = $this->unserialize($response->getContent()); - - // Get fresh record_1 - $testRecord = new \record_adapter($app, $testRecord->getDataboxId(), $testRecord->getRecordId()); - - $this->evaluateResponse200($response); - $this->evaluateMeta200($content); - - $this->evaluateRecordsStatusResponse($testRecord, $content); - - $record_new_status = strrev($testRecord->getStatus()); - $this->assertEquals($record_status_expected, $record_new_status); - $record1->setStatus(str_repeat('0', 32)); } From 418b86c0ba3dc67f856f16bcff3af860a8f7903e Mon Sep 17 00:00:00 2001 From: aynsix Date: Fri, 6 Sep 2019 16:20:17 +0400 Subject: [PATCH 18/26] initialize status structure for test --- .../Phrasea/Controller/Api/ApiJsonTest.php | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php index bad05dccc7..c8f2cdb254 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJsonTest.php @@ -14,6 +14,7 @@ use Alchemy\Phrasea\Model\Entities\LazaretSession; use Alchemy\Phrasea\Model\Entities\Task; use Alchemy\Phrasea\Model\Entities\User; use Alchemy\Phrasea\SearchEngine\SearchEngineOptions; +use Alchemy\Phrasea\Status\StatusStructureProviderInterface; use Doctrine\Common\Collections\ArrayCollection; use Guzzle\Common\Exception\GuzzleException; use Ramsey\Uuid\Uuid; @@ -1256,13 +1257,33 @@ class ApiJsonTest extends ApiTestCase $record1 = $this->getRecord1(); $route = '/api/v1/records/' . $record1->getDataboxId() . '/' . $record1->getRecordId() . '/setstatus/'; - $record_status = strrev($record1->getStatus()); + $initialRecordStatus = $record_status = strrev($record1->getStatus()); + + /** @var StatusStructureProviderInterface $statusProvider */ + $statusProvider = $app['status.provider']; + + // initialize status structure for test eg: 4 to 15 bit + foreach (range(4, 15) as $n) { + $properties = [ + 'searchable' => '0', + 'printable' => '0', + 'name' => 'status_test_' . $n, + 'labelon' => '', + 'labeloff' => '', + 'labels_on' => [], + 'labels_off' => [], + ]; + + $statusProvider->updateStatus($record1->getStatusStructure(), $n, $properties); + } + $statusStructure = $record1->getStatusStructure(); $tochange = []; foreach ($statusStructure as $n => $datas) { $tochange[$n] = substr($record_status, ($n - 1), 1) == '0' ? '1' : '0'; } + $this->evaluateMethodNotAllowedRoute($route, ['GET', 'PUT', 'DELETE']); $response = $this->request('POST', $route, $this->getParameters(['status' => $tochange]), ['HTTP_Accept' => $this->getAcceptMimeType()]); @@ -1322,6 +1343,8 @@ class ApiJsonTest extends ApiTestCase $this->assertEquals(substr($record_status, ($n), 1), $tochange[$n]); } + $this->assertEquals($initialRecordStatus, $record_status); + $record1->setStatus(str_repeat('0', 32)); } From 02126193142d6b2314a910297910db5299a02a67 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 10 Sep 2019 14:03:51 +0400 Subject: [PATCH 19/26] PHRAS-2282 #comment upgrade phraseanet-production-client@0.34.63-d #time 2h --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d93ac787a6..db6d50a49b 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "^0.34.53-d", + "phraseanet-production-client": "0.34.63-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index c469bd7d52..471f86bfba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7555,10 +7555,10 @@ phraseanet-common@^0.4.1: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@^0.34.53-d: - version "0.34.53-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.53-d.tgz#517e5d9ccae2f1f0f3cdb7ac194e70579cbcc65f" - integrity sha512-/Vd5kd/YRapDpUWzBZZvm5hHwieXdU2cBEtC3D/FPbeSEI3dmYEDnuznDxBafPZvep65KdAtufPw+B6ulWNgBQ== +phraseanet-production-client@0.34.63-d: + version "0.34.63-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.63-d.tgz#0b74aa2188002effedd143d4c16364007daad672" + integrity sha512-kjySO4v4KALrr7UC/6WacSn/2s4pEaiY98iqejoK2rkzZEsuVOUKyuifxfTaX4xkFSfSwf5F0RA2n43JJbDGHA== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From a1ce905c730cd1d5113b50440983f93cbd20aec1 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Thu, 12 Sep 2019 17:31:01 +0400 Subject: [PATCH 20/26] PHRAS-2282 #comment Add fix #time 3h --- .../www/prod/images/Basket/Browser/archive.png | Bin 682 -> 1756 bytes .../prod/images/Basket/Browser/archived.png | Bin 802 -> 1694 bytes .../prod/WorkZone/Browser/Results.html.twig | 10 +++------- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/resources/www/prod/images/Basket/Browser/archive.png b/resources/www/prod/images/Basket/Browser/archive.png index f7373f9614bb55930cf69743f28ed9193e83aa2c..6015eafc48cb8560f4191eee8397bb7e0ef755b9 100644 GIT binary patch literal 1756 zcmV<21|#{2P)Px*mPtfGR9FeES8qt2RTw|_kGrO06D6CiFISW>om;pmnmV_M6a<1y`_$ZETT#rh z52Jl35CSQJXwrxBOKVAxi2Gnr6OEkz1hh%!HjrGd^hSN^-+e!s{2ynElfd+#>b z1JC>XInQ~{bIy6rbIxnbLvTH0!QHxbE7;uJ93+M4a`Qur8#iu{5Ij@{S65dD&YwRo z8hirE(Ao=h_@y8Ue&XPK9n{Rt%@w=H$H)Jm(AU>z_U_%=OFo{%heFsz1%ab_$f##m zeSN*Jy1M#5DhZpLn_unUzyCe3K^bvuZ0r}0$5S>mG-L(`2hF~H`^?d!N5wchJ6k4V za&vR5soA}Ix8a2D-@h*gYinzLU|iO45T2tQa0iex{s*`M+)^X(0(O}TX$9@Ref#!i zFevefCF0<61tefJ2JDSufe(#n8GosSDdBjfk`rICE7 zk!+ldLyk~eTWgY%lD38IZ-5>)G1l{x?Trl$4cSnw>a^&I8TErlzL0twLY7+kF^`xdAZ_D9OPnc3?vmT`m_F zM1Y;cp{S_H96EH!Qe&l=Ob;{?*V59`=TpctjHV z`}-S_&$S_gm;_P000XA-I-L+m8I=#1*x1;Zf9%+?AHh2S6`(&aFRup52S9EB*X3bq zLm;R#M#jV;>OkCy%@8`aSq;$UfM|LvH|*Bo#*~Tfn>TM>^m@Igz^4I+78e)mN=r*8 z!7~bi<Uzes^#OG`@vN)t;QorohTToCBMgOb;UvUD7LG;m>8KJ@u~ zpQ3D8rBx4;yQ8C{fSDNHdvtU(TxHIjIm6x20AyQfyn4aj`+uKcQYO0{$?-yN0M#dLlDu7!$9fyxbud$7o{bgKjE zFm)axiA0@nVJ+YxJ9zM*C6lq;Riej~=D}D_L>d0!ln8nNQ9~RickkZ)9tzoFPJ>K< z7YDZPHMPV-o65>c5to;j&E({y$;!&oW`o3I)f3O021DWnvkQf00ratO@7}#{QCsR@ z$U_*g_8Ni?X!K%N~b(xB3jl%S5dMs!A0CtQ53CG0E_ zfC^|NDwC=+rPR@hqRONKk(_9oQoD`v;Z$uo5Fwn}bz%_yQHRm=Y!@6D7|7eXbLS^G zGG*b$kz^$JuPZAnmkJ9DN6@Y-5h+0F9v+Cwq;6D<mPn;4(%{i_ytz@CYO1QL zmSAJwR}JiuB%v=Ri3c^Y5%=ahR6Hx#*x2~`z<~oiaGGdzEy37VKvn?_UOYs9M#Vo& zt60GLa^=buF*$kiBr9Dkb7>0%0^NASz7B!eud5^P8wOwnF+4nc@kxT9*Vfinc?k0{ zO#VrLzBvYLc`O;ZjBgKuXO(ZI-*Hi9fOkM=XD5F^9J1lKQ`gQ(TIP@yu6<{hVDh!fbRgvflf_w=LtZsB9 z?`$<>Kn4lL;}#WgZJM;Sw5aWDdrS}pH|uX92Qnskt^$FXD~W@@uuDgd9O)NrgwMjl zf|;G2HP~x|6JYZ5^Ti7LZut6O+x+~z*|TR)gx=e#o}Qi$z*%Ebt2v_E!yCuf)YOz; zTwMGUUmrAjR=`JEZ*T7#XV0GHjm2%@!&NRE9f(xw2dD&tEl9x2?g!lLk6eGSd1}Bb zp}(f4<}KtHFKv4evJ>_|=$ye28H@y!o}M0m_3G7+larI*e%ck{3gBnsyAvl)e1sPk zuUrj)E5QJW1jo|bgVKPQLmCvR7jNH8JVz=JSTQQ^i^!E!=nV?h-$?X7F>o(_P&!~Y z1vO6u2UVo30Z2uKEK~=FY=P=XiMnMx;&!B7ZNQ2{O+fB@ILa1;?9`rAKnGRXPVH?v yU^L2p3?de)Z&?8ql-dVVT`c;v_7Mk-G{FCQ5nKVJ^CElz0000C_;h& literal 682 zcmV;b0#*HqP)P000;W1^@s654Bdt00009a7bBm000XU z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0yjxS zK~#9!V)+06KLauNVJoM@^>*DRV$~yKCI%wGZ${x9_J1#`9<^}^Fpvm{vIJx>^Zzei z%nVpot|w5WvLnlM}=c{C!IQcwcA=Ei5TO=J5ZyJGE=dDgmll0t_kxAf=Bi z#`EU}o8_-98>#7&0&IfPKlj+pn=&<;7)uyINeqtnvp zsrPx*SV=@dR9FeES9^$6Wf1?}$KJc{vKFQ*Y9g(srM3{2_E0nuQ3@(Wqre^z<#RQ0 z(F(~5%F0C~^4+^noh+==6FTJ7o~@x06XH z;ah|g!hGV(!dHcJ<|JdK;M~RH8KTY#WCWh?5Sgy&%2E*#V>W2?7J*I#8&_kW$APim z1Jfk(;A!TQbR9T7_9IaBlxz5Xg*lY)Sp0Lsx&gqYzsyLPWrU3E)lIbld*kpZ(p}ITvsW;2u4Wt zq-9U=8)t5|44O($HL zZpsVbDm5KG622m3=RQE{wsO4SIkYPTMR##vDYw{ZP!d&AxP0R)7&5LJKgc+buC-uS z`D{!SrNGhyU|t*xV$K$f$XGaJ^WjNkJkC32a}Zk|71R5*5%ex}=A0b8u?)2(QM@Gm zt%u`a&*^5=^q7M~Vj~KYA21k17q=`!eMtgA(d|=L4 z39K~WQb18WAQn~dhdHqX%TTECeR)q7x?}qd1fVLH!zmGd5Od3y)id0=y?~MYCqCPR zuf#!*n2|WhdKZVgkiW+p+>2#RFJN7Np#O8NHW~GJ9Vro7czV1tNeFkAMsr$ZhjhLP zUv!;|8gXP7)HY5ee6gCn)-A*0#JgMq%n=V>%=#i)LMhqm%7n|C>ad|Kfrn+BN8cU5 z6XRFoS5dMRuwvT;VIXF&)MGxPRVAH?mJ6GOi9(yS$h@Ov5Hgd^U}OtokIX<^tO!IZ zaZw>zFq5=1h_THnmBNCU&1BHW#)Z;+xe=*Q26gIC_+tT!>1kI!w+Q#$T8f3zEk+hP zht1`Z{P|)t=5?*bKCxRS!T{>>LLfG$jP9I+E<^iZLujiC+r5a6H}{@nnE1$ITo9Mw zxf-xGMZ!=ll34Rnq>^#GO2z+0H!}F7be6twR%i^ZV1gOYEQleVPGPfjtq~mpV1Jo( z)OA~1B_UbN?NcU)hLReL5idGhcKqAI2XW~m)cz|F+;7}=prW_SPd8B0Au%@h5J$e2 z%s%(_zfANvM3KlY$Np#p{bZa^kA4aad^um&(d>`UfNgEpS zh$Q8s?YJmfKiUd6s~QiC`cfJoyI%-pp5PA~! z#3l)bOfU+lswYZ!*Wlf56_|9>8IlZ~y@It5rZE5L3B7U+05d@VWRjl|P7I7?hk)Y3 z28uGi>RH@5`Yw#FtiZ5D3_ayrxl;7}dw!-RixX$AV8@m}v1Q8F_*>L`Be!*+jly>uHKr29=dm-EAy0Pag!X*o0^PmjcY{O!b>kLRSX|WB6 o%~b|B%QF<2+^m1-reU%F0o*?6={=xo8vpOV literal 802 zcmV+-1Ks?IP)P000;W1^@s654Bdt00009a7bBm000XU z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0E6>uQHz|(h^+7Yp7O6=mLxQF2+1KLc}e9+&G2iXwB z^v{&n?{GMZ4il-5!b@u>i)<4CqTfeeq#un7^Zaav7}!sC62Of?tL?C@Z;YASChHL| zq)~KYhBPnVym2vT$Bp1p_Qwc|T%%#S2Mp^G&_2a%DoX@P`15HZKvobD^y+QAf9ykI zS(56_)-&8=3o;!#(=? zT)u#YN5|K&p?z3DXm(3WxIKC@dTk|FkX2O$MS}wPO3|PwGRU$F^?F@HtyTj`k~9oH zdtb&0>TNqu$mDO|^JS%loF!1js8p*k^g8mh<7C7{ADaYB6I9T*Bf{KBWD zwbE~dgAhYShk9JveYH6m1wL4h9-5-KLT+1fsJAR4(H|Q7#3xgWkX~3K^Mtl;VJzaq zZg}%~GPP%7DorxjZ_Z#=A#OT$_`vnda{dC%`0PI!Z!UNTo=_xlYVNCel?oKm{}ih{ g>E!pi75)k^0K4h~W746!4gdfE07*qoM6N<$f^SQ2Q2+n{ diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig index c6f43ee5a8..711b90b73c 100644 --- a/templates/web/prod/WorkZone/Browser/Results.html.twig +++ b/templates/web/prod/WorkZone/Browser/Results.html.twig @@ -14,7 +14,7 @@
{% for Basket in Baskets %} -
+
×
@@ -31,14 +31,10 @@ {% if Basket.getValidation() is empty or Basket.getValidation().isInitiator(app.getAuthenticatedUser()) %} - - - +   - - - +   {% endif %} From de46a85bce1cd83193b3f0c8be16b75a432ccb06 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 16 Sep 2019 17:58:39 +0400 Subject: [PATCH 21/26] PHRAS-2661 #comment fix menu bar: help menu #time 3h --- templates/web/common/menubar.html.twig | 161 ++++++++++++------------- 1 file changed, 80 insertions(+), 81 deletions(-) diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig index 84ab930e7d..8c6f23d7fc 100644 --- a/templates/web/common/menubar.html.twig +++ b/templates/web/common/menubar.html.twig @@ -25,103 +25,103 @@ @@ -235,11 +235,10 @@ {{ 'phraseanet:: aide' | trans }} - -
+ +
From be9220969b037723c108d57441294f4a16b6f995 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 17 Sep 2019 13:34:06 +0400 Subject: [PATCH 22/26] PHRAS-2282 #time 4h --- .../prod/WorkZone/Browser/Browser.html.twig | 18 +++++++++ .../prod/WorkZone/Browser/Results.html.twig | 39 +++++-------------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/templates/web/prod/WorkZone/Browser/Browser.html.twig b/templates/web/prod/WorkZone/Browser/Browser.html.twig index 91ca5054c5..0f40cff488 100644 --- a/templates/web/prod/WorkZone/Browser/Browser.html.twig +++ b/templates/web/prod/WorkZone/Browser/Browser.html.twig @@ -102,4 +102,22 @@ transform: translate(-50%, -50%); } + diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig index 711b90b73c..4f390a821f 100644 --- a/templates/web/prod/WorkZone/Browser/Results.html.twig +++ b/templates/web/prod/WorkZone/Browser/Results.html.twig @@ -15,18 +15,17 @@
{% for Basket in Baskets %}
- × +  
- - - - - + - -
+
+ +
{% set BasketElement = Basket.getElements().first() %} {% if BasketElement %} {{thumbnail.format(BasketElement.getRecord(app).get_thumbnail(), 150, 106, '', true, false)}} {% endif %} -
  + +

{% if Basket.getValidation() is empty or Basket.getValidation().isInitiator(app.getAuthenticatedUser()) %} @@ -38,7 +37,7 @@ {% endif %} - {{ Basket.getName() }} + {{ Basket.getName() }}
{{ Basket.getElements().count() }} {{ ' records' }} @@ -70,12 +69,11 @@

{% endif %} -

+
{% endfor %} @@ -111,21 +109,4 @@
- + From a66c813835afe0032c55d7c79c5828781c5bb388 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 17 Sep 2019 14:15:27 +0400 Subject: [PATCH 23/26] PHRAS-2282 change icon --- .../prod/images/Basket/Browser/archive.png | Bin 1756 -> 1694 bytes .../prod/images/Basket/Browser/archived.png | Bin 1694 -> 1756 bytes .../prod/WorkZone/Browser/Results.html.twig | 8 ++------ 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/resources/www/prod/images/Basket/Browser/archive.png b/resources/www/prod/images/Basket/Browser/archive.png index 6015eafc48cb8560f4191eee8397bb7e0ef755b9..ab89643a3538605c68436ef9056dd71cfda6cd17 100644 GIT binary patch delta 1664 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 VTmhu>B76V<002ovPDHLkV1n;CLtp>^ diff --git a/resources/www/prod/images/Basket/Browser/archived.png b/resources/www/prod/images/Basket/Browser/archived.png index ab89643a3538605c68436ef9056dd71cfda6cd17..6015eafc48cb8560f4191eee8397bb7e0ef755b9 100644 GIT binary patch delta 1727 zcmV;w20;0q4crZoF@KgxL_t(o39VOeNS##}KlhKjrehN&o2@TblrWuJxG9=Cw}})4 zf=v6=++bT#%&`xneJBtDDS~Lyhw@8nNsx&9U{Di{oc{&OsauFLKZvD)&NWy5yWW1k z$NRi{-@AM7HrNBt`}{f2dCqgrdCqgrYs^D%J!HY%x^*kq+<)90B!%d5^FxapH*Sy+ zJX8i(S62tlpFb}ed;-eQ+6#2}r63A^;^2H8)XdGz6}!jB$N!+v*VkwE?%mr=%#6Q#Ld-WCjNZ&Axs6 z%+aGq#W*`VTYn~Ea&vR5soA}Ix8a2D-@h*gYinzLU|iO45T2tQa0iex{s*`M+)^X( z0(O}TX$9@Ref#!iFevefCF0<61tefJ2JDSufe(#n8G zosSDdBjfk`rICE7k!+ldLyk~eTWgY%lD38IZ-5>)F@M(cl6x7&RfiMatW z4k*dND1UZfLl#{w7Z*f;ox`E1sK^{TbjVU;rI}0*G!oa+($eQvE0}ZV&WV_qxa~JC zF3#Z~WGl-cA1HW468ii58>Hrt&(S5J(x751824*qDFp*s&kMI{+1+ zKQAw@2FeFOZUEQiVQNDls53^!#3AZH+=rvZl+7Z>YFOG_ugGYW#`(C$P#e~HfTZreG(NP%EWOG^Su6H6SOh$AUn5a_^z zlGlZ@bR2v%aA8+I^!a?BqHI~ERS%Q9qobpMnHb)CbaXUaWzL*A!`;yUWLs(E(PC@w z!GCn`?(Vj$glE}lYioN2f+VYMA*lseRD*>yn4aj`+uKcQYO0{$?-yN0M#dLlDu7!$ z9fyxbud$7o{bgKjEFm)axiA0@nVJ+YxJ9zM*C6lq;Riej~=D}D_L>d0!ln8nN zQ9~RickkZ)9tzoFPJ>K<7YDZPHMPV-n}5p6N)eZrm(Aqlq{+(4(q@CiW7QMSoCZVU z1+xot3aL|DSy(S z(vg&)j<`m2MpP$Ue61zyED?YTXe26=sxzh3(TSqUqymwgXq!^Ijq>4CZ8;DjoZ59_ z5dKkz(e!K=92gkL+qrY+Cpa=?;l`01l@D=U`@3kyfkt}78KKWZr7F_k(R94IQJHG0s;ZV?V}IXQ4eXI5p)V$h2Q{$~_vSlPJS*7P*!cRufdf2n znrL(_!Pr+oRsjuOJVbv+#Xn4|Sit&n<;oQ?IeGFVD_tyeX$u4b-FU;k4uRRPt0V6l z24Dp-JUo2yNrIr)*49>e2=g&a{z-toIR1lKQ`gQ(TIP@yu z6<{hVDh!fbRgvflf_w=LtZsB9?`$<>Kn4lL;}#WgZJM;Sw5aWDdrS}pH|uX92Qnsk zt^$FXD~W@@uuDgd9O)Nrgn!S%!h)Hdoi*5NgA-u#^Yg_D`)>I9VB7rsyxFs7PlVpv zs-B*n55QStQmZ+l+rt~j*VNRMUtC=L6JH-RdRD+kT5oUf8)wg+<&DK{;louf936;M z>IbL2ZwBd>PU&YWjx|`q+V^n zibG96?t3`O7KH57o;XxM2UXcl?QJ?>G|GMqA{MG|SpgN4+6PlzEc&$e5eJPl!2fy? VTmhu>B76V<002ovPDHLkV1n;CLtp>^ delta 1664 zcmV-`27me74W12?tI_OeDnRzd~@bI7igtO>rh5cJsfBIEQeC2k$)(E)MNM(74j3K(z%w# zFIeHP&YG2)xUg@bffH5mr$mCcP#>V;orI z$buJHVw6BfunR_r9PSWbWw&xq6QNvarp@Jfhzjw z^m-aQWf1YVlYdDk;ah|g!hGV(!dHcJ<|JdK;M~RH8KTY#WCWh?5Sgy&%2E*#V>W2? z7J*I#8&_kW$APim1Jfk(;A!TQbR9T7_9IaBlxz5Xg*lY)Sp0Lsx&gqYzsyLPWrU3E z)lIbl&%h}0VG9X=AiB4y`3K#91CL37L3SPIArtTNn||EJ7#kbTOJkD`?V4D zE_CLc9KEp&wIxx!B>k<2<6zI}X4LeUgF|8?3V)IxFc?G^w=6?_Neq)+zk=TgoVWL) zY{43BaSWn?EC^*Rvm9GlNCivVOlLQsY{@sc;RVr(RRo9M!O+kE)ic`!sT--Mqn(pR zE4G+5+q@P1oa5pge zXn)~cc#wqj6$`*H>|=L439K~WQb18WAQn~dhdHqX%TTECeR)q7x?}qd1fVLH!zmGd z5Od3y)id0=y?~MYCqCPRuf#!*n2|WhdKZVgkiW+p+>2#RFJN7Np#O8NHW~GJ9Vro7 zczV1tNeFkAMsr$ZhjhLPUv!;|8gXP7)PFWkBz&=&z1A(m;>5dL0?ZK)Ud;L;T0$w= z>dJ)6o9eKkEP;n*oJZdsz!T$F<5y9#6|iF41Ysa%uhe5cqE#iGiIxkSg^5C&w8*@p zWe_rx&0u5;Vvo!~T&xI0DsfRESum5dGl;RxDV4&4n9XF+$Hs-ye7O;+PzH7CP=EMi z0gLHrS3b80_uX2Gh0-lX7CMK`<&ymQVl(D-t;IgETPDH)>heM$Hm8j4oP#by`(Q(8 zs|wq_h>kb+o@1E!$YNX&m*BY?ur@`)P%M&I^HQXealA^!|3x=4_@s1}zHnA(46R^- z8PF_mzUo=rIr=V)uB^bYL<~LUTY0%s^!$5%rX`CL zXRct!mOrs&%GdZ?)O;hjsj)RN&4TDjtQCKAj*WtV3>539kO`D_^JhRSK%RRc+vd8l z=PSY`3u5!24BBkNVv_3&NHJ-#4T#NE1~ {% if Page - 1 > 0 %} - - < - +   {% endif %} Page {{ Page }} / {{ MaxPage }} {% if Page + 1 <= MaxPage %} - - > - +   {% endif %} From 20e918175cc3d6a42d863b5a7010911a3fee4327 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 17 Sep 2019 16:17:23 +0400 Subject: [PATCH 24/26] PHRAS-2661 --- resources/www/common/js/components/common.js | 6 +----- resources/www/common/styles/main.scss | 16 ++++++++++++++++ resources/www/report/styles/main.scss | 16 ++++++++++------ templates/web/common/menubar.html.twig | 4 ++++ 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/resources/www/common/js/components/common.js b/resources/www/common/js/components/common.js index d19965e696..39c6ddf3c8 100644 --- a/resources/www/common/js/components/common.js +++ b/resources/www/common/js/components/common.js @@ -31,17 +31,13 @@ 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 - // }); $('body').on('click', '.infoDialog', function (event) { infoDialog($(this)); }); }); + function showOverlay(n, appendto, callback, zIndex) { var div = "OVERLAY"; diff --git a/resources/www/common/styles/main.scss b/resources/www/common/styles/main.scss index 6a99013e9b..805e018608 100644 --- a/resources/www/common/styles/main.scss +++ b/resources/www/common/styles/main.scss @@ -88,4 +88,20 @@ $mainMenuLinkBackgroundHoverColor: transparent; box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.39); } } +/*Help menu*/ +.contextMenu.helpcontextmenu { + display: none; + &.shown { + display: block; + position: absolute; + z-index: 101; + } +} +.help-trigger { + display:inline-block; + cursor:pointer; + padding: 0 4px; + border:none; + margin-left: -12px; +} diff --git a/resources/www/report/styles/main.scss b/resources/www/report/styles/main.scss index 75030126a9..218fce1f28 100644 --- a/resources/www/report/styles/main.scss +++ b/resources/www/report/styles/main.scss @@ -110,7 +110,7 @@ $select-height: 26px; } .input-prepend { margin: 0; - + .dmin, .dmax { border: 0 none; height: 16px; @@ -203,7 +203,7 @@ $select-height: 26px; height: $select-height; } .select-styled { - position: absolute; + position: absolute; top: 0; right: 0; bottom: 0; @@ -232,9 +232,9 @@ $select-height: 26px; background-color: darken($select-background, 5); } } - + .select-options { - display: none; + display: none; position: absolute; top: 12px; right: -12px; @@ -292,7 +292,7 @@ $select-height: 26px; -webkit-transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%); transform: translate(-50%, -50%); - + &:hover { background-color: #2c2c2c; } @@ -355,4 +355,8 @@ $select-height: 26px; &.ui-widget-content{ background-color: #212121; } -} \ No newline at end of file +} + +#mainMenu li .context-menu-item-inner a:hover { + color: #000; +} diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig index 8c6f23d7fc..3821f42e79 100644 --- a/templates/web/common/menubar.html.twig +++ b/templates/web/common/menubar.html.twig @@ -300,6 +300,10 @@