From 1484088dac25a0c2e1cf4f09b01db62612fb1d3a Mon Sep 17 00:00:00 2001
From: Dan Garner <dan@xibosignage.com>
Date: Mon, 12 Aug 2024 13:59:39 +0100
Subject: [PATCH] Display Profile: correct the help text on android screen
 dimensions xibosignageltd/xibo-private#831

---
 views/displayprofile-form-edit-android.twig    |  2 +-
 views/displayprofile-form-edit-javascript.twig | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/views/displayprofile-form-edit-android.twig b/views/displayprofile-form-edit-android.twig
index 24ac21ce33..352a8a7dc6 100644
--- a/views/displayprofile-form-edit-android.twig
+++ b/views/displayprofile-form-edit-android.twig
@@ -167,7 +167,7 @@
                     {{ forms.dropdown("orientation", "single", title, displayProfile.getSetting("orientation"), options, "id", "value", helpText) }}
 
                     {% set title = "Screen Dimensions"|trans %}
-                    {% set helpText = "Set dimensions to be used for the Player window ensuring that they do not exceed the actual screen size. Enter the following values representing the pixel sizings for; Left,Top,Width,Height. This requires a Player Restart to action."|trans %}
+                    {% set helpText = "Set dimensions to be used for the Player window ensuring that they do not exceed the actual screen size. Enter the following values representing the pixel sizings for; Top,Left,Width,Height. This requires a Player Restart to action."|trans %}
                     {{ forms.input("screenDimensions", title, displayProfile.getSetting("screenDimensions"), helpText) }}
 
                 </div>
diff --git a/views/displayprofile-form-edit-javascript.twig b/views/displayprofile-form-edit-javascript.twig
index ebbd9c45b7..aa89448303 100644
--- a/views/displayprofile-form-edit-javascript.twig
+++ b/views/displayprofile-form-edit-javascript.twig
@@ -75,10 +75,10 @@
             let values = $inputField.val().split(',');
 
             fieldsTemplate = template({
-                left: values[0],
-                top: values[1],
-                width: values[2],
-                height:  values[3]
+              top: values[0],
+              left: values[1],
+              width: values[2],
+              height:  values[3]
             });
         } else {
             fieldsTemplate = template();
@@ -375,8 +375,8 @@
 
     <script type="text/x-handlebars-template" id="android-dimension-fields">
         <div class="row">
-            <input type="number" value="{{ left }}" class="col-3 form-control androidDimensionInput" name="dimensionLeft" id="dimensionLeft" placeholder="{% endverbatim %}{{ "Left"|trans }}{% verbatim %}"></input>
             <input type="number" value="{{ top }}" class="col-3 form-control androidDimensionInput" name="dimensionTop" id="dimensionTop" placeholder="{% endverbatim %}{{ "Top"|trans }}{% verbatim %}"></input>
+            <input type="number" value="{{ left }}" class="col-3 form-control androidDimensionInput" name="dimensionLeft" id="dimensionLeft" placeholder="{% endverbatim %}{{ "Left"|trans }}{% verbatim %}"></input>
             <input type="number" value="{{ width }}" class="col-3 form-control androidDimensionInput" name="dimensionWidth" id="dimensionWidth" placeholder="{% endverbatim %}{{ "Width"|trans }}{% verbatim %}"></input>
             <input type="number" value="{{ height }}" class="col-3 form-control androidDimensionInput" name="dimensionHeight" id="dimensionHeight" placeholder="{% endverbatim %}{{ "Height"|trans }}{% verbatim %}"></input>
         </div>