@shift72/core-template 1.0.0-alpha.0 → 1.2.0-alpha.0

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

@@ -1,5 +1,7 @@
 {{block carouselItemSynopsis(synopsis)}}
-  <div class="meta-item-synopsis">
-    <p>{{synopsis | stripHTML}}</p>
-  </div>
+  {{if len(synopsis)}}
+    <div class="meta-item-synopsis">
+      <p>{{synopsis | stripHTML}}</p>
+    </div>
+  {{end}}
 {{end}}

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

@@ -7,7 +7,7 @@
 {{import "../../common/cta_buttons.jet"}}
 
 {{block carouselItem(item)}}
-  {{showItemContent := !isset(item["PageType"]) || item.PageType != "external"}}  
+  {{showItemContent := !isset(item["PageType"]) || item.PageType != "external"}}
 
   <div class="s72-carousel-item" data-slug="{{item.Slug}}">
     <a href="{{routeToSlug(item.Slug)}}" class="carousel-item-link" aria-label="{{item.Title}}">
@@ -17,7 +17,12 @@
       {{if showItemContent}}
         <div class="carousel-item-caption">
           {{if item.ItemType == "film"}}
-            {{yield sponsor(hideLink="true") item.InnerItem}}
+            {{if len(item.InnerItem.AwardCategories) > 0 || item.InnerItem.ImageMap["Sponsor"]}}
+              <div class="sponsor-awards-wrapper">
+                {{yield sponsor(hideLink="true") item.InnerItem}}
+                {{yield awardsCarousel() item.InnerItem}}
+              </div>
+            {{end}}
           {{end}}
           <div class="meta-item-content">
             {{yield carouselItemTitle(title=item.GetTitle(i18n))}}
@@ -28,11 +33,9 @@
               {{yield carouselItemSynopsis(synopsis=item.InnerItem.Tagline)}}
             {{end}}
 
-            {{yield ctaButtons(itemType=item.ItemType, trailerRedirect=true) item.InnerItem}}            
+            {{yield ctaButtons(itemType=item.ItemType) item.InnerItem}}
 
             <s72-availability-label data-slug="{{item.Slug}}"></s72-availability-label>
-
-            {{yield awardsCarousel() item.InnerItem}}
           </div>
         </div>
       {{end}}

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

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

package/site/templates/common/cta_buttons.jet

@@ -1,6 +1,6 @@
 {{import "./social-media-buttons.jet"}}
 
-{{block ctaButtons(itemType, trailerRedirect=false)}}
+{{block ctaButtons(itemType)}}
   {{isFilm := itemType == "film"}}
   {{isSeason := itemType == "tvseason"}}
   {{isEpisode := itemType == "tvepisode"}}
@@ -40,20 +40,12 @@
         <div class="extra-buttons">
 
           {{if showTrailerButton}}
-            {{if trailerRedirect}}
-              <div class="s72-btn-trailer" data-url="{{routeToSlug(slug)}}?autoplay">
-                <button class="s72-btn s72-btn-play">
-                  <span class="s72-btn-play-icon"><s72-play-icon></s72-play-icon></span>
-                </button>
-              </div>
-            {{else}}
-              {{dataLabel := i18n("play_trailer")}}
-              <s72-modal-player src="{{trailerURL}}" class="s72-btn-trailer" data-slug="{{slug}}" data-label="{{dataLabel}}" autoplay="querystring"></s72-modal-player>
-            {{end}}
+            {{dataLabel := i18n("play_trailer")}}
+            <s72-modal-player src="{{trailerURL}}" class="s72-btn-trailer" data-slug="{{slug}}" data-label="{{dataLabel}}" autoplay="querystring" layout="tooltip"></s72-modal-player>
           {{end}}
 
           {{if showWishlistButton}}
-            <s72-userwishlist-button data-slug="{{slug}}" class="btn-wishlist"></s72-userwishlist-button>
+            <s72-userwishlist-button data-slug="{{slug}}" class="btn-wishlist" layout="tooltip"></s72-userwishlist-button>
           {{end}}
 
           {{if showShareButton}}

