From b249028199eb32a04195a43ba443eff44fc84283 Mon Sep 17 00:00:00 2001
From: OUNZAR Aymane <aymane.ounzar@imt-atlantique.net>
Date: Thu, 23 Oct 2025 19:54:50 +0200
Subject: [PATCH] Changed the names of the introduced options for it to be more
 intiuitive for the user

---
 .../model/api/general/MergeMultiplePagesRequest.java | 10 +++++-----
 .../src/main/resources/messages_en_US.properties     | 10 +++++-----
 .../main/resources/templates/multi-page-layout.html  | 12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/core/src/main/java/stirling/software/SPDF/model/api/general/MergeMultiplePagesRequest.java b/app/core/src/main/java/stirling/software/SPDF/model/api/general/MergeMultiplePagesRequest.java
index d686896b2..45574cf2a 100644
--- a/app/core/src/main/java/stirling/software/SPDF/model/api/general/MergeMultiplePagesRequest.java
+++ b/app/core/src/main/java/stirling/software/SPDF/model/api/general/MergeMultiplePagesRequest.java
@@ -21,12 +21,12 @@ public class MergeMultiplePagesRequest extends PDFFile {
     @Schema(
         description = "The layout direction of content on the page",
         type = "string",
-        defaultValue = "TOP_DOWN_LEFT_RIGHT",
+        defaultValue = "LR_TD",
         allowableValues = {
-            "TOP_DOWN_LEFT_RIGHT",
-            "TOP_DOWN_RIGHT_LEFT",
-            "BOTTOM_UP_LEFT_RIGHT",
-            "BOTTOM_UP_RIGHT_LEFT"
+            "LR_TD",
+            "RL_TD",
+            "TD_LR",
+            "TD_RL"
         })
     private String direction;
 
diff --git a/app/core/src/main/resources/messages_en_US.properties b/app/core/src/main/resources/messages_en_US.properties
index ab01c4a0a..9220403bc 100644
--- a/app/core/src/main/resources/messages_en_US.properties
+++ b/app/core/src/main/resources/messages_en_US.properties
@@ -1163,11 +1163,11 @@ pageLayout.landscape=Landscape
 pageLayout.addBorder=Add Borders
 pageLayout.rows=Rows
 pageLayout.columns=Columns
-pageLayout.direction=Direction
-pageLayout.topDownLeftRight=Top down then left right
-pageLayout.topDownRightLeft=Top down then right left
-pageLayout.bottomUpLeftRight=Bottom up then left right
-pageLayout.bottomUpRightLeft=Bottom up then right left
+pageLayout.pageOrder=Page order:
+pageLayout.leftRightTopDown=Left -> Right, then Top -> Bottom
+pageLayout.rightLeftTopDown=Right -> Left, then Top -> Bottom
+pageLayout.topDownLeftRight=Top -> Bottom, then Left -> Right
+pageLayout.topDownRightLeft=Top -> Bottom, then Right -> Left
 pageLayout.submit=Submit
 
 
diff --git a/app/core/src/main/resources/templates/multi-page-layout.html b/app/core/src/main/resources/templates/multi-page-layout.html
index c57a6f194..df65f14f6 100644
--- a/app/core/src/main/resources/templates/multi-page-layout.html
+++ b/app/core/src/main/resources/templates/multi-page-layout.html
@@ -37,12 +37,12 @@
                   <input type="text" class="form-control" id="columns" name="columns" required>
                 </div>
                 <div class="mb-3">
-                  <label for="direction" th:text="#{pageLayout.direction}"></label>
-                  <select class="form-control" id="direction" name="direction">
-                    <option value="TOP_DOWN_LEFT_RIGHT" th:text="#{pageLayout.topDownLeftRight}"></option>
-                    <option value="TOP_DOWN_RIGHT_LEFT" th:text="#{pageLayout.topDownRightLeft}"></option>
-                    <option value="BOTTOM_UP_RIGHT_LEFT" th:text="#{pageLayout.bottomUpRightLeft}"></option>
-                    <option value="BOTTOM_UP_LEFT_RIGHT" th:text="#{pageLayout.bottomUpLeftRight}"></option>
+                  <label for="page-order" th:text="#{pageLayout.pageOrder}"></label>
+                  <select class="form-control" id="page-order" name="page-order">
+                    <option value="LR_TD" th:text="#{pageLayout.leftRightTopDown}"></option>
+                    <option value="RL_TD" th:text="#{pageLayout.rightLeftTopDown}"></option>
+                    <option value="TD_LR" th:text="#{pageLayout.topDownLeftRight}"></option>
+                    <option value="TD_RL" th:text="#{pageLayout.topDownRightLeft}"></option>
                   </select>
                 </div>
                 <div class="mb-3">