';
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index ed9937dff..8191bf6ef 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -832,7 +832,7 @@
return "itembynamedetails.html?id=" + id + contextSuffix;
}
if (item.Type == "Recording") {
- return "livetvrecording.html?id=" + id + contextSuffix;
+ return "itemdetails.html?id=" + id;
}
if (item.Type == "MusicArtist") {
diff --git a/dashboard-ui/scripts/livetvguideprovider-scd.js b/dashboard-ui/scripts/livetvguideprovider-scd.js
index a9a5ff77d..b0e7f9c69 100644
--- a/dashboard-ui/scripts/livetvguideprovider-scd.js
+++ b/dashboard-ui/scripts/livetvguideprovider-scd.js
@@ -4,6 +4,8 @@
function reload(page, providerId) {
+ Dashboard.showLoadingMsg();
+
ApiClient.getNamedConfiguration("livetv").done(function (config) {
var info = config.ListingProviders.filter(function (i) {
@@ -12,15 +14,64 @@
listingsId = info.ListingsId;
$('#selectListing', page).val(info.ListingsId || '').selectmenu('refresh');
- $('#selectCountry', page).val(info.Country || '').selectmenu('refresh');
- page.querySelector('.txtZipCode').value = info.ZipCode || '';
- $(page.querySelector('.txtZipCode')).trigger('change');
page.querySelector('.txtUser').value = info.Username || '';
page.querySelector('.txtPass').value = info.Username || '';
+ page.querySelector('.txtZipCode').value = info.ZipCode || '';
+
+ setCountry(page, info);
});
}
+ function setCountry(page, info) {
+
+ ApiClient.getJSON(ApiClient.getUrl('LiveTv/ListingProviders/SchedulesDirect/Countries')).done(function (result) {
+
+ var countryList = [];
+ var i, length;
+
+ for (var region in result) {
+ var countries = result[region];
+
+ if (countries.length && region !== 'ZZZ') {
+ for (i = 0, length = countries.length; i < length; i++) {
+ countryList.push({
+ name: countries[i].fullName,
+ value: countries[i].shortName
+ });
+ }
+ }
+ }
+
+ countryList.sort(function (a, b) {
+ if (a.name > b.name) {
+ return 1;
+ }
+ if (a.name < b.name) {
+ return -1;
+ }
+ // a must be equal to b
+ return 0;
+ });
+
+ $('#selectCountry', page).html(countryList.map(function (c) {
+
+ return '
';
+
+ }).join('')).val(info.Country || '').selectmenu('refresh');
+
+ $(page.querySelector('.txtZipCode')).trigger('change');
+
+ }).fail(function () {
+
+ Dashboard.alert({
+ message: Globalize.translate('ErrorGettingTvLineups')
+ });
+ });
+
+ Dashboard.hideLoadingMsg();
+ }
+
function submitLoginForm(page) {
Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/scripts/livetvrecording.js b/dashboard-ui/scripts/livetvrecording.js
deleted file mode 100644
index 95adfd632..000000000
--- a/dashboard-ui/scripts/livetvrecording.js
+++ /dev/null
@@ -1,130 +0,0 @@
-(function ($, document) {
-
- var currentItem;
-
- function deleteRecording() {
-
- Dashboard.confirm(Globalize.translate('MessageConfirmRecordingDeletion'), Globalize.translate('HeaderConfirmRecordingDeletion'), function (result) {
-
- if (result) {
-
- Dashboard.showLoadingMsg();
-
- ApiClient.deleteLiveTvRecording(currentItem.Id).done(function () {
-
- Dashboard.alert(Globalize.translate('MessageRecordingDeleted'));
-
- Dashboard.navigate('livetvrecordings.html');
- });
- }
-
- });
- }
-
- function play() {
-
- var userdata = currentItem.UserData || {};
-
- var mediaType = currentItem.MediaType;
-
- LibraryBrowser.showPlayMenu(null, currentItem.Id, currentItem.Type, false, mediaType, userdata.PlaybackPositionTicks);
- }
-
- function renderRecording(page, item) {
-
- currentItem = item;
- var context = 'livetv';
-
- var name = item.Name;
-
- $('#itemImage', page).html(LibraryBrowser.getDetailImageHtml(item));
-
- Dashboard.setPageTitle(name);
-
- $('.itemName', page).html(name);
-
- $('.itemEpisodeName', page).html(item.EpisodeTitle || '');
-
- $('.itemCommunityRating', page).html(LibraryBrowser.getRatingHtml(item));
-
- $('.userDataIcons', page).html(LibraryBrowser.getUserDataIconsHtml(item));
-
- LibraryBrowser.renderGenres($('.itemGenres', page), item, context);
- LibraryBrowser.renderOverview(page.querySelectorAll('.itemOverview'), item);
- $('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(item));
-
- LiveTvHelpers.renderMiscProgramInfo($('.miscTvProgramInfo', page), item);
-
- $(page).trigger('displayingitem', [{
-
- item: item,
- context: 'livetv'
- }]);
-
- $('.recordingStatus', page).html('Status: ' + item.Status);
-
- if (MediaController.canPlay(item)) {
- $('#playButtonContainer', page).show();
- } else {
- $('#playButtonContainer', page).hide();
- }
-
- if (item.CanDelete) {
- $('#deleteButtonContainer', page).show();
- } else {
- $('#deleteButtonContainer', page).hide();
- }
-
- LiveTvHelpers.renderOriginalAirDate($('.airDate', page), item);
-
- Dashboard.hideLoadingMsg();
-
- Dashboard.getCurrentUser().done(function(user) {
-
- if (SyncManager.isAvailable(item, user)) {
- $('.btnSync', page).removeClass('hide');
- } else {
- $('.btnSync', page).addClass('hide');
- }
- });
- }
-
- function reload(page) {
-
- Dashboard.showLoadingMsg();
-
- var id = getParameterByName('id');
-
- ApiClient.getLiveTvRecording(id, Dashboard.getCurrentUserId()).done(function (result) {
-
- renderRecording(page, result);
-
- });
- }
-
- $(document).on('pageinitdepends', "#liveTvRecordingPage", function () {
-
- var page = this;
-
- $('.btnDelete', page).on('click', deleteRecording);
- $('.btnPlay', page).on('click', play);
-
- $('.btnSync', page).on('click', function () {
-
- SyncManager.showMenu({
- items: [currentItem]
- });
- });
-
- }).on('pagebeforeshowready', "#liveTvRecordingPage", function () {
-
- var page = this;
-
- reload(page);
-
- }).on('pagebeforehide', "#liveTvRecordingPage", function () {
-
- currentItem = null;
- });
-
-})(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index 600738d24..85346f036 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -88,8 +88,6 @@
}).done(function (result) {
renderRecordings($('#latestRecordings', page), result.Items);
-
- LibraryBrowser.setLastRefreshed(page);
});
ApiClient.getLiveTvRecordingGroups({
diff --git a/dashboard-ui/scripts/livetvtimers.js b/dashboard-ui/scripts/livetvtimers.js
index c0691a78f..5b088c427 100644
--- a/dashboard-ui/scripts/livetvtimers.js
+++ b/dashboard-ui/scripts/livetvtimers.js
@@ -103,8 +103,6 @@
ApiClient.getLiveTvTimers().done(function (result) {
renderTimers(page, result.Items);
-
- LibraryBrowser.setLastRefreshed(page);
});
}
diff --git a/dashboard-ui/scripts/syncactivity.js b/dashboard-ui/scripts/syncactivity.js
index 55a2ed125..f35e031b9 100644
--- a/dashboard-ui/scripts/syncactivity.js
+++ b/dashboard-ui/scripts/syncactivity.js
@@ -296,9 +296,9 @@
Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) {
if (pluginSecurityInfo.IsMBSupporter || !AppInfo.enableSupporterMembership) {
- $('.syncPromotion', page).hide();
+ $('.supporterPromotionContainer', hide).show();
} else {
- $('.syncPromotion', page).show();
+ $('.supporterPromotionContainer', page).show();
}
});
diff --git a/dashboard-ui/syncactivity.html b/dashboard-ui/syncactivity.html
index 176f5a406..a67233107 100644
--- a/dashboard-ui/syncactivity.html
+++ b/dashboard-ui/syncactivity.html
@@ -20,18 +20,20 @@