Make language and board selection more concise

diff --git a/l10n/po/br/trivabble.po b/l10n/po/br/trivabble.po
index 11fc84571fbc3e188eb6d6912185c19b9b2b86eb..762d3db104cc338db7a2a2daf3e47cf234d474f0 100644 (file)
--- a/l10n/po/br/trivabble.po
+++ b/l10n/po/br/trivabble.po
@@ -198,5 +198,5 @@ msgstr ""
 "Adlakaat holl pezhioù ho\n"
 "touger-pezhoù er sac'h"
 
-msgid  "Interface language:"
+msgid  "Interface:"
 msgstr "Yezh ar c'hetal:"

diff --git a/l10n/po/fr/trivabble.po b/l10n/po/fr/trivabble.po
index e4c791ccb18b663d5eb1d2afd79d24db97b584f2..a9572a92faaf8faf899c174586dd7da10e15b73c 100644 (file)
--- a/l10n/po/fr/trivabble.po
+++ b/l10n/po/fr/trivabble.po
@@ -109,8 +109,8 @@ msgstr "Cliquez sur le score de quelqu'un\npour le changer."
 msgid  "Put back all the tiles of\nyour rack in the bag"
 msgstr "Remettre toutes les pièces du\nchevalet dans le sac"
 
-msgid  "Interface language:"
-msgstr "Langue de l'interface :"
+msgid  "Interface:"
+msgstr "Interface :"
 
 msgid "Sorry to disturb you, but we need to reload the game so you can continue playing. You will not lose anything except the messages in the chat. Are you ready?"
 msgstr "Désolé pour le dérangement, mais nous avons besoin de recharger le jeu pour que vous poussiez continuer à jouer. Vous ne perdrez rien sauf les messages dans le chat. Êtes-vous prêt·e ?"
@@ -163,8 +163,8 @@ msgstr  "Vous ne pouvez pas tirer de pièce : le sac est vide."
 msgid  "Are you sure you want to change board to '{0}'? This will put all the tiles back in the bag and start another game."
 msgstr "Êtes-vous sûr·e de vouloir de changer la langue du plateau à '{0}' ? Cela remettra toutes les lettres du jeu dans le sac et commencera une nouvelle partie."
 
-msgid  "Board language:"
-msgstr "Langue du plateau :"
+msgid  "Board:"
+msgstr "Plateau :"
 
 msgid  "You changed the board to {0} for language {1}"
 msgstr "Vous avez changé le plateau pour {0} en {1}"
@@ -277,8 +277,8 @@ msgstr "Pas de légende"
 msgid  "Short caption"
 msgstr "Légendes courtes"
 
-msgid  "Board configuration:"
-msgstr "Configuration du plateau"
+msgid  "Configuration:"
+msgstr "Configuration:"
 
 msgid  "Are you sure you want to change board to {0}? This will put all the tiles back in the bag and start another game."
 msgstr "Êtes-vous sûr·e de vouloir de changer le type du plateau à {0} ? Cela remettra toutes les lettres du jeu dans le sac et commencera une nouvelle partie."

diff --git a/l10n/po/ro/trivabble.po b/l10n/po/ro/trivabble.po
index 63bc9023bb3ed3e837bfd5bf99f4b6a81210bc7f..11af3cc7a99e26ef8b51b5719e04751da41f389d 100644 (file)
--- a/l10n/po/ro/trivabble.po
+++ b/l10n/po/ro/trivabble.po
@@ -190,7 +190,7 @@ msgstr ""
 "Pune înapoi în sac toate\n"
 "jetoanele de pe suportul tău"
 
-msgid "Interface language:"
+msgid "Interface:"
 msgstr "Limba interfeței:"
 
 msgid ""

diff --git a/l10n/pot/trivabble.pot b/l10n/pot/trivabble.pot
index 3a735b5f4e747966bb8909e5e8205206c80325e5..2c989269d3b9055bd9edc30b19898f80358082ed 100644 (file)
--- a/l10n/pot/trivabble.pot
+++ b/l10n/pot/trivabble.pot
@@ -115,7 +115,7 @@ msgstr ""
 msgid  "Put back all the tiles of\nyour rack in the bag"
 msgstr ""
 
-msgid  "Interface language:"
+msgid  "Interface:"
 msgstr ""
 
 msgid "Sorry to disturb you, but we need to reload the game so you can continue playing. You will not lose anything except the messages in the chat. Are you ready?"
@@ -169,7 +169,7 @@ msgstr ""
 msgid  "Are you sure you want to change board to '{0}'? This will put all the tiles back in the bag and start another game."
 msgstr ""
 
-msgid  "Board language:"
+msgid  "Board:"
 msgstr ""
 
 msgid  "You changed the board to {0} for language {1}"
@@ -282,7 +282,7 @@ msgstr ""
 msgid  "Short caption"
 msgstr ""
 
-msgid  "Board configuration:"
+msgid  "Configuration:"
 msgstr ""
 
 msgid  "Are you sure you want to change board to {0}? This will put all the tiles back in the bag and start another game."

diff --git a/public/index.html b/public/index.html
index edac689ca9f42b86affcd376056150bdc1c701c1..06dbeb67284894ba05413917df4b452c3d29df87 100644 (file)
--- a/public/index.html
+++ b/public/index.html
@@ -35,25 +35,25 @@
             <button id="chat-btn" class="minibutton" data-l10n="text-content">Send message</button>
             <div id="board-selection">
                 <p>
-                    <label for="select-lang" data-l10n="text-content">Interface language: </label>
-                    <select id="select-lang">
+                    <span class="label"><label for="select-lang" data-l10n="text-content">Interface:</label></span>
+                    <span class="select"><select id="select-lang">
                         <option value="en">English</option>
                         <option value="fr">Français</option>
                         <option value="br">Brezhoneg</option>
                         <option value="ro">Română</option>
-                    </select>
+                    </select></span>
                 </p>
                 <p id="board-lang-selection" hidden="true">
-                    <label for="board-lang" data-l10n="text-content">Board language: </label>
-                    <select id="board-lang">
+                    <span class="label"><label for="board-lang" data-l10n="text-content">Board:</label></span>
+                    <span class="select"><select id="board-lang">
                         <option value="fr">French</option>
-                    </select>
+                    </select></span>
                 </p>
                 <p id="board-label-selection" hidden="true">
-                    <label for="board-label" data-l10n="text-content">Board configuration: </label>
-                    <select id="board-label">
+                    <span class="label"><label for="board-label" data-l10n="text-content">Configuration: </label></span>
+                    <span class="select"><select id="board-label">
                         <option value="15x15-7">15x15-7</option>
-                    </select>
+                    </select></span>
                 </p>
             </div>
         </div>

diff --git a/public/trivabble.css b/public/trivabble.css
index 86b6d71a4688f02c678732369bd709daf76556d4..3d8ec5ecc7ce7fb578975a87c4d2db4b6dc15c38 100644 (file)
--- a/public/trivabble.css
+++ b/public/trivabble.css
@@ -793,3 +793,23 @@ button#next-help-msg:hover {
 #timer > span:first-child {
     color:gray;
 }
+
+#board-selection {
+    display:table;
+}
+
+#board-selection > p:not([hidden]) {
+    display: table-row
+}
+
+#board-selection > p > span {
+    display: table-cell;
+}
+
+#board-selection > p > .label {
+    padding-right:1ex;
+}
+
+#board-selection > p > .select, #board-selection > p > .select > select {
+    width: 100%;
+}