@shift72/core-template 1.7.0 → 1.8.0

package/site/no_NO.all.json

@@ -1511,5 +1511,32 @@
   },
   "new_card_error_timed_out": {
     "other": "Noe gikk galt da kortet ble lagt til. Prøv igjen senere eller bruk et annet kort."
+  },
+  "tv_app_badge_title": {
+    "other": "Tilgjengelig på TV-apper"
+  },
+  "app_badge_fire_tv": {
+    "other": "Få den på Amazon Fire TV"
+  },
+  "app_badge_android_tv": {
+    "other": "Få den på Android TV"
+  },
+  "app_badge_apple_tv": {
+    "other": "Få den på Apple TV"
+  },
+  "wcag_aria_label_social_instagram": {
+    "other": "Besøk oss på Instagram"
+  },
+  "wcag_aria_label_social_youtube": {
+    "other": "Abonner på Youtube"
+  },
+  "wcag_aria_label_social_facebook": {
+    "other": "Besøk oss på Facebook"
+  },
+  "wcag_aria_label_social_twitter": {
+    "other": "Besøk oss på Twitter"
+  },
+  "wcag_aria_label_social_letterboxd": {
+    "other": "Besøk oss på Letterboxd"
   }
 }

package/site/pl_PL.all.json

@@ -1588,5 +1588,32 @@
   },
   "new_card_error_timed_out": {
     "other": "Coś poszło nie tak podczas dodawania tej karty. Spróbuj ponownie później lub użyj innej karty."
+  },
+  "tv_app_badge_title": {
+    "other": "Dostępne w aplikacjach telewizyjnych"
+  },
+  "app_badge_fire_tv": {
+    "other": "Pobierz go na Amazon Fire TV"
+  },
+  "app_badge_android_tv": {
+    "other": "Pobierz na Android TV"
+  },
+  "app_badge_apple_tv": {
+    "other": "Pobierz na Apple TV"
+  },
+  "wcag_aria_label_social_instagram": {
+    "other": "Odwiedź nas na Instagramie"
+  },
+  "wcag_aria_label_social_youtube": {
+    "other": "Subskrybuj na Youtube"
+  },
+  "wcag_aria_label_social_facebook": {
+    "other": "Odwiedź nas na Facebooku"
+  },
+  "wcag_aria_label_social_twitter": {
+    "other": "Odwiedź nas na Twitterze"
+  },
+  "wcag_aria_label_social_letterboxd": {
+    "other": "Odwiedź nas na Letterboxd"
   }
 }

package/site/pt_BR.all.json

@@ -1515,5 +1515,32 @@
   },
   "new_card_error_timed_out": {
     "other": "Algo deu errado ao adicionar esse cartão. Tente novamente mais tarde ou use um cartão diferente."
+  },
+  "tv_app_badge_title": {
+    "other": "Disponível em aplicativos de TV"
+  },
+  "app_badge_fire_tv": {
+    "other": "Baixe na Amazon Fire TV"
+  },
+  "app_badge_android_tv": {
+    "other": "Baixe na Android TV"
+  },
+  "app_badge_apple_tv": {
+    "other": "Baixe na Apple TV"
+  },
+  "wcag_aria_label_social_instagram": {
+    "other": "Visite-nos no Instagram"
+  },
+  "wcag_aria_label_social_youtube": {
+    "other": "Inscreva-se no Youtube"
+  },
+  "wcag_aria_label_social_facebook": {
+    "other": "Visite-nos no Facebook"
+  },
+  "wcag_aria_label_social_twitter": {
+    "other": "Visite-nos no Twitter"
+  },
+  "wcag_aria_label_social_letterboxd": {
+    "other": "Visite-nos no Letterboxd"
   }
 }

package/site/pt_PT.all.json

