From 736a8233a35dc76d12056174787b6bba37e9248b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 19 Dec 2013 16:51:32 -0500 Subject: [PATCH] added IHasImages and IHasUserData --- dashboard-ui/addplugin.html | 4 +-- dashboard-ui/advancedmetadata.html | 4 +-- dashboard-ui/librarysettings.html | 10 +++--- dashboard-ui/livetvchannel.html | 4 +-- dashboard-ui/livetvchannels.html | 4 +-- dashboard-ui/livetvguide.html | 4 +-- dashboard-ui/livetvnewrecording.html | 16 +++++----- dashboard-ui/livetvrecording.html | 4 +-- dashboard-ui/livetvrecordings.html | 4 +-- dashboard-ui/livetvseriestimer.html | 10 +++--- dashboard-ui/livetvseriestimers.html | 4 +-- dashboard-ui/livetvtimer.html | 24 +++++++++------ dashboard-ui/livetvtimers.html | 4 +-- dashboard-ui/metadataimageextraction.html | 4 +-- dashboard-ui/metadataimages.html | 4 +-- dashboard-ui/scripts/librarybrowser.js | 14 +++++++++ dashboard-ui/scripts/livetvnewrecording.js | 26 ++++++++-------- dashboard-ui/scripts/livetvrecordings.js | 2 +- dashboard-ui/scripts/livetvseriestimer.js | 12 ++++---- dashboard-ui/scripts/livetvseriestimers.js | 4 +-- dashboard-ui/scripts/livetvtimer.js | 36 ++++++++++++++++------ dashboard-ui/scripts/livetvtimers.js | 4 +-- dashboard-ui/scripts/pluginupdatespage.js | 8 ++--- 23 files changed, 121 insertions(+), 89 deletions(-) diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html index 9bb1694c9..7325c10ed 100644 --- a/dashboard-ui/addplugin.html +++ b/dashboard-ui/addplugin.html @@ -11,7 +11,7 @@

Plugin Catalog

-
+

