Update built-in extensions to use fixed order in extensions menu

public/css/extensions-panel.css

@@ -97,114 +97,7 @@ input.extension_missing[type="checkbox"] {
     flex-direction: column;
 }
 
-/** LEFT COLUMN **/
+/* Fixes order of settings for extensions */
-/* Must be always on top */
+.extension_container {
-#extensions_settings>#assets_ui {
+    display: contents;
-    order: -1;
-}
-
-#extensions_settings>.expression_settings {
-    order: 2;
-}
-
-#extensions_settings>.background_settings {
-    order: 3;
-}
-
-#extensions_settings>.sd_settings {
-    order: 4;
-}
-
-#extensions_settings>#tts_settings {
-    order: 5;
-}
-
-#extensions_settings>#rvc_settings {
-    order: 6;
-}
-
-#extensions_settings>.objective-settings {
-    order: 7;
-}
-
-#extensions_settings>#speech_recognition_settings {
-    order: 8;
-}
-
-#extensions_settings>#audio_settings {
-    order: 9;
-}
-
-/** RIGHT COLUMN **/
-#extensions_settings2>.translation_settings {
-    order: 1;
-}
-
-#extensions_settings2>.caption_settings {
-    order: 2;
-}
-
-#extensions_settings2>.quickReplySettings {
-    order: 3;
-}
-
-#extensions_settings2>.idle-settings {
-    order: 4;
-}
-
-#extensions_settings2>#memory_settings {
-    order: 5;
-}
-
-#extensions_settings2>.hypebot_settings {
-    order: 6;
-}
-
-#extensions_settings2>.regex_settings {
-    order: 7;
-}
-
-#extensions_settings2>.vectors_settings {
-    order: 8;
-}
-
-#extensions_settings2>.chromadb_settings {
-    order: 9;
-}
-
-#extensions_settings2>.randomizer_settings {
-    order: 10;
-}
-
-/** WAND MENU **/
-#extensionsMenu>#ttsExtensionMenuItem {
-    order: 1;
-}
-
-#extensionsMenu>#sd_gen {
-    order: 2;
-}
-
-#extensionsMenu>#send_picture {
-    order: 3;
-}
-
-#extensionsMenu>#token_counter {
-    order: 4;
-}
-
-#extensionsMenu>#objective-task-manual-check-menu-item {
-    order: 5;
-}
-
-#extensionsMenu>#roll_dice {
-    order: 6;
-}
-
-#extensionsMenu>#translate_chat {
-    order: 7;
-}
-
-#extensionsMenu>#translate_input_message {
-    order: 8;
 }

public/index.html

@@ -4334,8 +4334,31 @@
                         </div>
                     </div>
                     <div id="extensions_settings" class="flex1 wide50p">
+                        <div id="assets_container" class="extension_container"></div>
+                        <div id="expressions_container" class="extension_container"></div>
+                        <div id="sd_container" class="extension_container"></div>
+                        <div id="tts_container" class="extension_container"></div>
+                        <div id="stt_container" class="extension_container"></div>
+                        <div id="audio_container" class="extension_container"></div>
+                        <div id="silence_container" class="extension_container"></div>
+                        <div id="objective_container" class="extension_container"></div>
+                        <div id="blip_container" class="extension_container"></div>
+                        <div id="live2d_container" class="extension_container"></div>
+                        <div id="vrm_container" class="extension_container"></div>
+                        <div id="timelines_container" class="extension_container"></div>
                     </div>
                     <div id="extensions_settings2" class="flex1 wide50p">
+                        <div id="websearch_container" class="extension_container"></div>
+                        <div id="emulatorjs_container" class="extension_container"></div>
+                        <div id="qr_container" class="extension_container"></div>
+                        <div id="translation_container" class="extension_container"></div>
+                        <div id="caption_container" class="extension_container"></div>
+                        <div id="idle_container" class="extension_container"></div>
+                        <div id="summarize_container" class="extension_container"></div>
+                        <div id="hypebot_container" class="extension_container"></div>
+                        <div id="regex_container" class="extension_container"></div>
+                        <div id="vectors_container" class="extension_container"></div>
+                        <div id="randomizer_container" class="extension_container"></div>
                     </div>
                     <hr class="wide100p margin0">
                     <div class="alignitemscenter flex-container justifyCenter wide100p" style="justify-content: space-between;">

public/scripts/extensions/assets/index.js

@@ -440,7 +440,7 @@ jQuery(async () => {
     });
 
     windowHtml.find('#assets_filters').hide();
