@shift72/core-template 1.9.5 → 1.9.7

package/site/en_AU.all.json

@@ -1658,5 +1658,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Visit us on LinkedIn"
+  },
+  "pricing_from": {
+    "other": "Watch from"
   }
-}
+}

package/site/es_ES.all.json

@@ -1662,5 +1662,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Visítenos en LinkedIn"
+  },
+  "pricing_from": {
+    "other": "Mirar desde"
   }
-}
+}

package/site/es_MX.all.json

@@ -1662,5 +1662,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Visítenos en LinkedIn"
+  },
+  "pricing_from": {
+    "other": "Mirar desde"
   }
-}
+}

package/site/et_ET.all.json

@@ -1658,5 +1658,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Külastage meid LinkedInis"
+  },
+  "pricing_from": {
+    "other": "Vaata alates"
   }
-}
+}

package/site/fi_FI.all.json

@@ -1658,5 +1658,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Vieraile meillä LinkedInissä"
+  },
+  "pricing_from": {
+    "other": "Katso alkaen"
   }
-}
+}

package/site/fr_FR.all.json

@@ -1662,5 +1662,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Visitez-nous sur LinkedIn"
+  },
+  "pricing_from": {
+    "other": "Regarder depuis"
   }
-}
+}

package/site/hr_HR.all.json

@@ -1660,5 +1660,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Posjetite nas na LinkedInu"
+  },
+  "pricing_from": {
+    "other": "Gledajte iz"
   }
-}
+}

package/site/hu_HU.all.json

@@ -1658,5 +1658,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Látogasson el hozzánk a LinkedIn-en"
+  },
+  "pricing_from": {
+    "other": "Nézd innen"
   }
-}
+}

package/site/it_IT.all.json

@@ -1662,5 +1662,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Visitaci su LinkedIn"
+  },
+  "pricing_from": {
+    "other": "Guarda da"
   }
-}
+}

package/site/ja_JP.all.json

@@ -1645,5 +1645,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "LinkedIn にアクセスしてください"
+  },
+  "pricing_from": {
+    "other": "から見る"
   }
-}
+}

package/site/lt_LT.all.json

@@ -1690,5 +1690,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Aplankykite mus „LinkedIn“."
+  },
+  "pricing_from": {
+    "other": "Žiūrėti iš"
   }
-}
+}

package/site/nl_BE.all.json

@@ -1658,5 +1658,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Bezoek ons op LinkedIn"
+  },
+  "pricing_from": {
+    "other": "Kijk vanaf"
   }
-}
+}

package/site/no_NO.all.json

@@ -1658,5 +1658,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Besøk oss på LinkedIn"
+  },
+  "pricing_from": {
+    "other": "Se fra"
   }
-}
+}

package/site/pl_PL.all.json

@@ -1735,5 +1735,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Odwiedź nas na LinkedInie"
+  },
+  "pricing_from": {
+    "other": "Oglądaj od"
   }
-}
+}

package/site/plans.html.jet

@@ -11,25 +11,24 @@
       <h1>{{ i18n("plans_page_header") }}</h1>
     </div>
 
-    <div class="container-xxxl px-2 px-lg-5">
-      <div class="row">
+    <div class="plans-container">
       {{ range _, p := site.Plans }}
-        <div class="plan col-xs-6 col-lg-4 mb-3">
-          <div class="card h-100">
+        <div class="plan">
+          <div class="plan-card">
             <div class="plan-container">
               {{ if isset(p.LandscapeImage) && p.LandscapeImage != ""}}
                 <div class="poster poster-landscape">
                   {{ if p.Page }}
                     <a href="{{ routeToSlug(p.Page.Slug) }}">
                   {{ end }}
-                  <s72-image src="{{p.LandscapeImage}}" alt="{{p.Name}}" class="plan-poster card-img-top" border="0"></s72-image>
+                  <s72-image src="{{p.LandscapeImage}}" alt="{{p.Name}}" class="plan-poster"></s72-image>
                   <s72-plan-label data-slug="{{p.Slug}}" data-title="{{p.Name}}"></s72-plan-label>
                   {{ if p.Page }}
                     </a>
                   {{ end }}
                 </div>
               {{ end }}
-              <div class="card-body d-flex flex-column justify-content-between">
+              <div class="plan-caption-details-container">
                 <div class="plan-caption-details">
 
                   {{ if !isset(p.LandscapeImage) || p.LandscapeImage == "" }}
@@ -97,7 +96,7 @@
           </div>
         </div>
       {{ end }}
-      </div>
+    
     </div>
 
   </main>

