Merge pull request #2146 from sensei-hacker/separate_mixer_wizard

clear separation between mixer preset and wizard
iNavFlight · Aug 22, 2024 · 69c6c92 · 69c6c92
2 parents c6890d3 + 98bdff2
commit 69c6c92
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/locale/en/messages.json b/locale/en/messages.json
@@ -2096,7 +2096,7 @@
         "message": "Mixer <span style=\"color: #37a8db\">saved</span>"
     },
     "mixerWizard": {
-        "message": "Mixer wizard"
+        "message": "Motor Mixer Wizard"
     },
     "mixerWizardInfo": {
         "message": "<ol><li>Remove propellers</li><li>Connect LiPo and use Outputs Tab to test all motors</li><li>Note the position of each motor (motor #1 - Left Top and so on)</li><li>Fill the table below</li></ol>"

diff --git a/tabs/mixer.html b/tabs/mixer.html
@@ -71,9 +71,6 @@
 
                             <div class="mixer-load-button">
                                 <div id="needToUpdateMixerMessage" class="is-hidden" data-i18n="mixerNotLoaded"></div>
-                                <div class="btn default_btn narrow green is-hidden">
-                                    <a id="mixer-wizard" href="#" data-i18n="mixerWizard"></a>
-                                </div>
                                 <div class="btn default_btn narrow red">
                                     <a id="load-and-apply-mixer-button" href="#" data-i18n="mixerLoadAndApplyPresetRules"></a>
                                 </div>
@@ -87,6 +84,17 @@
                         </div>
                     </div>
                 </div>
+                <div class="platform-type gui_box grey" id="mixer-wizard-gui_box" is-hidden>
+                    <div class="gui_box_titlebar">
+                        <div class="spacer_box_title" data-i18n="mixerWizard"></div>
+                    </div>
+
+                    <div class="spacer_box">
+                        <div class="btn default_btn narrow green">
+                            <a id="mixer-wizard" href="#" data-i18n="mixerWizard"></a>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="clear-both"></div>
@@ -264,7 +272,8 @@ <h1 class="modal__title modal__title--warning" data-i18n="mixerWizardModalTitle"
                 </table>
             </div>
         </div>
-        <div class="modal__buttons">
+
+        <div class="modal__buttons--upbottom">
             <a id="wizard-execute-button" class="modal__button modal__button--main" data-i18n="mixerWizardModalApply"></a>
         </div>
     </div>

diff --git a/tabs/mixer.js b/tabs/mixer.js
@@ -696,9 +696,9 @@ TABS.mixer.initialize = function (callback, scrollPosition) {
             FC.MIXER_CONFIG.appliedMixerPreset = presetId;
 
             if (currentMixerPreset.id == 3) {
-                $wizardButton.parent().removeClass("is-hidden");
+                $("#mixer-wizard-gui_box").removeClass("is-hidden");
             } else {
-                $wizardButton.parent().addClass("is-hidden");
+                $("#mixer-wizard-gui_box").addClass("is-hidden");
             }
 
             if (FC.MIXER_CONFIG.platformType == PLATFORM.AIRPLANE && currentMixerPreset.id != loadedMixerPresetID) {