Bug 1381692 - Reorder and rename the Grid display settings checkboxes. r=micah draft
authorGabriel Luong <gabriel.luong@gmail.com>
Mon, 17 Jul 2017 20:47:15 -0400
changeset 610237 bb7538c8c4e0f3b123c2e468ff4badb221b8092a
parent 610235 75c857f94fd58a988cd478a1e3be16d67dabfe3d
child 637784 53b2333d8a2b2059afb3eb54d9eb6aaa8bc1687b
push id68807
push userbmo:gl@mozilla.com
push dateTue, 18 Jul 2017 00:47:29 +0000
reviewersmicah
bugs1381692
milestone56.0a1
Bug 1381692 - Reorder and rename the Grid display settings checkboxes. r=micah MozReview-Commit-ID: BYEPuPiNGUd
devtools/client/inspector/grids/components/GridDisplaySettings.js
devtools/client/locales/en-US/layout.properties
--- a/devtools/client/inspector/grids/components/GridDisplaySettings.js
+++ b/devtools/client/inspector/grids/components/GridDisplaySettings.js
@@ -68,33 +68,16 @@ module.exports = createClass({
         dom.li(
           {
             className: "grid-settings-item",
           },
           dom.label(
             {},
             dom.input(
               {
-                id: "grid-setting-extend-grid-lines",
-                type: "checkbox",
-                checked: highlighterSettings.showInfiniteLines,
-                onChange: this.onShowInfiniteLinesCheckboxClick,
-              }
-            ),
-            getStr("layout.extendGridLinesInfinitely")
-          )
-        ),
-        dom.li(
-          {
-            className: "grid-settings-item",
-          },
-          dom.label(
-            {},
-            dom.input(
-              {
                 id: "grid-setting-show-grid-line-numbers",
                 type: "checkbox",
                 checked: highlighterSettings.showGridLineNumbers,
                 onChange: this.onShowGridLineNumbersCheckboxClick,
               }
             ),
             getStr("layout.displayNumbersOnLines2")
           )
@@ -108,16 +91,33 @@ module.exports = createClass({
            dom.input(
              {
                id: "grid-setting-show-grid-areas",
                type: "checkbox",
                checked: highlighterSettings.showGridAreasOverlay,
                onChange: this.onShowGridAreasCheckboxClick,
              }
            ),
-           getStr("layout.displayGridAreas")
+           getStr("layout.displayGridAreas2")
           )
-        )
+        ),
+        dom.li(
+          {
+            className: "grid-settings-item",
+          },
+          dom.label(
+            {},
+            dom.input(
+              {
+                id: "grid-setting-extend-grid-lines",
+                type: "checkbox",
+                checked: highlighterSettings.showInfiniteLines,
+                onChange: this.onShowInfiniteLinesCheckboxClick,
+              }
+            ),
+            getStr("layout.extendGridLinesInfinitely2")
+          )
+        ),
       )
     );
   },
 
 });
--- a/devtools/client/locales/en-US/layout.properties
+++ b/devtools/client/locales/en-US/layout.properties
@@ -5,27 +5,27 @@
 # LOCALIZATION NOTE This file contains the Layout Inspector strings.
 # The Layout Inspector is a panel accessible in the Inspector sidebar.
 
 # LOCALIZATION NOTE (layout.cannotShowGridOutline, layout.cannotSHowGridOutline.title):
 # In the case where the grid outline cannot be effectively displayed.
 layout.cannotShowGridOutline=Cannot show outline for this grid
 layout.cannotShowGridOutline.title=The selected grid’s outline cannot effectively fit inside the layout panel for it to be usable.
 
-# LOCALIZATION NOTE (layout.displayGridAreas): Label of the display grid areas setting
+# LOCALIZATION NOTE (layout.displayGridAreas2): Label of the display grid areas setting
 # option in the CSS Grid pane.
-layout.displayGridAreas=Display grid areas
+layout.displayGridAreas2=Display area names
 
 # LOCALIZATION NOTE (layout.displayNumbersOnLines2): Label of the display numbers on lines
 # setting option in the CSS Grid pane.
 layout.displayNumbersOnLines2=Display line numbers
 
-# LOCALIZATION NOTE (layout.extendGridLinesInfinitely): Label of the extend grid lines
+# LOCALIZATION NOTE (layout.extendGridLinesInfinitely2): Label of the extend grid lines
 # infinitely setting option in the CSS Grid pane.
-layout.extendGridLinesInfinitely=Extend grid lines infinitely
+layout.extendGridLinesInfinitely2=Extend lines infinitely
 
 # LOCALIZATION NOTE (layout.header): The accordion header for the CSS Grid pane.
 layout.header=Grid
 
 # LOCALIZATION NOTE (layout.gridDisplaySettings): The header for the grid display
 # settings container in the CSS Grid pane.
 layout.gridDisplaySettings=Grid Display Settings