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

CSS

Browse Source
This commit is contained in:
Laurent Destailleur 2023-02-16 00:42:19 +01:00
parent c31eec1d94
commit ec706fa13e
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/core/class/commonobject.class.php
View File

@ -873,8 +873,11 @@ abstract class CommonObject
$out .= img_picto($langs->trans("Address"), 'map-marker-alt'); $out .= img_picto($langs->trans("Address"), 'map-marker-alt');
$out .= '</a> '; $out .= '</a> ';
} }
$out .= dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $address = dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', ');
$outdone++; if ($address) {
$out .= $address;
$outdone++;
}
$outdone++; $outdone++;
// List of extra languages // List of extra languages
@ -900,6 +903,7 @@ abstract class CommonObject
// If there is extra languages // If there is extra languages
foreach ($arrayoflangcode as $extralangcode) { foreach ($arrayoflangcode as $extralangcode) {
$s = picto_from_langcode($extralangcode, 'class="pictoforlang paddingright"'); $s = picto_from_langcode($extralangcode, 'class="pictoforlang paddingright"');
// This also call dol_format_address()
$coords = $this->getFullAddress(1, ', ', $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT, $extralangcode); $coords = $this->getFullAddress(1, ', ', $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT, $extralangcode);
$htmltext .= $s.dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $htmltext .= $s.dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', ');
} }
@ -908,7 +912,8 @@ abstract class CommonObject
} }
} }
if (!in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS) // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
if (!in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)
&& empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state) { && empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state) {
if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) { if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
$out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state; $out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state;
@ -918,6 +923,10 @@ abstract class CommonObject
$outdone++; $outdone++;
} }
if ($outdone) {
$out = '<div class="address inline-block">'.$out.'</div>';
}
if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) { if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) {
$out .= ($outdone ? '<br>' : ''); $out .= ($outdone ? '<br>' : '');
} }

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

@ -2338,7 +2338,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
if (method_exists($object, 'getBannerAddress') && !in_array($object->element, array('product', 'bookmark', 'ecm_directories', 'ecm_files'))) { if (method_exists($object, 'getBannerAddress') && !in_array($object->element, array('product', 'bookmark', 'ecm_directories', 'ecm_files'))) {
$moreaddress = $object->getBannerAddress('refaddress', $object); $moreaddress = $object->getBannerAddress('refaddress', $object);
if ($moreaddress) { if ($moreaddress) {
$morehtmlref .= '<div class="refidno">'; $morehtmlref .= '<div class="refidno refaddress">';
$morehtmlref .= $moreaddress; $morehtmlref .= $moreaddress;
$morehtmlref .= '</div>'; $morehtmlref .= '</div>';
} }

4
htdocs/theme/eldy/global.inc.php
View File

@ -3956,6 +3956,10 @@ div.refidno {
font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize ?>; font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize ?>;
line-height: 1.4em; line-height: 1.4em;
} }
div.refaddress div.address {
line-height: 1.2em;
font-size: 0.95em;
}
div.refidno form { div.refidno form {
display: inline-block; display: inline-block;
} }

8
htdocs/theme/md/style.css.php
View File

@ -4039,7 +4039,7 @@ div.refidpadding {
div.refid { div.refid {
font-weight: bold; font-weight: bold;
color: var(--colortexttitlenotab); color: var(--colortexttitlenotab);
font-size: 160%; font-size: 120%;
} }
a.refid { a.refid {
color: var(--colortexttitlenotab) !important; color: var(--colortexttitlenotab) !important;
@ -4049,11 +4049,15 @@ div.refidno {
font-weight: normal; font-weight: normal;
color: var(--refidnocolor); color: var(--refidnocolor);
font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize ?>; font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize ?>;
line-height: 21px; line-height: 1.3em;
} }
div.refidno form { div.refidno form {
display: inline-block; display: inline-block;
} }
div.refaddress div.address {
line-height: 1.2em;
font-size: 0.9em;
}
div.pagination { div.pagination {
float: right; float: right;