Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "CC-3208 IFrame Styling Backport" #98

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "CC-3208 IFrame Styling Backport" #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/styles/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,13 +310,13 @@ body {
}

.show-page-section-btns-wrapper {
margin: 0px 0 20px 0;
margin: 10px 0 20px 0;
}

.show-page-section-btn {
text-transform: uppercase;
width: 100%;
margin: 0px 0;
margin: 2px 0;
@media (min-width: $xs) {
border-radius: 0;
box-sizing: border-box;
Expand Down Expand Up @@ -503,7 +503,7 @@ body {
}

.vod-chapters {
min-height: 370px;
min-height: 300px;
@media (min-width: $xs) {
max-height: 350px;
overflow: auto;
Expand All @@ -516,7 +516,7 @@ body {
}

.show-page-last-row {
padding-top: 20px;
padding-bottom: 20px;
}

.vod-chapters .vod-chapters-chapter:nth-of-type(even) {
Expand Down
181 changes: 90 additions & 91 deletions app/templates/show.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,121 +1,120 @@
{{#if (or embediFrame embededPdf)}}
<div class="row show-page">
<div class="col-sm-12">
<h2 class="show-page-header">{{show.cgTitle}}</h2>
<div class="show-page-social-links hidden-xs">
{{#fb-share-button}}Share{{/fb-share-button}}
{{#twitter-share-button}}Tweet{{/twitter-share-button}}
</div>
<div class="row show-page">
<div class="col-sm-12">
<h2 class="show-page-header">{{show.cgTitle}}</h2>
<div class="show-page-social-links hidden-xs">
{{#fb-share-button}}Share{{/fb-share-button}}
{{#twitter-share-button}}Tweet{{/twitter-share-button}}
</div>
</div>
</div>

<div class="row show-page">
{{! VOD or Image}}
<div class="col-sm-8">
{{#if (or show.vods.firstObject.isWatchable show.vods.firstObject.isReady)}}
<div class="embed-responsive embed-responsive-16by9">
{{{show.vods.firstObject.embedCode}}}
</div>
{{else}}
<div class="embed-responsive embed-responsive-16by9">
{{show-thumbnail show=show quality='Large' class="img-responsive"}}
<div class="row show-page show-page-last-row">
<div class="col-sm-5 col-sm-push-7">
<div class="row show-page show-page-video-col">
{{! VOD or Image}}
<div class="col-sm-12">
{{#if (or show.vods.firstObject.isWatchable show.vods.firstObject.isReady)}}
<div class="embed-responsive embed-responsive-16by9">
{{{show.vods.firstObject.embedCode}}}
</div>
{{else}}
<div class="embed-responsive embed-responsive-16by9">
{{show-thumbnail show=show quality='Large' class="img-responsive"}}
</div>
{{/if}}
<div class="show-page-social-links visible-xs-block">
{{#fb-share-button adaptive=false}}Share{{/fb-share-button}}
{{#twitter-share-button adaptive=false}}Tweet{{/twitter-share-button}}
</div>
{{/if}}
<div class="show-page-social-links visible-xs-block">
{{#fb-share-button adaptive=false}}Share{{/fb-share-button}}
{{#twitter-share-button adaptive=false}}Tweet{{/twitter-share-button}}
</div>
</div>

{{!Chapters / details Tabs}}
<div class="col-sm-4">
<div class="show-page-section-btns-wrapper clearfix">
{{#if vodChapters}}
<button type="button" class="btn show-page-section-btn pull-left {{if (eq activeTab 'details') 'btn-primary' 'btn-default'}}" {{action 'showDetails'}}>Show Details</button>
<button type="button" class="btn show-page-section-btn pull-right {{if (eq activeTab 'chapters') 'btn-primary' 'btn-default'}}" {{action 'showChapters'}}>Chapters</button>
<a href={{embededPdf.url}} class="btn show-page-section-btn btn-default visible-xs-inline-block">Open {{embededPdf.fieldDisplay.label}} {{fa-icon 'external-link'}} </a>
{{else}}
<h3 class="show-page-show-details-header">Show Details</h3>
{{/if}}
{{!Chapters / details Tabs}}
<div class="col-sm-12">
<div class="show-page-section-btns-wrapper clearfix">
{{#if vodChapters}}
<button type="button" class="btn show-page-section-btn pull-left {{if (eq activeTab 'details') 'btn-primary' 'btn-default'}}" {{action 'showDetails'}}>Show Details</button>
<button type="button" class="btn show-page-section-btn pull-right {{if (eq activeTab 'chapters') 'btn-primary' 'btn-default'}}" {{action 'showChapters'}}>Chapters</button>
<a href={{embededPdf.url}} class="btn show-page-section-btn btn-default visible-xs-inline-block">Open {{embededPdf.fieldDisplay.label}} {{fa-icon 'external-link'}} </a>
{{else}}
<h3 class="show-page-show-details-header">Show Details</h3>
{{/if}}
</div>
</div>
</div>

{{! Show Details / Chapters}}
<div class="col-sm-4">
<div class="col-sm-12">
{{! Show Details / Chapters}}
{{#if (eq activeTab 'details')}}
{{show-details show=show producer=producer reels=reels runs=runs currentChannelId=currentChannelId}}
<h3 class="show-page-airtimes-header">Upcoming air times</h3>
{{#each runs as |run|}}
<div class="show-future-runs-container">
{{moment-calendar run.runDateTime}}
</div>
<div class="show-future-runs-container">
{{moment-calendar run.runDateTime}}
</div>
{{else}}
There are currently no upcoming air times.
There are currently no upcoming air times.
{{/each}}
{{else}}
{{vod-chapters chapters=vodChapters seekto=seekto setSeekTo=(action 'setSeekTo')}}
{{/if}}
</div>
</div>

<div class="row show-page show-page-last-row">
<div class="col-sm-12">
{{#if embededPdf}}
{{pdf-viewer url=embededPdf.url class="hidden-xs"}}
{{!pdf-js pdf=documentUrl toolbarComponent=null}}
{{/if}}
{{#if embediFrame}}
<iframe class="pdf-wrapper" src={{embediFrame.url}}></iframe>
{{/if}}
</div>
<div class="col-sm-7 col-sm-pull-5">
{{#if embededPdf}}
{{pdf-viewer url=embededPdf.url class="hidden-xs"}}
{{/if}}
{{#if embediFrame}}
<iframe class="pdf-wrapper" src={{embediFrame.url}}></iframe>
{{/if}}
{{!pdf-js pdf=documentUrl toolbarComponent=null}}
</div>

</div>
{{else}}
<div class="row show-page">
<div class="col-sm-12">
{{#if (or show.vods.firstObject.isWatchable show.vods.firstObject.isReady)}}
<div class="embed-responsive embed-responsive-16by9">
{{{show.vods.firstObject.embedCode}}}
</div>
{{else}}
{{#if show.showThumbnails}}
<div class="embed-responsive embed-responsive-16by9">
{{show-thumbnail show=show quality='Large' class="img-responsive"}}
</div>
{{/if}}
<div class="row show-page">
<div class="col-sm-12">
{{#if (or show.vods.firstObject.isWatchable show.vods.firstObject.isReady)}}
<div class="embed-responsive embed-responsive-16by9">
{{{show.vods.firstObject.embedCode}}}
</div>
{{else}}
{{#if show.showThumbnails}}
<div class="embed-responsive embed-responsive-16by9">
{{show-thumbnail show=show quality='Large' class="img-responsive"}}
</div>
{{/if}}
</div>
{{/if}}
</div>
</div>

<div class="row show-page">
<div class="col-sm-12">
<h2 class="show-page-header">{{show.cgTitle}}</h2>
<div class="show-page-social-links">
{{#fb-share-button}}Share{{/fb-share-button}}
{{#twitter-share-button}}Tweet{{/twitter-share-button}}
</div>
<div class="row show-page">
<div class="col-sm-12">
<h2 class="show-page-header">{{show.cgTitle}}</h2>
<div class="show-page-social-links">
{{#fb-share-button}}Share{{/fb-share-button}}
{{#twitter-share-button}}Tweet{{/twitter-share-button}}
</div>
</div>
</div>

<div class="row show-page show-page-last-row">
<div class="col-sm-6">
<h3 class="show-page-show-details-header">Show Details</h3>
{{show-details show=show producer=producer reels=reels runs=runs currentChannelId=currentChannelId}}
</div>
<div class="col-sm-6">
{{#if (and show.vods.firstObject.chapters show.vods.firstObject.chaptersPublished)}}
<h3 class="show-details-chapters-header">Chapters</h3>
{{vod-chapters chapters=vodChapters seekto=seekto setSeekTo=(action 'setSeekTo')}}
<hr />
{{/if}}
<h3 class="show-page-airtimes-header">Upcoming air times</h3>
{{#each runs as |run|}}
<div class="show-future-runs-container">
{{moment-calendar run.runDateTime}}
</div>
{{else}}
There are currently no upcoming air times.
{{/each}}
</div>
<div class="row show-page show-page-last-row">
<div class="col-sm-6">
<h3 class="show-page-show-details-header">Show Details</h3>
{{show-details show=show producer=producer reels=reels runs=runs currentChannelId=currentChannelId}}
</div>
<div class="col-sm-6">
{{#if (and show.vods.firstObject.chapters show.vods.firstObject.chaptersPublished)}}
<h3 class="show-details-chapters-header">Chapters</h3>
{{vod-chapters chapters=vodChapters seekto=seekto setSeekTo=(action 'setSeekTo')}}
<hr />
{{/if}}
<h3 class="show-page-airtimes-header">Upcoming air times</h3>
{{#each runs as |run|}}
<div class="show-future-runs-container">
{{moment-calendar run.runDateTime}}
</div>
{{else}}
There are currently no upcoming air times.
{{/each}}
</div>
</div>
{{/if}}