ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 169d72f683 d0f4374909
commit 64679ea99b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
definitions/base.js
View File

@ -7703,13 +7703,13 @@ module.exports = function(s,config,lang){
info: [ info: [
{ {
"fieldType": "indicatorBar", "fieldType": "indicatorBar",
"icon": "microchip", "icon": "square",
"name": "cpu", "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>`, "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", "fieldType": "indicatorBar",
"icon": "square", "icon": "microchip",
"name": "ram", "name": "ram",
"label": `<span class="os_totalmem used"><i class="fa fa-spinner fa-pulse"></i></span> ${lang.MB} ${lang.RAM}`, "label": `<span class="os_totalmem used"><i class="fa fa-spinner fa-pulse"></i></span> ${lang.MB} ${lang.RAM}`,
}, },

4
web/pages/blocks/home/infoBlocks.ejs
View File

@ -2,12 +2,12 @@
<h6 class="card-title"><i class="fa fa-th"></i> &nbsp; <%- lang['CPU'] %> & <%- lang['RAM'] %></h6> <h6 class="card-title"><i class="fa fa-th"></i> &nbsp; <%- lang['CPU'] %> & <%- lang['RAM'] %></h6>
<% [ <% [
{ {
"icon": "microchip", "icon": "square",
"name": "cpu", "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>`, "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", "name": "ram",
"label": `<span class="os_totalmem used"><i class="fa fa-spinner fa-pulse"></i></span> ${lang.MB} ${lang.RAM}`, "label": `<span class="os_totalmem used"><i class="fa fa-spinner fa-pulse"></i></span> ${lang.MB} ${lang.RAM}`,
}, },