Merge pull request #2387 from iNavFlight/MrD_Reorder-IPF-columns

Move Active column in IPF

Author: sensei-hacker

js/logicCondition.js

@@ -236,12 +236,12 @@ let LogicCondition = function (enabled, activatorId, operation, operandAType, op
     self.render = function (index, $container) {
 
         $container.find('tbody').append('<tr>\
+                <td class="logic_cell__activator"></div></td>\
                 <td class="logic_cell__index"></td>\
                 <td class="logic_cell__enabled"></td>\
                 <td class="logic_cell__operation"></td>\
                 <td class="logic_cell__operandA"></td>\
                 <td class="logic_cell__operandB"></td>\
-                <td class="logic_cell__activator"></div></td>\
                 <td class="logic_cell__flags"></div></td>\
                 <td class="logic_cell__status"></td>\
             </tr>\

locale/en/messages.json

@@ -5183,7 +5183,7 @@
         "message": "Close"
     },
     "logicActivator": {
-        "message": "Active"
+        "message": "Active when"
     },
     "save": {
         "message": "Save"

src/css/tabs/programming.css

@@ -37,4 +37,8 @@
     padding: 2px;
     margin-right: 1em;
     font-size: 13px;
+}
+
+.logic_cell__activator {
+    width: 145px;
 }

tabs/programming.html

@@ -20,12 +20,12 @@ <h2>GVAR 0</h2>
             <table class="mixer-table logic__table">
                 <thead>
                     <tr>
+                        <th data-i18n="logicActivator"></th>
                         <th style="width: 50px" data-i18n="logicId"></th>
                         <th style="width: 80px" data-i18n="logicEnabled"></th>
                         <th style="width: 120px" data-i18n="logicOperation"></th>
                         <th data-i18n="logicOperandA"></th>
                         <th data-i18n="logicOperandB"></th>
-                        <th data-i18n="logicActivator"></th>
                         <th style="width: 40px" data-i18n="logicFlags"></th>
                         <th style="width: 50px" data-i18n="logicStatus"></th>
                     </tr>