Sync with upstream: 895e9b0b6723ff3ecf5ec52e633d6b9997b704e4

source/_data/defaults.yml

@@ -162,6 +162,8 @@ conference:
   social_vimeo_url: "https://vimeo.com/channels/incontrodevops"
   social_youtube_url: "https://www.youtube.com/c/grusp"
   social_instagram_url: "https://www.instagram.com/grusp_/"
+  social_mastodon_url: "https://phpc.social/@grusp"
+
   # 404
   back_to_home_label: "back to home page"
   # footer

source/_data/page_safety.yml

@@ -0,0 +1,25 @@
+main_title: "Health and Safety Policy"
+content_1: "<br>The health and safety of our attendees, speakers, sponsors, and staff is our top priority.
+  We are closely monitoring the COVID-19 situation and will follow the guidance of the Italian health officials.
+  <br>We will keep this page updated with the latest regulations and recommendations."
+content_2: "<b>phpday team will:</b>
+  <ul>
+    <li>• Monitor the latest official guidelines and adjust our policy as needed;
+    <li>• Provide masks for those that want or need them.
+  </ul>
+"
+content_3: "<b>phpday team recommends that all attendees:</b>
+  <ul>
+    <li>• Being fully vaccinated including boosters before arrival;
+    <li>• Getting tested before and during the event.
+  </ul>
+  <br><b>Please do not attend the conference if you feel sick or have been in close contact with someone who has been sick prior to the conference.</b>
+"
+content_4: "Useful links:
+  <ul>
+    <li>• <a href='https://www.salute.gov.it/portale/nuovocoronavirus/homeNuovoCoronavirus.jsp' target='_blank'>Italian Government website dedicated to Covid-19</a>
+    <li>• <a href='https://www.salute.gov.it/portale/nuovocoronavirus/dettaglioContenutiNuovoCoronavirus.jsp?lingua=english&id=5412&area=nuovoCoronavirus&menu=vuoto&tab=1' target='_blank'>Covid-19, Information for travellers - Italian Government</a>
+  </ul>
+"
+content_5: "For more information or questions, please send an email to: "
+content_6: 'This page was freely adapted from <a href="https://tek.phparch.com/" target="_blank">php[tek]</a>''s own policy. Thank you!'

source/_data/page_welcome.yml

@@ -11,6 +11,9 @@ info_about:
 info_coc:
   title: "COC"
   content: "Regole di comportamento"
+info_safety:
+  title: "Salute pubblica"
+  content: "La salute di tutti è una nostra priorità"
 info_scholarships:
   title: "Scholarships"
   content: "Come richiedere un biglietto gratuito"
@@ -22,6 +25,6 @@ info_venue:
   content: "Location e informazioni utili"
 info_ticket:
   title: "Biglietti"
-  content: "I biglietti sono disponibili su Eventbrite"
+  content: "I biglietti sono disponibili su Tito"
   # the tickets link is the only one that does not use the "global" label
   readmore_label: "ACQUISTA"

source/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Allow: /

source/welcome/safety/index.md

@@ -0,0 +1,9 @@
+---
+title: health and safety
+date: 2024-01-03 11:12:00
+layout: safety
+path: welcome/safety
+permalink: welcome/safety
+# Used to generate breadcrumbs
+parent: welcome
+---

themes/grusp_conf/layout/includes/_social.pug

@@ -17,4 +17,7 @@
 			include ../../source/assets/ico/ico-social-linkedin.svg
 	a(href=site.data.defaults.conference.social_instagram_url target="_blank" role="button" rel="noopener noreferrer external" aria-label="instagram")
 		.social-icon
-			include ../../source/assets/ico/ico-social-instagram.svg			
+			include ../../source/assets/ico/ico-social-instagram.svg
+	a(href=site.data.defaults.conference.social_mastodon_url target="_blank" role="button" rel="noopener noreferrer external" aria-label="instagram")
+		.social-icon
+			include ../../source/assets/ico/ico-social-mastodon.svg

themes/grusp_conf/layout/includes/footer.pug

@@ -16,16 +16,18 @@ footer
         strong !{where}
           | , 
           time(datetime=site.data.defaults.conference.date) !{start_date}