package/site/pt_BR.all.json

@@ -1662,5 +1662,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Visite-nos no LinkedIn"
+  },
+  "pricing_from": {
+    "other": "Assista à partir"
   }
-}
+}

package/site/pt_PT.all.json

@@ -1662,5 +1662,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Visite-nos no LinkedIn"
+  },
+  "pricing_from": {
+    "other": "Assista à partir"
   }
-}
+}

package/site/ru_RU.all.json

@@ -1712,5 +1712,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Посетите нас на LinkedIn"
+  },
+  "pricing_from": {
+    "other": "Смотреть из"
   }
-}
+}

package/site/sr_SR.all.json

@@ -1674,5 +1674,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Посетите нас на ЛинкедИн-у"
+  },
+  "pricing_from": {
+    "other": "Гледајте из"
   }
-}
+}

package/site/static/images/icons/androidtv.svg

@@ -0,0 +1,36 @@
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+  width="122px" height="44px" viewBox="0 0 800 138" enable-background="new 0 0 800 138"
+  xml:space="preserve">
+  <g>
+    <path d="M43.714,44.202c12.974,0,23.79,6.668,28.827,13.874V46.002h19.816v90.08H78.899c-3.511,0-6.358-2.842-6.358-6.357v-5.705
+      c-5.037,7.2-15.853,13.863-28.827,13.863c-24.674,0-43.417-21.074-43.417-46.838S19.04,44.202,43.714,44.202 M47.319,62.221
+      c-16.037,0-26.848,12.608-26.848,28.824c0,16.211,10.811,28.827,26.848,28.827c16.032,0,26.848-12.616,26.848-28.827
+      C74.167,74.829,63.352,62.221,47.319,62.221" fill="currentColor"/>
+    <path d="M114.863,46.005h19.821v12.25c5.4-9.005,15.674-14.05,27.385-14.05c20.895,0,34.411,14.773,34.411,37.655v54.222h-13.463
+      c-3.51,0-6.358-2.847-6.358-6.357V85.103c0-14.231-7.21-22.879-18.732-22.879c-13.153,0-23.242,10.269-23.242,29.542v44.316
+      h-13.469c-3.505,0-6.353-2.847-6.353-6.357V46.005z" fill="currentColor"/>
+    <path d="M255.575,44.202c12.969,0,23.785,6.668,28.827,13.874V0.967h19.811v135.115h-13.458c-3.505,0-6.353-2.842-6.353-6.357
+      v-5.705c-5.042,7.2-15.858,13.863-28.827,13.863c-24.685,0-43.421-21.074-43.421-46.838S230.891,44.202,255.575,44.202
+      M259.181,62.221c-16.032,0-26.843,12.608-26.843,28.824c0,16.211,10.811,28.827,26.843,28.827
+      c16.026,0,26.837-12.616,26.837-28.827C286.018,74.829,275.207,62.221,259.181,62.221" fill="currentColor"/>
+    <path d="M326.724,46.005h19.816v16.034c3.421-10.269,13.511-16.934,23.784-16.934c2.516,0,5.047,0.182,7.748,0.721v20.356
+      c-3.432-1.082-6.305-1.621-9.905-1.621c-11.353,0-21.626,9.553-21.626,27.568v43.953h-13.463c-3.505,0-6.353-2.847-6.353-6.357
+      V46.005z" fill="currentColor"/>
+    <path d="M431.504,137.883c-26.658,0-47.2-20.722-47.2-46.833c0-26.124,20.542-46.848,47.2-46.848
+      c26.669,0,47.201,20.719,47.201,46.848C478.705,117.161,458.173,137.883,431.504,137.883 M431.504,119.514
+      c15.854,0,27.027-12.437,27.027-28.464c0-16.031-11.174-28.468-27.027-28.468c-16.031,0-27.2,12.437-27.2,28.468
+      C404.304,107.077,415.473,119.514,431.504,119.514" fill="currentColor"/>
+    <path d="M504.674,26.37c-7.205,0-13.332-5.939-13.332-13.334c0-7.206,6.127-13.15,13.332-13.15c7.384,0,13.152,5.945,13.152,13.15
+      C517.826,20.431,512.058,26.37,504.674,26.37 M494.773,46.002h19.811v90.08h-13.458c-3.511,0-6.353-2.853-6.353-6.357V46.002z" fill="currentColor"/>
+    <path d="M574.285,44.202c12.974,0,23.785,6.668,28.832,13.874V0.967h19.816v135.115h-13.458c-3.517,0-6.358-2.842-6.358-6.357
+      v-5.705c-5.047,7.2-15.858,13.863-28.832,13.863c-24.674,0-43.411-21.074-43.411-46.838S549.611,44.202,574.285,44.202
+      M577.891,62.221c-16.026,0-26.837,12.608-26.837,28.824c0,16.211,10.811,28.827,26.837,28.827
+      c16.037,0,26.848-12.616,26.848-28.827C604.738,74.829,593.928,62.221,577.891,62.221" fill="currentColor"/>
+    <path d="M657.387,57.463h-19.39V45.51h19.39V20.323h12.679V45.51h26.453v11.953h-26.453v52.361
+      c0,11.048,4.896,15.395,15.037,15.395c3.621,0,8.517-0.726,11.416-1.989v11.411c-4.174,1.632-8.516,2.357-13.41,2.357
+      c-15.396,0-25.722-8.884-25.722-26.095V57.463z" fill="currentColor"/>
+    <polygon points="799.604,45.507 757.215,136.093 747.251,136.093 704.855,45.507 718.987,45.507 752.141,117.43 785.294,45.507 	
+      " fill="currentColor"/>
+  </g>
+</svg>