@@ -1515,5 +1515,32 @@
   },
   "new_card_error_timed_out": {
     "other": "Algo deu errado ao adicionar esse cartão. Tente novamente mais tarde ou use um cartão diferente."
+  },
+  "tv_app_badge_title": {
+    "other": "Disponível em aplicativos de TV"
+  },
+  "app_badge_fire_tv": {
+    "other": "Baixe na Amazon Fire TV"
+  },
+  "app_badge_android_tv": {
+    "other": "Baixe na Android TV"
+  },
+  "app_badge_apple_tv": {
+    "other": "Baixe na Apple TV"
+  },
+  "wcag_aria_label_social_instagram": {
+    "other": "Visite-nos no Instagram"
+  },
+  "wcag_aria_label_social_youtube": {
+    "other": "Inscreva-se no Youtube"
+  },
+  "wcag_aria_label_social_facebook": {
+    "other": "Visite-nos no Facebook"
+  },
+  "wcag_aria_label_social_twitter": {
+    "other": "Visite-nos no Twitter"
+  },
+  "wcag_aria_label_social_letterboxd": {
+    "other": "Visite-nos no Letterboxd"
   }
 }

package/site/ru_RU.all.json

@@ -1565,5 +1565,32 @@
   },
   "new_card_error_timed_out": {
     "other": "Что-то пошло не так при добавлении этой карты. Повторите попытку позже или используйте другую карту."
+  },
+  "tv_app_badge_title": {
+    "other": "Доступно в приложениях для ТВ"
+  },
+  "app_badge_fire_tv": {
+    "other": "Получите его на Amazon Fire TV"
+  },
+  "app_badge_android_tv": {
+    "other": "Загрузите его на Android TV"
+  },
+  "app_badge_apple_tv": {
+    "other": "Получить его на Apple TV"
+  },
+  "wcag_aria_label_social_instagram": {
+    "other": "Посетите нас в Instagram"
+  },
+  "wcag_aria_label_social_youtube": {
+    "other": "Подпишитесь на Youtube"
+  },
+  "wcag_aria_label_social_facebook": {
+    "other": "Посетите нас на Facebook"
+  },
+  "wcag_aria_label_social_twitter": {
+    "other": "Посетите нас в Твиттере"
+  },
+  "wcag_aria_label_social_letterboxd": {
+    "other": "Посетите нас на Letterboxd"
   }
 }

package/site/sr_SR.all.json

@@ -1527,5 +1527,32 @@
   },
   "new_card_error_timed_out": {
     "other": "Нешто није у реду приликом додавања те картице. Покушајте поново касније или користите другу картицу."
+  },
+  "tv_app_badge_title": {
+    "other": "Доступно у ТВ апликацијама"
+  },
+  "app_badge_fire_tv": {
+    "other": "Набавите га на Амазон Фире ТВ-у"
+  },
+  "app_badge_android_tv": {
+    "other": "Набавите га на Андроид ТВ-у"
+  },
+  "app_badge_apple_tv": {
+    "other": "Набавите га на Аппле ТВ-у"
+  },
+  "wcag_aria_label_social_instagram": {
+    "other": "Посетите нас на Инстаграму"
+  },
+  "wcag_aria_label_social_youtube": {
+    "other": "Претплатите се на Иоутубе"
+  },
+  "wcag_aria_label_social_facebook": {
+    "other": "Посетите нас на Фејсбуку"
+  },
+  "wcag_aria_label_social_twitter": {
+    "other": "Посетите нас на Твитеру"
+  },
+  "wcag_aria_label_social_letterboxd": {
+    "other": "Посетите нас на Леттербокд-у"
   }
 }

package/site/styles/_buttons.scss

@@ -110,7 +110,8 @@
 
 .s72-btn-rent,
 .s72-btn-purchase,
-.s72-btn-subscribe {
+.s72-btn-subscribe,
+.s72-btn-purchase-option {
   background: $button-background;
   border: 3px solid $button-background;
   min-width: 140px;
@@ -129,6 +130,36 @@
   }
 }
 
