diff --git a/src/main/java/org/computate/frFR/java/EcrirePageClasse.java b/src/main/java/org/computate/frFR/java/EcrirePageClasse.java index b078f62..f8b5e33 100644 --- a/src/main/java/org/computate/frFR/java/EcrirePageClasse.java +++ b/src/main/java/org/computate/frFR/java/EcrirePageClasse.java @@ -457,7 +457,7 @@ else if("Boolean".equals(entiteNomSimple)) { if( entiteVar.equals(langueConfig.getString(I18n.var_archive))) { tl(1, "{%- if 'Page' == ", langueConfig.getString(I18n.var_classeApiMethodeMethode), " %}"); // tl(1, "{%- if 'Page' == ", langueConfig.getString(I18n.var_classeApiMethodeMethode), " %}"); - tl(9, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\""); + tl(9, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", ""); tl(11, "id=\"{{", langueConfig.getString(I18n.var_classeApiMethodeMethode), "}}_", entiteVar, "\""); if(entiteNomAffichage != null) { @@ -591,7 +591,7 @@ else if(BooleanUtils.isTrue(entiteSignature)) { else { if(entiteLien) { tl(1, "{%- if 'Page' == ", langueConfig.getString(I18n.var_classeApiMethodeMethode), " %}"); - tl(9, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\""); + tl(9, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", ""); tl(11, "id=\"{{", langueConfig.getString(I18n.var_classeApiMethodeMethode), "}}_", entiteVar, "\""); if(entiteNomAffichage != null) { @@ -2281,7 +2281,7 @@ public void pageCodeClasseJinja(String langueNom, JsonObject i18nPage) throws Ex wTh.tl(7, "
"); } else { wTh.tl(7, "<", composantsWebPrefixe, "dropdown id=\"htm", i18nGlobale.getString(I18n.var_ListeDeroulante), "-", entiteVar, "\">"); - wTh.tl(8, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" slot=\"trigger\" caret>", entiteNomAffichage, ""); + wTh.tl(8, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " slot=\"trigger\" caret>", entiteNomAffichage, ""); wTh.tl(8, "<", composantsWebPrefixe, "menu>"); wTh.tl(9, "<", composantsWebPrefixe, "menu-item data-action=\"", i18nPage.getString(I18n.var_tri), "\" data-order=\"asc\" id=\"htm", i18nGlobale.getString(I18n.var_ListeDeroulante), "-", entiteVar, "-asc\">"); wTh.tl(10, ""); @@ -2296,7 +2296,7 @@ public void pageCodeClasseJinja(String langueNom, JsonObject i18nPage) throws Ex } if(entiteLien) { - wTd.tl(7, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\""); + wTd.tl(7, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", ""); wTd.tl(9, "id=\"{{", i18nPage.getString(I18n.var_classeApiMethodeMethode), "}}_", entiteVar, "\""); if(entiteNomAffichage != null) { @@ -2663,7 +2663,7 @@ else if("DELETE".equals(classeApiMethodeMethode)) { l(); s("{%- macro htm", i18nPage.getString(I18n.var_Bouton), "_", classeApiOperationIdMethode, "() %}"); if(!classeApiMethode.equals(i18nPage.getString(I18n.var_PageRecherche))) { - s("<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\""); + s("<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", ""); s(" id=\"htm", i18nGlobale.getString(I18n.var_Bouton), "_", classeApiOperationIdMethode, "\""); s(" data-", classeVarId, "={{ ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " | tojson }}"); s(">"); @@ -2688,7 +2688,7 @@ else if(classeApiMethode.contains(i18nPage.getString(I18n.var_PUTCopie))) l(); l("{%- macro htm", i18nPage.getString(I18n.var_Formulaire), i18nPage.getString(I18n.var_Bouton), "_", classeApiOperationIdMethode, "() %}"); - tl(6, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" slot=\"footer\" type=\"submit\" variant=\"primary\""); + tl(6, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " slot=\"footer\" type=\"submit\" variant=\"primary\""); tl(8, "id=\"htm", i18nPage.getString(I18n.var_Formulaire), i18nPage.getString(I18n.var_Bouton), "_", classeApiOperationIdMethode, "\""); tl(8, ">", methodeTitreValeurs, ""); l("{%- endmacro %}"); @@ -4161,7 +4161,7 @@ public void ecrirePageRechercheSuggere(String langueNom, JsonObject i18nPage) th tl(1, "{% endif %}"); tl(7, ">"); tl(5, ""); - tl(5, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\""); + tl(5, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", ""); tl(7, "onclick=\"window.location.href = '", classePageUriMethode + "?q=", query1, ":' + encodeURIComponent(this.previousElementSibling.value) + '", fqs, sorts, "&rows=", start2, "&rows=", rows1, "'; \""); tl(7, ">"); tl(6, ""); @@ -4197,20 +4197,17 @@ public void ecrirePageFormulaireRecherche(String langueNom, JsonObject i18nPage) o = auteurFormulaireRechercheJinja; // formulaires // + tl(5, "<", composantsWebPrefixe, "divider>"); + tl(5, "
"); + tl(6, "
"); tl(0, "{% if ", i18nPage.getString(I18n.var_AUTH_PORTEE_SUPER_ADMIN), " in ", i18nGlobale.getString(I18n.var_portees), " %}"); tl(1, "{% if \"PATCH\" in ", i18nGlobale.getString(I18n.var_portees), " %}"); - tl(4, "<", composantsWebPrefixe, "divider>"); - - tl(4, "
"); - tl(5, "
"); - //STUFF4 - // recharger 1 // - t(2, "{% if ", varResultat, "Count == 1 %}"); + tl(2, "{% if ", varResultat, "Count == 1 %}"); // s("<", composantsWebPrefixe, "tooltip content=\"", i18nPage.getString(I18n.str_Recharger), " ", classeCeNom, "\">"); - tl(7, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" id=\"", i18nPage.getString(I18n.var_recharger), StringUtils.trim(StringUtils.capitalize(classeCe)), classeGenPageNomSimple, "\""); + tl(7, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " id=\"", i18nPage.getString(I18n.var_recharger), StringUtils.trim(StringUtils.capitalize(classeCe)), classeGenPageNomSimple, "\""); tl(9, " onclick=\"patch{{", i18nPage.getString(I18n.var_classeNomSimple), "}}Vals( [ {name: 'fq', value: '", classeVarId, ":{{", classeVarId, "}}' } ], {}, this, function() { ", i18nPage.getString(I18n.var_ajouterLueur), "(document.querySelector('#", i18nPage.getString(I18n.var_recharger), StringUtils.trim(StringUtils.capitalize(classeCe)), classeGenPageNomSimple, "')); }, function() { ", i18nPage.getString(I18n.var_ajouterErreur), "(document.querySelector('#", i18nPage.getString(I18n.var_recharger), StringUtils.trim(StringUtils.capitalize(classeCe)), classeGenPageNomSimple, "')); }); return false; \">"); tl(8, ""); tl(8, i18nPage.getString(I18n.var_recharger)); @@ -4221,7 +4218,7 @@ public void ecrirePageFormulaireRecherche(String langueNom, JsonObject i18nPage) // recharger tous // tl(2, "{% if ", varResultat, "Count > 0 %}"); // tl(9, "<", composantsWebPrefixe, "tooltip content=\"", i18nPage.getString(I18n.str_Recharger), " ", classeTousNom, "\">"); - tl(7, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" id=\"", i18nPage.getString(I18n.var_recharger), StringUtils.trim(StringUtils.capitalize(classeTous)), classeGenPageNomSimple, "{{ ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " | e }}\""); + tl(7, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " id=\"", i18nPage.getString(I18n.var_recharger), StringUtils.trim(StringUtils.capitalize(classeTous)), classeGenPageNomSimple, "{{ ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " | e }}\""); tl(9, " onclick=\"patch{{", i18nPage.getString(I18n.var_classeNomSimple), "}}Vals([], {}, this, function() { ", i18nPage.getString(I18n.var_ajouterLueur), "(document.querySelector('#", i18nPage.getString(I18n.var_recharger), StringUtils.trim(StringUtils.capitalize(classeTous)), classeGenPageNomSimple, "{{ ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " | e }}')); }, function() { ", i18nPage.getString(I18n.var_ajouterErreur), "(document.querySelector('#", i18nPage.getString(I18n.var_recharger), StringUtils.trim(StringUtils.capitalize(classeTous)), classeGenPageNomSimple, "{{ ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " | e }}')); }); \""); tl(9, ">"); tl(8, ""); @@ -4286,6 +4283,7 @@ public void ecrirePageFormulaireRecherche(String langueNom, JsonObject i18nPage) } } l(); + tl(6, "
"); tl(5, "
"); for(String classeApiMethode : classeApiMethodes) { @@ -4338,7 +4336,6 @@ public void ecrirePageFormulaireRecherche(String langueNom, JsonObject i18nPage) tl(0, "{{ htm", i18nPage.getString(I18n.var_Formulaire), "_", classeApiOperationIdMethode, "() }}"); } } - tl(4, "
"); o = oAncien; } @@ -4482,7 +4479,7 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw tl(10, "<", composantsWebPrefixe, "tooltip for=\"buttonFacet", classeNomSimple, "_{{ key }}\">", i18nPage.getString(I18n.str_voir_valeurs), ""); tl(10, "
"); - t(11, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\""); + t(11, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", ""); s(" id=\"buttonFacet", classeNomSimple, "_{{ key }}\""); s(" data-var=\"{{ value.var }}\""); s(" data-clear=\"{% if value.facetField is defined %}true{% else %}false{% endif %}\""); @@ -4953,7 +4950,7 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw tl(16, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Max\" placeholder=\"max\" value=\"{{ value.stats.max }}\" style=\"width: 4em; \">"); tl(16, " speed in seconds "); tl(16, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Speed\" placeholder=\"speed\" value=\"1\" style=\"width: 4em; \">"); - tl(16, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" onclick=\"animate", i18nPage.getString(I18n.var_Stats), "(); \">animate"); + tl(16, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"animate", i18nPage.getString(I18n.var_Stats), "(); \">animate"); tl(15, "
"); tl(14, "{% endif %}"); tl(13, "{% endif %}"); @@ -5000,16 +4997,14 @@ public void ecrirePageRechercheAucun(String langueNom, JsonObject i18nPage) thro // htmBodyCount0 // /////////////////// - tl(5, "<", composantsWebPrefixe, "tooltip for=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\">", i18nPage.getString(I18n.str_retourner_a_), classeTousNom, ""); - tl(4, "
"); + tl(4, "<", composantsWebPrefixe, "tooltip for=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\">", i18nPage.getString(I18n.str_retourner_a_), classeTousNom, ""); // tl(5, "<", composantsWebPrefixe, "tooltip content=\"", i18nPage.getString(I18n.str_retourner_a_), classeTousNom, "\">"); //STUFF4 - tl(6, "<", composantsWebPrefixe, "button id=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\" variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" href=\"{{ SITE_BASE_URL }}{{ pageUri }}\">"); - tl(7, ""); - tl(7, classeTousNom); - tl(6, ""); - tl(5, ""); - tl(4, "
"); + tl(5, "<", composantsWebPrefixe, "button id=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " href=\"{{ SITE_BASE_URL }}{{ pageUri }}\">"); + tl(6, ""); + tl(6, classeTousNom); + tl(5, ""); + tl(4, ""); t(4, "

"); s(classeIcone); s(" ", classeNomAdjectifPluriel, ""); @@ -5032,105 +5027,105 @@ public void ecrirePageBoutonsRecherche(String langueNom, JsonObject i18nPage) th ToutEcrivain oAncien = o; o = auteurBoutonsRechercheJinja; - tl(4, "
"); + tl(5, "
"); ////////////// // bouton q // ////////////// // tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Recherche_avancee_pour_), classeNomAdjectifPluriel, "\">"); - tl(5, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Recherche), "').open = true; \">"); - tl(6, " "); - tl(6, i18nPage.getString(I18n.var_Rechercher)); - tl(5, ""); + tl(6, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Recherche), "').open = true; \">"); + tl(7, " "); + tl(7, i18nPage.getString(I18n.var_Rechercher)); + tl(6, ""); // tl(5, ""); /////////////// // bouton fq // /////////////// // tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Filtres_et_nombres_de_facettes_pour_), classeNomAdjectifPluriel, "\">"); - tl(5, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Filtres), "').open = true; \">"); - tl(6, " "); - tl(6, i18nPage.getString(I18n.var_Filtres)); - tl(5, ""); + tl(6, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Filtres), "').open = true; \">"); + tl(7, " "); + tl(7, i18nPage.getString(I18n.var_Filtres)); + tl(6, ""); // tl(5, ""); /////////////// // bouton fq // /////////////// // tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Filtres_et_nombres_de_facettes_pour_), classeNomAdjectifPluriel, "\">"); - tl(5, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Tri), "').open = true; \">"); - tl(6, " "); - tl(6, i18nPage.getString(I18n.str_Tri)); - tl(5, ""); + tl(6, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Tri), "').open = true; \">"); + tl(7, " "); + tl(7, i18nPage.getString(I18n.str_Tri)); + tl(6, ""); // tl(5, ""); ////////////////// // bouton gamme // ////////////////// // tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Recherche_avancee_pour_), classeNomAdjectifPluriel, "\">"); - tl(5, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Gamme), "').open = true; \">"); - tl(6, " "); - tl(6, i18nPage.getString(I18n.var_Gamme)); - tl(5, ""); + tl(6, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Gamme), "').open = true; \">"); + tl(7, " "); + tl(7, i18nPage.getString(I18n.var_Gamme)); + tl(6, ""); // tl(5, ""); ////////////////// // bouton pivot // ////////////////// // tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Recherche_avancee_pour_), classeNomAdjectifPluriel, "\">"); - tl(5, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Pivot), "').open = true; \">"); - tl(6, " "); - tl(6, i18nPage.getString(I18n.var_Pivot)); - tl(5, ""); + tl(6, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Pivot), "').open = true; \">"); + tl(7, " "); + tl(7, i18nPage.getString(I18n.var_Pivot)); + tl(6, ""); // tl(5, ""); ///////////////////////// // bouton liste champs // ///////////////////////// // tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Recherche_avancee_pour_), classeNomAdjectifPluriel, "\">"); - tl(5, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_ListeChamps), "').open = true; \">"); - tl(6, " "); - tl(6, i18nPage.getString(I18n.var_ListeChamps)); - tl(5, ""); + tl(6, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_ListeChamps), "').open = true; \">"); + tl(7, " "); + tl(7, i18nPage.getString(I18n.var_ListeChamps)); + tl(6, ""); // tl(5, ""); ////////////////// // bouton stats // ////////////////// // tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Recherche_avancee_pour_), classeNomAdjectifPluriel, "\">"); - tl(5, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Stats), "').open = true; \">"); - tl(6, " "); - tl(6, i18nPage.getString(I18n.var_Stats)); - tl(5, ""); + tl(6, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Stats), "').open = true; \">"); + tl(7, " "); + tl(7, i18nPage.getString(I18n.var_Stats)); + tl(6, ""); // tl(5, ""); //////////////// // bouton API // //////////////// // tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Interroger_lAPI_REST_JSON_pour_), classeNomAdjectifPluriel, "\">"); - t(5, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\""); + t(6, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", ""); s(" href=\"{{ apiUri }}{% if ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " is defined %}/{{ ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " }}{% else %}{{ queryStr }}{% endif %}\""); l(">"); - tl(6, " "); - tl(6, i18nPage.getString(I18n.var_Api)); - tl(5, ""); + tl(7, " "); + tl(7, i18nPage.getString(I18n.var_Api)); + tl(6, ""); // tl(5, ""); - tl(4, "
"); + tl(5, "
"); // tl(7, "<", composantsWebPrefixe, "button-group>"); // tl(8, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", String.format(i18nPage.getString(I18n.str_Afficher_les_resultats_sous_forme_de_details), classeNomAdjectifPluriel), "\" pill>"); - // tl(9, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" pill id=\"grid-toggle-details\">"); + // tl(9, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " pill id=\"grid-toggle-details\">"); // tl(10, ""); // tl(9, ""); // tl(8, ""); // tl(8, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", String.format(i18nPage.getString(I18n.str_Afficher_les_resultats_sous_forme_de_liste), classeNomAdjectifPluriel), "\">"); - // tl(9, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" id=\"grid-toggle-list\">"); + // tl(9, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " id=\"grid-toggle-list\">"); // tl(10, ""); // tl(9, ""); // tl(8, ""); // tl(8, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", String.format(i18nPage.getString(I18n.str_Afficher_les_resultats_sous_forme_de_cartes), classeNomAdjectifPluriel), "\" pill>"); - // tl(9, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" pill id=\"grid-toggle-card\">"); + // tl(9, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " pill id=\"grid-toggle-card\">"); // tl(10, ""); // tl(9, ""); // tl(8, ""); @@ -5145,54 +5140,54 @@ public void ecrirePageBoutonsPagination(String langueNom, JsonObject i18nPage) t o = auteurBoutonsPaginationJinja; l(); - tl(6, "
"); - tl(7, "<", composantsWebPrefixe, "button-group>"); - tl(8, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", String.format(i18nPage.getString(I18n.str_Afficher_les_resultats_precedents), classeNomAdjectifPluriel), "\">"); - t(9, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" pill"); + tl(5, "
"); + tl(6, "<", composantsWebPrefixe, "button-group>"); + tl(7, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", String.format(i18nPage.getString(I18n.str_Afficher_les_resultats_precedents), classeNomAdjectifPluriel), "\">"); + t(8, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " pill"); s("{% if pagination.page", i18nPage.getString(I18n.var_Precedent), " is defined %}"); s(" href=\"{{pageUri}}?start={{pagination.page", i18nPage.getString(I18n.var_Precedent), ".", i18nPage.getString(I18n.var_debut), "}}&rows={{pagination.", i18nPage.getString(I18n.var_lignes), "}}\""); s("{% else %}"); s(" disabled"); s("{% endif %}"); l(">"); - tl(10, ""); - tl(9, ""); - tl(8, ""); + tl(9, ""); + tl(8, ""); + tl(7, ""); - tl(8, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", String.format(i18nPage.getString(I18n.str_Afficher_la_moitie_des_resultats), classeNomAdjectifPluriel), "\">"); - t(9, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\""); + tl(7, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", String.format(i18nPage.getString(I18n.str_Afficher_la_moitie_des_resultats), classeNomAdjectifPluriel), "\">"); + t(8, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", ""); s("{% if pagination.", i18nPage.getString(I18n.var_lignes), i18nPage.getString(I18n.var_Precedent), " >= pagination['1L'] %}"); s(" href=\"{{pageUri}}?start={{pagination.", i18nPage.getString(I18n.var_debut), "}}&rows={{ pagination.", i18nPage.getString(I18n.var_lignes), i18nPage.getString(I18n.var_Precedent), " }}\""); s("{% else %}"); s(" disabled"); s("{% endif %}"); l(">"); - tl(10, ""); - tl(9, ""); - tl(8, ""); + tl(9, ""); + tl(8, ""); + tl(7, ""); - tl(8, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", String.format(i18nPage.getString(I18n.str_Afficher_le_double_des_resultats), classeNomAdjectifPluriel), "\">"); - t(9, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\""); + tl(7, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", String.format(i18nPage.getString(I18n.str_Afficher_le_double_des_resultats), classeNomAdjectifPluriel), "\">"); + t(8, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", ""); s(" href=\"{{pageUri}}?start={{pagination.", i18nPage.getString(I18n.var_debut), "}}&rows={{ pagination.", i18nPage.getString(I18n.var_lignes), i18nPage.getString(I18n.var_Prochaine), " }}\""); l(">"); - tl(10, ""); - tl(9, ""); - tl(8, ""); + tl(9, ""); + tl(8, ""); + tl(7, ""); - tl(8, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", String.format(i18nPage.getString(I18n.str_Afficher_les_resultats_suivants), classeNomAdjectifPluriel), "\">"); - t(9, "<", composantsWebPrefixe, "button variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" pill"); + tl(7, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", String.format(i18nPage.getString(I18n.str_Afficher_les_resultats_suivants), classeNomAdjectifPluriel), "\">"); + t(8, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " pill"); s("{% if pagination.page", i18nPage.getString(I18n.var_Prochaine), " is defined %}"); s(" href=\"{{pageUri}}?start={{pagination.page", i18nPage.getString(I18n.var_Prochaine), ".", i18nPage.getString(I18n.var_debut), "}}&rows={{pagination.", i18nPage.getString(I18n.var_lignes), "}}\""); s("{% else %}"); s(" disabled"); s("{% endif %}"); l(">"); - tl(10, ""); - tl(9, ""); - tl(8, ""); - tl(7, ""); - tl(7, "
{{ pagination.", i18nPage.getString(I18n.var_debut), "Num }} – {{ pagination.", i18nPage.getString(I18n.var_fin), "Num }} ", i18nPage.getString(I18n.var_de), " {{ pagination.", i18nPage.getString(I18n.var_numTrouve), " }}
"); - tl(6, "
"); + tl(9, ""); + tl(8, ""); + tl(7, ""); + tl(6, ""); + tl(6, "
{{ pagination.", i18nPage.getString(I18n.var_debut), "Num }} – {{ pagination.", i18nPage.getString(I18n.var_fin), "Num }} ", i18nPage.getString(I18n.var_de), " {{ pagination.", i18nPage.getString(I18n.var_numTrouve), " }}
"); + tl(5, "
"); o = oAncien; } @@ -5253,7 +5248,7 @@ public void ecrirePageRechercheJinja(String langueNom, JsonObject i18nPage) thro tl(5, "

"); tl(5, "
"); tl(6, "<", composantsWebPrefixe, "tooltip for=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\">", i18nPage.getString(I18n.str_retourner_a_), classeTousNom, ""); - tl(6, "<", composantsWebPrefixe, "button id=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\" variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" href=\"{{ SITE_BASE_URL }}{{ pageUri }}\">"); + tl(6, "<", composantsWebPrefixe, "button id=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " href=\"{{ SITE_BASE_URL }}{{ pageUri }}\">"); tl(7, ""); tl(7, classeTousNom); tl(6, ""); @@ -5301,6 +5296,7 @@ public void ecrirePageRechercheJinja(String langueNom, JsonObject i18nPage) thro // tl(3, "SimpleOrderedMap facets = (SimpleOrderedMap)Optional.ofNullable(", langueConfig.getString(ConfigCles.var_liste), classeApiClasseNomSimple, ".getResponse()).map(QueryResponse::getResponse).map(r -> r.get(\"facets\")).orElse(new SimpleOrderedMap());"); s(wFoot); tl(5, "
"); + tl(4, ""); tl(0, "{% endif %}"); tl(0, "{%- endblock htmBody", i18nPage.getString(I18n.var_Milieu), classePageNomSimple, " %}"); @@ -5369,7 +5365,7 @@ public void ecrirePageEditionJinja(String langueNom, JsonObject i18nPage) throws tl(5, "
"); tl(6, "<", composantsWebPrefixe, "tooltip for=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\">", i18nPage.getString(I18n.str_retourner_a_), classeTousNom, ""); - tl(6, "<", composantsWebPrefixe, "button id=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\" variant=\"", "wa-".equals(composantsWebPrefixe) ? "brand" : "primary", "\" href=\"{{ SITE_BASE_URL }}{{ pageUri }}\">"); + tl(6, "<", composantsWebPrefixe, "button id=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " href=\"{{ SITE_BASE_URL }}{{ pageUri }}\">"); tl(7, ""); tl(7, classeTousNom); tl(6, "");