From 4429594a43cdabf6889c123b54ac4bfae0a1e407 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Tue, 17 Nov 2020 23:14:47 +0100 Subject: [PATCH] luci-mod-status: move svg to dedicated dir Move svgs from top dir to a dedicated svgs dir. Signed-off-by: Ansuel Smith --- .../htdocs/luci-static/resources/{ => svg}/bandwidth.svg | 0 .../htdocs/luci-static/resources/{ => svg}/connections.svg | 0 .../htdocs/luci-static/resources/{ => svg}/load.svg | 0 .../htdocs/luci-static/resources/{ => svg}/wifirate.svg | 0 .../htdocs/luci-static/resources/{ => svg}/wireless.svg | 0 .../htdocs/luci-static/resources/view/status/bandwidth.js | 2 +- .../htdocs/luci-static/resources/view/status/connections.js | 2 +- .../htdocs/luci-static/resources/view/status/load.js | 2 +- .../htdocs/luci-static/resources/view/status/wireless.js | 4 ++-- 9 files changed, 5 insertions(+), 5 deletions(-) rename modules/luci-mod-status/htdocs/luci-static/resources/{ => svg}/bandwidth.svg (100%) rename modules/luci-mod-status/htdocs/luci-static/resources/{ => svg}/connections.svg (100%) rename modules/luci-mod-status/htdocs/luci-static/resources/{ => svg}/load.svg (100%) rename modules/luci-mod-status/htdocs/luci-static/resources/{ => svg}/wifirate.svg (100%) rename modules/luci-mod-status/htdocs/luci-static/resources/{ => svg}/wireless.svg (100%) diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/bandwidth.svg b/modules/luci-mod-status/htdocs/luci-static/resources/svg/bandwidth.svg similarity index 100% rename from modules/luci-mod-status/htdocs/luci-static/resources/bandwidth.svg rename to modules/luci-mod-status/htdocs/luci-static/resources/svg/bandwidth.svg diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/connections.svg b/modules/luci-mod-status/htdocs/luci-static/resources/svg/connections.svg similarity index 100% rename from modules/luci-mod-status/htdocs/luci-static/resources/connections.svg rename to modules/luci-mod-status/htdocs/luci-static/resources/svg/connections.svg diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/load.svg b/modules/luci-mod-status/htdocs/luci-static/resources/svg/load.svg similarity index 100% rename from modules/luci-mod-status/htdocs/luci-static/resources/load.svg rename to modules/luci-mod-status/htdocs/luci-static/resources/svg/load.svg diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/wifirate.svg b/modules/luci-mod-status/htdocs/luci-static/resources/svg/wifirate.svg similarity index 100% rename from modules/luci-mod-status/htdocs/luci-static/resources/wifirate.svg rename to modules/luci-mod-status/htdocs/luci-static/resources/svg/wifirate.svg diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/wireless.svg b/modules/luci-mod-status/htdocs/luci-static/resources/svg/wireless.svg similarity index 100% rename from modules/luci-mod-status/htdocs/luci-static/resources/wireless.svg rename to modules/luci-mod-status/htdocs/luci-static/resources/svg/wireless.svg diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/bandwidth.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/bandwidth.js index edb934ed93..7953d8dbf5 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/bandwidth.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/bandwidth.js @@ -27,7 +27,7 @@ function rate(n, br) { return view.extend({ load: function() { return Promise.all([ - this.loadSVG(L.resource('bandwidth.svg')), + this.loadSVG(L.resource('svg/bandwidth.svg')), network.getDevices() ]); }, diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js index 4c1b097f2b..cc89811428 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js @@ -36,7 +36,7 @@ Math.log2 = Math.log2 || function(x) { return Math.log(x) * Math.LOG2E; }; return view.extend({ load: function() { return Promise.all([ - this.loadSVG(L.resource('connections.svg')) + this.loadSVG(L.resource('svg/connections.svg')) ]); }, diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/load.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/load.js index 3b302dc509..cfb7a96b08 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/load.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/load.js @@ -19,7 +19,7 @@ Math.log2 = Math.log2 || function(x) { return Math.log(x) * Math.LOG2E; }; return view.extend({ load: function() { return Promise.all([ - this.loadSVG(L.resource('load.svg')) + this.loadSVG(L.resource('svg/load.svg')) ]); }, diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/wireless.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/wireless.js index 171899262a..95077bc10a 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/wireless.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/wireless.js @@ -21,8 +21,8 @@ Math.log2 = Math.log2 || function(x) { return Math.log(x) * Math.LOG2E; }; return view.extend({ load: function() { return Promise.all([ - this.loadSVG(L.resource('wireless.svg')), - this.loadSVG(L.resource('wifirate.svg')), + this.loadSVG(L.resource('svg/wireless.svg')), + this.loadSVG(L.resource('svg/wifirate.svg')), network.getWifiDevices().then(function(radios) { var tasks = [], all_networks = []; -- 2.30.2