-      p !{site.data.defaults.conference.past_editions_pre}
-      p
-        each item in site.data.defaults.conference.past_editions 
-          - url = "https://" + item + "." + site.data.defaults.conference.base_url
-          a(href=url target="_blank" rel="noopener noreferrer").past-edition !{item}
-      p !{site.data.defaults.conference.past_editions_videos_pre}
-        a(href=site.data.defaults.conference.social_vimeo_url) !{site.data.defaults.conference.past_editions_videos_vimeo_label}
-        | !{site.data.defaults.conference.past_editions_videos_mid}
-        a(href=site.data.defaults.conference.social_youtube_url) !{site.data.defaults.conference.past_editions_videos_youtube_label}
-        | !{site.data.defaults.conference.past_editions_videos_post}
+
+      if(site.data.defaults.conference.past_editions)
+        p !{site.data.defaults.conference.past_editions_pre}
+        p
+          each item in site.data.defaults.conference.past_editions
+            - url = "https://" + item + "." + site.data.defaults.conference.base_url
+            a(href=url target="_blank" rel="noopener noreferrer").past-edition !{item}
+        p !{site.data.defaults.conference.past_editions_videos_pre}
+          a(href=site.data.defaults.conference.social_vimeo_url) !{site.data.defaults.conference.past_editions_videos_vimeo_label}
+          | !{site.data.defaults.conference.past_editions_videos_mid}
+          a(href=site.data.defaults.conference.social_youtube_url) !{site.data.defaults.conference.past_editions_videos_youtube_label}
+          | !{site.data.defaults.conference.past_editions_videos_post}
 
       include _social.pug
     .column.is-one-third

themes/grusp_conf/layout/includes/header.pug

@@ -49,14 +49,26 @@ script(type="text/javascript").
     "siteId": !{site.data.defaults.conference.iubenda.siteId},
     "cookiePolicyId": !{site.data.defaults.conference.iubenda.cookiePolicyId},
     "localConsentDomain": `!{site.data.defaults.conference.iubenda.localConsentDomain}`,