package/site/templates/film/item.jet

@@ -55,7 +55,6 @@
             <br>
           {{end}}
 
-          {{yield awardNominations() film}}
           <div class="element-switcher-wrapper">
             <s72-element-switcher>
               {{if isEnabled("element_switcher_enabled")}}
@@ -81,7 +80,7 @@
                     <div class="meta-detail-crew">
                       <h2>{{member.Job}}</h2>
                       {{ path := "/search.html?q=" + member.Name }}
-                      <a href="{{ routeToPath(path) }}">{{member.Name}}</a>
+                      <p><a href="{{ routeToPath(path) }}">{{member.Name}}</a></p>
                     </div>
                   {{end}}
                   {{if len(film.Languages) > 0 }}
@@ -145,6 +144,7 @@
             </s72-element-switcher>
             {{yield sponsor() film}}
           </div>
+          {{yield awardNominations() film}}
           {{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>
@@ -186,4 +186,4 @@
     </section>
     {{ end }}
   </main>
-{{end}}
+{{end}}

package/site/templates/items/meta_item.jet

@@ -5,6 +5,14 @@
   {{ displayTitleAndGenreBelowPosters = config("media_item_caption") == "true" }}
   {{ genresLimit = configInt("media_item_caption_genres_count") }}
 
+  {{isFilm := item.ItemType == "film"}}
+  {{isSeason := item.ItemType == "tvseason"}}
+  {{isEpisode := item.ItemType == "tvepisode"}}
+  {{isBundle := item.ItemType == "bundle"}}
+
+  {{showPlayButton := isFilm || isSeason || isEpisode}}
+  {{showPricingButtons := isFilm || isSeason || isBundle}}
+
   {{isPage := hasPrefix(item.Slug, "/page/")}}
   {{isExternalPage := isPage && item.InnerItem.PageType == "external"}}
   {{isCollection := hasPrefix(item.Slug, "/collection/")}}
@@ -22,14 +30,14 @@
   {{pill := ""}}
   {{pillSupplement := ""}}
   {{slugRoute := routeToSlug(item.Slug)}}
-  {{if item.ItemType == "tvepisode"}}
+  {{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}}
   {{end}}
   {{title := item.Title}}
-  {{if item.ItemType == "tvseason"}}
+  {{if isSeason}}
     {{synopsis = stripHTML(item.InnerItem.Tagline)}}
     {{title = item.InnerItem.ShowInfo.Title}}
     {{pill = i18n("season_name") + " " + item.InnerItem.SeasonNumber}}
@@ -61,11 +69,17 @@
             {{ end }}
 
             <div class="buttons">
-              <s72-play-button data-slug="{{item.Slug}}" title="{{item.Title}}"></s72-play-button>
-              <s72-pricing-buttons data-slug="{{item.Slug}}" class="pricing-buttons-fit" title="{{item.Title}}"></s72-pricing-buttons>
-              {{ if item.ItemType == "film" }}
+              {{if showPlayButton}}
+                <s72-play-button data-slug="{{item.Slug}}" title="{{item.Title}}"></s72-play-button>
+              {{end}}
+
+              {{if showPricingButtons}}
+                <s72-pricing-buttons data-slug="{{item.Slug}}" class="pricing-buttons-fit" title="{{item.Title}}"></s72-pricing-buttons>
+              {{end}}
+
+              {{if isFilm}}
                 <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 }}
+              {{end}}
             </div>
           </div>
           <s72-userwishlist-button data-slug="{{item.Slug}}" class="btn-wishlist"></s72-userwishlist-button>

package/site/templates/items/tagline.jet

@@ -1,5 +1,9 @@
 {{block metaItemTagline(genres=true, genresLimit=-1, classification=true)}}
   <div class="meta-item-tagline">
