From 150dd7177429910b7f22f4ad2d9212d431577030 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 29 Nov 2020 16:02:39 +0100
Subject: [PATCH] Look and feel v13

---
 htdocs/admin/company.php              |   5 +++--
 htdocs/core/class/html.form.class.php |  20 +++++++++++---------
 htdocs/theme/common/flags/unknown.png | Bin 0 -> 1595 bytes
 3 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 htdocs/theme/common/flags/unknown.png

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 8b900f552c8..75dcb9b179f 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -406,11 +406,12 @@ print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmlt
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ADDRESS">'.$langs->trans("CompanyAddress").'</label></td><td>';
 print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'.($conf->global->MAIN_INFO_SOCIETE_ADDRESS ? $conf->global->MAIN_INFO_SOCIETE_ADDRESS : GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml')).'</textarea></td></tr>'."\n";
 
+// Zip
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ZIP">'.$langs->trans("CompanyZip").'</label></td><td>';
-print '<input class="minwidth100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP ? $conf->global->MAIN_INFO_SOCIETE_ZIP : GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alpha')).'"></td></tr>'."\n";
+print '<input class="width100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP ? $conf->global->MAIN_INFO_SOCIETE_ZIP : GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alpha')).'"></td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_TOWN">'.$langs->trans("CompanyTown").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth100" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN ? $conf->global->MAIN_INFO_SOCIETE_TOWN : GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml')).'"></td></tr>'."\n";
+print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth200" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN ? $conf->global->MAIN_INFO_SOCIETE_TOWN : GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml')).'"></td></tr>'."\n";
 
 // Country
 print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 444a44cdc34..a56402fddef 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5102,19 +5102,21 @@ class Form
 		$out .= '<select class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'" id="'.$htmlname.'">';
 		foreach ($langs->cache_currencies as $code_iso => $currency)
 		{
-			if ($selected && $selected == $code_iso)
-			{
-				$out .= '<option value="'.$code_iso.'" selected>';
-			} else {
-				$out .= '<option value="'.$code_iso.'">';
-			}
-			$out .= $currency['label'];
+			$labeltoshow = $currency['label'];
 			if ($mode == 1)
 			{
-				$out .= ' ('.$code_iso.')';
+				$labeltoshow .= ' <span class="opacitymedium">('.$code_iso.')</span>';
 			} else {
-				$out .= ' ('.$langs->getCurrencySymbol($code_iso).')';
+				$labeltoshow .= ' <span class="opacitymedium">('.$langs->getCurrencySymbol($code_iso).')</span>';
 			}
+
+			if ($selected && $selected == $code_iso)
+			{
+				$out .= '<option value="'.$code_iso.'" selected data-html="'.dol_escape_htmltag($labeltoshow).'">';
+			} else {
+				$out .= '<option value="'.$code_iso.'" data-html="'.dol_escape_htmltag($labeltoshow).'">';
+			}
+			$out .= $labeltoshow;
 			$out .= '</option>';
 		}
 		$out .= '</select>';
diff --git a/htdocs/theme/common/flags/unknown.png b/htdocs/theme/common/flags/unknown.png
new file mode 100644
index 0000000000000000000000000000000000000000..08efc7b264d7eab8e1c4c13424342999084a4965
GIT binary patch
literal 1595
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

literal 0
HcmV?d00001