diff --git a/dashboard-ui/components/directorybrowser/directorybrowser.js b/dashboard-ui/components/directorybrowser/directorybrowser.js index 0bf7883517..742a13c728 100644 --- a/dashboard-ui/components/directorybrowser/directorybrowser.js +++ b/dashboard-ui/components/directorybrowser/directorybrowser.js @@ -134,7 +134,7 @@ html += '
'; html += Globalize.translate('MessageDirectoryPickerLinuxInstruction'); html += '
'; - html += '' + Globalize.translate('ButtonMoreInformation') + ''; + //html += '' + Globalize.translate('ButtonMoreInformation') + ''; } html += '

'; diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html index 41a2025460..a00e4007a5 100644 --- a/dashboard-ui/livetvstatus.html +++ b/dashboard-ui/livetvstatus.html @@ -4,7 +4,7 @@ ${TitleLiveTV} -
+
@@ -41,12 +41,18 @@

${AddGuideProviderHelp}

+
+ ${ButtonRefreshGuideData} + +

-

${HeaderTvTuners}

+
+

${HeaderTvTuners}

-
+
+
diff --git a/dashboard-ui/scripts/devices.js b/dashboard-ui/scripts/devices.js index dc304823ba..d8d2cebc03 100644 --- a/dashboard-ui/scripts/devices.js +++ b/dashboard-ui/scripts/devices.js @@ -27,7 +27,9 @@ var html = ''; - html += '
'; + if (devices.length) { + html += '
'; + } html += devices.map(function (d) { @@ -65,7 +67,9 @@ }).join(''); - html += '
'; + if (devices.length) { + html += '
'; + } var elem = $('.devicesList', page).html(html).trigger('create'); diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index ae8bb8397b..2f66cc02ce 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -375,7 +375,7 @@ items.push({ name: Globalize.translate('ButtonSync'), id: 'sync', - ironIcon: 'refresh' + ironIcon: 'sync' }); } @@ -1257,7 +1257,7 @@ items.push({ name: Globalize.translate('ButtonSync'), id: 'sync', - ironIcon: 'refresh' + ironIcon: 'sync' }); require(['actionsheet'], function () { diff --git a/dashboard-ui/scripts/livetvstatus.js b/dashboard-ui/scripts/livetvstatus.js index 87746e6736..6d3e44e7e4 100644 --- a/dashboard-ui/scripts/livetvstatus.js +++ b/dashboard-ui/scripts/livetvstatus.js @@ -81,6 +81,12 @@ html += '
'; } + if (tuners.length) { + page.querySelector('.tunerSection').classList.remove('hide'); + } else { + page.querySelector('.tunerSection').classList.add('hide'); + } + var elem = $('.tunerList', page).html(html); $('.btnResetTuner', elem).on('click', function () { @@ -493,6 +499,22 @@ reload(page); + // on here + $('.btnRefresh', page).taskButton({ + mode: 'on', + progressElem: page.querySelector('.refreshGuideProgress'), + taskKey: 'RefreshGuide' + }); + + }).on('pagehide', "#liveTvStatusPage", function () { + + var page = this; + + // off here + $('.btnRefreshGuide', page).taskButton({ + mode: 'off' + }); + }); })(jQuery, document, window); diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html index 01f4228eb8..0ed6e51e0f 100644 --- a/dashboard-ui/userparentalcontrol.html +++ b/dashboard-ui/userparentalcontrol.html @@ -32,8 +32,11 @@
-
${LabelBlockContentWithTags}
- +

${LabelBlockContentWithTags}

+ + + ${ButtonAdd} +
@@ -61,8 +64,6 @@ - - ${ButtonCancel}