+    {{if classification}}
+      <s72-classification-label data-slug="{{.Slug}}" data-layout="tooltip"></s72-classification-label>
+    {{end}}
+
     {{itemGenres := makeSlice()}}
     {{if genres}}
       {{if isset(.Genres)}}
@@ -9,85 +13,56 @@
       {{end}}
     {{end}}
 
-    {*{ Figure out how many dividers. }*}
-    {{dividers := 0}}
-    {{if genres && len(itemGenres) > 0}}
-      {{dividers = dividers + 1}}
-    {{end}}
-    {{if isset(.Runtime)}}
-      {{dividers = dividers + 1}}
-    {{end}}
-    {{if isset(.Items)}}
-      {{dividers = dividers + 1}}
-    {{end}}
-    {{if isset(.Episodes)}}
-      {{dividers = dividers + 1}}
-    {{end}}
-    {{if isset(.ReleaseDate) && .ReleaseDate.Year() > 1}}
-      {{dividers = dividers + 1}}
-    {{end}}
-    {*{ There should be one less dividers than tagline items. }*}
-    {{dividers = dividers - 1}}
-
-    {{if classification}}
-      <s72-classification-label data-slug="{{.Slug}}" data-layout="tooltip"></s72-classification-label>
-    {{end}}
+    {{showDivider := false}}
 
     {{if isset(.Runtime)}}
-      {{yield taglineItem() content}}
+      {{yield item(class="runtime") content}}
         {{if .Runtime > 60}}
-          {{.Runtime.Hours()}}{{i18n("runtime_hours")}} {{.Runtime.Minutes()}}{{i18n("runtime_minutes")}}
-        {{else}}
-          {{.Runtime}}{{i18n("runtime_minutes")}}
+          {{.Runtime.Hours()}}{{i18n("runtime_hours")}}
         {{end}}
+        {{.Runtime.Minutes()}}{{i18n("runtime_minutes")}}
       {{end}}
-      {{yield taglineDivider(dividers=dividers)}}
-      {{dividers = dividers - 1}}
+      {{showDivider = true}}
     {{end}}
 
     {{if isset(.Items)}}
-      {{yield taglineItem() content}}
+      {{yield item() content}}
         {{i18n("bundle_items_generic", len(.Items))}}
       {{end}}
-      {{yield taglineDivider(dividers=dividers)}}
-      {{dividers = dividers - 1}}
+      {{showDivider = true}}
     {{end}}
 
     {{if isset(.Episodes)}}
-      {{yield taglineItem() content}}
+      {{yield item(class="episodes") content}}
         {{i18n("episode_count", len(.Episodes))}}
       {{end}}
-      {{yield taglineDivider(dividers=dividers)}}
-      {{dividers = dividers - 1}}
+      {{showDivider = true}}
     {{end}}
 
     {{if genres && len(itemGenres) > 0}}
       {{if genresLimit > -1 && len(itemGenres) > genresLimit}}
         {{itemGenres = itemGenres[:genresLimit]}}
       {{end}}
-      {{yield taglineItem() content}}
+      {{yield item(class="genres") content}}
         {{itemGenres}}
       {{end}}
-      {{yield taglineDivider(dividers=dividers)}}
-      {{dividers = dividers - 1}}
+      {{showDivider = true}}
     {{end}}
 
-    {{if isset(.ReleaseDate) && .ReleaseDate.Year() > 1}}
-      {{yield taglineItem() content}}
+    {{if isset(.ReleaseDate) && .ReleaseDate.Year() > 1888}}
+      {{yield item(class="release-date") content}}
         {{.ReleaseDate.Year()}}
       {{end}}
-      {{yield taglineDivider(dividers=dividers)}}
-      {{dividers = dividers - 1}}
+      {{showDivider = true}}
     {{end}}
   </div>
 {{end}}
 
