@shift72/core-template 0.4.2 → 0.5.0

package/site/templates/collection/carousel_item.jet

@@ -35,6 +35,18 @@
               {{ if item.ItemType == "film" }}
                 <can-be-watched-button data-slug="{{item.InnerItem.Slug}}" data-url="{{ item.InnerItem.CustomFields.GetString("can_be_watched_button_link", "") }}" data-label="{{ item.InnerItem.CustomFields.GetString("can_be_watched_button_text", "can_be_watched_button_text") }}"></can-be-watched-button>
               {{ end }}
+              <div class="meta-item-extras">
+                {{if len(trailer) > 0 }}
+                  <div class="s72-btn-trailer btn-trailer" data-url="{{routeToSlug(item.Slug)}}?autoplay">
+                    <button class="s72-btn s72-btn-play btn-sm s72-btn-trailer">
+                      <span class="s72-btn-play-icon"><s72-play-icon></s72-play-icon></span>
+                      <span class="verb s72-btn-play-label">{{i18n("play_trailer")}}</span>
+                    </button>
+                  </div>
+                {{end}}
+                <s72-userwishlist-button data-slug="{{item.Slug}}" class="btn-wishlist"></s72-userwishlist-button>
+                <s72-share-buttons item="::item.meta" class="hidden-sm hidden-xs pull-right"></s72-share-buttons>
+              </div>
             </div>
 
             <s72-availability-label data-slug="{{item.Slug}}"></s72-availability-label>
@@ -42,19 +54,6 @@
             <div class="meta-item-synopsis">
               <p>{{item.InnerItem.Tagline | stripHTML}}</p>
             </div>
-
-            <div class="meta-item-extras">
-              {{if len(trailer) > 0 }}
-                <div class="s72-btn-trailer btn-trailer" data-url="{{routeToSlug(item.Slug)}}?autoplay">
-                  <button class="s72-btn s72-btn-play btn-sm s72-btn-trailer">
-                    <span class="s72-btn-play-icon"><s72-play-icon></s72-play-icon></span>
-                    <span class="verb s72-btn-play-label">{{i18n("play_trailer")}}</span>
-                  </button>
-                </div>
-              {{end}}
-              <s72-userwishlist-button data-slug="{{item.Slug}}" class="btn-wishlist"></s72-userwishlist-button>
-              <s72-share-buttons item="::item.meta" class="hidden-sm hidden-xs pull-right"></s72-share-buttons>
-            </div>
             {{yield awardsCarousel() item.InnerItem}}
           </div>
         </div>

package/site/templates/common/awards/carousel.jet

@@ -1,9 +1,15 @@
 {{block awardsCarousel()}}
   {{ if isset(.AwardCategories) && (len(.AwardCategories) > 0) }}
+
+    {{award_winner := false}}
+    {{ range .AwardCategories }}
+      {{ if .IsWinner}}{{award_winner = true}}{{end}}
+    {{ end }}
+
     <div class="meta-awards">
       <div class="meta-award-nomination">
         <span><i class="meta-award-nomination-icon"></i></span>
-        <span class="font-weight-bold">{{ i18n("awards_in_competition") }}</span>
+        <span>{{ i18n("awards_in_competition") }}{{award_winner ? " - " + i18n("awards_winner") : ""}}</span>
       </div>
     </div>
   {{ end }}

package/site/templates/common/awards/item.jet

@@ -2,9 +2,9 @@
   {{ if isset(.AwardCategories) && (len(.AwardCategories) > 0) }}
     <div class="meta-awards row mt-2p5 meta-awards-all">
     {{ range .AwardCategories }}
-      <div class="meta-award-nomination mb-2p5 col-12 col-sm-8 col-lg-6 col-xl-4">
+      <div class="meta-award-nomination mb-3 col-12 col-sm-8 col-lg-6 col-xl-4">
         <span><i class="meta-award-nomination-icon"></i></span>
