sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Firmware flasher: classic build toggle - moved to build configuration header (#3091)

10.9-maintenance
Ivan Efimov 2022-11-20 12:14:48 -06:00 committed by GitHub
parent d6c129fb1f
commit 50fc11cd66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/css/main.less
View File

@ -1439,6 +1439,9 @@ dialog {
float: left; float: left;
margin-bottom: 7px; margin-bottom: 7px;
font-weight: 600; font-weight: 600;
.switchery {
margin-top: -3px;
}
} }
.gui_box_bottombar { .gui_box_bottombar {
background-color: #e4e4e4; background-color: #e4e4e4;
@ -2365,6 +2368,9 @@ button.active {
padding-bottom: 0; padding-bottom: 0;
margin-bottom: 5px; margin-bottom: 5px;
float: left; float: left;
.switchery {
margin-top: -3px;
}
} }
.spacer_box_title { .spacer_box_title {
padding-left: 10px; padding-left: 10px;
@ -2464,6 +2470,9 @@ button.active {
padding-bottom: 0; padding-bottom: 0;
margin-bottom: 5px; margin-bottom: 5px;
float: left; float: left;
.switchery {
margin-top: -3px;
}
} }
.spacer_box_title { .spacer_box_title {
padding-left: 10px; padding-left: 10px;

13
src/css/tabs/firmware_flasher.less
View File

@ -188,6 +188,12 @@
font-size: 11px; font-size: 11px;
} }
} }
.build_configuration_toggle_wrapper {
float: left;
position: absolute;
padding-left: 15px;
padding-top: 4px;
}
} }
.btn { .btn {
.disabled { .disabled {
@ -225,6 +231,11 @@
} }
} }
#customDefines { #customDefines {
width: calc(95% - 6px); width: calc(95% - 10px);
height: 26px; height: 26px;
} }
#build_configuration_toggle_label_text {
margin-left: 6px;
padding-top: 2px;
margin-right: 10px;
}

6
src/js/tabs/firmware_flasher.js
View File

@ -650,11 +650,7 @@ firmware_flasher.initialize = function (callback) {
$('input.classicbuild_mode').change(function () { $('input.classicbuild_mode').change(function () {
const status = $(this).is(':checked'); const status = $(this).is(':checked');
$('select[name="radioProtocols"]').attr('disabled', status); $('.hide-in-classic-build-mode').toggle(!status);
$('select[name="telemetryProtocols"]').attr('disabled', status);
$('select[name="motorProtocols"]').attr('disabled', status);
$('select[name="options"]').attr('disabled', status);
$('input[name="customDefines"]').attr('disabled', status);
}); });
$('input.classicbuild_mode').change(); $('input.classicbuild_mode').change();

22
src/tabs/firmware_flasher.html
View File

@ -145,25 +145,19 @@
</p> </p>
</div> </div>
<div class="build_configuration gui_box"> <div class="build_configuration gui_box" style="position: relative;">
<div class="darkgrey_box gui_box_titlebar"> <div class="darkgrey_box gui_box_titlebar">
<div class="spacer_box_title" style="text-align: center;" i18n="firmwareFlasherBuildConfigurationHead"> <div class="build_configuration_toggle_wrapper">
</div> <label id="build_configuration_toggle_label">
</div>
<div class="spacer" style="margin-bottom: 10px;">
<div class="margin-bottom">
<div style="width: 49%; float: left;">
<label>
<input class="classicbuild_mode toggle" type="checkbox" name="classicBuildModeCheckbox" /> <input class="classicbuild_mode toggle" type="checkbox" name="classicBuildModeCheckbox" />
<span i18n="classicBuild"></span> <span id="build_configuration_toggle_label_text" i18n="classicBuild"></span>
</label> </label>
<div class="helpicon cf_tip_wide" i18n_title="classicBuildModeDescription"></div> <div class="helpicon cf_tip_wide" i18n_title="classicBuildModeDescription"></div>
</div> </div>
<div style="width: 49%; float: right;"> <div class="spacer_box_title" style="text-align: center;" i18n="firmwareFlasherBuildConfigurationHead">
</div> </div>
</div> </div>
</div> <div class="spacer hide-in-classic-build-mode" style="margin-bottom: 10px;">
<div class="spacer" style="margin-bottom: 10px;">
<div class="margin-bottom"> <div class="margin-bottom">
<div style="width: 49%; float: left;"> <div style="width: 49%; float: left;">
<strong i18n="firmwareFlasherBuildRadioProtocols"></strong> <strong i18n="firmwareFlasherBuildRadioProtocols"></strong>
@ -183,7 +177,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="spacer" style="margin-bottom: 10px;"> <div class="spacer hide-in-classic-build-mode" style="margin-bottom: 10px;">
<div class="margin-bottom"> <div class="margin-bottom">
<div style="width: 49%; float: left;"> <div style="width: 49%; float: left;">
<strong i18n="firmwareFlasherBuildOptions"></strong> <strong i18n="firmwareFlasherBuildOptions"></strong>
@ -213,7 +207,7 @@
<div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherBranchDescription"></div> <div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherBranchDescription"></div>
</div> </div>
</div> </div>
<div style="width: 49%; float: right;"> <div style="width: 49%; float: right;" class="hide-in-classic-build-mode">
<strong i18n="firmwareFlasherBuildCustomDefines"></strong> <strong i18n="firmwareFlasherBuildCustomDefines"></strong>
<div id="customDefinesInfo"> <div id="customDefinesInfo">
<input id="customDefines" name="customDefines"></input> <input id="customDefines" name="customDefines"></input>