From fe40731df3c430066f4c5904b72bd0ab32b6031d Mon Sep 17 00:00:00 2001 From: James Read Date: Thu, 29 Feb 2024 21:27:34 +0000 Subject: [PATCH 1/2] bugfix: PageTitle works again (#236) --- webui.dev/js/marshaller.js | 2 +- webui.dev/main.js | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/webui.dev/js/marshaller.js b/webui.dev/js/marshaller.js index b578197..c3b66b3 100644 --- a/webui.dev/js/marshaller.js +++ b/webui.dev/js/marshaller.js @@ -294,7 +294,7 @@ function changeDirectory (selected) { const title = document.querySelector('h1') title.innerHTML = '' - const rootLink = createDirectoryBreadcrumb('OliveTin', null) + const rootLink = createDirectoryBreadcrumb(window.pageTitle, null) title.appendChild(rootLink) for (const dir of window.directoryNavigation) { diff --git a/webui.dev/main.js b/webui.dev/main.js index cb366f2..593d485 100644 --- a/webui.dev/main.js +++ b/webui.dev/main.js @@ -115,10 +115,15 @@ function processWebuiSettingsJson (settings) { document.querySelector('#perma-widget').hidden = !settings.ShowNavigation document.querySelector('footer[title="footer"]').hidden = !settings.ShowFooter + window.pageTitle = 'OliveTin' + if (settings.PageTitle) { - document.title = settings.PageTitle + window.pageTitle = settings.PageTitle + + document.title = window.pageTitle + const titleElem = document.querySelector('#page-title') - if (titleElem) titleElem.innerText = settings.PageTitle + if (titleElem) titleElem.innerText = window.pageTitle } } From 12cc61fba524ec459b542a4c735b1bc8e18fcfc2 Mon Sep 17 00:00:00 2001 From: James Read Date: Thu, 29 Feb 2024 21:27:54 +0000 Subject: [PATCH 2/2] feature: Nicer container dashboard example in the default config (#235) --- config.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config.yaml b/config.yaml index abd604f..3297ff5 100644 --- a/config.yaml +++ b/config.yaml @@ -5,6 +5,7 @@ # Listen on all addresses available, port 1337 listenAddressSingleHTTPFrontend: 0.0.0.0:1337 + # Choose from INFO (default), WARN and DEBUG logLevel: "INFO" @@ -256,12 +257,13 @@ dashboards: # This is the second dashboard. - title: My Containers contents: - - title: Container {{ container.Names }} + - title: 'Container {{ container.Names }} ({{ container.Image }})' entity: container type: fieldset contents: - type: display title: | - {{ container.Names }}

{{ container.State }} + {{ container.RunningFor }}

{{ container.State }} + - title: 'Start {{ container.Names }}' - title: 'Stop {{ container.Names }}'