diff --git a/dashboard-ui/scripts/livetvchannel.js b/dashboard-ui/scripts/livetvchannel.js
index c350c30e43..827bd94bd2 100644
--- a/dashboard-ui/scripts/livetvchannel.js
+++ b/dashboard-ui/scripts/livetvchannel.js
@@ -21,12 +21,12 @@
html += '';
- html += ' | ';
+ html += ' | ';
html += 'Date | ';
html += 'Start | ';
- html += 'End | ';
+ html += 'End | ';
html += 'Name | ';
- html += 'Genre | ';
+ html += 'Genre | ';
html += '
';
@@ -36,7 +36,7 @@
html += '';
- html += '';
+ html += ' | ';
if (program.RecordingId) {
html += '';
@@ -60,10 +60,19 @@
html += ' | ' + LiveTvHelpers.getDisplayTime(program.StartDate) + ' | ';
- html += '' + LiveTvHelpers.getDisplayTime(program.EndDate) + ' | ';
+ html += '' + LiveTvHelpers.getDisplayTime(program.EndDate) + ' | ';
- html += '' + (program.Name || '') + ' | ';
- html += '' + program.Genres.join(' / ') + ' | ';
+ html += '';
+
+ if (program.Name) {
+ //html += '';
+ html += program.Name;
+ //html += '';
+ }
+
+ html += ' | ';
+
+ html += '' + program.Genres.join(' / ') + ' | ';
html += '
';
}
@@ -90,7 +99,7 @@
function loadPrograms(page) {
ApiClient.getLiveTvPrograms({
-
+
ChannelIds: currentItem.Id,
UserId: Dashboard.getCurrentUserId()
@@ -155,7 +164,7 @@
window.LiveTvHelpers = {
getDisplayTime: function (date) {
-
+
try {
date = parseISO8601Date(date, { toLocal: true });
diff --git a/dashboard-ui/scripts/livetvrecording.js b/dashboard-ui/scripts/livetvrecording.js
index 44ccff165d..ac1ee575de 100644
--- a/dashboard-ui/scripts/livetvrecording.js
+++ b/dashboard-ui/scripts/livetvrecording.js
@@ -33,7 +33,7 @@
Dashboard.setPageTitle(name);
$('.itemName', page).html(name);
- $('.itemChannelNumber', page).html('' + item.ChannelName + '').trigger('create');
+ $('.itemChannelNumber', page).html('Channel: ' + item.ChannelName + '').trigger('create');
$('.itemEpisodeName', page).html(item.EpisodeTitle);
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index 0b2f69d4fb..a7b7f034b8 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -36,10 +36,6 @@
html += '';
html += '';
html += recording.Name;
-
- if (recording.EpisodeTitle) {
- html += " " + recording.EpisodeTitle;
- }
html += '';
html += ' | ';
diff --git a/dashboard-ui/scripts/livetvseriestimer.js b/dashboard-ui/scripts/livetvseriestimer.js
index 6462626ffc..a927bd561e 100644
--- a/dashboard-ui/scripts/livetvseriestimer.js
+++ b/dashboard-ui/scripts/livetvseriestimer.js
@@ -33,6 +33,10 @@
$('#txtRequiredPrePaddingSeconds', page).val(item.RequiredPrePaddingSeconds);
$('#txtRequiredPostPaddingSeconds', page).val(item.RequiredPostPaddingSeconds);
+ $('#chkNewOnly', page).checked(item.RecordNewOnly).checkboxradio('refresh');
+ $('#chkAllChannels', page).checked(item.RecordAnyChannel).checkboxradio('refresh');
+ $('#chkAnyTime', page).checked(item.RecordAnyTime).checkboxradio('refresh');
+
var channelHtml = '';
if (item.RecurrenceType == 'NewProgramEventsAllChannels' || item.RecurrenceType == 'AllProgramEventsAllChannels') {
@@ -44,8 +48,6 @@
$('.channel', page).html('Channel: ' + channelHtml).trigger('create');
- $('#selectSeriesType', page).val(item.RecurrenceType).selectmenu('refresh').trigger('change');
-
selectDays(page, item.Days);
@@ -99,7 +101,10 @@
item.RequestedPostPaddingSeconds = $('#txtRequestedPostPaddingSeconds', form).val();
item.RequiredPrePaddingSeconds = $('#txtRequiredPrePaddingSeconds', form).val();
item.RequiredPostPaddingSeconds = $('#txtRequiredPostPaddingSeconds', form).val();
- item.RecurrenceType = $('#selectSeriesType', form).val();
+
+ item.RecordNewOnly = $('#chkNewOnly', form).checked();
+ item.RecordAnyChannel = $('#chkAllChannels', form).checked();
+ item.RecordAnyTime = $('#chkAnyTime', form).checked();
item.Days = getDays(form);
@@ -136,16 +141,6 @@
});
- $('#selectSeriesType', page).on('change', function () {
-
- if (this.value == 'Manual') {
- $('#fldDays', page).show();
- } else {
- $('#fldDays', page).hide();
- }
-
- });
-
}).on('pagebeforeshow', "#liveTvSeriesTimerPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/livetvseriestimers.js b/dashboard-ui/scripts/livetvseriestimers.js
index da6f137bd9..59f778d2c5 100644
--- a/dashboard-ui/scripts/livetvseriestimers.js
+++ b/dashboard-ui/scripts/livetvseriestimers.js
@@ -32,8 +32,8 @@
html += ' | ';
html += 'Name | ';
html += 'Channel | ';
- html += 'Days | ';
- html += 'Time | ';
+ html += 'Days | ';
+ html += 'Time | ';
html += '';
@@ -61,7 +61,7 @@
}
html += '';
- html += '';
+ html += ' | ';
if (timer.DayPattern) {
html += timer.DayPattern;
@@ -74,7 +74,7 @@
html += ' | ';
- html += '' + LiveTvHelpers.getDisplayTime(timer.StartDate) + ' | ';
+ html += '' + LiveTvHelpers.getDisplayTime(timer.StartDate) + ' | ';
html += '';
}
diff --git a/dashboard-ui/scripts/livetvtimers.js b/dashboard-ui/scripts/livetvtimers.js
index fbd42aa7f6..42eb07afed 100644
--- a/dashboard-ui/scripts/livetvtimers.js
+++ b/dashboard-ui/scripts/livetvtimers.js
@@ -78,7 +78,19 @@
html += '' + minutes.toFixed(0) + ' mins | ';
- html += '' + (timer.Status || '') + ' | ';
+ html += '';
+
+ if (timer.Status == 'ConflictedNotOk' || timer.Status == 'Error') {
+
+ html += '';
+ html += timer.Status;
+ html += '';
+
+ } else {
+ html += timer.Status;
+ }
+
+ html += ' | ';
html += '';
|