-        <span class="font-weight-bold">{{ i18n("awards_nominated_for") }} {{ .DisplayLabel }}</span>
+        <span>{{ .DisplayLabel }}</span>
       </div>
     {{ end }}
     </div>

package/site/templates/film/item.jet

@@ -21,16 +21,15 @@
   <main id="main" class="page page-film meta-detail meta-detail-film">
     <div class="meta-detail-bg">
       <div class="right-gradient"></div>
-      <s72-image src="{{film.Images.Background}}" alt="" class="meta-detail-bg-img"></s72-image>
+      <s72-image src="{{film.ImageMap["Background"]}}" alt="" class="meta-detail-bg-img"></s72-image>
     </div>
     <div class="container">
       <div class="meta-detail-main">
         {{if config("default_image_type") == "portrait"}}
             <div class="poster poster-portrait">
               <s72-availability-status data-slug="{{film.Slug}}"></s72-availability-status>
-              <s72-image src="{{film.Images.Classification}}" alt="" class="classification-image">
-
-              <s72-image src="{{film.Images.Portrait}}" alt="{{film.Title}}" class="poster poster-image poster-image-portrait"></s72-image>
+              <s72-image src="{{film.ImageMap["Classification"]}}" alt="" class="classification-image">
+              <s72-image src="{{film.ImageMap["Portrait"]}}" alt="{{film.Title}}" class="poster poster-image poster-image-portrait"></s72-image>
 
             </div>
         {{end}}
@@ -48,6 +47,13 @@
             <s72-play-button data-slug="{{film.Slug}}" data-title="{{film.Title}}"></s72-play-button>
             <s72-pricing-buttons data-slug="{{film.Slug}}" data-title="{{film.Title}}"></s72-pricing-buttons>
             <can-be-watched-button data-slug="{{film.Slug}}" data-url="{{ film.CustomFields.GetString("can_be_watched_button_link", "") }}" data-label="{{ film.CustomFields.GetString("can_be_watched_button_text", "can_be_watched_button_text") }}"></can-be-watched-button>
+            <div class="meta-detail-extras">
+              {{if len(film.Trailers) > 0 }}
+                  <s72-modal-player src="{{film.Trailers[0].URL}}" class="s72-btn-trailer" data-slug="{{film.Slug}}" data-label="{{i18n("play_trailer")}}" autoplay="querystring"></s72-modal-player>
+              {{end}}
+              <s72-userwishlist-button data-slug="{{film.Slug}}" class="btn-wishlist"></s72-userwishlist-button>
+              {{yield socialMediaButtons(path=currentUrlPath, letterboxdID=film.Refs.LetterboxdID)}}
+            </div>
           </div>
           {{if config("default_image_type") != "portrait"}}
             <s72-availability-status data-slug="{{film.Slug}}"></s72-availability-status>
@@ -56,67 +62,92 @@
           <s72-availability-label data-slug="{{film.Slug}}"></s72-availability-label>
 
           {{yield awardNominations() film}}
-
-          <div class="meta-detail-synopsis">{{film.Overview | raw}}</div>
-          <div class="meta-detail-extras">
-            {{if len(film.Trailers) > 0 }}
-                <s72-modal-player src="{{film.Trailers[0].URL}}" class="s72-btn-trailer" data-slug="{{film.Slug}}" data-label="{{i18n("play_trailer")}}" autoplay="querystring"></s72-modal-player>
+          <s72-element-switcher>
+            {{if isEnabled("element_switcher_enabled")}}
+              <div class="meta-detail-switcher-tagline">
+                <p>{{film.Tagline}}</p>
+              </div>
             {{end}}
