diff --git a/dashboard-ui/components/directorybrowser/directorybrowser.js b/dashboard-ui/components/directorybrowser/directorybrowser.js index 9582d8d1c..1fa623600 100644 --- a/dashboard-ui/components/directorybrowser/directorybrowser.js +++ b/dashboard-ui/components/directorybrowser/directorybrowser.js @@ -128,7 +128,6 @@ html += '
'; html += Globalize.translate('MessageDirectoryPickerLinuxInstruction'); html += '
'; - //html += '' + Globalize.translate('ButtonMoreInformation') + ''; } html += '

'; diff --git a/dashboard-ui/components/tvproviders/xmltv.js b/dashboard-ui/components/tvproviders/xmltv.js index c7dfd50bc..60d3a5e19 100644 --- a/dashboard-ui/components/tvproviders/xmltv.js +++ b/dashboard-ui/components/tvproviders/xmltv.js @@ -1,4 +1,4 @@ -define(['jQuery', 'paper-checkbox', 'paper-button', 'emby-input', 'paper-item-body', 'paper-icon-item', 'paper-icon-button-light'], function ($) { +define(['jQuery', 'registrationservices', 'paper-checkbox', 'paper-button', 'emby-input', 'paper-item-body', 'paper-icon-item', 'paper-icon-button-light'], function ($, registrationServices) { return function (page, providerId, options) { @@ -8,10 +8,10 @@ if (config && id) { - var result = config.ListingProviders.filter(function(i) { + var result = config.ListingProviders.filter(function (i) { return i.Id == id; })[0]; - + if (result) { return Promise.resolve(result); } @@ -200,6 +200,8 @@ page.querySelector('.btnSubmitListings').classList.add('hide'); } + page.querySelector('.premiereHelp').innerHTML = Globalize.translate('XmlTvPremiere', 24); + $('form', page).on('submit', function () { submitListingsForm(); return false; @@ -207,6 +209,11 @@ page.querySelector('#btnSelectPath').addEventListener("click", onSelectPathClick); + page.querySelector('.lnkPremiere').addEventListener('click', function (e) { + registrationServices.showPremiereInfo(); + e.preventDefault(); + }); + page.querySelector('.chkAllTuners').addEventListener('change', function (e) { if (e.target.checked) { page.querySelector('.selectTunersSection').classList.add('hide'); diff --git a/dashboard-ui/components/tvproviders/xmltv.template.html b/dashboard-ui/components/tvproviders/xmltv.template.html index 455c2c016..5deb522ed 100644 --- a/dashboard-ui/components/tvproviders/xmltv.template.html +++ b/dashboard-ui/components/tvproviders/xmltv.template.html @@ -30,7 +30,6 @@
-
${OptionEnableForAllTuners}


@@ -39,7 +38,11 @@
-

+
+
+
+ ${ButtonLearnMore} +

