From 3dc7887a35d18dd9fbee86b3a9568dfe4bdb7302 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 6 Mar 2021 13:55:02 +0000
Subject: [PATCH] Move theme selection into instance section

---
 webapp_profile.py | 74 +++++++++++++++++++++++------------------------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index a2a0a53a8..a511734b1 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1273,6 +1273,41 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
             instanceStr += \
                 '  <input type="file" id="instanceLogo" name="instanceLogo"'
             instanceStr += '      accept="' + imageFormats + '"><br>\n'
+
+            # Themes section
+            themes = getThemesList(baseDir)
+            themesDropdown += '  <br><b><label class="labels">' + \
+                translate['Theme'] + '</label></b><br>\n'
+            grayscaleFilename = \
+                baseDir + '/accounts/.grayscale'
+            grayscale = ''
+            if os.path.isfile(grayscaleFilename):
+                grayscale = 'checked'
+            themesDropdown += \
+                '      <input type="checkbox" class="profilecheckbox" ' + \
+                'name="grayscale" ' + grayscale + \
+                '> ' + translate['Grayscale'] + '<br>'
+            themesDropdown += '  <select id="themeDropdown" ' + \
+                'name="themeDropdown" class="theme">'
+            for themeName in themes:
+                themesDropdown += '    <option value="' + \
+                    themeName.lower() + '">' + \
+                    translate[themeName] + '</option>'
+            themesDropdown += '  </select><br>'
+            if os.path.isfile(baseDir + '/fonts/custom.woff') or \
+               os.path.isfile(baseDir + '/fonts/custom.woff2') or \
+               os.path.isfile(baseDir + '/fonts/custom.otf') or \
+               os.path.isfile(baseDir + '/fonts/custom.ttf'):
+                themesDropdown += \
+                    '      <input type="checkbox" class="profilecheckbox" ' + \
+                    'name="removeCustomFont"> ' + \
+                    translate['Remove the custom font'] + '<br>'
+            themeName = getConfigParam(baseDir, 'theme')
+            themesDropdown = \
+                themesDropdown.replace('<option value="' + themeName + '">',
+                                       '<option value="' + themeName +
+                                       '" selected>')
+            instanceStr += themesDropdown
             instanceStr += \
                 '  <br><label class="labels">' + \
                 translate['Security'] + '</label><br>\n'
@@ -1315,42 +1350,6 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                 translate['This is a news instance'] + '<br>\n'
             instanceStr += '    </div>\n'
 
-            # Themes section
-            themes = getThemesList(baseDir)
-            themesDropdown = '<div class="container">'
-            themesDropdown += '  <b><label class="labels">' + \
-                translate['Theme'] + '</label></b><br>\n'
-            grayscaleFilename = \
-                baseDir + '/accounts/.grayscale'
-            grayscale = ''
-            if os.path.isfile(grayscaleFilename):
-                grayscale = 'checked'
-            themesDropdown += \
-                '      <input type="checkbox" class="profilecheckbox" ' + \
-                'name="grayscale" ' + grayscale + \
-                '> ' + translate['Grayscale'] + '<br>'
-            themesDropdown += '  <select id="themeDropdown" ' + \
-                'name="themeDropdown" class="theme">'
-            for themeName in themes:
-                themesDropdown += '    <option value="' + \
-                    themeName.lower() + '">' + \
-                    translate[themeName] + '</option>'
-            themesDropdown += '  </select><br>'
-            if os.path.isfile(baseDir + '/fonts/custom.woff') or \
-               os.path.isfile(baseDir + '/fonts/custom.woff2') or \
-               os.path.isfile(baseDir + '/fonts/custom.otf') or \
-               os.path.isfile(baseDir + '/fonts/custom.ttf'):
-                themesDropdown += \
-                    '      <input type="checkbox" class="profilecheckbox" ' + \
-                    'name="removeCustomFont"> ' + \
-                    translate['Remove the custom font'] + '<br>'
-            themesDropdown += '    </div>\n'
-            themeName = getConfigParam(baseDir, 'theme')
-            themesDropdown = \
-                themesDropdown.replace('<option value="' + themeName + '">',
-                                       '<option value="' + themeName +
-                                       '" selected>')
-
             # Role assignments section
             moderators = ''
             moderatorsFile = baseDir + '/accounts/moderators.txt'
@@ -1735,8 +1734,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += '      <label class="labels">' + \
         translate[idx] + '</label>\n'
     editProfileForm += skillsStr
-    editProfileForm += themesDropdown + roleAssignStr
-    editProfileForm += peertubeStr + instanceStr
+    editProfileForm += roleAssignStr + peertubeStr + instanceStr
     editProfileForm += '    <div class="container">\n'
     editProfileForm += '      <b><label class="labels">' + \
         translate['Danger Zone'] + '</label></b><br>\n'