';
html += '';
html += program.Name;
diff --git a/dashboard-ui/scripts/livetvnewrecording.js b/dashboard-ui/scripts/livetvnewrecording.js
index 994930fadc..9963b74a75 100644
--- a/dashboard-ui/scripts/livetvnewrecording.js
+++ b/dashboard-ui/scripts/livetvnewrecording.js
@@ -163,7 +163,7 @@
var programId = getParameterByName('programid');
- Dashboard.navigate('livetvprogram.html?id=' + programId);
+ Dashboard.navigate('itemdetails.html?id=' + programId);
});
diff --git a/dashboard-ui/scripts/livetvprogram.js b/dashboard-ui/scripts/livetvprogram.js
deleted file mode 100644
index 5a3aee6bc6..0000000000
--- a/dashboard-ui/scripts/livetvprogram.js
+++ /dev/null
@@ -1,135 +0,0 @@
-(function ($, document) {
-
- var currentItem;
-
- function deleteTimer(page, id) {
-
- Dashboard.confirm(Globalize.translate('MessageConfirmRecordingCancellation'), Globalize.translate('HeaderConfirmRecordingCancellation'), function (result) {
-
- if (result) {
-
- Dashboard.showLoadingMsg();
-
- ApiClient.cancelLiveTvTimer(id).done(function () {
-
- Dashboard.alert(Globalize.translate('MessageRecordingCancelled'));
-
- reload(page);
- });
- }
-
- });
- }
-
- function reload(page) {
-
- Dashboard.showLoadingMsg();
-
- ApiClient.getLiveTvProgram(getParameterByName('id'), Dashboard.getCurrentUserId()).done(function (item) {
-
- var context = 'livetv';
- currentItem = item;
-
- 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);
-
- Events.trigger(page, 'displayingitem', [{
-
- item: item,
- context: 'livetv'
- }]);
-
- if (item.TimerId) {
- $('#cancelRecordingButtonContainer', page).show();
- } else {
- $('#cancelRecordingButtonContainer', page).hide();
- }
-
- if (!item.TimerId && !item.SeriesTimerId) {
- $('#recordButtonContainer', page).show();
- } else {
- $('#recordButtonContainer', page).hide();
- }
-
- var startDateLocal = parseISO8601Date(item.StartDate, { toLocal: true });
- var endDateLocal = parseISO8601Date(item.EndDate, { toLocal: true });
- var now = new Date();
-
- if (now >= startDateLocal && now < endDateLocal) {
- $('#playButtonContainer', page).show();
- } else {
- $('#playButtonContainer', page).hide();
- }
-
- Dashboard.getCurrentUser().done(function (user) {
-
- if (user.Policy.IsAdministrator && item.LocationType !== "Offline") {
- $('#editButtonContainer', page).show();
- } else {
- $('#editButtonContainer', page).hide();
- }
-
- });
-
- LiveTvHelpers.renderOriginalAirDate($('.airDate', page), item);
-
- Dashboard.hideLoadingMsg();
- });
- }
-
- $(document).on('pageinitdepends', "#liveTvProgramPage", function () {
-
- var page = this;
-
- $('.btnRecord', page).on('click', function() {
-
- var id = getParameterByName('id');
-
- Dashboard.navigate('livetvnewrecording.html?programid=' + id);
-
- });
-
- $('.btnPlay', page).on('click', function () {
-
- ApiClient.getLiveTvChannel(currentItem.ChannelId, Dashboard.getCurrentUserId()).done(function (channel) {
-
- var userdata = channel.UserData || {};
-
- LibraryBrowser.showPlayMenu(null, channel.Id, channel.Type, false, channel.MediaType, userdata.PlaybackPositionTicks);
- });
- });
-
- $('.btnCancelRecording', page).on('click', function () {
-
- deleteTimer(page, currentItem.TimerId);
- });
-
- }).on('pagebeforeshowready', "#liveTvProgramPage", function () {
-
- var page = this;
-
- reload(page);
-
- }).on('pagebeforehide', "#liveTvProgramPage", function () {
-
- currentItem = null;
- });
-
-})(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/livetvstatus.js b/dashboard-ui/scripts/livetvstatus.js
index 448d2fd7f0..4164989848 100644
--- a/dashboard-ui/scripts/livetvstatus.js
+++ b/dashboard-ui/scripts/livetvstatus.js
@@ -387,7 +387,7 @@
var menuItems = [];
menuItems.push({
- name: 'Schedules Direct (USA / Canada)',
+ name: 'Schedules Direct',
id: 'SchedulesDirect'
});
diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js
index 99b9de4f68..e5333a22a1 100644
--- a/dashboard-ui/scripts/loginpage.js
+++ b/dashboard-ui/scripts/loginpage.js
@@ -63,9 +63,9 @@
$('.manualLoginForm', page).show();
if (focusPassword) {
- $('#txtManualPassword', page).focus();
+ $('#txtManualPassword input', page).focus();
} else {
- $('#txtManualName', page).focus();
+ $('#txtManualName input', page).focus();
}
if (showCancel) {