Merge branch 'lroussel-dev-detailsUX' into main

Author: iamcal

index.html

@@ -29,23 +29,28 @@
 
             <h1>Minecraft Enchantment Ordering Tool</h1>
 
-            <p>
-                When enchanting items in Minecraft, the order in which you combine armor, weapons and tools with books in your
-                anvil makes a huge difference. Each time you work on an anvil, you increase the <a href="https://minecraft.wiki/w/Anvil_mechanics">work penalty</a> for future workings. Once that
-                penalty gets too high, you simply can't add any more enchantments and the anvil says "Too Expensive!". This tool
-                helps you plan the optimal order of combining and applying books, to give you the cheapest possible cost.
-            </p>
-            <p>
-                This tool assume your gear and books start with zero "work penalty". That means you have not previously combined
-                the books (e.g. to turn two level 1 books into a single level 2 book) or worked the items or books in an anvil
-                in any way. To create gear with the maximum possible enchantment, you cannot combine lower-level books and must
-                start with high-level books from villager trading.
-            </p>
-            <p>
-                Allowing incompatible enchantments may be useful for combining protection-type enchantments (1.14 to 1.14.3pre-1)
-                and mending/infinity (1.9 to 1.11.1).
-            </p>
-
+            <details id="details-enchants" open>
+                <summary>About Enchantment in Minecraft</summary>
+                <p>
+                    When enchanting items in Minecraft, the order in which you combine armor, weapons and tools with books in your
+                    anvil makes a huge difference. Each time you work on an anvil, you increase the <a href="https://minecraft.wiki/w/Anvil_mechanics" target="_blank">work penalty</a> for future workings. Once that
+                    penalty gets too high, you simply can't add any more enchantments and the anvil says "Too Expensive!". This tool
+                    helps you plan the optimal order of combining and applying books, to give you the cheapest possible cost.
+                </p>
+            </details>
+            <details id="details-tool" open>
+                <summary>About this tool</summary>
+                <p>
+                    This tool assume your gear and books start with zero "work penalty". That means you have not previously combined
+                    the books (e.g. to turn two level 1 books into a single level 2 book) or worked the items or books in an anvil
+                    in any way. To create gear with the maximum possible enchantment, you cannot combine lower-level books and must
+                    start with high-level books from villager trading.
+                </p>
+                <p>
+                    Allowing incompatible enchantments may be useful for combining protection-type enchantments (1.14 to 1.14.3pre-1)
+                    and mending/infinity (1.9 to 1.11.1).
+                </p>
+            </details>
             <hr>
 
             <div id="left">

languages/en.json

