diff --git a/dashboard-ui/connectlogin.html b/dashboard-ui/connectlogin.html index a17f54b507..fbef69b9fa 100644 --- a/dashboard-ui/connectlogin.html +++ b/dashboard-ui/connectlogin.html @@ -56,7 +56,7 @@
- +

diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index 16e413b3bc..6605120a8b 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -360,7 +360,7 @@ @media all and (max-width: 480px) { - .backdropCard.fullWidthCardOnMobile { + .backdropCard { width: 100% !important; } } @@ -575,7 +575,7 @@ @media all and (max-width: 480px) { - .detailPage169Card.fullWidthCardOnMobile { + .detailPage169Card { width: 100% !important; } } diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index c52e753e83..75df02a5b8 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -42,7 +42,7 @@ } .ui-page-theme-b:not(.pageWithAbsoluteTabs), .pageWithAbsoluteTabs .pageBackground { - background-color: #1f1f1f; + background-color: #242424; } .backdropContainer { diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index a8aa2b575e..3f9a7c0fc6 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -35,7 +35,7 @@ border-radius: 1000px; } -.viewMenuBar .fa, .viewMenuBar paper-icon-button { +.viewMenuBar paper-icon-button { color: #fff; vertical-align: middle; } @@ -201,7 +201,7 @@ } .viewMenuBar, .libraryViewNav { - background-color: #111; + background-color: #121212; } .paperLibraryViewNav { diff --git a/dashboard-ui/css/livetv.css b/dashboard-ui/css/livetv.css index 9a5ca446e5..06fa8c3fff 100644 --- a/dashboard-ui/css/livetv.css +++ b/dashboard-ui/css/livetv.css @@ -185,7 +185,7 @@ } .channelPrograms, .timeslotHeadersInner { - width: 8000px; + width: 12000px; } .timeslotHeader { @@ -269,9 +269,9 @@ overflow: hidden; } - .pointerInput .programCellInner:hover { - background-color: #444; - } +.pointerInput .programCellInner:hover { + background-color: #444; +} .timeslotCellInner { position: absolute; @@ -312,6 +312,20 @@ top: 7px; } +@media (max-width: 1920px) { + + .channelPrograms, .timeslotHeadersInner { + width: 10000px; + } +} + +@media (max-width: 1600px) { + + .channelPrograms, .timeslotHeadersInner { + width: 8000px; + } +} + @media (max-width: 600px) { .guideChannelImage { @@ -366,4 +380,4 @@ .channelList, .programGrid { height: auto !important; -} \ No newline at end of file +} diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index dbc997e153..37804862c1 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -304,7 +304,7 @@ html { -ms-touch-action: manipulation; touch-action: manipulation; /* Prevent white flickering */ - background-color: #1f1f1f; + background-color: #262626; /* Normalize for different browsers */ margin: 0; padding: 0; @@ -660,7 +660,7 @@ h1 .imageLink { .warningFieldDescription { padding: 5px; border: 1px solid #f4c63f; - background: #ffefaa; + background: #fff3a5; border-radius: 5px; } @@ -868,15 +868,8 @@ h1 .imageLink { } .directoryPickerHeadline { - border: 1px solid #f7c942; - color: #222; - background: #fff9df; - background-image: -webkit-gradient(linear,left top,left bottom,from(#fffadf),to(#fff3a5)); - background-image: -webkit-linear-gradient(#fffadf,#fff3a5); - background-image: -moz-linear-gradient(#fffadf,#fff3a5); - background-image: -ms-linear-gradient(#fffadf,#fff3a5); - background-image: -o-linear-gradient(#fffadf,#fff3a5); - background-image: linear-gradient(#fffadf,#fff3a5); + color: #000; + background: #fff3a5; padding: 1em; border-radius: 5px; } diff --git a/dashboard-ui/playlistedit.html b/dashboard-ui/playlistedit.html index 2442486615..4d46068cf2 100644 --- a/dashboard-ui/playlistedit.html +++ b/dashboard-ui/playlistedit.html @@ -4,7 +4,7 @@ Emby -
+
diff --git a/dashboard-ui/scripts/backdrops.js b/dashboard-ui/scripts/backdrops.js index 86c64de64d..e1696997da 100644 --- a/dashboard-ui/scripts/backdrops.js +++ b/dashboard-ui/scripts/backdrops.js @@ -126,7 +126,7 @@ return false; } - return true; + return !AppInfo.isTouchPreferred; } function enabled() { diff --git a/dashboard-ui/scripts/channels.js b/dashboard-ui/scripts/channels.js index 5ad8de4a07..2db195c572 100644 --- a/dashboard-ui/scripts/channels.js +++ b/dashboard-ui/scripts/channels.js @@ -19,8 +19,6 @@ var html = ''; - updateFilterControls(page); - var view = 'Thumb'; if (view == "Thumb") { @@ -59,10 +57,6 @@ }); } - function updateFilterControls(page) { - - } - function loadTab(page, index) { switch (index) { @@ -70,7 +64,6 @@ case 1: LibraryBrowser.loadSavedQueryValues('channels', query); reloadItems(page); - updateFilterControls(page); break; default: break; @@ -84,7 +77,7 @@ var tabs = page.querySelector('paper-tabs'); var pages = page.querySelector('neon-animated-pages'); - LibraryBrowser.configurePaperLibraryTabs(page, tabs, pages); + LibraryBrowser.configurePaperLibraryTabs(page, tabs, pages, 1); $(tabs).on('iron-select', function () { var selected = this.selected; diff --git a/dashboard-ui/scripts/channelslatest.js b/dashboard-ui/scripts/channelslatest.js index 68a7ece872..4b51470077 100644 --- a/dashboard-ui/scripts/channelslatest.js +++ b/dashboard-ui/scripts/channelslatest.js @@ -2,7 +2,11 @@ function reloadItems(page) { - Sections.loadLatestChannelItems(page.querySelector('.latestItems'), Dashboard.getCurrentUserId()); + Dashboard.showLoadingMsg(); + + Sections.loadLatestChannelItems(page.querySelector('.latestItems'), Dashboard.getCurrentUserId()).always(function() { + Dashboard.hideLoadingMsg(); + }); } function loadTab(page, index) { diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index 52e69ff043..f514551bde 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -1534,7 +1534,9 @@ tabs.hideScrollButtons = true; - $(ownerpage).on('pagebeforeshowready', LibraryBrowser.onTabbedPageBeforeShowReady); + $(ownerpage).on('pagebeforeshowready', function() { + LibraryBrowser.onTabbedPageBeforeShowReady(this); + }); $(pages).on('iron-select', function () { diff --git a/dashboard-ui/scripts/homenextup.js b/dashboard-ui/scripts/homenextup.js index a2729199e2..0d20399b57 100644 --- a/dashboard-ui/scripts/homenextup.js +++ b/dashboard-ui/scripts/homenextup.js @@ -67,8 +67,7 @@ preferThumb: true, showDetailsMenu: true, centerText: true, - overlayPlayButton: AppInfo.enableAppLayouts, - fullWidthOnMobile: AppInfo.enableAppLayouts + overlayPlayButton: AppInfo.enableAppLayouts }); } diff --git a/dashboard-ui/scripts/homeupcoming.js b/dashboard-ui/scripts/homeupcoming.js index 7f4971a59e..f40451e509 100644 --- a/dashboard-ui/scripts/homeupcoming.js +++ b/dashboard-ui/scripts/homeupcoming.js @@ -117,7 +117,8 @@ preferThumb: true, context: 'tv', lazy: true, - showDetailsMenu: true + showDetailsMenu: true, + centerText: true }); html += '
'; diff --git a/dashboard-ui/scripts/htmlmediarenderer.js b/dashboard-ui/scripts/htmlmediarenderer.js index 45d8581978..8dd267a805 100644 --- a/dashboard-ui/scripts/htmlmediarenderer.js +++ b/dashboard-ui/scripts/htmlmediarenderer.js @@ -76,8 +76,6 @@ } } - var viblastKey = 'N8FjNTQ3NDdhZqZhNGI5NWU5ZTI='; - function requireViblast(callback) { require(['thirdparty/viblast/viblast.js'], function () { @@ -91,7 +89,7 @@ function downloadViblastKey(callback) { - var savedKeyPropertyName = 'viblastkey'; + var savedKeyPropertyName = 'vbk'; var savedKey = appStorage.getItem(savedKeyPropertyName); if (savedKey) { var deferred = DeferredBuilder.Deferred(); @@ -118,7 +116,8 @@ } function getViblastKey() { - return htmlMediaRenderer.customViblastKey || viblastKey; + + return htmlMediaRenderer.customViblastKey || 'N8FjNTQ3NDdhZqZhNGI5NWU5ZTI='; } function getStartTime(url) { diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index e80d94259c..a794597370 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -855,8 +855,7 @@ overlayText: true, lazy: true, showDetailsMenu: true, - overlayPlayButton: AppInfo.enableAppLayouts, - fullWidthOnMobile: AppInfo.enableAppLayouts + overlayPlayButton: AppInfo.enableAppLayouts }); } else if (item.Type == "GameSystem") { diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 5711c9fcc2..bbbbc477e2 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -189,7 +189,7 @@ return !LibraryBrowser.enableFullPaperTabs(); }, - configurePaperLibraryTabs: function (ownerpage, tabs, pages) { + configurePaperLibraryTabs: function (ownerpage, tabs, pages, defaultTabIndex) { tabs.hideScrollButtons = true; @@ -235,7 +235,9 @@ $('.libraryViewNav', ownerpage).removeClass('libraryViewNavWithMinHeight'); } - $(ownerpage).on('pagebeforeshowready', LibraryBrowser.onTabbedPageBeforeShowReady); + $(ownerpage).on('pagebeforeshowready', function () { + LibraryBrowser.onTabbedPageBeforeShowReady(ownerpage, defaultTabIndex); + }); $(pages).on('iron-select', function () { @@ -249,8 +251,7 @@ }); }, - onTabbedPageBeforeShowReady: function () { - var page = this; + onTabbedPageBeforeShowReady: function (page, defaultTabIndex) { var tabs = page.querySelector('paper-tabs'); var selected = tabs.selected; @@ -259,7 +260,12 @@ Logger.log('selected tab is null, checking query string'); - selected = parseInt(getParameterByName('tab') || '0'); + if (!LibraryBrowser.enableFullPaperTabs()) { + // Currently not supported in this mode + defaultTabIndex = null; + } + + selected = parseInt(getParameterByName('tab')) || defaultTabIndex || 0; Logger.log('selected tab will be ' + selected); diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 65ba9f5363..fc12fab329 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -407,10 +407,10 @@ if (self.supportsTextTracks()) { if (isVlc) { - //profile.SubtitleProfiles.push({ - // Format: 'srt', - // Method: 'External' - //}); + profile.SubtitleProfiles.push({ + Format: 'srt', + Method: 'External' + }); profile.SubtitleProfiles.push({ Format: 'srt', Method: 'Embed' diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js index 65638c685e..2aab58a729 100644 --- a/dashboard-ui/scripts/search.js +++ b/dashboard-ui/scripts/search.js @@ -101,7 +101,13 @@ var currentTimeout = searchHintTimeout; Dashboard.showLoadingMsg(); - ApiClient.getSearchHints({ userId: Dashboard.getCurrentUserId(), searchTerm: searchTerm, limit: 30 }).done(function (result) { + ApiClient.getSearchHints({ + + userId: Dashboard.getCurrentUserId(), + searchTerm: searchTerm, + limit: 30 + + }).done(function (result) { if (currentTimeout == searchHintTimeout) { renderSearchResultsInOverlay(elem, result.SearchHints); diff --git a/dashboard-ui/scripts/tvlatest.js b/dashboard-ui/scripts/tvlatest.js index 6172e984cc..d5a7405cbd 100644 --- a/dashboard-ui/scripts/tvlatest.js +++ b/dashboard-ui/scripts/tvlatest.js @@ -64,8 +64,7 @@ centerText: true, lazy: true, showTitle: false, - overlayPlayButton: AppInfo.enableAppLayouts, - fullWidthOnMobile: AppInfo.enableAppLayouts + overlayPlayButton: AppInfo.enableAppLayouts }); } diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js index bc4c5f35d1..735daac847 100644 --- a/dashboard-ui/scripts/tvrecommended.js +++ b/dashboard-ui/scripts/tvrecommended.js @@ -86,8 +86,7 @@ preferThumb: true, showDetailsMenu: true, centerText: true, - overlayPlayButton: AppInfo.enableAppLayouts, - fullWidthOnMobile: AppInfo.enableAppLayouts + overlayPlayButton: AppInfo.enableAppLayouts }); } @@ -152,7 +151,8 @@ lazy: true, cardLayout: true, context: 'tv', - showDetailsMenu: true + showDetailsMenu: true, + preferThumb: true }); } else if (view == 'Poster') { @@ -162,11 +162,11 @@ shape: getThumbShape(), showTitle: true, showParentTitle: true, - overlayText: screenWidth >= 800 && !AppInfo.hasLowImageBandwidth, lazy: true, context: 'tv', showDetailsMenu: true, - overlayPlayButton: true + overlayPlayButton: true, + preferThumb: true }); } diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index 1229120656..f221d51770 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -1,6 +1,6 @@ (function ($, document) { - var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster'); + var view = LibraryBrowser.getDefaultItemsView('Poster', 'Thumb'); var data = {}; diff --git a/dashboard-ui/scripts/tvupcoming.js b/dashboard-ui/scripts/tvupcoming.js index 4154d9641a..df0974fec2 100644 --- a/dashboard-ui/scripts/tvupcoming.js +++ b/dashboard-ui/scripts/tvupcoming.js @@ -111,7 +111,8 @@ preferThumb: true, context: 'tv', lazy: true, - showDetailsMenu: true + showDetailsMenu: true, + centerText: true }); html += '
'; diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css index 8d24167d7b..1bb9f1a266 100644 --- a/dashboard-ui/themes/ios.css +++ b/dashboard-ui/themes/ios.css @@ -59,9 +59,13 @@ html, body, .ui-btn, .pageTitle { } .libraryViewNav .ui-btn-active, .libraryViewNav .iron-selected, .barsMenuButton .fa, .btnActiveCast, .libraryViewNav a:not(.ui-btn-active):hover { - color: #E91E63 !important; + color: #FF2D55 !important; } +.viewMenuBar paper-icon-button { + color: #FF2D55 !important; +} + .libraryViewNav { border-top: 1px solid #333 !important; }