package/site/styles/_carousel.scss

@@ -29,7 +29,7 @@ s72-carousel {
   width: 100%;
 
   @include media-breakpoint-up(sm) {
-    margin-bottom: 40px;
+    margin-bottom: 32px;
   }
 }
 

package/site/styles/_footer.scss

@@ -164,6 +164,13 @@ footer {
       display: flex;
       height: 45px;
     }
+    .app-badge-android-tv {
+      background-color: var(--footer-app-badge-android-tv);
+      height: 44px;
+      mask: url('/images/icons/androidtv.svg') no-repeat center / contain;
+      mask: url('/images/icons/androidtv.svg') no-repeat center / contain;
+      width: 122px;
+    }
   }
 
   .app-badge-title,

package/site/styles/_plans.scss

@@ -5,30 +5,51 @@
 s72-plan-label {
   .s72-plan-owned {
     @extend .availability-state;
-    @extend .d-inline;
     color: $button-text-color;
+    display: inline;
   }
 }
 
 /* stylelint-disable selector-max-compound-selectors, max-nesting-depth */
 .plans-page {
-  // Add some spacing to the heading
-  .page-header h1 {
-    @extend .mb-3;
+  .plans-container {
+    display: grid;
+    gap: 20px;
+    grid-template-columns: 1fr;
+    max-width: 1920px;
+    padding: 0 20px;
+    width: 100%;
+    @include media-breakpoint-up(sm) {
+      grid-template-columns: repeat(auto-fill, minmax(360px, 1fr));
+    }
+    @include media-breakpoint-up(lg) {
+      padding: 0 50px;
+    }
   }
 
   .plan {
-    .card {
-      @extend .bg-transparent;
-      @extend .border-0;
+    .plan-card {
+      border: 0;
+      box-shadow: 0 3px 6px 1px rgba(0, 0, 0, 0.1);
+      color: #343a40;
+      height: 100%;
+      max-width: 580px;
 
       .plan-container {
-        @extend .bg-white;
         @include border-radius($border-radius);
+        background-color: rgb(255, 255, 255);
+
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+
+        .plan-poster {
+          width: 100%;
+        }
 
         .plan-caption-details {
           p {
-            @extend .mb-p75;
+            margin-bottom: 10px;
           }
 
           h2 {
@@ -36,24 +57,33 @@ s72-plan-label {
           }
         }
 
+        .plan-caption-details-container {
+          display: flex;
+          flex: 1 1 auto;
+          flex-direction: column;
+          justify-content: space-between;
+          min-height: 1px;
+          padding: 20px;
+        }
+
         s72-plan-label {
-          @extend .position-absolute;
-          @extend .mx-auto;
 
           left: 0;
+          margin: 0 auto;
+          position: absolute;
           top: 0;
           z-index: 99;
         }
 
         s72-pricing-buttons:not(.s72-show) {
-          @extend .m-0;
+          margin: 0;
         }
 
         .plan-caption-details .s72-plan-owned {
-          @extend .d-inline-block;
 
           background-color: var(--primary);
           border-radius: $border-radius 0 $border-radius 0;
+          display: inline-block;
           line-height: 20px;
           padding: 0 5px;
         }
@@ -74,7 +104,7 @@ s72-plan-label {
 
   // Hide the separator if this is a curated collection page
   + .separator {
-    @extend .border-0;
+    border: 0;
   }
 
   // Hide the titles of any collections

package/site/styles/_variables.scss

@@ -76,6 +76,9 @@
   --navbar-brand-height: 50px;
 
   --footer-brand-height: 50px;
+  --footer-app-badge-android-tv: var(
+    --body-color
+  ); // AndroidTV brand guidelines state this must be black or white
   --footer-social-bg: var(--body-bg-accent);
   --footer-social-bg-hover: var(--primary);
   --footer-social-icon: var(--body-color);
@@ -107,9 +110,10 @@
   --signin-sso-btn-background-color: var(--button-background);
   --signin-sso-btn-background-hover-color: var(--button-background-hover);
 
-  --carousel-height: 75vh;
-  --carousel-height-sm: 75vh;
-  --carousel-height-lg: 75vh;
+  // Carousel
+  --carousel-height: 88vh;
+  --carousel-height-sm: 88vh;
+  --carousel-height-lg: 88vh;
   --carousel-bottom-gradient-height: 200px; // Increase this to 300px for light theme.
   --carousel-bottom-gradient-height-sm: 200px; // Increase this to 300px for light theme.
   --carousel-bottom-gradient-height-lg: 200px; // Increase this to 600px for light theme.
@@ -117,6 +121,7 @@
   --carousel-image-object-position-sm: center;
   --carousel-image-object-position-lg: center;
 
+  // Pages
   --collection-padding-bottom: 40px;
 
   --page-padding-top: 120px;

package/site/templates/application/application.jet

@@ -2,6 +2,7 @@
 {{import "./head/seo.jet" }}
 {{import "./nav/nav.jet"}}
 {{import "./google.jet" }}
+{{import "./pixel.jet"}}
 {{import "./footer/footer.jet" }}
 
 {{CDN := "//cdn.shift72.com/1.4"}}
@@ -10,6 +11,9 @@
 {{CSSFileURL := site.SiteBrand.GetLink("css", "")}}
 {*{CSSFileURL := "/styles/local.css"}*}
 
+{{checkoutDevMode := false}}
+{{useCheckout := site.Toggles["use_checkout"] || checkoutDevMode}}
+
 <!DOCTYPE html>
 <html lang="{{lang.Code}}">
   <head>
@@ -50,6 +54,14 @@
     <script src="/scripts/main.js" defer></script>
 
     <script src="{{CDN}}/s72.transactional.js" defer></script>
+
+    {{if checkoutDevMode}}
+      <script>window.S72_CHECKOUT_OVERRIDE_URL = 'http://localhost:4072'</script>
+      <script src="http://localhost:4072/s72.checkout.js" defer></script> 
+    {{else if useCheckout}}
+      <script src="/checkout/s72.checkout.js" defer></script>
+    {{end}}
+
     <script src="https://js.stripe.com/v3/" defer></script>
 
     {* get default language from site record or kibble.json depening on if db translations is enabled *}  
@@ -76,6 +88,7 @@
     <s72-cookie-consent></s72-cookie-consent>
 
     {{yield googleTagManagerNoScript()}}
+    {{yield pixelNoScript()}}
 
     {{block navigation()}}
       {{yield nav() }}
@@ -86,6 +99,7 @@
     {{yield footer()}}
 
     {{yield googleScripts()}}
+    {{yield pixelScripts()}}
     <s72-donate-button></s72-donate-button>
   </body>
 </html>

package/site/templates/application/footer/app-badges.jet

@@ -26,7 +26,11 @@
 
       <div class="tv-app-badge-container">
         {{yield appBadge(href=app_link_fire_tv, image="/images/icons/amazonfiretv.png", altKey="app_badge_fire_tv", imgClass="tv-badge-image")}}
-        {{yield appBadge(href=app_link_android_tv, image="/images/icons/androidtv.png", altKey="app_badge_android_tv", imgClass="tv-badge-image")}} 
+        {{ if app_link_android_tv != "" }}
+        <a class="app-badge-link" href="{{app_link_android_tv}}" target="_blank">
+          <div class="app-badge-android-tv"></div>
+        </a>
+        {{ end }}
         {{yield appBadge(href=app_link_apple_tv_enabled, image="/images/icons/appletv.png", altKey="app_badge_apple_tv", imgClass="tv-badge-image")}} 
       </div>
     </div>

package/site/templates/application/footer/social-media-buttons.jet

@@ -78,8 +78,8 @@
 {{ end }}
 
 {{ block twitterIcon() }}
-  <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M8.7 18.939c6.315 0 9.77-5.23 9.77-9.769 0-.148 0-.297-.011-.446a7.382 7.382 0 0 0 1.721-1.775 6.883 6.883 0 0 1-1.977.531 3.424 3.424 0 0 0 1.51-1.892 6.758 6.758 0 0 1-2.18.83 3.425 3.425 0 0 0-2.508-1.085 3.432 3.432 0 0 0-3.433 3.434c0 .265.032.531.085.786a9.759 9.759 0 0 1-7.08-3.593 3.408 3.408 0 0 0-.467 1.733 3.43 3.43 0 0 0 1.53 2.86 3.459 3.459 0 0 1-1.551-.437v.043c0 1.669 1.18 3.05 2.753 3.37a3.63 3.63 0 0 1-.904.116c-.223 0-.435-.02-.648-.053a3.44 3.44 0 0 0 3.21 2.381 6.875 6.875 0 0 1-4.262 1.467c-.287 0-.553-.01-.83-.043a9.702 9.702 0 0 0 5.273 1.542z" fill="currentColor"/>
+  <svg xmlns="http://www.w3.org/2000/svg" height="1em" viewBox="0 0 512 512">
+    <path d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z" fill="currentColor"/>
   </svg>
 {{ end }}
 

package/site/templates/application/pixel.jet

@@ -0,0 +1,49 @@
+{{block pixelScripts(pixelID=config("meta_pixel_id"))}}
+  <!-- Meta Pixel Code -->
+  {{if pixelID != ""}}
+    <script>
+      function loadPixelScripts(messagebus) {
+        !function(f,b,e,v,n,t,s)
+        {if(f.fbq)return;n=f.fbq=function(){n.callMethod?
+        n.callMethod.apply(n,arguments):n.queue.push(arguments)};
+        if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';
+        n.queue=[];t=b.createElement(e);t.async=!0;
+        t.src=v;s=b.getElementsByTagName(e)[0];
+        s.parentNode.insertBefore(t,s)}(window, document,'script',
+        'https://connect.facebook.net/en_US/fbevents.js');
+
+        messagebus.publish('loaded-pixel-script', {{pixelID}});
+      };
+    </script>
+  <!-- End Meta Pixel Code -->
+
+  <script>
+    // Only send message to load Pixel if a/ the frontend cookie consent isn't required or b/ they've agreed to the cookie consent
+    var cookieConsentRequired = {{ isEnabled("frontend_cookie_consent") }};
+
+    document.addEventListener('s72loaded', function(event) {
+      let messagebus = event.detail.app.messagebus;
+      if(!cookieConsentRequired || event.detail.app.hasCookieConsent()) {
+        loadPixelScripts(messagebus);
+      }
+      else {
+        // Listen for an 'accept' of the cookie consent, in which case send message to load Pixel
+        messagebus.subscribe('cookie-consent-set', function(event) {
+          loadPixelScripts(messagebus);
+        });
+      }
+    });
+  </script>
+  {{end}}
+{{end}}
+
+{{block pixelNoScript(pixelID=config("meta_pixel_id"))}}
+  {{if len(pixelID) > 0}}
+    {{if !isEnabled("frontend_cookie_consent")}};
+      <!-- Start Pixel (noscript) -->
+      <noscript><img height="1" width="1" style="display:none" src="https://www.facebook.com/tr?id={{pixelID}}&ev=PageView&noscript=1"/></noscript> 
+      <!-- End Pixel (noscript) -->
+    {{end}}
+  {{end}}
+{{end}}
+

package/site/templates/common/cta_buttons.jet

@@ -62,7 +62,7 @@
           {{end}}
 
           {{if showShareButton}}
-            {{letterboxdID := isFilm ? .Refs.LetterboxdID : ""}}
+            {{letterboxdID := isFilm && config("show_letterboxd_share", "true") == "true" ? .Refs.LetterboxdID : ""}}
             {{shareURL := site.SiteConfig.SiteURL + routeToSlug(slug)}}
             {{yield socialMediaButtons(url=shareURL, letterboxdID=letterboxdID)}}
           {{end}}

package/site/tr_TR.all.json

@@ -1658,5 +1658,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Bizi LinkedIn'de ziyaret edin"
+  },
+  "pricing_from": {
+    "other": "Şuradan izle:"
   }
-}
+}

package/site/uk_UA.all.json

@@ -1718,5 +1718,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "Відвідайте нас на LinkedIn"
+  },
+  "pricing_from": {
+    "other": "Дивитися з"
   }
-}
+}

package/site/zh_TW.all.json

@@ -1645,5 +1645,8 @@
   },
   "wcag_aria_label_social_linkedin": {
     "other": "在 LinkedIn 上訪問我們"
+  },
+  "pricing_from": {
+    "other": "觀看來自"
   }
-}
+}