Merge branch 'swap-cpu-ram-icons' into 'dev'

UI: Swap cpu/ram icons

See merge request Shinobi-Systems/Shinobi!372
ejs-templating-update
Moe 2022-07-30 16:03:32 +00:00
commit 64679ea99b
2 changed files with 4 additions and 4 deletions

View File

@ -7703,13 +7703,13 @@ module.exports = function(s,config,lang){
info: [
{
"fieldType": "indicatorBar",
"icon": "microchip",
"icon": "square",
"name": "cpu",
"label": `<span class="os_cpuCount"><i class="fa fa-spinner fa-pulse"></i></span> ${lang.CPU}<span class="os_cpuCount_trailer"></span> : <span class="os_platform" style="text-transform:capitalize"><i class="fa fa-spinner fa-pulse"></i></span>`,
},
{
"fieldType": "indicatorBar",
"icon": "square",
"icon": "microchip",
"name": "ram",
"label": `<span class="os_totalmem used"><i class="fa fa-spinner fa-pulse"></i></span> ${lang.MB} ${lang.RAM}`,
},

View File

@ -2,12 +2,12 @@
<h6 class="card-title"><i class="fa fa-th"></i> &nbsp; <%- lang['CPU'] %> & <%- lang['RAM'] %></h6>
<% [
{
"icon": "microchip",
"icon": "square",
"name": "cpu",
"label": `<span class="os_cpuCount"><i class="fa fa-spinner fa-pulse"></i></span> ${lang.CPU}<span class="os_cpuCount_trailer"></span> : <span class="os_platform" style="text-transform:capitalize"><i class="fa fa-spinner fa-pulse"></i></span>`,
},
{
"icon": "square",
"icon": "microchip",
"name": "ram",
"label": `<span class="os_totalmem used"><i class="fa fa-spinner fa-pulse"></i></span> ${lang.MB} ${lang.RAM}`,
},