diff options
| author | Pawel Spychalski (DzikuVx) <pspychalski@gmail.com> | 2019-04-01 22:22:22 +0300 |
|---|---|---|
| committer | Pawel Spychalski (DzikuVx) <pspychalski@gmail.com> | 2019-04-01 22:22:22 +0300 |
| commit | e23a8a518935179a465bf8d1c0fa4e7539d0f3ba (patch) | |
| tree | 8d28f6c99dd680a6ddb629f2881f705de7ea6959 /tabs | |
| parent | 2a4f9309b9853b03e7ba071115924229cfd55245 (diff) | |
UI improvements and saving
Diffstat (limited to 'tabs')
| -rw-r--r-- | tabs/mixer.html | 17 | ||||
| -rw-r--r-- | tabs/mixer.js | 5 |
2 files changed, 16 insertions, 6 deletions
diff --git a/tabs/mixer.html b/tabs/mixer.html index 81f86219..4326e82a 100644 --- a/tabs/mixer.html +++ b/tabs/mixer.html @@ -127,10 +127,11 @@ </div> <div id="logic-wrapper"> - <div id="logic-background" class="logic__background"></div> - <div id="logic-content" class="logic__content"> + <div class="logic__background"></div> + <div class="logic__content"> <div class="tab_title" data-i18n="tabLogicConditions"></div> - <table id="logic-table" class="mixer-table"> + <div class="logic__content--wrapper"> + <table class="mixer-table logic__table"> <thead> <tr> <th style="width: 50px" data-i18n="logicId"></th> @@ -142,9 +143,17 @@ </tr> </thead> <tbody> - </tbody> </table> + </div> + <div class="logic__content--buttons content_toolbar"> + <div class="btn save_btn"> + <a href="#" class="logic__save" data-i18n="logicSave"></a> + </div> + <div class="btn save_btn red"> + <a href="#" class="logic__close" data-i18n="logicClose"></a> + </div> + </div> </div> </div> </div> diff --git a/tabs/mixer.js b/tabs/mixer.js index 49c5dee9..071ed9eb 100644 --- a/tabs/mixer.js +++ b/tabs/mixer.js @@ -1,4 +1,4 @@ -/*global $,helper,mspHelper,MSP,GUI,SERVO_RULES,MOTOR_RULES,MIXER_CONFIG,googleAnalytics*/ +/*global $,helper,mspHelper,MSP,GUI,SERVO_RULES,MOTOR_RULES,MIXER_CONFIG,googleAnalytics,LOGIC_CONDITIONS,TABS,ServoMixRule*/ 'use strict'; TABS.mixer = {}; @@ -379,7 +379,8 @@ TABS.mixer.initialize = function (callback, scrollPosition) { localize(); - LOGIC_CONDITIONS.render($('#logic-table')); + LOGIC_CONDITIONS.init($('#logic-wrapper')); + LOGIC_CONDITIONS.render(); GUI.content_ready(callback); } |