From f06a97d30bbca815a1476a7f76d8f50fd59975f3 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Mon, 14 Nov 2022 21:21:48 +0530
Subject: [PATCH] Move system info into settings
---
ui/index.html | 16 +++++++---------
ui/media/css/main.css | 1 +
ui/media/js/main.js | 3 +--
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ui/index.html b/ui/index.html
index 94a8d2ea..0964f393 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -7,7 +7,7 @@
<link rel="icon" type="image/png" href="/media/images/favicon-32x32.png" sizes="32x32">
<link rel="stylesheet" href="/media/css/fonts.css?v=1">
<link rel="stylesheet" href="/media/css/themes.css?v=2">
- <link rel="stylesheet" href="/media/css/main.css?v=13">
+ <link rel="stylesheet" href="/media/css/main.css?v=14">
<link rel="stylesheet" href="/media/css/auto-save.css?v=5">
<link rel="stylesheet" href="/media/css/modifier-thumbnails.css?v=4">
<link rel="stylesheet" href="/media/css/fontawesome-all.min.css?v=1">
@@ -35,9 +35,6 @@
<span id="tab-about" class="tab">
<span><i class="fa fa-comments icon"></i> Help & Community</span>
</span>
- <span id="tab-system-info" class="tab">
- <span><i class="fa fa-microchip icon"></i> System Info</span>
- </span>
</div>
</div>
@@ -242,6 +239,11 @@
<div id="system-settings" class="tab-content-inner">
<h1>System Settings</h1>
<table class="form-table"></table>
+ <br/>
+ <div>
+ <h3><i class="fa fa-microchip icon"></i> System Info</h3>
+ <div id="system-info"></div>
+ </div>
</div>
</div>
<div id="tab-content-about" class="tab-content">
@@ -283,10 +285,6 @@
</div>
</div>
</div>
- <div id="tab-content-system-info" class="tab-content">
- <div id="system-info" class="tab-content-inner">
- </div>
- </div>
</div>
@@ -330,7 +328,7 @@
<script src="media/js/inpainting-editor.js?v=1"></script>
<script src="media/js/image-modifiers.js?v=6"></script>
<script src="media/js/auto-save.js?v=8"></script>
-<script src="media/js/main.js?v=19"></script>
+<script src="media/js/main.js?v=20"></script>
<script src="media/js/themes.js?v=4"></script>
<script src="media/js/dnd.js?v=9"></script>
<script>
diff --git a/ui/media/css/main.css b/ui/media/css/main.css
index ff291c75..98447b1d 100644
--- a/ui/media/css/main.css
+++ b/ui/media/css/main.css
@@ -893,6 +893,7 @@ i.active {
}
#system-info {
max-width: 800px;
+ font-size: 10pt;
}
#system-info .value {
text-align: left;
diff --git a/ui/media/js/main.js b/ui/media/js/main.js
index 3c0c9c93..126d86b5 100644
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
@@ -203,12 +203,11 @@ function setSystemInfo(devices) {
activeGPUs = activeGPUs.map(ID_TO_TEXT)
let systemInfo = `
- <h1>System Info</h1>
<table>
<tr><td><label>Processor:</label></td><td class="value">${cpu}</td></tr>
<tr><td><label>Compatible Graphics Cards (all):</label></td><td class="value">${allGPUs.join('</br>')}</td></tr>
<tr><td></td><td> </td></tr>
- <tr><td><label>What's being used for rendering 🔥:</label></td><td class="value">${activeGPUs.join('</br>')}</td></tr>
+ <tr><td><label>Used for rendering 🔥:</label></td><td class="value">${activeGPUs.join('</br>')}</td></tr>
</table>`
let systemInfoEl = document.querySelector('#system-info')