@@ -105,7 +105,7 @@ diff --git a/dashboard-ui/advancedmetadata.html b/dashboard-ui/advancedmetadata.html index 633da1534..a08b7a6d6 100644 --- a/dashboard-ui/advancedmetadata.html +++ b/dashboard-ui/advancedmetadata.html @@ -21,12 +21,12 @@
  • -
    If enabled, movies and people will be updated automatically as they are updated on the TheMovieDB.org.
    +
    If enabled, movies and people will be updated automatically as they are updated on the TheMovieDB.org. This may replace some existing metadata.
  • -
    If enabled, tv series and episodes will be updated automatically as they are updated on the TheTVDB.com.
    +
    If enabled, tv series and episodes will be updated automatically as they are updated on the TheTVDB.com. This may replace some existing metadata.
  • @@ -35,13 +35,13 @@
  • - +
  • - -
    • diff --git a/dashboard-ui/livetvchannel.html b/dashboard-ui/livetvchannel.html index d0abd2692..bc16e7ddc 100644 --- a/dashboard-ui/livetvchannel.html +++ b/dashboard-ui/livetvchannel.html @@ -9,8 +9,8 @@ Guide Channels Recordings - Upcoming Recordings - Series Recordings + Schedule + Series
    diff --git a/dashboard-ui/livetvchannels.html b/dashboard-ui/livetvchannels.html index be6dff156..b54e9820f 100644 --- a/dashboard-ui/livetvchannels.html +++ b/dashboard-ui/livetvchannels.html @@ -9,8 +9,8 @@ Guide Channels Recordings - Upcoming Recordings - Series Recordings + Schedule + Series
    diff --git a/dashboard-ui/livetvguide.html b/dashboard-ui/livetvguide.html index afe0beefc..880a26aee 100644 --- a/dashboard-ui/livetvguide.html +++ b/dashboard-ui/livetvguide.html @@ -9,8 +9,8 @@ Guide Channels Recordings - Upcoming Recordings - Series Recordings + Schedule + Series
    diff --git a/dashboard-ui/livetvnewrecording.html b/dashboard-ui/livetvnewrecording.html index 3c101634e..9b676bad8 100644 --- a/dashboard-ui/livetvnewrecording.html +++ b/dashboard-ui/livetvnewrecording.html @@ -9,11 +9,11 @@ Guide Channels Recordings - Upcoming Recordings - Series Recordings + Schedule + Series
    - +

    @@ -80,8 +80,8 @@

    • - - + +
    • @@ -91,8 +91,8 @@
    • - - + +
    • @@ -116,7 +116,7 @@
    diff --git a/dashboard-ui/livetvrecording.html b/dashboard-ui/livetvrecording.html index a13136c3f..da81bd50b 100644 --- a/dashboard-ui/livetvrecording.html +++ b/dashboard-ui/livetvrecording.html @@ -9,8 +9,8 @@ Guide Channels Recordings - Upcoming Recordings - Series Recordings + Schedule + Series
    diff --git a/dashboard-ui/livetvrecordings.html b/dashboard-ui/livetvrecordings.html index 19f5e0560..cf6a4c12f 100644 --- a/dashboard-ui/livetvrecordings.html +++ b/dashboard-ui/livetvrecordings.html @@ -9,8 +9,8 @@ Guide Channels Recordings - Upcoming Recordings - Series Recordings + Schedule + Series
    diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html index ae58e9ba7..b4e756c6a 100644 --- a/dashboard-ui/livetvseriestimer.html +++ b/dashboard-ui/livetvseriestimer.html @@ -9,8 +9,8 @@ Guide Channels Recordings - Upcoming Recordings - Series Recordings + Schedule + Series
    @@ -73,7 +73,7 @@
    • - +
    • @@ -83,8 +83,8 @@
    • - - + +
    • diff --git a/dashboard-ui/livetvseriestimers.html b/dashboard-ui/livetvseriestimers.html index e1481db2e..43675704e 100644 --- a/dashboard-ui/livetvseriestimers.html +++ b/dashboard-ui/livetvseriestimers.html @@ -9,8 +9,8 @@ Guide Channels Recordings - Upcoming Recordings - Series Recordings + Schedule + Series

    diff --git a/dashboard-ui/livetvtimer.html b/dashboard-ui/livetvtimer.html index c4dd78702..1c41c4d11 100644 --- a/dashboard-ui/livetvtimer.html +++ b/dashboard-ui/livetvtimer.html @@ -9,19 +9,23 @@ Guide Channels Recordings - Upcoming Recordings - Series Recordings + Schedule + Series
    -

    - -

    -

    +

    +

    +

    + +

    +

    +

    +

    - Cancel Timer + Cancel Recording

    @@ -34,7 +38,7 @@
    • - +
    • @@ -44,8 +48,8 @@
    • - - + +
    • diff --git a/dashboard-ui/livetvtimers.html b/dashboard-ui/livetvtimers.html index ea3f73724..dded0d93c 100644 --- a/dashboard-ui/livetvtimers.html +++ b/dashboard-ui/livetvtimers.html @@ -9,8 +9,8 @@ Guide Channels Recordings - Upcoming Recordings - Series Recordings + Schedule + Series

    diff --git a/dashboard-ui/metadataimageextraction.html b/dashboard-ui/metadataimageextraction.html index b3c218185..ec9d82552 100644 --- a/dashboard-ui/metadataimageextraction.html +++ b/dashboard-ui/metadataimageextraction.html @@ -41,10 +41,10 @@
  • - -
    • diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html index 402951108..d8069691e 100644 --- a/dashboard-ui/metadataimages.html +++ b/dashboard-ui/metadataimages.html @@ -135,10 +135,10 @@
    • - -
      • diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 7c4b129bc..87a6e50e7 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1724,6 +1724,20 @@ type: "Primary" }); } + else if (item.Type == "Recording") { + url = ApiClient.getUrl("LiveTV/Recordings/" + item.Id + "/Images/Primary", { + maxheight: imageHeight, + tag: imageTags.Primary, + type: "Primary" + }); + } + else if (item.Type == "Program") { + url = ApiClient.getUrl("LiveTV/Programs/" + item.Id + "/Images/Primary", { + maxheight: imageHeight, + tag: imageTags.Primary, + type: "Primary" + }); + } else if (item.Type == "Person") { url = ApiClient.getPersonImageUrl(item.Name, { maxheight: imageHeight, diff --git a/dashboard-ui/scripts/livetvnewrecording.js b/dashboard-ui/scripts/livetvnewrecording.js index d51d18a54..19796c666 100644 --- a/dashboard-ui/scripts/livetvnewrecording.js +++ b/dashboard-ui/scripts/livetvnewrecording.js @@ -32,8 +32,8 @@ $('#chkAllChannels', page).checked(defaultTimer.RecordAnyChannel).checkboxradio('refresh'); $('#chkAnyTime', page).checked(defaultTimer.RecordAnyTime).checkboxradio('refresh'); - $('#txtPrePaddingSeconds', page).val(defaultTimer.PrePaddingSeconds); - $('#txtPostPaddingSeconds', page).val(defaultTimer.PostPaddingSeconds); + $('#txtPrePaddingSeconds', page).val(defaultTimer.PrePaddingSeconds / 60); + $('#txtPostPaddingSeconds', page).val(defaultTimer.PostPaddingSeconds / 60); $('#chkPrePaddingRequired', page).checked(defaultTimer.IsPrePaddingRequired).checkboxradio('refresh'); $('#chkPostPaddingRequired', page).checked(defaultTimer.IsPostPaddingRequired).checkboxradio('refresh'); @@ -105,10 +105,12 @@ var form = this; - apiClient.getNewLiveTvTimerDefaults({ programId: currentProgram.Id }).done(function (item) { + var programId = getParameterByName('programid'); - item.PrePaddingSeconds = $('#txtPrePaddingSeconds', form).val(); - item.PostPaddingSeconds = $('#txtPostPaddingSeconds', form).val(); + apiClient.getNewLiveTvTimerDefaults({ programId: programId }).done(function (item) { + + item.PrePaddingSeconds = $('#txtPrePaddingSeconds', form).val() * 60; + item.PostPaddingSeconds = $('#txtPostPaddingSeconds', form).val() * 60; item.IsPrePaddingRequired = $('#chkPrePaddingRequired', form).checked(); item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked(); @@ -142,15 +144,11 @@ return false; } - function liveTvNewRecordingPage() { + window.LiveTvNewRecordingPage = { + + onSubmit: onSubmit - var self = this; - - self.onSubmit = onSubmit; - - } - - window.LiveTvNewRecordingPage = new liveTvNewRecordingPage(); + }; $(document).on('pageinit', "#liveTvNewRecordingPage", function () { @@ -165,7 +163,7 @@ } }); - + $('#btnCancel', page).on('click', function () { Dashboard.navigate('livetvchannel.html?id=' + currentProgram.ChannelId); diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js index a7b7f034b..dc31d5745 100644 --- a/dashboard-ui/scripts/livetvrecordings.js +++ b/dashboard-ui/scripts/livetvrecordings.js @@ -35,7 +35,7 @@ html += ''; html += ''; - html += recording.Name; + html += recording.Name || '(blank)'; html += ''; html += ''; diff --git a/dashboard-ui/scripts/livetvseriestimer.js b/dashboard-ui/scripts/livetvseriestimer.js index fe18ef012..4ed869067 100644 --- a/dashboard-ui/scripts/livetvseriestimer.js +++ b/dashboard-ui/scripts/livetvseriestimer.js @@ -4,7 +4,7 @@ function deleteTimer(page, id) { - Dashboard.confirm("Are you sure you wish to cancel this series?", "Confirm Series Timer Cancellation", function (result) { + Dashboard.confirm("Are you sure you wish to cancel this series?", "Confirm Series Cancellation", function (result) { if (result) { @@ -12,7 +12,7 @@ ApiClient.cancelLiveTvSeriesTimer(id).done(function () { - Dashboard.alert('Timer cancelled.'); + Dashboard.alert('Series cancelled.'); reload(page); }); @@ -28,8 +28,8 @@ $('.itemName', page).html(item.Name); $('.overview', page).html(item.Overview || ''); - $('#txtPrePaddingSeconds', page).val(item.PrePaddingSeconds); - $('#txtPostPaddingSeconds', page).val(item.PostPaddingSeconds); + $('#txtPrePaddingSeconds', page).val(item.PrePaddingSeconds / 60); + $('#txtPostPaddingSeconds', page).val(item.PostPaddingSeconds / 60); $('#chkPrePaddingRequired', page).checked(item.IsPrePaddingRequired).checkboxradio('refresh'); $('#chkPostPaddingRequired', page).checked(item.IsPostPaddingRequired).checkboxradio('refresh'); @@ -97,8 +97,8 @@ apiClient.getLiveTvSeriesTimer(currentItem.Id).done(function (item) { - item.PrePaddingSeconds = $('#txtPrePaddingSeconds', form).val(); - item.PostPaddingSeconds = $('#txtPostPaddingSeconds', form).val(); + item.PrePaddingSeconds = $('#txtPrePaddingSeconds', form).val() * 60; + item.PostPaddingSeconds = $('#txtPostPaddingSeconds', form).val() * 60; item.IsPrePaddingRequired = $('#chkPrePaddingRequired', form).checked(); item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked(); diff --git a/dashboard-ui/scripts/livetvseriestimers.js b/dashboard-ui/scripts/livetvseriestimers.js index 59f778d2c..e7d878dee 100644 --- a/dashboard-ui/scripts/livetvseriestimers.js +++ b/dashboard-ui/scripts/livetvseriestimers.js @@ -2,7 +2,7 @@ function deleteTimer(page, id) { - Dashboard.confirm("Are you sure you wish to cancel this series?", "Confirm Series Timer Cancellation", function (result) { + Dashboard.confirm("Are you sure you wish to cancel this series?", "Confirm Series Cancellation", function (result) { if (result) { @@ -10,7 +10,7 @@ ApiClient.cancelLiveTvSeriesTimer(id).done(function () { - Dashboard.alert('Series Timer deleted'); + Dashboard.alert('Series cancelled.'); reload(page); }); diff --git a/dashboard-ui/scripts/livetvtimer.js b/dashboard-ui/scripts/livetvtimer.js index 8a496d8ef..61d556930 100644 --- a/dashboard-ui/scripts/livetvtimer.js +++ b/dashboard-ui/scripts/livetvtimer.js @@ -4,7 +4,7 @@ function deleteTimer(page, id) { - Dashboard.confirm("Are you sure you wish to cancel this timer?", "Confirm Timer Cancellation", function (result) { + Dashboard.confirm("Are you sure you wish to cancel this recording?", "Confirm Recording Cancellation", function (result) { if (result) { @@ -12,7 +12,7 @@ ApiClient.cancelLiveTvTimer(id).done(function () { - Dashboard.alert('Timer cancelled.'); + Dashboard.alert('Recording cancelled.'); reload(page); }); @@ -23,18 +23,34 @@ function renderTimer(page, item) { + var context = 'livetv'; currentItem = item; - $('.program', page).html(item.Name); - $('.channel', page).html('' + item.ChannelName + '').trigger('create'); - $('.overview', page).html(item.Overview || ''); + $('.itemName', page).html(item.Name); + $('.itemChannelNumber', page).html('Channel:   ' + item.ChannelName + '').trigger('create'); - $('#txtPrePaddingSeconds', page).val(item.PrePaddingSeconds); - $('#txtPostPaddingSeconds', page).val(item.PostPaddingSeconds); + if (item.EpisodeTitle) { + $('.itemEpisodeName', page).html('Episode:   ' + item.EpisodeTitle); + } else { + $('.itemEpisodeName', page).html(''); + } + + if (item.CommunityRating) { + $('.itemCommunityRating', page).html(LibraryBrowser.getRatingHtml(item)).show(); + } else { + $('.itemCommunityRating', page).hide(); + } + + LibraryBrowser.renderGenres($('.itemGenres', page), item, context); + LibraryBrowser.renderOverview($('.itemOverview', page), item); + + $('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(item)); + + $('#txtPrePaddingSeconds', page).val(item.PrePaddingSeconds / 60); + $('#txtPostPaddingSeconds', page).val(item.PostPaddingSeconds / 60); $('#chkPrePaddingRequired', page).checked(item.IsPrePaddingRequired).checkboxradio('refresh'); $('#chkPostPaddingRequired', page).checked(item.IsPostPaddingRequired).checkboxradio('refresh'); - $('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(item)); $('.status', page).html('Status:   ' + item.Status); if (item.SeriesTimerId) { @@ -56,8 +72,8 @@ apiClient.getLiveTvTimer(currentItem.Id).done(function (item) { - item.PrePaddingSeconds = $('#txtPrePaddingSeconds', form).val(); - item.PostPaddingSeconds = $('#txtPostPaddingSeconds', form).val(); + item.PrePaddingSeconds = $('#txtPrePaddingSeconds', form).val() * 60; + item.PostPaddingSeconds = $('#txtPostPaddingSeconds', form).val() * 60; item.IsPrePaddingRequired = $('#chkPrePaddingRequired', form).checked(); item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked(); diff --git a/dashboard-ui/scripts/livetvtimers.js b/dashboard-ui/scripts/livetvtimers.js index 42eb07afe..63b63f82a 100644 --- a/dashboard-ui/scripts/livetvtimers.js +++ b/dashboard-ui/scripts/livetvtimers.js @@ -2,7 +2,7 @@ function deleteTimer(page, id) { - Dashboard.confirm("Are you sure you wish to cancel this timer?", "Confirm Timer Cancellation", function (result) { + Dashboard.confirm("Are you sure you wish to cancel this recording?", "Confirm Recording Cancellation", function (result) { if (result) { @@ -10,7 +10,7 @@ ApiClient.cancelLiveTvTimer(id).done(function () { - Dashboard.alert('Timer deleted'); + Dashboard.alert('Recording cancelled.'); reload(page); }); diff --git a/dashboard-ui/scripts/pluginupdatespage.js b/dashboard-ui/scripts/pluginupdatespage.js index 56bc6b4cf..784173882 100644 --- a/dashboard-ui/scripts/pluginupdatespage.js +++ b/dashboard-ui/scripts/pluginupdatespage.js @@ -35,16 +35,16 @@ var options = PluginUpdatesPage.getHtmlOptions(["Off", "On"], (plugin.EnableAutoUpdate ? "On" : "Off")); - html += ""; - html += ""; + html += ""; + html += ""; html += ""; fieldId = "liPluginUpdateFieldb" + fieldIndex; options = PluginUpdatesPage.getHtmlOptions(["Release", "Beta", "Dev"], plugin.UpdateClass); - html += ""; - html += ""; + html += ""; + html += ""; html += ""; html += "";