diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 4a026739f6..be2c7f2154 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -778,7 +778,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { @media all and (min-width: 750px) { .detailPageContent { - max-width: 1000px; + max-width: 950px; width: auto; } } diff --git a/dashboard-ui/livetvrecording.html b/dashboard-ui/livetvrecording.html index e7d3b140dc..8dc91cb79b 100644 --- a/dashboard-ui/livetvrecording.html +++ b/dashboard-ui/livetvrecording.html @@ -13,8 +13,8 @@ ${TabScheduled} ${TabSeries} -
-
+
+
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index c5806208c1..c57c1b5ee6 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -421,7 +421,7 @@ html += '
'; html += '

' + Globalize.translate('HeaderLatestTvRecordings') + '

'; - html += 'd'; + html += ''; html += '
'; } @@ -437,7 +437,7 @@ lazy: true }); - elem.html(html).lazyChildren(); + elem.html(html).lazyChildren().trigger('create'); }); } diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js index 89ddbd89fd..5be43bc28c 100644 --- a/dashboard-ui/scripts/mediacontroller.js +++ b/dashboard-ui/scripts/mediacontroller.js @@ -224,6 +224,10 @@ return false; } + if (itemType == "Program") { + return false; + } + if (itemType == "MusicGenre" || itemType == "Season" || itemType == "Series" || itemType == "BoxSet" || itemType == "MusicAlbum" || itemType == "MusicArtist" || itemType == "Playlist") { return true; } diff --git a/dashboard-ui/scripts/syncactivity.js b/dashboard-ui/scripts/syncactivity.js index d120a88eff..cc8ce68a4c 100644 --- a/dashboard-ui/scripts/syncactivity.js +++ b/dashboard-ui/scripts/syncactivity.js @@ -83,14 +83,17 @@ else if (job.Status == 'Queued') { background = 'rgba(51, 136, 204, ' + opacity + ')'; } + else if (job.Status == 'ReadyToTransfer') { + background = 'rgba(51, 136, 204, ' + opacity + ')'; + } else if (job.Status == 'Transferring') { background = 'rgba(72, 0, 255, ' + opacity + ')'; } else if (job.Status == 'Converting') { - background = 'rgba(72, 0, 255, ' + opacity + ')'; + background = 'rgba(255, 106, 0, ' + opacity + ')'; } - html += '
'; + html += '
'; html += text; html += '
'; @@ -288,7 +291,7 @@ function stopListening() { if (ApiClient.isWebSocketOpen()) { - ApiClient.sendWebSocketMessage("SyncJobsStart", "0,1500"); + ApiClient.sendWebSocketMessage("SyncJobsStop", ""); } } diff --git a/dashboard-ui/scripts/syncjob.js b/dashboard-ui/scripts/syncjob.js index b6172b8e0b..3e511199b5 100644 --- a/dashboard-ui/scripts/syncjob.js +++ b/dashboard-ui/scripts/syncjob.js @@ -76,7 +76,7 @@ html += '
  • '; - var hasActions = ['Queued', 'Cancelled', 'Failed', 'Transferring', 'Converting', 'Synced'].indexOf(jobItem.Status) != -1; + var hasActions = ['Queued', 'Cancelled', 'Failed', 'ReadyToTransfer', 'Transferring', 'Converting', 'Synced'].indexOf(jobItem.Status) != -1; html += ''; @@ -181,7 +181,7 @@ else if (status == 'Cancelled') { html += '
  • ' + Globalize.translate('ButtonReenable') + '
  • '; } - else if (status == 'Queued' || status == 'Transferring' || status == 'Converting') { + else if (status == 'Queued' || status == 'Transferring' || status == 'Converting' || status == 'ReadyToTransfer') { html += '
  • ' + Globalize.translate('ButtonCancelItem') + '
  • '; } else if (status == 'Synced' && remove) { @@ -301,6 +301,7 @@ $('#txtTargetName', page).val(targetName); } + var _jobOptions; function loadJob(page) { Dashboard.showLoadingMsg(); @@ -318,6 +319,7 @@ })).done(function (options) { + _jobOptions = options; renderJob(page, job, options); Dashboard.hideLoadingMsg(); }); @@ -335,6 +337,13 @@ }); } + function loadJobInfo(page, job, jobItems) { + + renderJob(page, job, _jobOptions); + renderJobItems(page, jobItems); + Dashboard.hideLoadingMsg(); + } + function saveJob(page) { Dashboard.showLoadingMsg(); @@ -364,16 +373,49 @@ } + function onWebSocketMessage(e, msg) { + + var page = $.mobile.activePage; + + if (msg.MessageType == "SyncJob") { + loadJobInfo(page, msg.Data.Job, msg.Data.JobItems); + } + } + + function startListening(page) { + + var startParams = "0,1500"; + + startParams += "," + getParameterByName('id'); + + if (ApiClient.isWebSocketOpen()) { + ApiClient.sendWebSocketMessage("SyncJobStart", startParams); + } + + } + + function stopListening() { + + if (ApiClient.isWebSocketOpen()) { + ApiClient.sendWebSocketMessage("SyncJobStop", ""); + } + + } + $(document).on('pageshow', ".syncJobPage", function () { var page = this; loadJob(page); - }).on('pageinit', ".syncJobPage", function () { + startListening(page); + $(ApiClient).on("websocketmessage.syncJobPage", onWebSocketMessage); + + }).on('pagehide', ".syncJobPage", function () { var page = this; - + stopListening(); + $(ApiClient).off(".syncJobPage"); }); window.SyncJobPage = { diff --git a/dashboard-ui/syncactivity.html b/dashboard-ui/syncactivity.html index b2d16aa4a7..3318b33042 100644 --- a/dashboard-ui/syncactivity.html +++ b/dashboard-ui/syncactivity.html @@ -14,7 +14,7 @@ ${TabSettings}
    -
    +