-            <s72-userwishlist-button data-slug="{{film.Slug}}" class="btn-wishlist"></s72-userwishlist-button>
-            {{yield socialMediaButtons(path=currentUrlPath, letterboxdID=film.Refs.LetterboxdID)}}
-          </div>
-          <div class="meta-detail-cast">
-          {{if len(film.Cast) > 0 }}
-            <h2>{{i18n("meta_detail_cast_title")}}</h2>
-          {{end}}
-            <p>
-              {{range index, member := film.Cast}}
-                {{ path := "/search.html?q=" + member.Name }}
-                <a href="{{ routeToPath(path) }}">{{member.Name}}</a>{{if index < len(film.Cast) - 1}}, {{end}}
+            <div class="{{ isEnabled("element_switcher_enabled") ? "s72-hide" : "" }}"> {* hide class prevents FOUC *}
+              <div class="meta-detail-synopsis">{{film.Overview | raw}}</div>
+              <div class="meta-detail-cast">
+              {{if len(film.Cast) > 0 }}
+                <h2>{{i18n("meta_detail_cast_title")}}</h2>
               {{end}}
-            </p>
-          </div>
-          <div class="meta-detail-crew d-flex">
-            {{range index, member := film.Crew}}
-              <div class="crew-member">
-                <h2>{{member.Job}}</h2>
-                {{ path := "/search.html?q=" + member.Name }}
-                <a href="{{ routeToPath(path) }}">{{member.Name}}</a>
+                <p>
+                  {{range index, member := film.Cast}}
+                    {{ path := "/search.html?q=" + member.Name }}
+                    <a href="{{ routeToPath(path) }}">{{member.Name}}</a>{{if index < len(film.Cast) - 1}}, {{end}}
+                  {{end}}
+                </p>
               </div>
-            {{end}}
-          </div>
-          {{if len(film.Languages) > 0 }}
-            <div class="meta-detail-language">
-              <h2>{{i18n("meta_detail_languages", len(film.Languages))}}</h2>
-              <p>{{ film.Languages }}</p>
-            </div>
-          {{end}}
-          {{if len(film.GetSubtitles()) > 0 }}
-            <div class="meta-detail-subtitle">
-              <h2>{{i18n("meta_detail_subtitles")}}</h2>
-              <p>{{ film.GetSubtitles() }}</p>
-            </div>
-          {{end}}
-          {{if len(film.Countries) > 0 }}
-            <div class="meta-detail-country">
-              <h2>{{i18n("meta_detail_countries", len(film.Countries))}}</h2>
-              <p>{{ film.Countries }}</p>
-            </div>
-          {{end}}
-          {{if len(film.Studio) > 0 }}
-            <div class="meta-detail-studio">
-              <h2>{{i18n("meta_detail_studios", len(film.Studio))}}</h2>
-              {*{ FORMAT STUDIOS }*}
-              {{ studios := "" }}
-              {{ range studio := film.Studio }}
-                {{ studios = studios + studio + ", "}}
-              {{ end }}
-              {{ if len(studios) > 0 }}
-                {{ studios = studios[0:len(studios) - 2] }}
-              {{ end }}
-              <p>{{ studios }}</p>
+              <div class="meta-detail-crew d-flex">
+                {{range index, member := film.Crew}}
+                  <div class="crew-member">
+                    <h2>{{member.Job}}</h2>
+                    {{ path := "/search.html?q=" + member.Name }}
+                    <a href="{{ routeToPath(path) }}">{{member.Name}}</a>
+                  </div>
+                {{end}}
+              </div>
+              {{if len(film.Languages) > 0 }}
+                <div class="meta-detail-language">
+                  <h2>{{i18n("meta_detail_languages", len(film.Languages))}}</h2>
+                  <p>{{ film.Languages }}</p>
+                </div>
+              {{end}}
+              {{allSubtitles := film.GetSubtitles()}}
+              {{if len(allSubtitles) > 0 }}
+                {{subtitles := ""}}
+                {{captions := ""}}
+                {{if len(film.SubtitleTracks) == 0}}
+                  {{subtitles = allSubtitles}}
+                {{else}}
+                  {{range subTrack := film.SubtitleTracks}}
+                    {{if len(subTrack) >= 3}}
+                      {{if subTrack[2] == "caption"}}
+                          {{captions = captions ? captions + ", " + subTrack[1] : subTrack[1]}}
+                      {{else}}
+                          {{subtitles = subtitles ? subtitles + ", " + subTrack[1] : subTrack[1]}}
+                      {{end}}
+                    {{end}}
+                  {{end}}
+                {{end}}
+                {{if subtitles}}
+                  <div class="meta-detail-subtitle">
+                    <h2>{{i18n("meta_detail_subtitles")}}</h2>
+                    <p>{{subtitles}}</p>
+                  </div>
+                {{end}}
+                {{if captions}}
+                  <div class="meta-detail-subtitle">
+                    <h2>{{i18n("meta_detail_captions")}}</h2>
+                    <p>{{captions}}</p>
+                  </div>
+                {{end}}
+              {{end}}
+              {{if len(film.Countries) > 0 }}
+                <div class="meta-detail-country">
+                  <h2>{{i18n("meta_detail_countries", len(film.Countries))}}</h2>
+                  <p>{{ film.Countries }}</p>
+                </div>
+              {{end}}
+              {{if len(film.Studio) > 0 }}
+                <div class="meta-detail-studio">
+                  <h2>{{i18n("meta_detail_studios", len(film.Studio))}}</h2>
+                  {*{ FORMAT STUDIOS }*}
+                  {{ studios := "" }}
+                  {{ range studio := film.Studio }}
+                    {{ studios = studios + studio + ", "}}
+                  {{ end }}
+                  {{ if len(studios) > 0 }}
+                    {{ studios = studios[0:len(studios) - 2] }}
+                  {{ end }}
+                  <p>{{ studios }}</p>
+                </div>
+              {{end}}
             </div>