-{{block taglineItem()}}
-  <span class="meta-item-tagline-item">{{yield content}}</span>
-{{end}}
-
-{{block taglineDivider(dividers)}}
-  {{if dividers > 0}}
-    <span class="meta-item-tagline-divider">•</span>
-  {{end}}
+{{block item(class="missing", showDivider=showDivider)}}
+  <span class="{{class}}">
+    {{if showDivider}}
+      <span class="divider">•</span>
+    {{end}}
+    <span class="item">{{yield content}}</span>
+  </span>
 {{end}}

package/site/templates/tv/detail.jet

@@ -63,7 +63,7 @@
                     <div class="meta-detail-crew">
                       <h2>{{member.Job}}</h2>
                       {{ path := "/search.html?q=" + member.Name }}
-                      <a href="{{ routeToPath(path) }}"">{{member.Name}}</a>
+                      <p><a href="{{ routeToPath(path) }}"">{{member.Name}}</a></p>
                     </div>
                   {{end}}
                 </div>

package/site/tr_TR.all.json

@@ -1,7 +1,4 @@
 {
-  "site_owner": {
-    "other": "ABC Cinemas"
-  },
   "settings_title": {
     "other": "Settings"
   },
@@ -70,9 +67,6 @@
   "404_page_content": {
     "other": "<p>Üzgünüz, aradığınız sayfa var gibi görünmüyor.</p><p>Taşınmış veya silinmiş olabilir veya belki bir şey yanlış yazdı.</p><p>Aradığınızı bulmak için ana sayfaya geri dönmeyi deneyin.</p><p><a href=\"{{.URL}}\">Ana sayfaya geri dön</a></p>"
   },
-  "nav_homepage": {
-    "other": "ABC Cinemas"
-  },
   "nav_signin": {
     "other": "Oturum Aç"
   },
@@ -128,7 +122,7 @@
     "other": "Aramayı gönder"
   },
   "play_button_watch": {
-    "other": "Şimdi Oynat"
+    "other": "İzle şimdi"
   },
   "play_button_resume": {
     "other": "Devam et"
@@ -745,7 +739,7 @@
     "other": "Listeme Ekle"
   },
   "userwishlist_button_remove": {
-    "other": "Benim Listem"
+    "other": "Listemden Kaldır"
   },
   "userwishlist_button_add_compact": {
     "other": "Benim Listem"
@@ -887,13 +881,13 @@
     "other": "(günü geçmiş)"
   },
   "shopping_card_use_other": {
-    "other": "Yeni bir kart kullanın"
+    "other": "Yeni kart ekle"
   },
   "shopping_card_use_new_card": {
     "other": "Kartı değiştir "
   },
   "shopping_info_ownership_plan": {
-    "other": "Abonelik"
+    "other": "Plan"
   },
   "shopping_action_credit": {
     "other": "Doldurmak"
@@ -920,10 +914,10 @@
     "other": "Aboneliğimi iptal et"
   },
   "usersubscriptions_unsubscribe_modal_cancel": {
-    "other": "İptal"
+    "other": "Hayır, teşekkürler"
   },
   "usersubscriptions_unsubscribe_modal_confirm": {
-    "other": "Evet, aboneliğimi iptal et "
+    "other": "Evet İptal"
   },
   "usersubscriptions_unsubscribe_modal_title": {
     "other": "Aboneliği iptal et?"
@@ -1027,7 +1021,7 @@
     "other": "Tamamlayınız"
   },
   "shopping_complete_subscription": {
-    "other": "Abonelik satın alma işleminiz başarılı oldu. Artık {{.Title}} ."
+    "other": "Abonelik satın alma işleminiz başarılı oldu. Artık {{.Title}}."
   },
   "shopping_complete_subscription_browse": {
     "other": "Sitede <a href=\"/\">gezinmekten</a> veya belirli bir şey <a href=\"/search.html\">aramaktan</a> çekinmeyin."
@@ -1318,5 +1312,26 @@
   },
   "bundle_items_generic": {
     "other": "{{.Count}} öğeler"
+  },
+  "shopping_card_update_reason_expired": {
+    "other": "Kredi kartınızı güncelleyin. Desteklenen kartlar Visa, Mastercard ve American Express'tir."
+  },
+  "shopping_discount_applied_promo": {
+    "other": "Kod başarıyla uygulandı."
+  },
+  "promo_only_purchases_must_be_100_percent_discounted": {
+    "other": "Lütfen geçerli bir promosyon kodu girin."
+  },
+  "shopping_complete_promo_only": {
+    "other": "Artık {{.Title}} izleyebilirsiniz."
+  },
+  "shopping_action_redeem_promo_code": {
+    "other": "Tazmin etmek"
+  },
+  "pricing_ownership_promo": {
+    "other": "Tazmin etmek"
+  },
+  "shopping_info_ownership_subscription": {
+    "other": "abonelik"
   }
 }

