Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MIgration font-awesome 5 #107

Merged
merged 1 commit into from
Nov 1, 2020
Merged

MIgration font-awesome 5 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/class/blea.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public static function getMobileHealth() {
} elseif ($eqLogic->getStatus('battery') > 60 && $eqLogic->getStatus('battery') != '') {
$battery_status = '<span style="font-size : 1em;color:green">' . $eqLogic->getStatus('battery') . '%</span>';
} else {
$battery_status = '<span style="font-size : 1em;color:grey" title="{{Secteur}}"><i class="fa fa-plug"></i></span>';
$battery_status = '<span style="font-size : 1em;color:grey" title="{{Secteur}}"><i class="fas fa-plug"></i></span>';
}
$health .= '<td>' . $battery_status . '</td>';
$present = 0;
Expand All @@ -179,9 +179,9 @@ public static function getMobileHealth() {
$present = $presentcmd->execCmd();
}
if ($present == 1){
$present = '<span style="font-size : 1em;color:green" title="{{Présent}}"><i class="fa fa-check"></i></span>';
$present = '<span style="font-size : 1em;color:green" title="{{Présent}}"><i class="fas fa-check"></i></span>';
} else {
$present = '<span style="font-size : 1em;color:red" title="{{Absent}}"><i class="fa fa-times"></i></span>';
$present = '<span style="font-size : 1em;color:red" title="{{Absent}}"><i class="fas fa-times"></i></span>';
}
$health .= '<td>' . $present . '</td>';
$health .= '<td><span style="font-size : 0.8em;cursor:default;">' . $eqLogic->getStatus('lastCommunication') . '</span></td>';
Expand Down
6 changes: 3 additions & 3 deletions core/config/devices/awoxmesh/awox.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
"unite": "",
"logicalId": "name:awoxmesh,cmd:setWhite,value:0-100",
"display": {
"icon": "<i class=\"fa fa-snowflake-o\"><\/i>",
"icon": "<i class=\"fas fa-snowflake\"><\/i>",
"forceReturnLineBefore": 1
}
},
Expand All @@ -169,7 +169,7 @@
"unite": "",
"logicalId": "name:awoxmesh,cmd:setWhite,value:50-100",
"display": {
"icon": "<i class=\"fa fa-circle\"><\/i>"
"icon": "<i class=\"fas fa-circle\"><\/i>"
}
},
{
Expand All @@ -180,7 +180,7 @@
"unite": "",
"logicalId": "name:awoxmesh,cmd:setWhite,value:100-100",
"display": {
"icon": "<i class=\"fa fa-sun-o\"><\/i>",
"icon": "<i class=\"fas fa-sun\"><\/i>",
"forceReturnLineAfter": 1
}
},
Expand Down
2 changes: 1 addition & 1 deletion core/config/devices/beewismartdoor/beewismartdoor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"isHistorized": 0,
"unite": "%",
"display": {
"icon": "<i class=\"fa fa-battery-full\"><\/i>",
"icon": "<i class=\"fas fa-battery-full\"><\/i>",
"generic_type": "DONT"
},
"logicalId": "battery",
Expand Down
2 changes: 1 addition & 1 deletion core/config/devices/blpnr/blpnr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-battery-full\"><\/i>",
"icon": "<i class=\"fas fa-battery-full\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 1,
Expand Down
30 changes: 15 additions & 15 deletions core/config/devices/flowerpower/flowerpower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-sun-o\"><\/i>",
"generic_type": "DONT"
"icon": "<i class=\"fas fa-sun\"><\/i>",
"generic_type": "BRIGHTNESS"
},
"isVisible": 0,
"isHistorized": 0,
Expand All @@ -32,7 +32,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-thermometer-empty\"><\/i>",
"icon": "<i class=\"fas fa-thermometer-empty\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 0,
Expand All @@ -49,7 +49,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-thermometer-empty\"><\/i>",
"icon": "<i class=\"fas fa-thermometer-empty\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 0,
Expand All @@ -66,8 +66,8 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-thermometer-empty\"><\/i>",
"generic_type": "DONT"
"icon": "<i class=\"fas fa-thermometer-empty\"><\/i>",
"generic_type": "TEMPERATURE"
},
"isVisible": 0,
"isHistorized": 0,
Expand All @@ -83,8 +83,8 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-tint\"><\/i>",
"generic_type": "DONT"
"icon": "<i class=\"fas fa-tint\"><\/i>",
"generic_type": "HUMIDITY"
},
"isVisible": 0,
"isHistorized": 0,
Expand All @@ -100,8 +100,8 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-tint\"><\/i>",
"generic_type": "DONT"
"icon": "<i class=\"fas fa-tint\"><\/i>",
"generic_type": "GENERIC"
},
"isVisible": 1,
"isHistorized": 0,
Expand All @@ -117,7 +117,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-thermometer-empty\"><\/i>",
"icon": "<i class=\"fas fa-thermometer-empty\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 1,
Expand All @@ -134,7 +134,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-sun-o\"><\/i>",
"icon": "<i class=\"fas fa-sun\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 1,
Expand All @@ -151,7 +151,6 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-battery-full\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 0,
Expand All @@ -168,8 +167,8 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-battery-full\"><\/i>",
"generic_type": "DONT"
"icon": "<i class=\"fas fa-battery-full\"><\/i>",
"generic_type": "BATTERY"
},
"isVisible": 0,
"isHistorized": 0,
Expand All @@ -185,6 +184,7 @@
"type": "action",
"subtype": "other",
"display": {
"icon": "<i class=\"fas fa-sync\"><\/i>",
"generic_type": "GENERIC"
},
"isVisible": 1,
Expand Down
8 changes: 5 additions & 3 deletions core/config/devices/gigaset/gigaset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"type": "info",
"subtype": "binary",
"display": {
"generic_type": "GENERIC"
"generic_type": "PRESENCE"
},
"isVisible": 1,
"isHistorized": 0,
Expand All @@ -27,7 +27,8 @@
"type": "action",
"subtype": "other",
"display": {
"generic_type": "GENERIC"
"icon": "<i class=\"fas fa-sync\"><\/i>",
"generic_type": "Generic"
},
"isVisible": 1,
"isHistorized": 0,
Expand All @@ -39,7 +40,8 @@
"type": "info",
"subtype": "numeric",
"display": {
"generic_type": "GENERIC"
"icon": "<i class=\"fas fa-battery-full\"><\/i>",
"generic_type": "BATTERY"
},
"isVisible": 1,
"isHistorized": 0,
Expand Down
10 changes: 5 additions & 5 deletions core/config/devices/hector/hector.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-thermometer-empty\"><\/i>",
"icon": "<i class=\"fas fa-thermometer-empty\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 1,
Expand All @@ -32,7 +32,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-tint\"><\/i>",
"icon": "<i class=\"fas fa-tint\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 1,
Expand All @@ -49,7 +49,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-sun-o\"><\/i>",
"icon": "<i class=\"fas fa-sun\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 1,
Expand All @@ -66,7 +66,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-battery-full\"><\/i>",
"icon": "<i class=\"fas fa-battery-full\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 0,
Expand All @@ -83,7 +83,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-battery-full\"><\/i>",
"icon": "<i class=\"fas fa-battery-full\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 1,
Expand Down
2 changes: 1 addition & 1 deletion core/config/devices/itag/itag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"unite": "",
"logicalId": "button",
"display": {
"icon": "<i class=\"fa fa-circle-o\"><\/i>",
"icon": "<i class=\"fas fa-circle\"><\/i>",
"generic_type": "DONT"
},
"configuration": {
Expand Down
6 changes: 3 additions & 3 deletions core/config/devices/lywsd02/lywsd02.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-thermometer-empty\"><\/i>",
"icon": "<i class=\"fas fa-thermometer-empty\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 1,
Expand All @@ -33,7 +33,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-tint\"><\/i>",
"icon": "<i class=\"fas fa-tint\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 1,
Expand All @@ -50,7 +50,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-battery-full\"><\/i>",
"icon": "<i class=\"fas fa-battery-full\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 0,
Expand Down
6 changes: 3 additions & 3 deletions core/config/devices/lywsd03/lywsd03.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-thermometer-empty\"><\/i>",
"icon": "<i class=\"fas fa-thermometer-empty\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 1,
Expand All @@ -33,7 +33,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-tint\"><\/i>",
"icon": "<i class=\"fas fa-tint\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 1,
Expand All @@ -50,7 +50,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-battery-full\"><\/i>",
"icon": "<i class=\"fas fa-battery-full\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 0,
Expand Down
6 changes: 3 additions & 3 deletions core/config/devices/miband/miband1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-battery-full\"><\/i>",
"icon": "<i class=\"fas fa-battery-full\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 1,
Expand Down Expand Up @@ -98,7 +98,7 @@
"isVisible": 1,
"logicalId": "name:miband,handle:0x53,value:04",
"display": {
"icon": "<i class=\"fa fa-rss\"><\/i>",
"icon": "<i class=\"fas fa-rss\"><\/i>",
"generic_type": "DONT"
}
},
Expand All @@ -120,7 +120,7 @@
"isVisible": 0,
"logicalId": "name:miband,handle:0x53,value:02",
"display": {
"icon": "<i class=\"fa fa-clock-o\"><\/i>",
"icon": "<i class=\"fas fa-clock-o\"><\/i>",
"generic_type": "DONT"
}
},
Expand Down
10 changes: 5 additions & 5 deletions core/config/devices/miband/miband1s.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"mobile": "line"
},
"display": {
"icon": "<i class=\"fa fa-heartbeat\"><\/i>",
"icon": "<i class=\"fas fa-heartbeat\"><\/i>",
"generic_type": "DONT"
}
},
Expand Down Expand Up @@ -84,7 +84,7 @@
"type": "info",
"subtype": "numeric",
"display": {
"icon": "<i class=\"fa fa-battery-full\"><\/i>",
"icon": "<i class=\"fas fa-battery-full\"><\/i>",
"generic_type": "DONT"
},
"isVisible": 1,
Expand Down Expand Up @@ -115,7 +115,7 @@
"isVisible": 1,
"logicalId": "name:miband,handle:0x51,value:04",
"display": {
"icon": "<i class=\"fa fa-rss\"><\/i>",
"icon": "<i class=\"fas fa-rss\"><\/i>",
"generic_type": "DONT"
}
},
Expand All @@ -137,7 +137,7 @@
"isVisible": 0,
"logicalId": "name:miband,handle:0x51,value:02",
"display": {
"icon": "<i class=\"fa fa-clock-o\"><\/i>",
"icon": "<i class=\"fas fa-clock-o\"><\/i>",
"generic_type": "DONT"
}
},
Expand All @@ -153,7 +153,7 @@
"mobile": "line"
},
"display": {
"icon": "<i class=\"fa fa-heart\"><\/i>",
"icon": "<i class=\"fas fa-heart\"><\/i>",
"generic_type": "DONT"
}
},
Expand Down