diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js index af9b7ca082..bd8d9be15c 100644 --- a/dashboard-ui/scripts/sync.js +++ b/dashboard-ui/scripts/sync.js @@ -116,6 +116,7 @@ html += ''; html += ''; html += ''; + html += '
' + Globalize.translate('LabelSyncQualityHelp') + '
'; html += ''; } diff --git a/dashboard-ui/scripts/syncactivity.js b/dashboard-ui/scripts/syncactivity.js index 5e4843960b..621347efdc 100644 --- a/dashboard-ui/scripts/syncactivity.js +++ b/dashboard-ui/scripts/syncactivity.js @@ -93,7 +93,10 @@ else if (job.Status == 'Queued') { background = 'rgba(51, 136, 204, ' + opacity + ')'; } - else if (job.Status == 'InProgress') { + else if (job.Status == 'Transferring') { + background = 'rgba(72, 0, 255, ' + opacity + ')'; + } + else if (job.Status == 'Converting') { background = 'rgba(72, 0, 255, ' + opacity + ')'; } @@ -268,6 +271,18 @@ }); } + function onWebSocketMessage(e, msg) { + + var page = $.mobile.activePage; + + if (msg.MessageType == "SyncJobCreated") { + reloadData(page); + } + else if (msg.MessageType == "SyncJobCancelled") { + reloadData(page); + } + } + $(document).on('pageshow', ".syncActivityPage", function () { var page = this; @@ -290,6 +305,7 @@ taskKey: 'SyncPrepare' }); + $(ApiClient).on("websocketmessage.syncactivity", onWebSocketMessage); }).on('pagehide', ".syncActivityPage", function () { @@ -300,6 +316,7 @@ mode: 'off' }); + $(ApiClient).off(".syncactivity"); }); })(); \ No newline at end of file diff --git a/dashboard-ui/scripts/syncjob.js b/dashboard-ui/scripts/syncjob.js index 7465f10aa7..b6172b8e0b 100644 --- a/dashboard-ui/scripts/syncjob.js +++ b/dashboard-ui/scripts/syncjob.js @@ -29,6 +29,7 @@ html += ''; html += ''; html += ''; + html += '
' + Globalize.translate('LabelSyncQualityHelp') + '
'; html += ''; }