-    "rebuildIframe": !{site.data.defaults.conference.iubenda.rebuildIframe},
+    "askConsentAtCookiePolicyUpdate": true,
+    "countryDetection": true,
+    "enableLgpd": true,
+    "enableUspr": true,
+    "floatingPreferencesButtonDisplay": "bottom-left",
+    "invalidateConsentWithoutLog": true,
+    "lgpdAppliesGlobally": false,
+    "perPurposeConsent": true,
+    "whitelabel": false,
     "banner": {
-      "position": "float-top-center",
       "acceptButtonDisplay": true,
-      "customizeButtonDisplay": true
+      "closeButtonDisplay": false,
+      "customizeButtonDisplay": true,
+      "explicitWithdrawal": true,
+      "listPurposes": true,
+      "position": "float-top-center",
+      "rejectButtonDisplay": true
     },
     "callback": {
-      onPreferenceExpressedOrNotNeeded: function(preference) {
+      onPreferenceExpressedOrNotNeeded: function (preference) {
         dataLayer.push({
           iubenda_ccpa_opted_out: _iub.cs.api.isCcpaOptedOut()
         });
@@ -88,4 +100,5 @@ script(type="text/javascript").
   };
 
 //- Cookie solution (iubenda)
+script(type="text/javascript" src="//cdn.iubenda.com/cs/gpp/stub.js" charset="UTF-8").
 script(async type="text/javascript" src="//cdn.iubenda.com/cs/iubenda_cs.js" charset="UTF-8").

themes/grusp_conf/layout/includes/layout.pug

@@ -3,24 +3,23 @@
 - if (is_home()) pageTitle = 'home'
 - pageTitle += ' | ' + config.title
 
+- var ogDescription = page.description
+- if (is_home()) ogDescription = config.description
+
 doctype html
 html(lang=config.language)
   head
     meta(charset='UTF-8')
     title=pageTitle
     meta(name='viewport', content='width=device-width, initial-scale=1')
-    link(rel="canonical" href=url)
-
-    meta(property='og:title', content=site.data.defaults.conference.title)
-    if(is_home())
-      meta(property='og:description', content=config.description)
-    else
-      meta(property='og:description', content=page.description)
+    link(rel="canonical" href=url.replace('/index.html', '/'))
 
     meta(property="og:image" content=full_url_for(`/assets/img/social-1200x630.png`))
     meta(property="og:image:width" content="1200")
     meta(property="og:image:height" content="630")
 
+    != open_graph({title:pageTitle, description:ogDescription, site_name:config.slug})
+
     //- Favicons
     link(rel="apple-touch-icon" sizes="180x180" href=`/assets/favicons/apple-touch-icon.png`)
     link(rel="icon" type="image/png" sizes="32x32" href=`/assets/favicons/favicon-32x32.png`)
@@ -30,8 +29,6 @@ html(lang=config.language)
 
     link(rel="shortcut icon" href=`/assets/favicons/favicon.ico`)
 
-    != open_graph()
-
     if theme.stylesheets !== undefined && theme.stylesheets.length > 0
       //- stylesheets list from _config.yml
       each url in theme.stylesheets
@@ -112,4 +109,4 @@ html(lang=config.language)
           div!= body
         else
           block content
-    include footer.pug
+    include footer.pug

themes/grusp_conf/layout/index.pug

@@ -21,6 +21,6 @@ block content
   if(site.data.defaults.conference.location_visible)
     include components/location/location.pug
   if(site.data.defaults.conference.sponsors_visible)
-  include components/sponsors/sponsors.pug
+    include components/sponsors/sponsors.pug
   if site.data.defaults.conference.community_partners
     include components/community_partners/community_partners.pug

themes/grusp_conf/layout/safety.pug

@@ -0,0 +1,37 @@
+extends includes/layout.pug
+
+block content
+  - contact_url = "mailto:" + site.data.defaults.conference.contact_email
+  section(id="safety")
+    include includes/_breadcrumbs.pug
+
+    .container
+      .inner
+        .title-container
+          include ../source/assets/ico/ico-safety.svg
+          h1(role="heading" aria-level="1").title-is-1 !{site.data.page_safety.main_title}
+        p !{site.data.page_safety.content_1}
+
+    .container.container__short-version
+      .inner
+        if(site.data.page_safety.content_2)
+          p !{site.data.page_safety.content_2}
+        if(site.data.page_safety.content_3)
+          p !{site.data.page_safety.content_3}
+
+    .container.container__long-version
+      .inner
+        if(site.data.page_safety.content_4)
+          p !{site.data.page_safety.content_4}
+        if(site.data.page_safety.content_5)
+          p !{site.data.page_safety.content_5}
+            a(href=contact_url) !{site.data.defaults.conference.contact_email}
+        if(site.data.page_safety.content_6)
+          p !{site.data.page_safety.content_6}
+
+    //- imported components
+    include components/newsletter/newsletter
+    if(site.data.defaults.conference.sponsors_visible)
+      include components/sponsors/sponsors
+    if site.data.defaults.conference.community_partners
+      include components/community_partners/community_partners

themes/grusp_conf/layout/schedule.pug

@@ -160,6 +160,8 @@ block content
                                 include ../source/assets/ico/ico-cutlery.svg
                               if(row_item.service_icon == "glass")
                                 include ../source/assets/ico/ico-glass.svg
+                              if(row_item.service_icon == "bolt")
+                                include ../source/assets/ico/ico-bolt.svg
 
                             br
 

themes/grusp_conf/layout/talks_speakers.pug

@@ -174,6 +174,14 @@ block content
                                 a(role="button" href=speaker.speaker_linkedin_url rel="external noopener noreferrer" aria-label="linkedin profile")
                                   .social-icon
                                     include ../source/assets/ico/ico-social-linkedin.svg
+                              if(speaker.speaker_instagram_url)
+                                a(role="button" href=speaker.speaker_instagram_url rel="external noopener noreferrer" aria-label="instagram profile")
+                                  .social-icon
+                                    include ../source/assets/ico/ico-social-instagram.svg
+                              if(speaker.speaker_mastodon_url)
+                                a(role="button" href=speaker.speaker_mastodon_url rel="external noopener noreferrer" aria-label="mastodon profile")
+                                  .social-icon
+                                    include ../source/assets/ico/ico-social-mastodon.svg
                           .column
                             .columns.speaker-info
                               .column

themes/grusp_conf/layout/welcome.pug

@@ -43,6 +43,10 @@ block content
                     include ../source/assets/ico/ico-coc.svg
                     - the_title = site.data.page_welcome.info_coc.title
                     - the_content = site.data.page_welcome.info_coc.content
+                  if(sub_key === "safety")
+                    include ../source/assets/ico/ico-safety.svg
+                    - the_title = site.data.page_welcome.info_safety.title
+                    - the_content = site.data.page_welcome.info_safety.content
                   if(sub_key === "scholarships")
                     include ../source/assets/ico/ico-scholarship.svg
                     - the_title = site.data.page_welcome.info_scholarships.title