package/site/uk_UA.all.json

@@ -1,7 +1,4 @@
 {
-  "site_owner": {
-    "other": "ABC Cinemas"
-  },
   "settings_title": {
     "other": "Settings"
   },
@@ -72,9 +69,6 @@
   "404_page_content": {
     "other": "<p>На жаль, сторінка, яку ви шукаєте, не існує.</p><p>Вона могла бути переміщена або видалена, чи, можливо, ви щось неправильно написали.</p><p>Спробуйте повернутися на головну сторінку, щоб знайти те, що ви шукаєте.</p><p><a href=\"/\">Назад на головну сторінку</a></p>"
   },
-  "nav_homepage": {
-    "other": "ABC Cinemas"
-  },
   "nav_signin": {
     "other": "Увійти"
   },
@@ -130,7 +124,7 @@
     "other": "Шукати"
   },
   "play_button_watch": {
-    "other": "Дивитися"
+    "other": "Дивитися зараз"
   },
   "play_button_resume": {
     "other": "Продовжити"
@@ -823,7 +817,7 @@
     "other": "Додати до мого списку"
   },
   "userwishlist_button_remove": {
-    "other": "Мій список"
+    "other": "Видалити з мого списку"
   },
   "userwishlist_button_add_compact": {
     "other": "Мій список"
@@ -972,7 +966,7 @@
     "other": "(закінчився)"
   },
   "shopping_card_use_other": {
-    "other": "Використовуйте нову картку"
+    "other": "Додати нову картку"
   },
   "shopping_card_use_new_card": {
     "other": "Змінити картку"
@@ -987,7 +981,7 @@
     "other": "Кредитна картка не правильна? <a href=\"{{.SubscriptionsURL}}\">Натисніть тут, щоб оновити свою картку.</a>"
   },
   "shopping_info_ownership_plan": {
-    "other": "Підписка"
+    "other": "План"
   },
   "shopping_action_credit": {
     "other": "Поповнити"
@@ -1014,10 +1008,10 @@
     "other": "Скасувати мою підписку"
   },
   "usersubscriptions_unsubscribe_modal_cancel": {
-    "other": "Скасувати"
+    "other": "Ні, дякую"
   },
   "usersubscriptions_unsubscribe_modal_confirm": {
-    "other": "Так, скасувати мою підписку"
+    "other": "Так, скасувати"
   },
   "usersubscriptions_unsubscribe_modal_title": {
     "other": "Скасувати підписку?"
@@ -1149,7 +1143,7 @@
     "other": "Завершено"
   },
   "shopping_complete_subscription": {
-    "other": "Ваша покупка підписки була успішною. Тепер ви підписані на {{.Title}} ."
+    "other": "Ваша покупка підписки була успішною. Тепер ви підписані на {{.Title}}."
   },
   "shopping_complete_subscription_browse": {
     "other": "Не соромтеся <a href=\"/\">переглядати</a> сайт або <a href=\"/search.html\">шукати</a> щось конкретне."
@@ -1350,5 +1344,26 @@
   },
   "bundle_items_generic": {
     "other": "{{.Count}} елементи"
+  },
+  "shopping_card_update_reason_expired": {
+    "other": "Оновіть свою кредитну картку. Підтримувані картки Visa, Mastercard та American Express."
+  },
+  "shopping_discount_applied_promo": {
+    "other": "Код успішно застосовано."
+  },
+  "promo_only_purchases_must_be_100_percent_discounted": {
+    "other": "Введіть дійсний промо-код."
+  },
+  "shopping_complete_promo_only": {
+    "other": "Тепер ви можете дивитися {{.Title}}."
+  },
+  "shopping_action_redeem_promo_code": {
+    "other": "Викупити"
+  },
+  "pricing_ownership_promo": {
+    "other": "Викупити"
+  },
+  "shopping_info_ownership_subscription": {
+    "other": "Підписка"
   }
 }

