Просмотр исходного кода

Merge branch 'main' of ssh://github.com/OliveTin/OliveTin

jamesread 2 лет назад
Родитель
Сommit
25e643371e
3 измененных файлов с 12 добавлено и 5 удалено
  1. 4 2
      config.yaml
  2. 1 1
      webui.dev/js/marshaller.js
  3. 7 2
      webui.dev/main.js

+ 4 - 2
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 }} <br /><br /><strong>{{ container.State }}</strong>
+              {{ container.RunningFor }} <br /><br /><strong>{{ container.State }}</strong>
+
           - title: 'Start {{ container.Names }}'
           - title: 'Stop {{ container.Names }}'

+ 1 - 1
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) {

+ 7 - 2
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
   }
 }