-    $('#extensions_settings').append(windowHtml);
+    $('#assets_container').append(windowHtml);
 
     eventSource.on(event_types.OPEN_CHARACTER_LIBRARY, async (forceDefault) => {
         openCharacterBrowser(forceDefault);

public/scripts/extensions/caption/index.js

@@ -409,7 +409,7 @@ jQuery(async function () {
     }
     async function addSettings() {
         const html = await renderExtensionTemplateAsync('caption', 'settings');
-        $('#extensions_settings2').append(html);
+        $('#caption_container').append(html);
     }
 
     await addSettings();

public/scripts/extensions/expressions/index.js

@@ -1929,7 +1929,7 @@ function migrateSettings() {
     }
     async function addSettings() {
         const template = await renderExtensionTemplateAsync(MODULE_NAME, 'settings');
-        $('#extensions_settings').append(template);
+        $('#expressions_container').append(template);
         $('#expression_override_button').on('click', onClickExpressionOverrideButton);
         $('#expressions_show_default').on('input', onExpressionsShowDefaultInput);
         $('#expression_upload_pack_button').on('click', onClickExpressionUploadPackButton);

public/scripts/extensions/memory/index.js

@@ -900,7 +900,7 @@ function setupListeners() {
 jQuery(async function () {
     async function addExtensionControls() {
         const settingsHtml = await renderExtensionTemplateAsync('memory', 'settings', { defaultSettings });
-        $('#extensions_settings2').append(settingsHtml);
+        $('#summarize_container').append(settingsHtml);
         setupListeners();
         $('#summaryExtensionPopoutButton').off('click').on('click', function (e) {
             doPopout(e);

public/scripts/extensions/quick-reply/index.js

@@ -169,7 +169,7 @@ const init = async () => {
     log('settings: ', settings);
 
     manager = new SettingsUi(settings);
-    document.querySelector('#extensions_settings2').append(await manager.render());
+    document.querySelector('#qr_container').append(await manager.render());
 
     buttons = new ButtonUi(settings);
     buttons.show();

public/scripts/extensions/regex/index.js

@@ -470,7 +470,7 @@ jQuery(async () => {
     }
 
     const settingsHtml = $(await renderExtensionTemplateAsync('regex', 'dropdown'));
-    $('#extensions_settings2').append(settingsHtml);
+    $('#regex_container').append(settingsHtml);
     $('#open_regex_editor').on('click', function () {
         onRegexEditorOpenClick(false, false);
     });

public/scripts/extensions/stable-diffusion/index.js

@@ -3392,7 +3392,7 @@ jQuery(async () => {
 
 
     const template = await renderExtensionTemplateAsync('stable-diffusion', 'settings', defaultSettings);
-    $('#extensions_settings').append(template);
+    $('#sd_container').append(template);
     $('#sd_source').on('change', onSourceChange);
     $('#sd_scale').on('input', onScaleInput);
     $('#sd_steps').on('input', onStepsInput);

public/scripts/extensions/translate/index.js

@@ -572,7 +572,7 @@ jQuery(async () => {
 
     const buttonHtml = await renderExtensionTemplateAsync('translate', 'buttons');
     $('#extensionsMenu').append(buttonHtml);
-    $('#extensions_settings2').append(html);
+    $('#translation_container').append(html);
     $('#translate_chat').on('click', onTranslateChatClick);
     $('#translate_input_message').on('click', onTranslateInputMessageClick);
     $('#translation_clear').on('click', onTranslationsClearClick);

public/scripts/extensions/tts/index.js

@@ -1162,7 +1162,7 @@ $(document).ready(function () {
             </div>
         </div>
         `;
-        $('#extensions_settings').append(settingsHtml);
+        $('#tts_container').append(settingsHtml);
         $('#tts_refresh').on('click', onRefreshClick);
         $('#tts_enabled').on('click', onEnableClick);
         $('#tts_narrate_dialogues').on('click', onNarrateDialoguesClick);

public/scripts/extensions/vectors/index.js

@@ -1279,7 +1279,7 @@ jQuery(async () => {
     // Migrate from TensorFlow to Transformers
     settings.source = settings.source !== 'local' ? settings.source : 'transformers';
     const template = await renderExtensionTemplateAsync(MODULE_NAME, 'settings');
-    $('#extensions_settings2').append(template);
+    $('#vectors_container').append(template);
     $('#vectors_enabled_chats').prop('checked', settings.enabled_chats).on('input', () => {
         settings.enabled_chats = $('#vectors_enabled_chats').prop('checked');
         Object.assign(extension_settings.vectors, settings);