From 09b84f08379778c1cc87a0d2d61551227352c21c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 19 Feb 2023 12:10:59 +0100
Subject: [PATCH] Look and feel v18

---
 htdocs/core/tpl/massactions_pre.tpl.php | 20 ++++++++++++--------
 htdocs/langs/en_US/main.lang            |  1 +
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 66b681cb3ca..e84db5c99dd 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -75,15 +75,19 @@ if ($massaction == 'preaffecttag' && isModEnabled('category')) {
 	if (!empty($categ_types)) {
 		foreach ($categ_types as $categ_type) {
 			$cate_arbo = $form->select_all_categories($categ_type['code'], null, 'parent', null, null, 1);
-			$formquestion[] = array('type' => 'other',
-					'name' => 'affecttag_'.$categ_type['code'],
-					'label' => $langs->trans("Tag").' '.$categ_type['label'],
-					'value' => $form->multiselectarray('contcats_'.$categ_type['code'], $cate_arbo, GETPOST('contcats_'.$categ_type['code'], 'array'), null, null, null, null, '60%'));
-		}
-		$formquestion[] = array('type' => 'other',
-				'name' => 'affecttag_type',
+			$formquestion[] = array(
+				'type' => 'other',
+				'name' => 'affecttag_'.$categ_type['code'],
 				'label' => '',
-				'value' => '<input type="hidden" name="affecttag_type"  id="affecttag_type" value="'.implode(",", array_keys($categ_types)).'"/>');
+				'value' => $form->multiselectarray('contcats_'.$categ_type['code'], $cate_arbo, GETPOST('contcats_'.$categ_type['code'], 'array'), null, null, '', 0, '60%', '', '', $langs->trans("SelectTheTagsToAssign"))
+			);
+		}
+		$formquestion[] = array(
+			'type' => 'other',
+			'name' => 'affecttag_type',
+			'label' => '',
+			'value' => '<input type="hidden" name="affecttag_type"  id="affecttag_type" value="'.implode(",", array_keys($categ_types)).'"/>'
+		);
 		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmAffectTag"), $langs->trans("ConfirmAffectTagQuestion", count($toselect)), "affecttag", $formquestion, 1, 0, 200, 500, 1);
 	} else {
 		setEventMessage('CategTypeNotFound');
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 22f04a3ad44..6734168621c 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -514,6 +514,7 @@ NotYetAvailable=Not yet available
 NotAvailable=Not available
 Categories=Tags/categories
 Category=Tag/category
+SelectTheTagsToAssign=Select the tags/categories to assign
 By=By
 From=From
 FromDate=From