@@ -1,5 +1,7 @@
 {
     "h1_title" :"Minecraft Enchantment Ordering Tool",
+    "summary_1": "About Enchantements in Minecraft",
+    "summary_2": "About this tool",
     "paragraph_1" :"When enchanting items in Minecraft, the order in which you combine armor, weapons and tools with books in your anvil makes a huge difference. Each time you work on an anvil, you increase the <a href='https://minecraft.wiki/w/Anvil_mechanics'>work penalty</a> for future workings. Once that penalty gets too high, you simply can't add any more enchantments and the anvil says \"Too Expensive!\". This tool helps you plan the optimal order of combining and applying books, to give you the cheapest possible cost.",
     "paragraph_2" : "This tool assume your gear and books start with zero \"work penalty\". That means you have not previously combined the books (e.g. to turn two level 1 books into a single level 2 book) or worked the items or books in an anvil in any way. To create gear with the maximum possible enchantment, you cannot combine lower-level books and must start with high-level books from villager trading.",
     "paragraph_3": "Allowing incompatible enchantments may be useful for combining protection-type enchantments (1.14 to 1.14.3pre-1) and mending/infinity (1.9 to 1.11.1).",

languages/es-ES.json

@@ -1,5 +1,7 @@
 {
     "h1_title" :"Herramienta para ordenar encantamientos de Minecraft",
+    "summary_1": "Acerca de los Encantamientos en Minecraft",
+    "summary_2": "Acerca de esta herramienta",
     "paragraph_1" :"Cuando encantas items en Minecraft, el orden en el que combinas armaduras, armas, y herramientas con libros en un yunque puede marcar la diferencia. Cada vez que usas un yunque, aumentas la <a href='https://minecraft.wiki/w/Anvil_mechanics'>penalización de trabajo</a> para futuros usos. Una vez que la penalización es demasiado alta, el yunque no permitirá añadir más encantamientos y mostrará el mensaje \"¡Demasiado caro!\". Esta herramienta te ayudará a elegir el orden óptimo para aplicar y combinar libros. Así podrás conseguir el costo más barato posible.",
     "paragraph_2" : "Esta herramienta asume que tu equipo y libros empiezan con cero de \"penalización de trabajo\". Esto significa que anteriormente no has combinado dos libros (p.ej. convertir dos libros de nivel 1 en un libro de nivel 2), manipulando items o libros de cualquier manera en un yunque. Para crear equipamiento con el máximo nivel posible, no puedes combinar libros de nivel bajo, debes empezar con libros de nivel alto obtenidos a través de comerciar con aldeanos.",
     "paragraph_3": "Permitir encantamientos incompatibles puede ser útil para combinar encantamientos de tipo protección (1.14 a 1.14.3pre-1) y reparación/infinidad (1.9 a 1.11.1).",

languages/fr-FR.json

@@ -1,6 +1,8 @@
 {
     "h1_title" :"Outil d'Organisation des Enchantements Minecraft",
-    "paragraph_1" :"Lorsque vous enchantez des objets dans Minecraft, l'ordre dans lequel vous combinez votre armure, vos armes et outils avec des livres dans votre enclume fait la différence. À chaque fois que vous utilisez une enclume, vous augmentez les <a href='https://fr.minecraft.wiki/w/R%C3%A9paration_d%27objet#P%C3%A9nalit%C3%A9_de_r%C3%A9parations_ant%C3%A9rieures'>pénalités de réparation</a> pour les prochaines utilisations. Une fois la pénalité trop haute, vous ne pouvez plus ajouter d'enchantements supplémentaires et l'enclume indique \"Trop cher !\". Cet outil vous aide à planifier l'ordre optimal de combinaison et d'application des livres, pour vous donner le coût le moins cher possible.",
+    "summary_1": "À propros des Enchantements dans Minecraft",
+    "summary_2": "À propos de cet outil",
+    "paragraph_1" :"Lorsque vous enchantez des objets dans Minecraft, l'ordre dans lequel vous combinez votre armure, vos armes et outils avec des livres dans votre enclume fait la différence. À chaque fois que vous utilisez une enclume, vous augmentez les <a href='https://fr.minecraft.wiki/w/R%C3%A9paration_d%27objet#P%C3%A9nalit%C3%A9_de_r%C3%A9parations_ant%C3%A9rieures' target='_blank'>pénalités de réparation</a> pour les prochaines utilisations. Une fois la pénalité trop haute, vous ne pouvez plus ajouter d'enchantements supplémentaires et l'enclume indique \"Trop cher !\". Cet outil vous aide à planifier l'ordre optimal de combinaison et d'application des livres, pour vous donner le coût le moins cher possible.",
     "paragraph_2" : "Cet outil assume que votre équipement et vos livres commencent sans aucune \"pénalité de réparation\". Cela signifie que vous n'avez au préalable pas combiné les livres (ex. pour transformer deux livres niveau 1 en un unique livre niveau 2) ou réparé des objets ou livres dans une enclume de quelques manières que ce soit. Pour créer un équipement avec le maximum possible d'enchantements, vous ne pouvez pas combiner des livres de plus bas niveau mais devez commencer avec des livres de haut niveau provenant du commerce avec les villageois.",
     "paragraph_3": "Autoriser les enchantements incompatibles peut être utile pour combiner des enchantements de type protection (1.14 à 1.14.3pre-1) et racommodage/infinité (1.9 à 1.11.1).",
 

languages/it-IT.json

@@ -1,5 +1,7 @@
 {
     "h1_title" :"Strumento per ordinare gli incantesimi di Minecraft",
+    "summary_1": "A proposito degli Incantesimi in Minecraft",
+    "summary_2": "A proposito di questo strumento",
     "paragraph_1" :"Quando si incantano oggetti in Minecraft, l'ordine in cui si combinano armature, armi e strumenti con i libri nell'incudine fa una grande differenza. Ogni volta che si lavora su un'incudine, si aumenta la <a href='https://minecraft.wiki/w/Anvil_mechanics'>penalità del lavoro</a> per le lavorazioni future. Quando la penalità diventa troppo alta, semplicemente non si possono aggiungere altri incantamenti e l'incudine dice \"Troppo costoso!\". Questo strumento vi aiuta a pianificare l'ordine ottimale di combinazione e applicazione dei libri, per ottenere il costo più basso possibile.",
     "paragraph_2" : "Questo strumento presuppone che la vostra attrezzatura e i vostri libri inizino con una \"penalità del lavoro\" pari a zero. Ciò significa che non avete precedentemente combinato i libri (ad es. per trasformare due libri di livello 1 in un unico libro di livello 2) o lavorato gli oggetti o i libri in un'incudine in qualsiasi modo. Per creare un equipaggiamento con il livello massimo di incanto, non si possono combinare libri di livello inferiore e si deve iniziare con libri di livello elevato provenienti dal commercio con i villani.",
     "paragraph_3": "Consentire incantesimi incompatibili può essere utile per combinare incantesimi di tipo protettivo (1.14 fino a 1.14.3pre-1) e Ripristino/Infinità (1.9 fino a 1.11.1).",

languages/pl-PL.json

@@ -119,4 +119,4 @@
       "breach": "Przedarcie",
       "wind_burst": "Wicher"
   }
-}
+}

script.js

@@ -719,14 +719,36 @@ async function changePageLanguage(language){
     }
 
     languageId = language;
-    languageJson = await loadJsonLanguage(language).then(languageData => { return languageData});
+    if (language == 'en'){
+      languageJson = await loadJsonLanguage(language).then(languageData => { return languageData});
+    }else{
+      var languageJsonEn = await loadJsonLanguage('en').then(languageData => { return languageData});
+      languageJson = await loadJsonLanguage(language).then(languageData => { return languageData});
+      languageJson = mergeKeys(languageJson, languageJsonEn);
+    }
     if (languageJson){
         changeLanguageByJson(languageJson);
         localStorage.setItem("savedlanguage", language);
         // ^ Save language choice to localstorage
     }
 }
 
