diff --git a/dashboard-ui/components/tvguide/tvguide.js b/dashboard-ui/components/tvguide/tvguide.js index 9fe6fcb704..31c4a7d742 100644 --- a/dashboard-ui/components/tvguide/tvguide.js +++ b/dashboard-ui/components/tvguide/tvguide.js @@ -479,7 +479,7 @@ }).done(function (template) { var tabContent = options.element; - tabContent.innerHTML = template; + tabContent.innerHTML = Globalize.translateDocument(template); Events.on(tabContent.querySelector('.programGrid'), 'scroll', function () { diff --git a/dashboard-ui/cordova/imagestore.js b/dashboard-ui/cordova/imagestore.js index 5e167bfda7..09edfffd4e 100644 --- a/dashboard-ui/cordova/imagestore.js +++ b/dashboard-ui/cordova/imagestore.js @@ -56,7 +56,14 @@ // Use the embedded server for iOS8, and also if we don't know the iOS version, just to be safe //if (($.browser.iOSVersion || 0) < 9) { + var index = url.indexOf('/Documents'); + if (index != -1) { + return url.substring(index); + } + else { return url.replace('file://', ''); + } + //} } return url; diff --git a/dashboard-ui/scripts/syncactivity.js b/dashboard-ui/scripts/syncactivity.js index 4d2b9c27ef..66a7b22ebd 100644 --- a/dashboard-ui/scripts/syncactivity.js +++ b/dashboard-ui/scripts/syncactivity.js @@ -48,7 +48,7 @@ } var html = ''; - html += '
'; + html += '
'; html += text; html += '
'; @@ -59,23 +59,59 @@ var html = ''; - html += ''; + html += "
"; + + html += '
'; + html += '"; + + html += '
'; var textLines = []; @@ -95,80 +131,24 @@ textLines.push(' '); } - for (var i = 0, length = textLines.length; i < length; i++) { + html += '
'; + html += ''; + html += "
"; - if (i == 0) { - html += "
"; - } else { - html += "
"; - } + for (var i = 0, length = textLines.length; i < length; i++) { + html += "
"; html += textLines[i]; html += "
"; } - html += getSyncStatusBanner(job); + // cardFooter + html += "
"; - html += '
'; - html += ''; - html += '
'; + // cardBox + html += "
"; - html += ''; - html += ''; - - html += ''; - - html += ''; - - //html += "
"; - - //html += '"; - - //// card - //html += "
"; + // card + html += "
"; return html; } @@ -207,26 +187,24 @@ if (targetName != lastTargetName) { if (lastTargetName) { - html += '
'; - html += '
'; + html += '
'; + html += '
'; + html += '
'; } lastTargetName = targetName; - html += '
'; - html += '

' + targetName + '

'; - html += '
'; + html += '
'; + + html += '
' + targetName + '
'; + + html += '
'; } } html += getSyncJobHtml(page, job, cardBoxCssClass, syncJobPage); } - if (jobs.length) { - html += '
'; - html += '
'; - } - var elem = $('.syncActivity', page).html(html).lazyChildren(); Events.trigger(elem[0], 'create'); @@ -251,32 +229,38 @@ function refreshJob(page, job) { - var card = page.querySelector('.syncJobItem[data-id=\'' + job.Id + '\']'); + var card = page.querySelector('.card[data-id=\'' + job.Id + '\']'); if (!card) { return; } - var banner = card.querySelector('.syncStatus'); + var banner = card.querySelector('.syncStatusBanner'); if (banner.getAttribute('data-status') == job.Status) { var elem = document.createElement('div'); elem.innerHTML = getSyncStatusBanner(job); - elem = elem.querySelector('.syncStatus'); + elem = elem.querySelector('.syncStatusBanner'); elem.parentNode.removeChild(elem); banner.parentNode.replaceChild(elem, banner); } var progress = job.Progress || 0; - var syncProgresContainer = card.querySelector('.syncProgresContainer'); + var cardFooter = card.querySelector('.cardFooter'); - syncProgresContainer.querySelector('paper-progress').value = progress; + if (progress == 0 || progress >= 100) { + cardFooter.classList.add('hide'); + } + else { + cardFooter.classList.remove('hide'); + cardFooter.querySelector('.itemProgressBar').value = progress; + } } function showJobMenu(page, elem) { - var card = $(elem).parents('.syncJobItem'); + var card = $(elem).parents('.card'); var jobId = card.attr('data-id'); var status = card.attr('data-status'); @@ -327,7 +311,6 @@ function reloadData(page) { lastDataLoad = 0; - Dashboard.showLoadingMsg(); var options = {}; @@ -345,7 +328,6 @@ ApiClient.getJSON(ApiClient.getUrl('Sync/Jobs', options)).done(function (response) { loadData(page, response.Items); - Dashboard.hideLoadingMsg(); });