package/site/zh_TW.all.json

@@ -1,7 +1,4 @@
 {
-  "site_owner": {
-    "other": "ABC Cinemas"
-  },
   "settings_title": {
     "other": "設置"
   },
@@ -70,9 +67,6 @@
   "404_page_content": {
     "other": "<p>很抱歉，此頁面不存在。</p><p>頁面可能已被移除，或輸入的資訊有誤。</p><p>請回到首頁重新搜尋。</p><p><a href=\"{{.URL}}\">回到首頁</a></p>"
   },
-  "nav_homepage": {
-    "other": "ABC Cinemas"
-  },
   "nav_signin": {
     "other": "登入"
   },
@@ -131,7 +125,7 @@
     "other": "送出"
   },
   "play_button_watch": {
-    "other": "播放"
+    "other": "立即观看"
   },
   "play_button_resume": {
     "other": "繼續播放"
@@ -814,7 +808,7 @@
     "other": "加入我的追蹤片單"
   },
   "userwishlist_button_remove": {
-    "other": "我的追蹤片單"
+    "other": "从我的列表中删除"
   },
   "userwishlist_button_add_compact": {
     "other": "我的追蹤片單"
@@ -962,7 +956,7 @@
     "other": "（已過期）"
   },
   "shopping_card_use_other": {
-    "other": "使用新的信用卡"
+    "other": "添加新卡"
   },
   "shopping_card_use_new_card": {
     "other": "換一張信用卡"
@@ -977,7 +971,7 @@
     "other": "信用卡錯誤 <a href=\"{{.SubscriptionsURL}}\">請按此更新。</a>"
   },
   "shopping_info_ownership_plan": {
-    "other": "訂閱"
+    "other": "计划"
   },
   "shopping_action_credit": {
     "other": "頂尖"
@@ -1004,10 +998,10 @@
     "other": "取消我的訂閱"
   },
   "usersubscriptions_unsubscribe_modal_cancel": {
-    "other": "取消"
+    "other": "不，谢谢"
   },
   "usersubscriptions_unsubscribe_modal_confirm": {
-    "other": "是的，取消我的訂閱"
+    "other": "是的，取消"
   },
   "usersubscriptions_unsubscribe_modal_title": {
     "other": "取消訂閱？"
@@ -1316,5 +1310,26 @@
   },
   "bundle_items_generic": {
     "other": "{{.Count}} 项目"
+  },
+  "shopping_card_update_reason_expired": {
+    "other": "更新您的信用卡。支持的卡是 Visa、Mastercard 和 American Express。"
+  },
+  "shopping_discount_applied_promo": {
+    "other": "代碼成功應用。"
+  },
+  "promo_only_purchases_must_be_100_percent_discounted": {
+    "other": "請輸入有效的促銷代碼。"
+  },
+  "shopping_complete_promo_only": {
+    "other": "您現在可以觀看{{.Title}}。"
+  },
+  "shopping_action_redeem_promo_code": {
+    "other": "贖回"
+  },
+  "pricing_ownership_promo": {
+    "other": "贖回"
+  },
+  "shopping_info_ownership_subscription": {
+    "other": "订阅"
   }
 }