From 73e9262612a640bc4efaaee52afc98849c76c8db Mon Sep 17 00:00:00 2001 From: JP Simonnet <jean-philippe.simonnet@developpement-durable.gouv.fr> Date: Fri, 3 Nov 2023 16:07:04 +0100 Subject: [PATCH] correction carte pdf --- design_system_admin/modeles/dsfr_lien.html | 55 +++++++++++++--------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/design_system_admin/modeles/dsfr_lien.html b/design_system_admin/modeles/dsfr_lien.html index 6e63ee8..ee083de 100644 --- a/design_system_admin/modeles/dsfr_lien.html +++ b/design_system_admin/modeles/dsfr_lien.html @@ -3,6 +3,7 @@ [(#REM) ajout de la feuille CSS du modele ] <link rel="stylesheet" type="text/css" href="#CHEMIN{modeles/dsfr_lien.css}" 4 /> +[(#REM) couleur des fonds ] [(#ENV{couleur}|=={jaune}|oui) #SET{ma_couleur, 'fr-background-alt--yellow-moutarde'} ] [(#ENV{couleur}|=={jaune-clair}|oui) #SET{ma_couleur, 'fr-background-alt--yellow-tournesol'} ] [(#ENV{couleur}|=={bleu}|oui) #SET{ma_couleur, 'fr-background-alt--blue-cumulus'} ] @@ -218,7 +219,7 @@ <BOUCLE_conditionsimage_a0(CONDITION){SI #ENV{sans-image}|non}> <div class="fr-card__header"> - <div class="fr-card__img"> + <div class="fr-card__img "> <BOUCLE_conditionsimage_a(CONDITION){SI #ENV{logo}|oui}> [(#LOGO_ARTICLE|image_reduire{350,350} |image_recadre{350,350,center} |image_aplatir{jpg,ffffff} |inserer_attribut{class,fr-responsive-img}|inserer_attribut{alt,#DESCRIPTIF*})] </BOUCLE_conditionsimage_a> @@ -274,7 +275,7 @@ </div> </div> <BOUCLE_conditionstuileimage2(CONDITION){SI #ENV{sans-image}|non}> - <div class="fr-tile__img"> + <div class="fr-tile__img "> <BOUCLE_image_tuile(DOCUMENTS){id_article}{0,1}> [(#FICHIER |image_reduire{200,350} |image_recadre{200,200,center} |image_aplatir{jpg,ffffff} |inserer_attribut{class,fr-responsive-img}|inserer_attribut{alt,#DESCRIPTIF*})] </BOUCLE_image_tuile> @@ -342,7 +343,7 @@ </div> <BOUCLE_conditionsimage0(CONDITION){SI #ENV{sans-image}|non}> <div class="fr-card__header"> - <div class="fr-card__img"> + <div class="fr-card__img "> <BOUCLE_conditionsimage(CONDITION){SI #ENV{logo}|oui}> [(#LOGO_RUBRIQUE|image_reduire{350,350} |image_recadre{350,350,center} |image_aplatir{jpg,ffffff} |inserer_attribut{class,fr-responsive-img}|inserer_attribut{alt,#DESCRIPTIF*})] </BOUCLE_conditionsimage> @@ -394,7 +395,7 @@ </div> </div> <BOUCLE_conditionstuileimage(CONDITION){SI #ENV{sans-image}|non}> - <div class="fr-tile__img"> + <div class="fr-tile__img "> <BOUCLE_image_rub_tuile(DOCUMENTS){id_rubrique}{0,1}> @@ -471,7 +472,7 @@ </div> <BOUCLE_conditions_sansimage_mot(CONDITION){SI #ENV{sans-image}|non}> <div class="fr-card__header"> - <div class="fr-card__img"> + <div class="fr-card__img "> <BOUCLE_conditions_logo_mot(CONDITION){SI #ENV{logo}|oui}> [(#LOGO_MOT|image_reduire{350,350} |image_recadre{350,350,center} |image_aplatir{jpg,ffffff} |inserer_attribut{class,fr-responsive-img}|inserer_attribut{alt,#DESCRIPTIF*})] </BOUCLE_conditions_logo_mot> @@ -524,7 +525,7 @@ </div> </div> <BOUCLE_conditionstuileimage_mot(CONDITION){SI #ENV{sans-image}|non}> - <div class="fr-tile__img"> + <div class="fr-tile__img "> <BOUCLE_image_mot_tuile(DOCUMENTS){id_mot}{0,1}> [(#FICHIER |image_reduire{80,80} |image_recadre{80,80,center} |image_aplatir{jpg,ffffff} |inserer_attribut{class,fr-responsive-img}|inserer_attribut{alt,#DESCRIPTIF*})] </BOUCLE_image_mot_tuile> @@ -585,7 +586,7 @@ <p class="fr-card__title"> <a href="#ENV{url}">[(#ENV{titre}|non) #ENV{url}][(#ENV{titre}|oui) #ENV{titre}]</a> </p> - [<div class="fr-card__desc fr-mb-2w">(#ENV{texte})</div>] + [<div class="fr-card__desc fr-mb-2w fr-mr-4w">(#ENV{texte})</div>] [<div class="fr-card__start"> <ul class="fr-badges-group"> <li><p class="fr-badge [(#GET{moncouleurbadge})]">(#ENV{badge})</p></li> @@ -596,7 +597,7 @@ <BOUCLE_conditionsimage00(CONDITION){SI #ENV{image_id}|oui}> <div class="fr-card__header"> - <div class="fr-card__img"> + <div class="fr-card__img "> <BOUCLE_image_id(DOCUMENTS){id_document=#ENV{image_id}}{0,1}> [(#FICHIER |image_reduire{350,350} |image_recadre{350,350,center} |image_aplatir{jpg,ffffff} |inserer_attribut{class,fr-responsive-img}|inserer_attribut{alt,#DESCRIPTIF*})] </BOUCLE_image_id> @@ -619,15 +620,15 @@ <div class="fr-tile fr-enlarge-link [(#ENV{vertical}|non)fr-tile--horizontal] fr-mb-2w"> <div class="fr-tile__body"> <div class="fr-tile__content"> - [<h4 class="fr-tile__title"> + [<p class="fr-tile__title"> <a class="" href="#ENV{url}">(#ENV{titre})</a> - </h4>] + </p>] [<div class="fr-tile__desc">(#ENV{texte})</div>] </div> </div> <BOUCLE_conditionsimagetuile(CONDITION){SI #ENV{image_id}|oui}> - <div class="fr-tile__img"> + <div class="fr-tile__img "> <BOUCLE_image_id_tuile(DOCUMENTS){id_document=#ENV{image_id}}{0,1}> [(#FICHIER |image_reduire{350,350} |image_recadre{350,350,center} |image_aplatir{jpg,ffffff} |inserer_attribut{class,fr-responsive-img}|inserer_attribut{alt,#DESCRIPTIF*})] @@ -703,7 +704,7 @@ [(#REM) c'est une lien simple vers un document pdf] <BOUCLE_document-simple-pdf(CONDITION){si #ENV{carte}|non}> - <div class="fr-download"> + <div class="fr-download fr-mb-2w"> <p class="fr-m-0"> <a href="#ENV{url}" download class="fr-download__link" [title="Télécharger le document : (#ENV{titre})"]>[(#ENV{titre})] <span class="fr-download__detail"> @@ -714,19 +715,29 @@ </div> </BOUCLE_document-simple-pdf> + [(#REM) c'est une lien simple au format carte vers un document pdf] <BOUCLE_document-carte-pdf(CONDITION){si #ENV{carte}|oui}> - <div class="fr-download fr-enlarge-link fr-download--card"> - <p class="fr-m-0"> - <a href="#URL_DOCUMENT" download class="fr-download__card" [title="Télécharger le document : (#TITRE)"]>[(#ENV{titre})] - <span class="fr-download__detail"> - [Fichier (#ENV{type}) [ - (#ENV{poids})]] - - </span> - </a> - </p> - [<p class="fr-download__desc">(#ENV{texte})</p>] + <div class="fr-card fr-card--download fr-enlarge-link fr-mb-2w "> + <div class="fr-card__body"> + <div class="fr-card__content [(#GET{ma_couleur})]"> + <p class="fr-card__title"> + <a href="#ENV{url}" download [title="Télécharger le document : (#TITRE)"]>[(#ENV{titre}|non) #ENV{url}][(#ENV{titre}|oui) #ENV{titre}]</a> + </p> + [<div class="fr-card__desc fr-mb-1w fr-mr-4w">(#ENV{texte})</div>] + [<div class="fr-card__end fr-mb-2w"> + <p class="fr-card__detail "> + Fichier (#ENV{type}) [ - (#ENV{poids})] + </p> + </div>] + [<div class="fr-card__start"> + <ul class="fr-badges-group"> + <li><p class="fr-badge [(#GET{moncouleurbadge})]">(#ENV{badge})</p></li> + </ul> + </div>] + </div> + </div> </div> </BOUCLE_document-carte-pdf> -- GitLab