From 60b015919dc5b5d8ed6f95abb794b866a35a0252 Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Fri, 25 Jun 2021 10:25:24 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B03912=20-=20Polishing:=20Export=20-=20err?=
 =?UTF-8?q?or=20message=20+=20ccs=20for=20pdf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sources/application/WebPage/PDFPage.php | 4 ++--
 webservices/export-v2.php               | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/sources/application/WebPage/PDFPage.php b/sources/application/WebPage/PDFPage.php
index 74e6d3fab..f93ccdad6 100644
--- a/sources/application/WebPage/PDFPage.php
+++ b/sources/application/WebPage/PDFPage.php
@@ -67,10 +67,10 @@ class PDFPage extends WebPage
 table {
 	padding: 2pt;
 }
-table.ibo-datatable td {
+table.ibo-datatable td, table.listResults td  {
 	border: 0.5pt solid #000 ;
 }
-table.ibo-datatable th {
+table.ibo-datatable th, table.listResults th  {
 	background-color: #eee;
 	border: 0.5pt solid #000 ;
 }
diff --git a/webservices/export-v2.php b/webservices/export-v2.php
index a8793427e..116d28466 100644
--- a/webservices/export-v2.php
+++ b/webservices/export-v2.php
@@ -4,6 +4,7 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\UI\Base\Component\Alert\AlertUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Button\ButtonUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Field\FieldUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Form\FormUIBlockFactory;
@@ -131,8 +132,14 @@ function DisplayExpressionForm(WebPage $oP, $sAction, $sExpression = '', $sExcep
 	$oFieldQuery = FieldUIBlockFactory::MakeStandard('<input type="radio" name="query_mode" value="oql" id="radio_oql" checked><label for="radio_oql">'.Dict::S('Core:BulkExportLabelOQLExpression').'</label>');
 	$oTextArea = new TextArea('expression', htmlentities($sExpression, ENT_QUOTES, 'UTF-8'), "textarea_oql", 70, 8);
 	$oTextArea->SetPlaceholder(Dict::S('Core:BulkExportQueryPlaceholder'));
+	$oTextArea->AddCSSClass("ibo-queryoql");
 	$oFieldQuery->AddSubBlock($oTextArea);
 	$oForm->AddSubBlock($oFieldQuery);
+	if (!empty($sExceptionMessage)) {
+		$oAlert = AlertUIBlockFactory::MakeForFailure($sExceptionMessage);
+		$oAlert->SetIsCollapsible(false);
+		$oForm->AddSubBlock($oAlert);
+	}
 
 	$oFieldPhraseBook = FieldUIBlockFactory::MakeStandard('<input type="radio" name="query_mode" value="phrasebook" id="radio_phrasebook"><label for="radio_phrasebook">'.Dict::S('Core:BulkExportLabelPhrasebookEntry').'</label>');
 	$oSelect = SelectUIBlockFactory::MakeForSelect('query', "select_phrasebook");