diff --git a/plugins/uisptools/serverSide.mjs b/plugins/uisptools/serverSide.mjs
index 8c4734b..e1db347 100644
--- a/plugins/uisptools/serverSide.mjs
+++ b/plugins/uisptools/serverSide.mjs
@@ -28,13 +28,12 @@ var uisptools = {
//Any Routes above this line are not Checked for Auth and are Public
router.get('/' + this.uispToolsApiRequestHandler.options.urlPrefix + 'uisptools/api/*', this.checkApiAccess);
router.get('/' + this.uispToolsApiRequestHandler.options.urlPrefix + 'uisptools/api/getMenuItems', this.getMenuItems);
- router.get('/' + this.uispToolsApiRequestHandler.options.urlPrefix + 'uisptools/api/getMenuItems', this.getMenuItems);
} catch (ex) {
this.debug("error", ex.msg, ex.stack);
}
}
- fetchSiteClients(siteId){
+ getMenuItems(siteId){
return $.uisptools.ajax("/" + this.uispToolsApiRequestHandler.options.urlPrefix + "uisptools/api/nms/sites/" + siteId + "/clients");
}
diff --git a/plugins/wilcowireless/widgets/freqmapper/freqmapper.js b/plugins/wilcowireless/widgets/freqmapper/freqmapper.js
index 221b4ff..0b28d55 100644
--- a/plugins/wilcowireless/widgets/freqmapper/freqmapper.js
+++ b/plugins/wilcowireless/widgets/freqmapper/freqmapper.js
@@ -1,5 +1,5 @@
"use strict"
- import baseClientSide from "/uisptools/plugins/baseClientSide.js";
+ import baseClientSide from "../../../baseClientSide.js";
/*
* uisptools 1.0
* Copyright (c) 2022 Wilco Wireless
diff --git a/plugins/wilcowireless/widgets/towerclients/towerclients.js b/plugins/wilcowireless/widgets/towerclients/towerclients.js
index 799ddb4..c3da6ff 100644
--- a/plugins/wilcowireless/widgets/towerclients/towerclients.js
+++ b/plugins/wilcowireless/widgets/towerclients/towerclients.js
@@ -1,5 +1,5 @@
"use strict"
- import baseClientSide from "/uisptools/plugins/baseClientSide.js";
+ import baseClientSide from "../../../baseClientSide.js";
/*
* uisptools 1.0
* Copyright (c) 2022 Wilco Wireless
diff --git a/public/footer.htm b/public/footer.htm
new file mode 100644
index 0000000..60adba7
--- /dev/null
+++ b/public/footer.htm
@@ -0,0 +1,5 @@
+
+
+ © 2023 - Wireless Inc - 123 Any St. Anytown, MS 66757 - (555) 555-1212
+
+
\ No newline at end of file
diff --git a/public/index.htm b/public/index.htm
index 797f234..1ddbfb1 100644
--- a/public/index.htm
+++ b/public/index.htm
@@ -79,7 +79,7 @@
diff --git a/public/scripts/app/uispTools.js b/public/scripts/app/uispTools.js
index fbd27bb..b2078f6 100644
--- a/public/scripts/app/uispTools.js
+++ b/public/scripts/app/uispTools.js
@@ -39,6 +39,7 @@
templateCache: {
"login": { url: 'scripts/app/templates/login.htm', data: '', isLoaded: false },
"error": { url: 'scripts/app/templates/error.htm', data: '', isLoaded: false },
+ "footer": { url: 'footer.htm', data: '', isLoaded: false },
"defaultModal" : {url: 'scripts/app/templates/default.modal.htm', data: '', isLoaded: false}
},
@@ -232,6 +233,7 @@
//$.logToConsole("$.uisptools.appInit() DONE");
$.when(
+ $.uisptools.updateFooter(),
$.uisptools.getMenuItems(),
$.uisptools.loadPageContent()
).done(function (x, data) {
@@ -356,6 +358,9 @@
)
},
+
+
+
showPageContent: function (page) {
document.title = page.pageTitle;
$('meta[name="description"]').attr("content", page.pageDescription);
@@ -505,7 +510,13 @@
},
-
+ updateFooter: function () {
+ var deferred = $.Deferred();
+ $.uisptools.getTemplateCache("footer").then(function (footer) {
+ let $footer = $("footer").html(footer);
+ });
+ return deferred.promise();
+ },
getTemplateContent: function (options) {
diff --git a/server.js b/server.js
index 56ddc2e..22e3550 100644
--- a/server.js
+++ b/server.js
@@ -231,13 +231,7 @@ var getSocketInfo = function (socket) {
return { ip: ip };
};
-//config public files are used before public folder files to allow overwrite.
-if(fs.existsSync(path.join(__dirname, objOptions.configDirectory, 'public'))){
- app.use(express.static(path.join(__dirname, objOptions.configDirectory, 'public')));
-}
-
-app.use(express.static(path.join(__dirname, 'public')));
// disable the x-power-by express message in the header
@@ -510,11 +504,14 @@ var handlePublicFileRequest = function (req, res) {
//}
- if (fs.existsSync(path.join(__dirname, 'public',filePath)) === true) {
-
-
- res.sendFile(filePath, { root: path.join(__dirname, 'public') });
-
+ //config public files are used before public folder files to allow overwrite.
+
+
+
+ if (fs.existsSync(path.join(__dirname, objOptions.configDirectory, 'public',filePath)) === true) {
+ res.sendFile(filePath, { root: path.join(__dirname, objOptions.configDirectory, 'public') });
+ }else if (fs.existsSync(path.join(__dirname, 'public',filePath)) === true) {
+ res.sendFile(filePath, { root: path.join(__dirname, 'public') });
} else {
let fileExt = path.extname(filePath);
if(fileExt === "" || fileExt === ".htm" || fileExt === ".html"){