-          {{end}}
+          </s72-element-switcher>
           {{if len(film.Bonuses) > 0 && !film.CustomFields.GetBool("hide_bonus_content", false)}}
             <section class="meta-detail-bonus-content" aria-label="{{i18n("meta_detail_bonus_title")}}">
               <h2>{{i18n("meta_detail_bonus_title")}}</h2>

package/site/templates/page/curated.jet

@@ -20,7 +20,7 @@
 
     {{yield pageHeader(title=page.Title, plan=plan)}}
 
-    {{yield pageContent(text=page.Content, plan=plan)}}
+    {{yield pageContent(text=page.Content)}}
 
     <div class="page-collections">
       <h2 class="sr-only">{{i18n("wcag_collections_h2")}}</h2>

package/site/templates/page/page-content.jet

@@ -1,29 +1,7 @@
-{{block pageContent(text="", plan=0)}}
+{{block pageContent(text="")}}
   {{if len(text) > 0}}
     <div class="page-content">
       {{text | raw}}
-
-      {{if plan != 0 }}
-      <div class="plan-buttons">
-        {{ if plan.PlanType == "free" }}
-          {{ if plan.HasExpiryDate() }}
-          <s72-before datetime="{{ plan.ExpiryDate.UnixMilli() }}">
-            <s72-user-anon>
-              <a class="btn btn-block s72-btn-purchase signup-link" href="{{routeToPath("/signup.html")}}">{{ i18n("plan_free_link_text") }}</a>
-            </s72-user-anon>
-          </s72-before>
-          {{ else }}
-            <s72-user-anon>
-              <a class="btn btn-block s72-btn-purchase signup-link" href="{{routeToPath("/signup.html")}}">{{ i18n("plan_free_link_text") }}</a>
-            </s72-user-anon>
-          {{ end }}
-        {{ else }}
-        <s72-pricing-buttons data-slug="{{plan.Slug}}" data-title="{{plan.Name}}" data-ownership-label-prefix={{ i18n("plan_showcase_page_ownership_button_") }} data-hide-price="true" />
-        {{ end }}
-      </div>
-      {{end}}
     </div>
-
-
   {{end}}
 {{end}}

package/site/templates/page/page-header.jet

@@ -1,13 +1,13 @@
 {{block pageHeader(title="", plan=0)}}
   {{if len(title) > 0}}
