From 657129e4a7d95b1f23b25085e12fb3cd92f30081 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Fri, 23 Sep 2022 22:01:38 +0530
Subject: [PATCH] Don't cache modifiers; rearrange the modifier controls

---
 ui/index.html                    | 11 +++++------
 ui/media/modifier-thumbnails.css |  1 +
 ui/server.py                     |  3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index c84dbeff..1aaa1a72 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -170,15 +170,14 @@
             <div id="editor-modifiers" class="panel-box">
                 <h4 class="collapsible">Image Modifiers (art styles, tags etc)</h4>
                 <div id="editor-modifiers-entries" class="collapsible-content">
-                    <label for="preview-image">Preview:</label> 
+                    <label for="preview-image">Image Style:</label> 
                     <select id="preview-image" name="preview-image" value="portrait">
-                        <option value="portrait" selected="">Portrait</option>
+                        <option value="portrait" selected="">Face</option>
                         <option value="landscape">Landscape</option>
                     </select>
-                    <div>
-                        <label for="modifier-card-size-slider">Card Size:</label>
-                        <input id="modifier-card-size-slider" name="modifier-card-size-slider" value="0" type="range" min="-3" max="5">
-                    </div>
+                    &nbsp;
+                    <label for="modifier-card-size-slider">Card Size:</label>
+                    <input id="modifier-card-size-slider" name="modifier-card-size-slider" value="0" type="range" min="-3" max="5">
                 </div>
             </div>
         </div>
diff --git a/ui/media/modifier-thumbnails.css b/ui/media/modifier-thumbnails.css
index 23b3aec0..765bcb17 100644
--- a/ui/media/modifier-thumbnails.css
+++ b/ui/media/modifier-thumbnails.css
@@ -209,4 +209,5 @@
 #modifier-card-size-slider {
     width: 6em;
     margin-bottom: 0.5em;
+    transform: translateY(9pt);
 }
\ No newline at end of file
diff --git a/ui/server.py b/ui/server.py
index b3aa45a5..b446b2f1 100644
--- a/ui/server.py
+++ b/ui/server.py
@@ -206,7 +206,8 @@ def getAppConfig():
 
 @app.get('/modifiers.json')
 def read_modifiers():
-    return FileResponse(os.path.join(SD_UI_DIR, 'modifiers.json'))
+    headers = {"Cache-Control": "no-cache, no-store, must-revalidate", "Pragma": "no-cache", "Expires": "0"}
+    return FileResponse(os.path.join(SD_UI_DIR, 'modifiers.json'), headers=headers)
 
 @app.get('/output_dir')
 def read_home_dir():