diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index b95c6d7eff..81f2fa802f 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -50,7 +50,7 @@ } .withBackdrop .pageBackground { - background-color: rgba(20, 20,20, .92); + background-color: rgba(6, 6,6, .9); display: block; } diff --git a/dashboard-ui/scripts/livetvchannel.js b/dashboard-ui/scripts/livetvchannel.js index e725b202cd..33a8857c81 100644 --- a/dashboard-ui/scripts/livetvchannel.js +++ b/dashboard-ui/scripts/livetvchannel.js @@ -95,6 +95,8 @@ html += ''; } + + $('#childrenContent', page).html(html); } function loadPrograms(page, channelId) { @@ -109,7 +111,6 @@ }).then(function (result) { renderPrograms(page, result); - Dashboard.hideLoadingMsg(); }); } diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js index d21ab694d6..016aeccc91 100644 --- a/dashboard-ui/scripts/medialibrarypage.js +++ b/dashboard-ui/scripts/medialibrarypage.js @@ -419,6 +419,25 @@ }); }); + window.WizardLibraryPage = { + + next: function () { + + Dashboard.showLoadingMsg(); + + var apiClient = ApiClient; + + apiClient.ajax({ + type: "POST", + url: apiClient.getUrl('System/Configuration/MetadataPlugins/Autoset') + + }).then(function () { + + Dashboard.hideLoadingMsg(); + Dashboard.navigate('wizardsettings.html'); + }); + } + }; pageClassOn('pageshow', "mediaLibraryPage", function () { var page = this; @@ -426,30 +445,6 @@ }); -})(); - -var WizardLibraryPage = { - - next: function () { - - Dashboard.showLoadingMsg(); - - var apiClient = ApiClient; - - apiClient.ajax({ - type: "POST", - url: apiClient.getUrl('System/Configuration/MetadataPlugins/Autoset') - - }).then(function () { - - Dashboard.hideLoadingMsg(); - Dashboard.navigate('wizardsettings.html'); - }); - } -}; - -(function ($, document, window) { - pageIdOn('pageshow', "mediaLibraryPage", function () { var page = this; diff --git a/dashboard-ui/scripts/metadatasubtitles.js b/dashboard-ui/scripts/metadatasubtitles.js index e0cb88daf0..81e90d4a9b 100644 --- a/dashboard-ui/scripts/metadatasubtitles.js +++ b/dashboard-ui/scripts/metadatasubtitles.js @@ -5,7 +5,7 @@ $('#chkSubtitlesMovies', page).checked(config.DownloadMovieSubtitles); $('#chkSubtitlesEpisodes', page).checked(config.DownloadEpisodeSubtitles); - $('#chkSkipIfGraphicalSubsPresent', page).checked(config.SkipIfGraphicalSubtitlesPresent); + $('#chkSkipIfGraphicalSubsPresent', page).checked(config.SkipIfEmbeddedSubtitlesPresent); $('#chkSkipIfAudioTrackPresent', page).checked(config.SkipIfAudioTrackMatches); $('#txtOpenSubtitleUsername', page).val(config.OpenSubtitlesUsername); @@ -48,7 +48,7 @@ config.DownloadMovieSubtitles = $('#chkSubtitlesMovies', form).checked(); config.DownloadEpisodeSubtitles = $('#chkSubtitlesEpisodes', form).checked(); - config.SkipIfGraphicalSubtitlesPresent = $('#chkSkipIfGraphicalSubsPresent', form).checked(); + config.SkipIfEmbeddedSubtitlesPresent = $('#chkSkipIfGraphicalSubsPresent', form).checked(); config.SkipIfAudioTrackMatches = $('#chkSkipIfAudioTrackPresent', form).checked(); config.OpenSubtitlesUsername = $('#txtOpenSubtitleUsername', form).val(); diff --git a/dashboard-ui/strings/server.json b/dashboard-ui/strings/server.json index 24a22febf5..a30e4b9bb2 100644 --- a/dashboard-ui/strings/server.json +++ b/dashboard-ui/strings/server.json @@ -831,7 +831,7 @@ "HeaderSubtitleDownloadingHelp": "When Emby scans your video files it can search for missing subtitles, and download them using a subtitle provider such as OpenSubtitles.org.", "HeaderDownloadSubtitlesFor": "Download subtitles for:", "MessageNoChapterProviders": "Install a chapter provider plugin such as ChapterDb to enable additional chapter options.", - "LabelSkipIfGraphicalSubsPresent": "Skip if the video already contains graphical subtitles", + "LabelSkipIfGraphicalSubsPresent": "Skip if the video already contains embedded subtitles", "LabelSkipIfGraphicalSubsPresentHelp": "Keeping text versions of subtitles will result in more efficient delivery and decrease the likelihood of video transcoding.", "TabSubtitles": "Subtitles", "TabChapters": "Chapters",