+.s72-purchase-option.rent-or-buy {
+  .s72-purchase-option-buttons {
+    @include media-breakpoint-up(md) {
+      flex-wrap: nowrap;
+    }
+  }
+
+  .s72-btn-purchase-option {
+    background: transparent;
+    color: var(--body-color);
+    margin-bottom: 10px;
+
+    @include hover-focus {
+      background: $button-background-hover;
+      border-color: $button-background-hover;
+      color: $button-text-color-hover;
+    }
+
+    @include media-breakpoint-up(md) {
+      margin-bottom: 0;
+      margin-right: 10px;
+    }
+
+    &:last-child {
+      margin-bottom: 0;
+      margin-right: 0;
+    }
+  }
+}
+
 .s72-btn.s72-btn-unsubscribe,
 .s72-btn.s72-btn-updatecreditcard {
   @extend .btn-secondary;

package/site/styles/_footer.scss

@@ -7,10 +7,11 @@ footer {
 .footer-brand-link {
   align-self: center;
   display: flex;
+  margin-bottom: 30px;
 
   @include media-breakpoint-up(xl) {
     align-self: flex-start;
-    margin: 0 50px;
+    margin: 0 50px 20px;
   }
 }
 
@@ -19,10 +20,10 @@ footer {
 }
 
 .footer-nav {
-  padding: 30px 0;
+  margin-bottom: 30px;
 
   @include media-breakpoint-up(xl) {
-    padding: 20px 50px;
+    margin: 0 50px 20px;
   }
 
   .nav {
@@ -49,14 +50,46 @@ footer {
   }
 }
 
+.footer-social-media-icons {
+  display: grid;
+  gap: 24px;
+  grid-auto-columns: 25px;
+  grid-auto-flow: column;
+  grid-template-rows: 1fr;
+  justify-content: center;
+  margin-bottom: 30px;
+
+  @include media-breakpoint-up(xl) {
+    justify-content: start;
+    margin: 0 50px 20px;
+  }
+
+  .s72-btn {
+    border: initial;
+    grid-row: 1;
+    padding: 0;
+
+    i {
+      color: var(--body-color);
+      font-size: 25px;
+
+      &:hover {
+        color: var(--body-color-hover);
+      }
+    }
+  }
+}
+
 .footer-info {
   background-color: $footer-bar-background-color;
+  margin-top: 30px;
   padding: 20px 42px;
 
   @include media-breakpoint-up(xl) {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
+    margin-top: 20px;
     padding: 20px 50px;
   }
 }
@@ -85,20 +118,38 @@ footer {
   }
 }
 
-.app-banner {
+.app-banner,
+.tv-app-banner {
   align-items: center;
   display: flex;
   flex-direction: column;
   margin: 0 20px;
   padding: 50px 0;
+
   @include media-breakpoint-up(lg) {
     margin: 0 50px;
   }
+
   .app-badge-container {
     display: flex;
   }
 
-  .app-badge-title {
+  .tv-app-badge-container {
+    display: grid;
+    gap: 22px;
+    grid-auto-flow: column;
+    grid-template-rows: 1fr;
+    justify-content: center;
+
+    .app-badge-link {
+      align-items: center;
+      display: flex;
+      height: 45px;
+    }
+  }
+
+  .app-badge-title,
+  .tv-app-badge-title {
     @include body-1-style;
     margin-bottom: 20px;
     text-align: center;
@@ -107,6 +158,7 @@ footer {
   .app-badge-link {
     margin: 0 5px;
   }
+
   .app-badge-image {
     height: 40px;
   }

package/site/styles/_icons.scss

@@ -82,10 +82,30 @@
   content: '\e002';
 }
 
+.fa-instagram-footer::before {
+  content: '\e007';
+}
+
 .fa-twitter::before {
   content: '\e008';
 }
 
+.fa-twitter-footer::before {
+  content: '\e01f';
+}
+
+.fa-facebook-footer::before {
+  content: '\e01e';
+}
+
+.fa-youtube-footer::before {
+  content: '\e005';
+}
+
+.fa-letterboxd-footer::before {
+  content: '\e006';
+}
+
 .fa-star::before {
   content: '\e009';
 }
@@ -118,6 +138,10 @@
   content: '\e010';
 }
 
+.fa-external-link::before {
+  content: '\e004';
+}
+
 .fa-linkedin::before {
   content: '\e011';
 }

package/site/styles/_shift72.scss

@@ -34,6 +34,10 @@
   @extend .btn-primary-override;
 }
 
+.s72-btn-purchase-option {
+  @extend .btn-primary-override;
+}
+
 .s72-btn-close {
   @extend .close;
 }

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

@@ -3,23 +3,42 @@
 {{block appBadges()}}
   {{app_link_ios := config("app_link_ios")}}
   {{app_link_android := config("app_link_android")}}
-  {{if config("app_link_ios") != "" || config("app_link_android") != ""}}
+  {{app_link_apple_tv_enabled := config("app_link_apple_tv_enabled")}}
+  {{app_link_android_tv := config("app_link_android_tv")}}
+  {{app_link_fire_tv := config("app_link_fire_tv")}}
+
+  {{if app_link_ios != "" || app_link_android != ""}}
     <div class="app-banner">
       <h2 class="app-badge-title">{{ i18n("app_badge_title") }}</h2>
+
       <div class="app-badge-container">
-        {{if config("app_link_ios") != ""}}
-          <a class="app-badge-link" href="{{app_link_ios}}" target="_blank">
-            <s72-image src="/images/icons/app-store-badge.png" alt="{{ i18n("app_badge_ios") }}" class="app-badge-image"></s72-image>
-          </a>
-        {{end}}
-        {{if config("app_link_android") != ""}}
-          <a class="app-badge-link" href="{{app_link_android}}" target="_blank">
-            <s72-image src="/images/icons/google-play-badge.png" alt="{{ i18n("app_badge_android") }}" class="app-badge-image"></s72-image>
-          </a>
-        {{end}}
+        {{yield appBadge(href=app_link_ios, image="/images/icons/app-store-badge.png", altKey="app_badge_ios", imgClass="app-badge-image")}}
+        {{yield appBadge(href=app_link_android, image="/images/icons/google-play-badge.png", altKey="app_badge_android", imgClass="app-badge-image")}}     
+      </div>
+    </div>
+
+    {{yield separator()}}
+  {{end}}
+
+  {{if app_link_apple_tv_enabled == "true" || app_link_android_tv != "" || app_link_fire_tv != ""}}
+    <div class="tv-app-banner">
+      <h2 class="tv-app-badge-title">{{ i18n("tv_app_badge_title") }}</h2>
+
+      <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")}} 
+        {{yield appBadge(href=app_link_apple_tv_enabled, image="/images/icons/appletv.png", altKey="app_badge_apple_tv", imgClass="tv-badge-image")}} 
       </div>
     </div>
 
     {{yield separator()}}
   {{end}}
 {{end}}
+
+{{block appBadge(href, image, altKey, imgClass)}}
+  {{if href != "" && href != "false"}}
+    <a class="app-badge-link" {{if href != "true" }} href="{{href}}" target="_blank" {{end}}>
+      <s72-image class="{{imgClass}}" src="{{image}}" alt="{{ i18n(altKey) }}" ></s72-image>
+    </a>
+  {{end}}
+{{end}}

package/site/templates/application/footer/footer.jet

@@ -3,6 +3,7 @@
 {{import "./nav.jet"}}
 {{import "./app-badges.jet"}}
 {{import "./sponsor-banner.jet"}}
+{{import "./social-media-buttons.jet"}}
 
 {{block footer()}}
 
@@ -16,6 +17,8 @@
 
     {{yield footerNav(navLinks=site.Navigation.Footer)}}
 
+    {{yield footerSocialMediaButtons()}}
+
     {{yield footerInfo()}}
   </footer>
 {{end}}

package/site/templates/application/footer/nav.jet

@@ -1,13 +1,13 @@
 {{ block footerNav(navLinks) }}
-  <nav class="footer-nav" aria-label="{{ i18n("wcag_aria_label_footer") }}">
-    {{ if len(navLinks) > 0 }}
-      <ul class="nav">
-        {{ range navLinks }}
-          <li class="nav-item {{ len(.Link.ExternalURL) == 0 && routeToSlug(.Link.Slug) == currentUrlPath ? "active" : "" }}">
-            <a class="nav-link" href="{{ len(.Link.ExternalURL) > 0 ? .Link.ExternalURL : routeToSlug(.Link.Slug) }}">{{ .Label }}</a>
-          </li>
-        {{ end }}
-      </ul>
-    {{ end }}
-  </nav>
-{{ end }}
+  {{ if len(navLinks) > 0 }}
+    <nav class="footer-nav" aria-label="{{ i18n("wcag_aria_label_footer") }}">
+        <ul class="nav">
+          {{ range navLinks }}
+            <li class="nav-item {{ len(.Link.ExternalURL) == 0 && routeToSlug(.Link.Slug) == currentUrlPath ? "active" : "" }}">
+              <a class="nav-link" href="{{ len(.Link.ExternalURL) > 0 ? .Link.ExternalURL : routeToSlug(.Link.Slug) }}">{{ .Label }}</a>
+            </li>
+          {{ end }}
+        </ul>
+    </nav>
+  {{ end }}
+{{ end }}

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

@@ -0,0 +1,25 @@
+{{block footerSocialMediaButtons()}}
+  {{social_link_instagram := config("social_link_instagram")}}
+  {{social_link_youtube := config("social_link_youtube")}}
+  {{social_link_facebook := config("social_link_facebook")}}
+  {{social_link_twitter := config("social_link_twitter")}}
+  {{social_link_letterboxd := config("social_link_letterboxd")}}
+
+  {{if social_link_instagram != "" || social_link_youtube != "" || social_link_facebook != "" || social_link_twitter != "" || social_link_letterboxd != ""}}
+    <div class="footer-social-media-icons">
+      {{yield footerSocialMediaIcon(link=social_link_instagram, iconClass="instagram", titleKey="wcag_aria_label_social_instagram")}}
+      {{yield footerSocialMediaIcon(link=social_link_youtube, iconClass="youtube", titleKey="wcag_aria_label_social_youtube")}}
+      {{yield footerSocialMediaIcon(link=social_link_facebook, iconClass="facebook", titleKey="wcag_aria_label_social_facebook")}}
+      {{yield footerSocialMediaIcon(link=social_link_twitter, iconClass="twitter", titleKey="wcag_aria_label_social_twitter")}}
+      {{yield footerSocialMediaIcon(link=social_link_letterboxd, iconClass="letterboxd", titleKey="wcag_aria_label_social_letterboxd")}}
+    </div>
+  {{end}}
+{{end}}
+
+{{block footerSocialMediaIcon(link, iconClass, titleKey)}}
+  {{if link != ""}}
+    <a class="s72-btn" target="_blank" title="{{i18n(titleKey)}}" href="{{link}}">
+      <i class="fa fa-{{iconClass}}-footer"></i>
+    </a>
+  {{end}}
+{{end}}

package/site/templates/collection/carousel/item.jet

@@ -39,8 +39,6 @@
             <s72-availability-label data-slug="{{item.Slug}}"></s72-availability-label>
 
             {{yield ctaButtons(itemType=item.ItemType, context="carousel") item.InnerItem}}
-
-
           </div>
         </div>
       {{end}}

package/site/templates/items/meta_item.jet

@@ -29,9 +29,7 @@
   {{end}}
   {{pill := ""}}
   {{pillSupplement := ""}}
-  {{slugRoute := routeToSlug(item.Slug)}}
   {{if isEpisode}}
-    {{slugRoute = routeToSlug(item.InnerItem.Season.Slug) + "#episode-" + item.InnerItem.EpisodeNumber}}
     {{synopsis = item.InnerItem.Overview}}
     {{pill = i18n("episode_name") + " " + item.InnerItem.EpisodeNumber}}
     {{pillSupplement = "from " + i18n("season_name") + " " + item.InnerItem.Season.SeasonNumber}}

package/site/templates/items/tagline.jet

@@ -17,7 +17,7 @@
 
     {{if isset(.Runtime)}}
       {{yield item(class="runtime") content}}
-        {{if .Runtime > 60}}
+        {{if .Runtime > 59}}
           {{.Runtime.Hours()}}{{i18n("runtime_hours")}}
         {{end}}
         {{.Runtime.Minutes()}}{{i18n("runtime_minutes")}}

package/site/templates/tv/detail.jet

@@ -81,6 +81,7 @@
               <h2>{{i18n("meta_detail_episodes_title")}}</h2>
               {{yield list(itemsPerRow=4, itemLayout="portrait") content}}
                 {{range episode := tvseason.Episodes}}
+                  <a id="episode-{{episode.EpisodeNumber}}"></a>
                   {{yield subItem(item=episode)}}
                 {{end}}
               {{end}}

package/site/tr_TR.all.json

@@ -1511,5 +1511,32 @@
   },
   "new_card_error_timed_out": {
     "other": "Bu kartı eklerken bir şeyler ters gitti. Lütfen daha sonra tekrar deneyin veya farklı bir kart kullanın."
+  },
+  "tv_app_badge_title": {
+    "other": "TV uygulamalarında kullanılabilir"
+  },
+  "app_badge_fire_tv": {
+    "other": "Amazon Fire TV'den alın"
+  },
+  "app_badge_android_tv": {
+    "other": "Android TV'de alın"
+  },
+  "app_badge_apple_tv": {
+    "other": "Apple TV'de alın"
+  },
+  "wcag_aria_label_social_instagram": {
+    "other": "Bizi Instagram'da ziyaret edin"
+  },
+  "wcag_aria_label_social_youtube": {
+    "other": "Youtube'da abone olun"
+  },
+  "wcag_aria_label_social_facebook": {
+    "other": "Facebook'ta bizi ziyaret edin"
+  },
+  "wcag_aria_label_social_twitter": {
+    "other": "Twitter'da bizi ziyaret edin"
+  },
+  "wcag_aria_label_social_letterboxd": {
+    "other": "Bizi Letterboxd'da ziyaret edin"
   }
 }

package/site/uk_UA.all.json

@@ -1571,5 +1571,32 @@
   },
   "new_card_error_timed_out": {
     "other": "Під час додавання цієї картки сталася помилка. Повторіть спробу пізніше або скористайтеся іншою карткою."
+  },
+  "tv_app_badge_title": {
+    "other": "Доступно в додатках для телевізора"
+  },
+  "app_badge_fire_tv": {
+    "other": "Отримайте його на Amazon Fire TV"
+  },
+  "app_badge_android_tv": {
+    "other": "Завантажте на Android TV"
+  },
+  "app_badge_apple_tv": {
+    "other": "Отримайте його на Apple TV"
+  },
+  "wcag_aria_label_social_instagram": {
+    "other": "Відвідайте нас в Instagram"
+  },
+  "wcag_aria_label_social_youtube": {
+    "other": "Підпишіться на Youtube"
+  },
+  "wcag_aria_label_social_facebook": {
+    "other": "Відвідайте нас на Facebook"
+  },
+  "wcag_aria_label_social_twitter": {
+    "other": "Відвідайте нас у Twitter"
+  },
+  "wcag_aria_label_social_letterboxd": {
+    "other": "Відвідайте нас на Letterboxd"
   }
 }