Put ContactUs page back into navbar and more fixes

- logo in page headers
- CSS for relevant image size
- update unaligned logos

assets/sass/main.scss

@@ -11,3 +11,7 @@ p {
 #sitelogo {
     max-width: 15rem ;
 }
+
+#headerlogo {
+    max-width: 25rem;
+}

content/en/_index.md

@@ -3,11 +3,12 @@ title: "DéCySif"
 sectiontitle: "Home"
 cascade:
   featured_image: '/images/Decysif.png'
-description: "Formal verification in the service of safety and security"
+description: "**Formal verification in the service of safety and security**"
 synopsis: "DéCySif is a regional R&D project funded by an i-Démo call and the
 Ile-de-France French region gathering AdaCore, Inria, OCamlPro and TrustInSoft.
 Its objective is to improve the safety and security of critical systems using
-formal verification tools."
+formal verification tools.<br />The project began on **November 1st 2022**
+and will end on **November 1st 2027**."
 
 project:
   sectiontitle: "The project"
@@ -37,7 +38,7 @@ project:
 coordinator:
   sectiontitle: "Coordinator"
   content: "TrustInSoft are the coordinators of the project. For any enquiry,
-  please use the [contact form]({{< ref \"contact.en.md\" >}})."
+  please use the [contact form]({{< ref \"contact.md\" >}})."
 
 publications:
   - papername: "Formally Verified Rounding Errors of the Logarithm-Sum-Exponential Function"

content/en/contact.md

@@ -0,0 +1,12 @@
+---
+title: Contact
+featured_image: '/images/Decysif.png'
+button_text: "Leave us a message!"
+layout: contact
+description: "**Contact us!**"
+---
+
+You can contact us by filling the form below.
+
+{{< form-contact >}}
+

content/fr/_index.md

@@ -3,10 +3,10 @@ title: "DéCySif"
 sectiontitle: "Accueil"
 cascade:
   featured_image: '/images/Decysif.png'
-description: "La vérification formelle au service de la sécurité et la sûreté"
+description: "**La vérification formelle au service de la sécurité et la sûreté**"
 synopsis: "DéCySif est un projet i-Demo régional de R&D regroupant AdaCore,
 l'Inria, OCamlPro et TrustInSoft. Il vise à améliorer la sécurité et la sûreté
-des systèmes critiques en utilisant des outils de vérification formelle."
+des systèmes critiques en utilisant des outils de vérification formelle.<br />Le projet prendra place du **1er Novembre 2022** au **1er Novembre 2027**."
 
 project:
   sectiontitle: "Le projet"
@@ -35,7 +35,7 @@ project:
 coordinator:
   sectiontitle: "Coordinateur"
   content: "La société TrustInSoft est le coordinateur du projet. Pour toute
-  demande d'information, veuillez passer par le formulaire de [contact]({{< ref \"contact.fr.md\" >}})."
+  demande d'information, veuillez passer par le formulaire de [contact]({{< ref \"contact.md\" >}})."
 
 publications:
   - papername: "Formally Verified Rounding Errors of the Logarithm-Sum-Exponential Function"

content/fr/contact.md

@@ -0,0 +1,12 @@
+---
+title: Contact
+featured_image: '/images/Decysif.png'
+button_text: "Laissez-nous un message !"
+layout: contact
+description: "**Contactez nous !**"
+---
+
+Pour nous contacter, merci de remplir le formulaire ci-dessous.
+
+{{< form-contact >}}
+

hugo.toml

@@ -26,6 +26,7 @@ Paginate = 10
 
 [params]
   site_logo = 'images/logo_decysif_excellence_for_security_blank_bg_rectangle.svg'
+  header_logo = 'images/logo_decysif_security_by_design_blank_bg_rectangle.svg'
   text_color = ""
   recent_posts_number = 5
 [params.contact]

layouts/partials/page-header.html

@@ -6,11 +6,13 @@
       {{ partial "site-navigation.html" . }}
       <div class="tc-l pv6 ph3 ph4-ns">
         {{ if not .Params.omit_header_text }}
-          <div class="f2 f1-l fw2 white-90 mb0 lh-title">{{ .Title | default .Site.Title }}</div>
-          {{ with .Params.description  }}
-            <div class="fw1 f5 f3-l white-80 measure-wide-l center lh-copy mt3 mb4">
-              {{ . }}
-            </div>
+          {{ with .Site.Params.header_logo }}
+        <img src="{{ relURL . }}" class="w100 mw5-ns" id="headerlogo" alt="{{ $.Site.Title }}" />
+          {{ end }}
+          {{ with .Params.description | markdownify }}
+        <div class="fw1 f5 f3-l white-80 measure-wide-l center lh-copy mt3 mb4">
+          {{ . }}
+        </div>
           {{ end }}
         {{ end }}
       </div>

layouts/partials/site-navigation.html

@@ -1,11 +1,7 @@
 <nav class="pv3 ph3 ph4-ns" role="navigation">
   <div class="flex-l justify-between items-center center">
     <a href="{{ .Site.Home.RelPermalink }}" class="f3 fw2 hover-white no-underline white-90 dib">
-      {{ with .Site.Params.site_logo }}
-        <img src="{{ relURL . }}" class="w100 mw5-ns" id="sitelogo" alt="{{ $.Site.Title }}" />
-      {{ else }}
         {{ .Site.Title }}
-      {{ end }}
     </a>
     <div class="flex-l items-center">
       {{ partial "i18nlist.html" . }}
@@ -34,6 +30,13 @@
             </a>
           </li>
           {{ end }}
+          {{ with .Site.GetPage "/contact.md" }}
+          <li class="list f5 f4-ns fw4 dib {{ cond (eq $.Site.Language.LanguageDirection "rtl") "pl3" "pr3" }}">
+            <a class="hover-white no-underline white-90" href="{{ .RelPermalink }}" title="{{ i18n "pageTitle" . }}">
+              <button id="contact-button" class="btn btn-success black-90" type="button">{{ .Page.Params.button_text }}</button>
+            </a>
+          </li>
+          {{ end }}
         </ul>
       {{ partialCached "social-follow.html" . }}
     </div>