From 18b35af50722863ef5976051adf1c14324f52417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=C3=ADn=20Skala?= Date: Fri, 26 Aug 2022 09:52:50 +0200 Subject: [PATCH 1/3] Fix default storage font --- definitions/base.js | 2 +- web/pages/blocks/home/infoBlocks.ejs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/definitions/base.js b/definitions/base.js index b723aae9..f7125568 100644 --- a/definitions/base.js +++ b/definitions/base.js @@ -7884,7 +7884,7 @@ module.exports = function(s,config,lang){ "title1": lang["Timelapse Frames Share"], "color2": "warning", "title2": lang["FileBin Share"], - "label": ``, + "label": ``, }, ] }, diff --git a/web/pages/blocks/home/infoBlocks.ejs b/web/pages/blocks/home/infoBlocks.ejs index 4f705f6c..93e353ad 100644 --- a/web/pages/blocks/home/infoBlocks.ejs +++ b/web/pages/blocks/home/infoBlocks.ejs @@ -38,7 +38,7 @@ { "icon": "hdd", "name": "disk", - "label": ``, + "label": ``, }, ].forEach((item) => { %>
From ac6265d99853a2aa9e4b05848554a8c590480b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=C3=ADn=20Skala?= Date: Fri, 26 Aug 2022 11:13:15 +0200 Subject: [PATCH 2/3] Add Default storage name --- definitions/base.js | 2 +- web/assets/js/bs5.startup.js | 2 +- web/pages/blocks/home/infoBlocks.ejs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/definitions/base.js b/definitions/base.js index f7125568..72dd177b 100644 --- a/definitions/base.js +++ b/definitions/base.js @@ -7884,7 +7884,7 @@ module.exports = function(s,config,lang){ "title1": lang["Timelapse Frames Share"], "color2": "warning", "title2": lang["FileBin Share"], - "label": ``, + "label": `Default : `, }, ] }, diff --git a/web/assets/js/bs5.startup.js b/web/assets/js/bs5.startup.js index 2f8d703c..ce78936e 100644 --- a/web/assets/js/bs5.startup.js +++ b/web/assets/js/bs5.startup.js @@ -7,7 +7,7 @@ var ramIndicatorUsed = ramIndicator.find('.used') var ramIndicatorPercentText = ramIndicator.find('.indicator-percent') var diskIndicator = $('#indicator-disk') var diskIndicatorBar = diskIndicator.find('.progress-bar') -var diskIndicatorBarUsed = diskIndicator.find('.diskUsed') +var diskIndicatorBarUsed = diskIndicator.find('.value') var diskIndicatorPercentText = diskIndicator.find('.indicator-percent') var loadedIndicators = {} function loadHiddenSectionsInForms(){ diff --git a/web/pages/blocks/home/infoBlocks.ejs b/web/pages/blocks/home/infoBlocks.ejs index 93e353ad..66928662 100644 --- a/web/pages/blocks/home/infoBlocks.ejs +++ b/web/pages/blocks/home/infoBlocks.ejs @@ -38,7 +38,7 @@ { "icon": "hdd", "name": "disk", - "label": ``, + "label": `Default : `, }, ].forEach((item) => { %>
From f1f9ad49cdb60564787c86ef416bd17cac218dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=C3=ADn=20Skala?= Date: Sat, 27 Aug 2022 00:08:12 +0200 Subject: [PATCH 3/3] Use lang files for Default storage prefix --- definitions/base.js | 2 +- languages/cz.json | 3 ++- languages/en_CA.json | 3 ++- web/pages/blocks/home/infoBlocks.ejs | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/definitions/base.js b/definitions/base.js index 72dd177b..b45808f6 100644 --- a/definitions/base.js +++ b/definitions/base.js @@ -7884,7 +7884,7 @@ module.exports = function(s,config,lang){ "title1": lang["Timelapse Frames Share"], "color2": "warning", "title2": lang["FileBin Share"], - "label": `Default : `, + "label": `${lang.Primary} : `, }, ] }, diff --git a/languages/cz.json b/languages/cz.json index 485ea716..4b2ba275 100644 --- a/languages/cz.json +++ b/languages/cz.json @@ -853,5 +853,6 @@ "Alert Sound Delay":"Zpoždění zvukového upozornění", "powerVideoEventLimit":"You have set a high event limit. Are you sure you want to make this request?", "There are no monitors that you can view with this account.":"There are no monitory that you can view with this account.", - "Use Built-In":"Použít vestavěné" + "Use Built-In":"Použít vestavěné", + "Primary":"Hlavní" } diff --git a/languages/en_CA.json b/languages/en_CA.json index 797ad83d..792f7c17 100644 --- a/languages/en_CA.json +++ b/languages/en_CA.json @@ -1705,5 +1705,6 @@ "fieldTextChannelSvf": "Place FFMPEG video filters in this box to affect the streaming portion. No spaces.", "Last Updated": "Last Updated", "Z-Wave Manager": "Z-Wave Manager", - "Z-Wave": "Z-Wave" + "Z-Wave": "Z-Wave", + "Primary":"Primary" } diff --git a/web/pages/blocks/home/infoBlocks.ejs b/web/pages/blocks/home/infoBlocks.ejs index 66928662..333f5e71 100644 --- a/web/pages/blocks/home/infoBlocks.ejs +++ b/web/pages/blocks/home/infoBlocks.ejs @@ -38,7 +38,7 @@ { "icon": "hdd", "name": "disk", - "label": `Default : `, + "label": `${lang.Primary} : `, }, ].forEach((item) => { %>