lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look and feel v13

Browse Source
This commit is contained in:
Laurent Destailleur 2020-11-29 15:47:08 +01:00
parent 6c65ebef0d
commit 404634919d
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/core/class/html.form.class.php
View File

@ -824,15 +824,22 @@ class Form
$atleastonefavorite = 0; $atleastonefavorite = 0;
$out .= '<option value="" disabled class="selectoptiondisabledwhite">------------</option>'; $out .= '<option value="" disabled class="selectoptiondisabledwhite">------------</option>';
} }
if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label']))
{ $labeltoshow = '';
$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'" selected>'; if ($row['label']) $labeltoshow .= dol_trunc($row['label'], $maxlength, 'middle');
} else { else $labeltoshow .= '&nbsp;';
$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'">'; if ($row['code_iso']) {
$labeltoshow .= ' <span class="opacitymedium">('.$row['code_iso'].')</span>';
$tmpflag = picto_from_langcode($row['code_iso'], 'class="saturatemedium marginrightonly"');
$labeltoshow = $tmpflag.' '.$labeltoshow;
} }
if ($row['label']) $out .= dol_trunc($row['label'], $maxlength, 'middle');
else $out .= '&nbsp;'; if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label'])) {
if ($row['code_iso']) $out .= ' ('.$row['code_iso'].')'; $out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'" selected data-html="'.dol_escape_htmltag($labeltoshow).'">';
} else {
$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'" data-html="'.dol_escape_htmltag($labeltoshow).'">';
}
$out .= $labeltoshow;
$out .= '</option>'; $out .= '</option>';
} }
} }

15
htdocs/core/lib/functions.lib.php
View File

@ -7255,14 +7255,12 @@ function dol_validElement($element)
/** /**
* Return img flag of country for a language code or country code * Return img flag of country for a language code or country code
* *
* @param string $codelang Language code (en_IN, fr_CA...) or Country code (IN, FR) * @param string $codelang Language code ('en_IN', 'fr_CA', ...) or ISO Country code on 2 characters in uppercase ('IN', 'FR')
* @param string $moreatt Add more attribute on img tag (For example 'style="float: right"') * @param string $moreatt Add more attribute on img tag (For example 'style="float: right"' or 'class="saturatemedium"')
* @return string HTML img string with flag. * @return string HTML img string with flag.
*/ */
function picto_from_langcode($codelang, $moreatt = '') function picto_from_langcode($codelang, $moreatt = '')
{ {
global $langs;
if (empty($codelang)) return ''; if (empty($codelang)) return '';
if ($codelang == 'auto') if ($codelang == 'auto')
@ -7275,7 +7273,14 @@ function picto_from_langcode($codelang, $moreatt = '')
'ca_ES' => 'catalonia', 'ca_ES' => 'catalonia',
'da_DA' => 'dk', 'da_DA' => 'dk',
'fr_CA' => 'mq', 'fr_CA' => 'mq',
'sv_SV' => 'se' 'sv_SV' => 'se',
'AQ' => 'unknown',
'CW' => 'unknown',
'IM' => 'unknown',
'JE' => 'unknown',
'MF' => 'unknown',
'BL' => 'unknown',
'SX' => 'unknown'
); );
if (isset($langtocountryflag[$codelang])) $flagImage = $langtocountryflag[$codelang]; if (isset($langtocountryflag[$codelang])) $flagImage = $langtocountryflag[$codelang];