diff --git a/dashboard-ui/devices/ie/ie.css b/dashboard-ui/devices/ie/ie.css deleted file mode 100644 index dc5ca4280..000000000 --- a/dashboard-ui/devices/ie/ie.css +++ /dev/null @@ -1,29 +0,0 @@ -paper-fab.keyboard-focus.paper-fab-0 { - background: #444; -} - -.channelHeaderCell { - display: block; -} - -.guideChannelInfo { - padding-top: 5px; -} - -.guideChannelImage { - position: absolute; - top: 0; - right: 5px; -} - -.actionSheet { - display: block !important; -} - -.actionSheetContent { - display: block !important; -} - -.actionSheetMenuItem { - display: block !important; -} diff --git a/dashboard-ui/devices/ie/ie.js b/dashboard-ui/devices/ie/ie.js deleted file mode 100644 index 8565660a1..000000000 --- a/dashboard-ui/devices/ie/ie.js +++ /dev/null @@ -1,57 +0,0 @@ -define(['browser', 'appStorage'], function (browser, appStorage) { - - require(['css!devices/ie/ie.css']); - var browserSwitchKey = "ieswitchbrowser"; - - function getWeek(date) { - - var onejan = new Date(date.getFullYear(), 0, 1); - return Math.ceil((((date - onejan) / 86400000) + onejan.getDay() + 1) / 7); - } - - function onPageShow() { - - var msg; - - var expectedValue = getWeek(new Date()) + "_7"; - - if (appStorage.getItem(browserSwitchKey) == expectedValue) { - return; - } - - if (!appStorage.getItem(browserSwitchKey)) { - appStorage.setItem(browserSwitchKey, expectedValue); - return; - } - - if (navigator.userAgent.toLowerCase().indexOf('windows nt 10.') != -1) { - - msg = Globalize.translate('MessageTryMicrosoftEdge'); - - msg += "

"; - msg += '' + Globalize.translate('ButtonLearnMore') + ''; - - Dashboard.alert({ - message: msg, - title: Globalize.translate('HeaderTryMicrosoftEdge') - }); - - } else if (!browser.mobile) { - - msg = Globalize.translate('MessageTryModernBrowser'); - - msg += "

"; - msg += '' + Globalize.translate('ButtonLearnMore') + ''; - - Dashboard.alert({ - message: msg, - title: Globalize.translate('HeaderTryModernBrowser') - }); - } - - appStorage.setItem(browserSwitchKey, expectedValue); - } - - pageClassOn('pageshow', "libraryPage", onPageShow); - pageClassOn('pageshow', "type-interior", onPageShow); -}); \ No newline at end of file diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html index 56affeb7d..ce9075395 100644 --- a/dashboard-ui/encodingsettings.html +++ b/dashboard-ui/encodingsettings.html @@ -9,6 +9,7 @@
${LabelHardwareAccelerationTypeHelp}
diff --git a/dashboard-ui/kids.html b/dashboard-ui/kids.html deleted file mode 100644 index 1856eb7cb..000000000 --- a/dashboard-ui/kids.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - Emby - - -
-
- -
-
-
-
${HeaderAdultsReadHere}
- -
-
${KidsModeAdultInstruction}
-
- -

- ${ButtonConfigurePinCode} -

- - ${ButtonExit} -
-
- - - -
- -
-
Icons
-
-
-
- - -
-
- - diff --git a/dashboard-ui/scripts/kids.js b/dashboard-ui/scripts/kids.js deleted file mode 100644 index 70ce3f057..000000000 --- a/dashboard-ui/scripts/kids.js +++ /dev/null @@ -1,123 +0,0 @@ -define(['jQuery'], function ($) { - - function showSignIn(page) { - - $('.kidsOptionsLogin', page).fadeIn(); - - $('#txtPinCode', page).val(''); - $('.btnOptions', page).hide(); - $('.kidContent', page).hide(); - } - - function validatePin(page) { - - } - - function loadContent(page) { - - var options = { - - SortBy: "Random", - SortOrder: "Descending", - MediaTypes: "Video", - Limit: 100, - Recursive: true, - Fields: "PrimaryImageAspectRatio", - ExcludeLocationTypes: "Virtual", - ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop,Thumb" - }; - - ApiClient.getItems(Dashboard.getCurrentUserId(), options).then(function (result) { - - $('.itemsContainer', page).html(LibraryBrowser.getPosterViewHtml({ - - items: result.Items, - shape: "horizontalBackdrop", - preferThumb: true, - overlayText: true, - lazy: true, - defaultAction: 'play', - coverImage: true, - enableImageEnhancers: false - - })).lazyChildren(); - - }); - - } - - function onPinSubmit() { - var page = $(this).parents('.page'); - - if (validatePin(page)) { - - $('.kidsOptionsLogin', page).hide(); - $('.kidsOptions', page).fadeIn(); - - } else { - Dashboard.alert({ - message: 'Invalid pin code entered. Please try again.', - title: 'Input Error' - }); - } - - return false; - } - - function onOptionsSubmit() { - var page = $(this).parents('.page'); - - $('.kidsOptions', page).fadeOut(); - $('.btnOptions', page).show(); - $('.kidContent', page).show(); - - return false; - } - - $(document).on('pageshow', "#kidsPage", function () { - - var page = this; - - var userId = Dashboard.getCurrentUserId(); - - $('.kidContent', page).hide(); - - $('.kidsWelcome', page).show(); - $('.lnkPinCode', page).attr('href', 'myprofile.html?userId=' + userId); - $('.btnOptions', page).buttonEnabled(false); - $('.kidsOptionsLogin', page).hide(); - $('.kidsOptions', page).hide(); - - $('.kidsBackdropContainer').css('background-image', 'url(css/images/kids/bg.jpg)'); - - }).on('pageinit', "#kidsPage", function () { - - var page = this; - - $('.btnDismissWelcome', page).on('click', function () { - - $('.kidsWelcome', page).fadeOut(); - $('.btnOptions', page).buttonEnabled(true); - $('.kidContent', page).show(); - loadContent(page); - - }); - - $('.btnOptions', page).on('click', function () { - - showSignIn(page); - }); - - $('.btnCancelPin', page).on('click', function () { - - $('.kidsOptionsLogin', page).fadeOut(); - $('.btnOptions', page).show(); - $('.kidContent', page).show(); - }); - - $('.kidPinForm').off('submit', onPinSubmit).on('submit', onPinSubmit); - $('.kidsOptionsForm').off('submit', onOptionsSubmit).on('submit', onOptionsSubmit); - }); - -}); diff --git a/dashboard-ui/scripts/registrationservices.js b/dashboard-ui/scripts/registrationservices.js index 5ae5120ab..727f2509b 100644 --- a/dashboard-ui/scripts/registrationservices.js +++ b/dashboard-ui/scripts/registrationservices.js @@ -1,4 +1,4 @@ -define(['appStorage'], function (appStorage) { +define(['appStorage', 'shell'], function (appStorage, shell) { var supporterPlaybackKey = 'lastSupporterPlaybackMessage4'; @@ -190,7 +190,6 @@ } window.RegistrationServices = { - renderPluginInfo: function (page, pkg, pluginSecurityInfo) { require(['jQuery'], function ($) { @@ -213,8 +212,7 @@ if (expDateTime <= nowTime) { regStatus += "

"; regStatus += Globalize.translate('MessageTrialExpired'); - } - else if (expDateTime > new Date(1970, 1, 1).getTime()) { + } else if (expDateTime > new Date(1970, 1, 1).getTime()) { regStatus += "

"; regStatus += Globalize.translate('MessageTrialWillExpireIn').replace('{0}', Math.round(expDateTime - nowTime) / (86400000)); @@ -294,6 +292,10 @@ resolve(); } }); + }, + + showPremiereInfo: function () { + shell.openUrl('https://emby.media/premiere'); } }; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 6b551d3a6..7b3eb3640 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -3149,10 +3149,6 @@ var AppInfo = {}; } } - if (browserInfo.msie) { - deps.push('devices/ie/ie'); - } - deps.push('scripts/librarylist'); deps.push('scripts/librarymenu'); diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json index 19ca9833f..b9528a269 100644 --- a/dashboard-ui/strings/en-US.json +++ b/dashboard-ui/strings/en-US.json @@ -2384,5 +2384,6 @@ "UnzipFFmpegFile": "Unzip the downloaded file to a folder of your choice.", "OptionUseSystemInstalledVersion": "Use system installed version", "OptionUseMyCustomVersion": "Use a custom version", - "FFmpegSavePathNotFound": "We're unable to locaate FFmpeg using the path you've entered. FFprobe is also required and must exist in the same folder. These components are normally bundled together in the same download. Please check the path and try again." + "FFmpegSavePathNotFound": "We're unable to locaate FFmpeg using the path you've entered. FFprobe is also required and must exist in the same folder. These components are normally bundled together in the same download. Please check the path and try again.", + "XmlTvPremiere": "By default, Emby will import {0} hours of guide data. Importing unlimited data requires an active Emby Premiere subscription." }