-    <div class="page-header">
+    <div class="page-header pb-0">
       {{if plan != 0}}
         <s72-plan-label data-slug="{{plan.Slug}}" data-title="{{plan.Name}}"></s72-plan-label>
       {{end}}
       <h1>{{title}}</h1>
-      {{if plan != 0 && plan.HasExpiryDate() }}
-        {{ if plan.HasExpiryDate() }}
-          <p class="alert p-0 border-0 my-1">
+      {{if plan != 0}}
+        {{if plan.HasExpiryDate()}}
+          <p class="alert p-0 border-0 mt-1rem mb-0">
             <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" class="bi bi-exclamation-circle mr-p5" viewBox="0 0 16 16"> <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"/> <path d="M7.002 11a1 1 0 1 1 2 0 1 1 0 0 1-2 0zM7.1 4.995a.905.905 0 1 1 1.8 0l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 4.995z"/> </svg>
             <small>
               <s72-before datetime="{{ plan.ExpiryDate.UnixMilli() }}">
@@ -19,8 +19,27 @@
               </s72-after>
             </small>
           </p>
-        {{ end }}
+        {{end}}
+
+        <div class="plan-buttons mt-1rem mb-0">
+          {{ if plan.PlanType == "free" }}
+            {{ if plan.HasExpiryDate() }}
+            <s72-before datetime="{{ plan.ExpiryDate.UnixMilli() }}">
+              <s72-user-anon>
+                <a class="btn btn-block s72-btn-purchase signup-link" href="{{routeToPath("/signup.html")}}">{{ i18n("plan_free_link_text") }}</a>
+              </s72-user-anon>
+            </s72-before>
+            {{ else }}
+              <s72-user-anon>
+                <a class="btn btn-block s72-btn-purchase signup-link" href="{{routeToPath("/signup.html")}}">{{ i18n("plan_free_link_text") }}</a>
+              </s72-user-anon>
+            {{ end }}
+          {{ else }}
+          <s72-pricing-buttons data-slug="{{plan.Slug}}" data-title="{{plan.Name}}" />
+          {{ end }}
+        </div>
       {{end}}
+
     </div>
   {{end}}
-{{end}}
+{{end}}

package/site/templates/tv/detail.jet

@@ -37,16 +37,16 @@
           <div class="meta-detail-buttons">
             <s72-play-button data-slug="{{tvseason.Slug}}" data-title="{{tvseason.Title}}"></s72-play-button>
             <s72-pricing-buttons data-slug="{{tvseason.Slug}}" data-title="{{tvseason.Title}}"></s72-pricing-buttons>
+            <div class="meta-detail-extras">
+              {{if len(tvseason.Trailers) > 0 }}
+                <s72-modal-player src="{{tvseason.Trailers[0].URL}}" class="s72-btn-trailer" data-slug="{{tvseason.Slug}}" data-label="{{i18n("play_trailer")}}" autoplay="querystring"></s72-modal-player>
+              {{end}}
+              <s72-userwishlist-button data-slug="{{tvseason.Slug}}" class="btn-wishlist"></s72-userwishlist-button>
+              {{yield socialMediaButtons(path=currentUrlPath)}}
+            </div>
           </div>
           <s72-availability-label data-slug="{{tvseason.Slug}}"></s72-availability-label>
           <div class="meta-detail-synopsis">{{tvseason.Overview | raw}}</div>
-          <div class="meta-detail-extras">
-            {{if len(tvseason.Trailers) > 0 }}
-              <s72-modal-player src="{{tvseason.Trailers[0].URL}}" class="s72-btn-trailer" data-slug="{{tvseason.Slug}}" data-label="{{i18n("play_trailer")}}" autoplay="querystring"></s72-modal-player>
-            {{end}}
-            <s72-userwishlist-button data-slug="{{tvseason.Slug}}" class="btn-wishlist"></s72-userwishlist-button>
-            {{yield socialMediaButtons(path=currentUrlPath)}}
-          </div>
           <div class="meta-detail-cast">
           {{if len(tvseason.Cast) > 0 }}
             <h2>{{i18n("meta_detail_cast_title")}}</h2>