Form Builder: move dialog language selector

orbeon · Nov 8, 2024 · a0f6663 · a0f6663
1 parent 0aa36c2
commit a0f6663
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/form-builder/jvm/src/main/assets/forms/orbeon/builder/resources/form-builder.less b/form-builder/jvm/src/main/assets/forms/orbeon/builder/resources/form-builder.less
@@ -601,6 +601,22 @@ body.orbeon {
     // All dialogs
     .xforms-dialog {
 
+        .xbl-fb-language-choice {
+
+            position: absolute;
+            right: 0;
+            top: 1px;
+            width: fit-content;
+
+            .navbar {
+                .navbar-inner {
+                    padding-top: 0;
+                    padding-bottom: 0;
+                    background-color: transparent;
+                }
+            }
+        }
+
         // Things look better when the headings are centered
         .xbl-fr-grid .fr-grid.fr-repeat .fr-grid-head .fr-grid-th {
             vertical-align: middle;
@@ -1213,16 +1229,6 @@ body.orbeon {
         width: 1000px;
         max-width: none;
 
-        .xbl-fb-language-choice {
-            .navbar {
-                margin: 0;
-
-                .navbar-inner {
-                    padding: 3px;
-                }
-            }
-        }
-
         .xforms-label {
             margin-top: 5px;
         }

diff --git a/form-builder/jvm/src/main/resources/xbl/fb/language-choice/language-choice.xbl b/form-builder/jvm/src/main/resources/xbl/fb/language-choice/language-choice.xbl
@@ -48,8 +48,8 @@
                             xxf:get-request-header('orbeon-liferay-language') (: AND no language selection via header    :)
                         )
                     ]">
-                <div class="navbar">
-                    <div class="navbar-inner">
+                <xh:div class="navbar">
+                    <xh:div class="navbar-inner">
                         <xh:div class="fr-language-choice pull-right">
                             <xf:select1 ref="xxf:binding('fb-language-choice')" appearance="bootstrap" fr:dropdown-align="right">
                                 <xf:label value="xxf:label('fb-language-choice')"/>
@@ -64,8 +64,8 @@
                                 </xf:itemset>
                             </xf:select1>
                         </xh:div>
-                    </div>
-                </div>
+                    </xh:div>
+                </xh:div>
             </xf:group>
         </xbl:template>
     </xbl:binding>