Merge pull request #1734 from MediaBrowser/dev

fixes #1356 - [BUG] .mkv that stream copies, cannot be played without…
This commit is contained in:
Luke 2016-05-15 02:08:29 -04:00
commit 05c3cac7aa

View file

@ -1,18 +1,15 @@
<div id="tvRecommendedPage" data-dom-cache="true" data-role="page" class="page libraryPage backdropPage pageWithAbsoluteTabs" data-backdroptype="series"> <div id="tvRecommendedPage" data-dom-cache="true" data-role="page" class="page libraryPage backdropPage pageWithAbsoluteTabs" data-backdroptype="series">
<div class="mdl-tabs mdl-js-tabs mdl-js-ripple-effect">
<div class="libraryViewNav"> <div class="libraryViewNav">
<div class="mdl-tabs__tab-bar"> <button class="pageTabButton is-active" data-index="0">${TabSuggestions}</button>
<a href="#suggestionsTab" class="mdl-tabs__tab is-active" data-index="0">${TabSuggestions}</a> <button class="pageTabButton" data-index="1">${TabLatest}</button>
<a href="#latestTab" class="mdl-tabs__tab" data-index="1">${TabLatest}</a> <button class="pageTabButton" data-index="2">${TabUpcoming}</button>
<a href="#upcomingTab" class="mdl-tabs__tab" data-index="2">${TabUpcoming}</a> <button class="pageTabButton" data-index="3">${TabShows}</button>
<a href="#seriesTab" class="mdl-tabs__tab" data-index="3">${TabShows}</a> <button class="pageTabButton" data-index="4">${TabEpisodes}</button>
<a href="#episodesTab" class="mdl-tabs__tab" data-index="4">${TabEpisodes}</a> <button class="pageTabButton" data-index="5">${TabGenres}</button>
<a href="#genresTab" class="mdl-tabs__tab" data-index="5">${TabGenres}</a> <button class="pageTabButton" data-index="6">${TabNetworks}</button>
<a href="#studiosTab" class="mdl-tabs__tab" data-index="6">${TabNetworks}</a>
</div> </div>
</div> <div class="is-active pageTabContent ehsContent" id="suggestionsTab" data-index="0">
<div class="mdl-tabs__panel is-active pageTabContent ehsContent" id="suggestionsTab" data-index="0">
<div id="resumableSection" class="homePageSection"> <div id="resumableSection" class="homePageSection">
<div> <div>
<h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderResume}</h1> <h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderResume}</h1>
@ -33,7 +30,7 @@
</div> </div>
<p class="noNextUpItems" style="display: none;">${NoNextUpItemsMessage}</p> <p class="noNextUpItems" style="display: none;">${NoNextUpItemsMessage}</p>
</div> </div>
<div class="mdl-tabs__panel pageTabContent ehsContent" id="latestTab" data-index="1"> <div class="pageTabContent ehsContent" id="latestTab" data-index="1">
<div class="homePageSection"> <div class="homePageSection">
<div> <div>
<h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderLatestEpisodes}</h1> <h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderLatestEpisodes}</h1>
@ -43,7 +40,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="mdl-tabs__panel pageTabContent ehsContent" id="upcomingTab" data-index="2"> <div class="pageTabContent ehsContent" id="upcomingTab" data-index="2">
<div id="upcomingItems"> <div id="upcomingItems">
</div> </div>
<div class="noItemsMessage" style="display: none;"> <div class="noItemsMessage" style="display: none;">
@ -53,7 +50,7 @@
</p> </p>
</div> </div>
</div> </div>
<div class="mdl-tabs__panel pageTabContent ehsContent" id="seriesTab" data-index="3"> <div class="pageTabContent ehsContent" id="seriesTab" data-index="3">
<div style="text-align: center;padding:.7em 0;"> <div style="text-align: center;padding:.7em 0;">
<div style="text-align: center; display: flex; align-items: center; justify-content: center;"> <div style="text-align: center; display: flex; align-items: center; justify-content: center;">
<div class="paging"></div> <div class="paging"></div>
@ -72,7 +69,7 @@
<div class="paging"></div> <div class="paging"></div>
</div> </div>
</div> </div>
<div class="mdl-tabs__panel pageTabContent ehsContent" id="episodesTab" data-index="4"> <div class="pageTabContent ehsContent" id="episodesTab" data-index="4">
<div style="text-align: center; display: flex; align-items: center; justify-content: center;"> <div style="text-align: center; display: flex; align-items: center; justify-content: center;">
<div class="paging"></div> <div class="paging"></div>
<button is="paper-icon-button-light" class="btnSelectView" title="${ButtonSelectView}"><iron-icon icon="view-comfy"></iron-icon></button> <button is="paper-icon-button-light" class="btnSelectView" title="${ButtonSelectView}"><iron-icon icon="view-comfy"></iron-icon></button>
@ -85,20 +82,19 @@
<div class="paging"></div> <div class="paging"></div>
</div> </div>
</div> </div>
<div class="mdl-tabs__panel pageTabContent ehsContent" id="genresTab" data-index="5"> <div class="pageTabContent ehsContent" id="genresTab" data-index="5">
<div style="text-align: center; display: flex; align-items: center; justify-content: center;"> <div style="text-align: center; display: flex; align-items: center; justify-content: center;">
<button is="paper-icon-button-light" class="btnSelectView" title="${ButtonSelectView}"><iron-icon icon="view-comfy"></iron-icon></button> <button is="paper-icon-button-light" class="btnSelectView" title="${ButtonSelectView}"><iron-icon icon="view-comfy"></iron-icon></button>
</div> </div>
<div id="items" class="itemsContainer paddedItemsContainer"></div> <div id="items" class="itemsContainer paddedItemsContainer"></div>
</div> </div>
<div class="mdl-tabs__panel pageTabContent ehsContent" id="studiosTab" data-index="6"> <div class="pageTabContent ehsContent" id="studiosTab" data-index="6">
<div class="viewSettings"> <div class="viewSettings">
<div class="listTopPaging"> <div class="listTopPaging">
</div> </div>
</div> </div>
<div id="items" class="itemsContainer paddedItemsContainer" style="text-align: center;"></div> <div id="items" class="itemsContainer paddedItemsContainer" style="text-align: center;"></div>
</div> </div>
</div>
<div data-role="content"> <div data-role="content">
</div> </div>