diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html index dc584e2f92..7d7f360dc3 100644 --- a/dashboard-ui/addplugin.html +++ b/dashboard-ui/addplugin.html @@ -20,7 +20,7 @@ diff --git a/dashboard-ui/appservices.html b/dashboard-ui/appservices.html index cc47d93e87..d2708318d7 100644 --- a/dashboard-ui/appservices.html +++ b/dashboard-ui/appservices.html @@ -20,7 +20,7 @@
${TabTuners} - ${TabGuide} + ${TabGuide} ${TabSettings} ${TabExternalServices}
diff --git a/dashboard-ui/bower_components/paper-styles/.bower.json b/dashboard-ui/bower_components/paper-styles/.bower.json index 7765e262a2..04e2128c81 100644 --- a/dashboard-ui/bower_components/paper-styles/.bower.json +++ b/dashboard-ui/bower_components/paper-styles/.bower.json @@ -1,6 +1,6 @@ { "name": "paper-styles", - "version": "1.0.10", + "version": "1.0.11", "description": "Common (global) styles for Material Design elements.", "authors": [ "The Polymer Authors" @@ -28,11 +28,11 @@ "devDependencies": { "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "_release": "1.0.10", + "_release": "1.0.11", "_resolution": { "type": "version", - "tag": "v1.0.10", - "commit": "f1a79cd7916f7870a59918911062007bbc07867e" + "tag": "v1.0.11", + "commit": "347542e9ebe3e6e5f0830ee10e1c20c12956ff2c" }, "_source": "git://github.com/PolymerElements/paper-styles.git", "_target": "^1.0.0", diff --git a/dashboard-ui/bower_components/paper-styles/bower.json b/dashboard-ui/bower_components/paper-styles/bower.json index 4f7e0ede0d..7d28f69a6e 100644 --- a/dashboard-ui/bower_components/paper-styles/bower.json +++ b/dashboard-ui/bower_components/paper-styles/bower.json @@ -1,6 +1,6 @@ { "name": "paper-styles", - "version": "1.0.10", + "version": "1.0.11", "description": "Common (global) styles for Material Design elements.", "authors": [ "The Polymer Authors" diff --git a/dashboard-ui/bower_components/paper-styles/color.html b/dashboard-ui/bower_components/paper-styles/color.html index f0be341822..d907e68c01 100644 --- a/dashboard-ui/bower_components/paper-styles/color.html +++ b/dashboard-ui/bower_components/paper-styles/color.html @@ -268,9 +268,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN --paper-orange-a400: #ff9100; --paper-orange-a700: #ff6500; - --paper-deep-orange-50: #ff5722; - --paper-deep-orange-100: #fbe9e7; - --paper-deep-orange-200: #ffccbc; + --paper-deep-orange-50: #fbe9e7; + --paper-deep-orange-100: #ffccbc; + --paper-deep-orange-200: #ffab91; --paper-deep-orange-300: #ff8a65; --paper-deep-orange-400: #ff7043; --paper-deep-orange-500: #ff5722; diff --git a/dashboard-ui/livetvguidesettings.html b/dashboard-ui/livetvguidesettings.html new file mode 100644 index 0000000000..f5dae5d888 --- /dev/null +++ b/dashboard-ui/livetvguidesettings.html @@ -0,0 +1,71 @@ + + + + ${TitleLiveTV} + + +
+ +
+
+ +
+ ${TabTuners} + ${TabGuide} + ${TabSettings} + ${TabExternalServices} +
+ +
+ +
+ +

${HeaderGuideProviders}

+

${AddGuideProviderHelp}

+ ${ButtonAdd} +
+
+ + + +

${HeaderAddProvider}

+ +
+
+
+ + +
Schedules Direct
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ ${ButtonCancel} + +
+
+ +
+ +
+
+
+
+ + diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html index 332c0fd01a..9499c26849 100644 --- a/dashboard-ui/livetvsettings.html +++ b/dashboard-ui/livetvsettings.html @@ -11,7 +11,7 @@
${TabTuners} - ${TabGuide} + ${TabGuide} ${TabSettings} ${TabExternalServices}
diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html index 54c8a41e7d..19f821281d 100644 --- a/dashboard-ui/livetvstatus.html +++ b/dashboard-ui/livetvstatus.html @@ -11,7 +11,7 @@
${TabTuners} - ${TabGuide} + ${TabGuide} ${TabSettings} ${TabExternalServices}
diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html index d4732bff97..bfb9cbdbb0 100644 --- a/dashboard-ui/mypreferenceslanguages.html +++ b/dashboard-ui/mypreferenceslanguages.html @@ -81,25 +81,6 @@

diff --git a/dashboard-ui/scripts/homenextup.js b/dashboard-ui/scripts/homenextup.js index 0d20399b57..e73c81d388 100644 --- a/dashboard-ui/scripts/homenextup.js +++ b/dashboard-ui/scripts/homenextup.js @@ -28,8 +28,6 @@ EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; - query.ParentId = LibraryMenu.getTopParentId(); - ApiClient.getNextUpEpisodes(query).done(function (result) { if (result.Items.length) { diff --git a/dashboard-ui/scripts/homeupcoming.js b/dashboard-ui/scripts/homeupcoming.js index f40451e509..0d67059a59 100644 --- a/dashboard-ui/scripts/homeupcoming.js +++ b/dashboard-ui/scripts/homeupcoming.js @@ -16,16 +16,6 @@ EnableImageTypes: "Primary,Backdrop,Banner,Thumb" }; - query.ParentId = LibraryMenu.getTopParentId(); - - var context = ''; - - if (query.ParentId) { - - context = 'tv'; - - } - ApiClient.getJSON(ApiClient.getUrl("Shows/Upcoming", query)).done(function (result) { var items = result.Items; diff --git a/dashboard-ui/scripts/livetvguidesettings.js b/dashboard-ui/scripts/livetvguidesettings.js new file mode 100644 index 0000000000..dc8626ed29 --- /dev/null +++ b/dashboard-ui/scripts/livetvguidesettings.js @@ -0,0 +1,111 @@ +(function ($, document, window) { + + function loadPage(page) { + + ApiClient.getNamedConfiguration("livetv").done(function (config) { + + renderProviders(page, config.ListingProviders); + Dashboard.hideLoadingMsg(); + }); + } + + function renderProviders(page, providers) { + + var html = ''; + + html += ''; + + var elem = $('.providerList', page).html(html).trigger('create'); + + $('.btnDelete', elem).on('click', function () { + + var id = this.getAttribute('data-id'); + + deleteProvider(page, id); + }); + } + + function deleteProvider(page, id) { + + var message = Globalize.translate('MessageConfirmDeleteGuideProvider'); + + Dashboard.confirm(message, Globalize.translate('HeaderDeleteProvider'), function (confirmResult) { + + if (confirmResult) { + + Dashboard.showLoadingMsg(); + + ApiClient.ajax({ + type: "DELETE", + url: ApiClient.getUrl('LiveTv/TunerHosts', { + Id: id + }) + + }).done(function () { + + loadPage(page); + }); + } + }); + } + + function submitAddProviderForm(page) { + + page.querySelector('.dlgAddProvider').close(); + Dashboard.showLoadingMsg(); + + ApiClient.ajax({ + type: "POST", + url: ApiClient.getUrl('LiveTv/TunerHosts'), + data: JSON.stringify({ + Type: $('#selectTunerDeviceType', page).val(), + Url: $('#txtDevicePath', page).val() + }), + contentType: "application/json" + + }).done(function () { + + loadPage(page); + }); + + } + + $(document).on('pageinitdepends', "#liveTvGuideSettingsPage", function () { + + var page = this; + + $('.btnAddProvider', page).on('click', function () { + page.querySelector('.dlgAddProvider').open(); + }); + + $('.formAddProvider', page).on('submit', function () { + submitAddProviderForm(page); + return false; + }); + + }).on('pageshowready', "#liveTvGuideSettingsPage", function () { + + var page = this; + + loadPage(page); + }); + +})(jQuery, document, window); diff --git a/dashboard-ui/scripts/livetvstatus.js b/dashboard-ui/scripts/livetvstatus.js index 52309d0189..63235d502d 100644 --- a/dashboard-ui/scripts/livetvstatus.js +++ b/dashboard-ui/scripts/livetvstatus.js @@ -291,7 +291,7 @@ page.querySelector('.dlgAddDevice').open(); }); - $('.dlgAddDevice', page).on('submit', function () { + $('.formAddDevice', page).on('submit', function () { submitAddDeviceForm(page); return false; }); diff --git a/dashboard-ui/scripts/mypreferenceslanguages.js b/dashboard-ui/scripts/mypreferenceslanguages.js index f06ff23544..fb146deeed 100644 --- a/dashboard-ui/scripts/mypreferenceslanguages.js +++ b/dashboard-ui/scripts/mypreferenceslanguages.js @@ -33,7 +33,15 @@ $('#chkEnableChromecastAc3', page).checked(AppSettings.enableChromecastAc3()).checkboxradio("refresh"); $('#chkExternalVideoPlayer', page).checked(AppSettings.enableExternalPlayers()).checkboxradio("refresh"); - $('#selectMaxBitrate', page).val(AppSettings.maxStreamingBitrate()).selectmenu("refresh"); + + var bitrateOptions = MediaPlayer.getVideoQualityOptions().map(function (i) { + + return ''; + + }).join(''); + $('#selectMaxBitrate', page).html(bitrateOptions).val(AppSettings.maxStreamingBitrate()).selectmenu("refresh"); + + $('#selectMaxChromecastBitrate', page).val(AppSettings.maxChromecastBitrate()).selectmenu("refresh"); Dashboard.hideLoadingMsg(); diff --git a/dashboard-ui/scripts/pluginspage.js b/dashboard-ui/scripts/pluginspage.js index 4f928dcfc0..8e7e242d07 100644 --- a/dashboard-ui/scripts/pluginspage.js +++ b/dashboard-ui/scripts/pluginspage.js @@ -29,7 +29,7 @@ }); } - function getPluginCardHtml(plugin, getTextLinesCallback, pluginConfigurationPages) { + function getPluginCardHtml(plugin, pluginConfigurationPages) { var configPage = $.grep(pluginConfigurationPages, function (pluginConfigurationPage) { return pluginConfigurationPage.PluginId == plugin.Id; @@ -96,10 +96,6 @@ html += plugin.Version; html += ""; - if (getTextLinesCallback) { - html += getTextLinesCallback(plugin); - } - // cardFooter html += ""; @@ -112,16 +108,16 @@ return html; } - function renderPlugins(page, plugins, getTextLinesCallback) { + function renderPlugins(page, plugins) { ApiClient.getJSON(ApiClient.getUrl("dashboard/configurationpages") + "?pageType=PluginConfiguration").done(function (configPages) { - populateList(page, plugins, getTextLinesCallback, configPages); + populateList(page, plugins, configPages); }); } - function populateList(page, plugins, getTextLinesCallback, pluginConfigurationPages) { + function populateList(page, plugins, pluginConfigurationPages) { plugins = plugins.sort(function (plugin1, plugin2) { @@ -130,7 +126,7 @@ }); var html = plugins.map(function (p) { - return getPluginCardHtml(p, getTextLinesCallback, pluginConfigurationPages); + return getPluginCardHtml(p, pluginConfigurationPages); }).join(''); diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html index 4657953af1..f99eee76f0 100644 --- a/dashboard-ui/vulcanize-out.html +++ b/dashboard-ui/vulcanize-out.html @@ -7261,9 +7261,9 @@ this._removeChildren(); --paper-orange-a400: #ff9100; --paper-orange-a700: #ff6500; - --paper-deep-orange-50: #ff5722; - --paper-deep-orange-100: #fbe9e7; - --paper-deep-orange-200: #ffccbc; + --paper-deep-orange-50: #fbe9e7; + --paper-deep-orange-100: #ffccbc; + --paper-deep-orange-200: #ffab91; --paper-deep-orange-300: #ff8a65; --paper-deep-orange-400: #ff7043; --paper-deep-orange-500: #ff5722;