Merge pull request #913 from MTES-MCT/campaign-logo-size

fix: draft image sizes + display rules for both date and location
MTES-MCT · Sep 30, 2024 · f624e79 · f624e79
2 parents fbf710f + 68d8589
commit f624e79
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/frontend/src/components/Draft/DraftBody.tsx b/frontend/src/components/Draft/DraftBody.tsx
@@ -22,7 +22,7 @@ function DraftBody(props: Readonly<Props>) {
     <Container as="article" className={styles.article} fluid>
       <Row className="fr-mb-2w justify-space-between">
         <h6 id="draft-body-label" className="fr-mb-0">
-          Contenu de votre courrier (obligatoire)
+          Contenu de votre courrier
         </h6>
         <AppLink
           isSimple
@@ -37,7 +37,7 @@ function DraftBody(props: Readonly<Props>) {
           <AppTextInput
             inputForm={props.form}
             inputKey="subject"
-            label="Objet*"
+            label="Objet"
             value={props.subject}
             onChange={(event) =>
               props.onChange({

diff --git a/packages/draft/src/templates/draft/draft.css b/packages/draft/src/templates/draft/draft.css
@@ -35,9 +35,13 @@ p {
   width: 40%;
 }
 
-.header__image {
+.header__image, .footer__image {
   max-width: 140px;
-  height: auto;
+  max-height: 140px;
+  object-fit: contain;
+}
+
+.header__image {
   margin-bottom: 0.5rem;
 }
 

diff --git a/packages/draft/src/templates/draft/draft.hbs b/packages/draft/src/templates/draft/draft.hbs
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="fr">
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -54,9 +54,17 @@
         {{#if writtenFrom}}
           {{#if writtenAt}}
             <p>À {{writtenFrom}}, le {{localdate writtenAt}}</p>
+          {{else}}
+            <p>À {{writtenFrom}}</p>
+          {{/if}}
+        {{else}}
+          {{#if writtenAt}}
+            <p>Le {{localdate writtenAt}}</p>
           {{/if}}
         {{/if}}
+        {{#if subject}}
         <p><strong>Objet : </strong>{{subject}}</p>
+        {{/if}}
       </header>
       <section class="main__body">
         {{{body}}}
@@ -65,7 +73,7 @@
     <footer>
       <section class="footer__signature">
         {{#if sender.signatoryFile}}
-          <p><img src="{{sender.signatoryFile}}" alt="Signature" /></p>
+          <p><img src="{{sender.signatoryFile}}" alt="Signature" class="footer__image" /></p>
         {{/if}}
         {{#if sender.signatoryFirstName}}
           {{#if sender.signatoryLastName}}