+function mergeKeys(a, b){
+  var o = {};
+  for (var i in b){
+    if (typeof b[i] === 'object'){
+      o[i] = mergeKeys(a.hasOwnProperty(i) ? a[i] : {}, b[i]);
+    }else{
+      if (a.hasOwnProperty(i)){
+        o[i] = a[i]
+      }else{
+        o[i] = b[i];
+      }
+    }
+  }
+  return o;
+}
+
 function loadJsonLanguage(language) {
     return fetch('languages/'+language+'.json?'+languages_cache_key)
       .then(response => {
@@ -758,6 +780,11 @@ function changeLanguageByJson(languageJson){
     const h1Element = document.getElementsByTagName('h1')[0];
     h1Element.textContent = languageJson.h1_title;
 
+    /* summaries */
+    const summaries = document.getElementsByTagName('summary');
+    summaries[0].innerHTML = languageJson.summary_1;
+    summaries[1].innerHTML = languageJson.summary_2;
+
     /* paragraphs */
     const paragraphs = document.getElementsByTagName('p');
     paragraphs[1].innerHTML = languageJson.paragraph_1;

style.css

@@ -144,6 +144,23 @@ a:hover {
   color: var(--link-hover);
 }
 
+a[target="_blank"]::after {
+  content: " ↗";
+}
+
+summary {
+  font-size: 1.25rem;
+  font-weight: bold;
+  text-decoration: underline dotted;
+  margin: 0.5rem 0;
+  color: var(--link-hover);
+
+  &:hover {
+    text-decoration: underline;
+    cursor: pointer; 
+  }
+}
+
 #enchants {
     width: 400px;
 }