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

Merge pull request #14737 from aspangaro/13a17

Browse Source 
Time to enable fontawesome icons on weather feature
This commit is contained in:
Laurent Destailleur 2020-09-15 11:29:28 +02:00 committed by GitHub
commit 522676d745
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3265,12 +3265,13 @@ function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $mo
{
global $conf;
if (is_numeric($picto))
{
$leveltopicto = array(0=>'weather-clear.png', 1=>'weather-few-clouds.png', 2=>'weather-clouds.png', 3=>'weather-many-clouds.png', 4=>'weather-storm.png');
//return '<i class="fa fa-weather-level'.$picto.'"></i>';
$picto = $leveltopicto[$picto];
} elseif (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
if (is_numeric($picto)) {
//$leveltopicto = array(0=>'weather-clear.png', 1=>'weather-few-clouds.png', 2=>'weather-clouds.png', 3=>'weather-many-clouds.png', 4=>'weather-storm.png');
//$picto = $leveltopicto[$picto];
return '<i class="fa fa-weather-level'.$picto.'"></i>';
} elseif (!preg_match('/(\.png|\.gif)$/i', $picto)) {
$picto .= '.png';
}
$path = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/weather/'.$picto;

8
htdocs/theme/eldy/info-box.inc.php
View File

@ -379,19 +379,19 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
}
.fa-weather-level0:before{
content: "\f185";
color : #cccccc;
color : #ffbf00;
}
.fa-weather-level1:before{
content: "\f6c4";
color : #cccccc;
color : #b0b0b0;
}
.fa-weather-level2:before{
content: "\f0c2";
color : #cccccc;
color : #9b9b9b;
}
.fa-weather-level3:before{
content: "\f740";
color : #cccccc;
color : #888888;
}
.fa-weather-level4:before{
content: "\f0e7";