-
${LabelService}
-
${LabelStatus}
-
${LabelVersion}
+
${HeaderServices}
+
diff --git a/dashboard-ui/scripts/livetvsettings.js b/dashboard-ui/scripts/livetvsettings.js
index 22507d6062..c26f9c2e4b 100644
--- a/dashboard-ui/scripts/livetvsettings.js
+++ b/dashboard-ui/scripts/livetvsettings.js
@@ -18,8 +18,6 @@
return '
';
});
- $('#selectActiveService', page).html(serviceOptions).val(config.ActiveService || '').selectmenu('refresh');
-
Dashboard.hideLoadingMsg();
}
@@ -53,7 +51,6 @@
config.GuideDays = $('#selectGuideDays', form).val() || null;
- config.ActiveService = $('#selectActiveService', form).val() || null;
ApiClient.updateNamedConfiguration("livetv", config).done(Dashboard.processServerConfigurationUpdateResult);
});
diff --git a/dashboard-ui/scripts/livetvstatus.js b/dashboard-ui/scripts/livetvstatus.js
index 135b269a8a..044633a512 100644
--- a/dashboard-ui/scripts/livetvstatus.js
+++ b/dashboard-ui/scripts/livetvstatus.js
@@ -97,6 +97,47 @@
});
}
+ function getServiceHtml(service) {
+
+ var html = '';
+ html += '
';
+
+ var serviceUrl = service.HomePageUrl || '#';
+
+ html += '
' + service.Name + '
';
+
+ var versionHtml = service.Version || 'Unknown';
+
+ if (service.HasUpdateAvailable) {
+ versionHtml += '
' + Globalize.translate('LiveTvUpdateAvailable') + '';
+ }
+ else {
+ versionHtml += '

' + Globalize.translate('LabelVersionUpToDate');
+ }
+
+ html += '
' + versionHtml + '
';
+
+ var status = service.Status;
+
+ if (service.Status == 'Ok') {
+
+ status = '
' + status + '';
+ } else {
+
+ if (service.StatusMessage) {
+ status += ' (' + service.StatusMessage + ')';
+ }
+
+ status = '
' + status + '';
+ }
+
+ html += '
' + Globalize.translate('ValueStatus', status) + '
';
+
+ html += '
';
+
+ return html;
+ }
+
function loadPage(page, liveTvInfo) {
if (liveTvInfo.IsEnabled) {
@@ -109,43 +150,17 @@
$('.noLiveTvServices', page).show();
}
- var service = liveTvInfo.Services.filter(function (s) {
- return s.Name == liveTvInfo.ActiveServiceName;
+ $('.servicesList', page).html(liveTvInfo.Services.map(getServiceHtml).join('')).trigger('create');
- })[0] || {};
+ var tuners = [];
+ for (var i = 0, length = liveTvInfo.Services.length; i < length; i++) {
- var serviceUrl = service.HomePageUrl || '#';
-
- $('#activeServiceName', page).html('
' + liveTvInfo.ActiveServiceName + '').trigger('create');
-
- var versionHtml = service.Version || 'Unknown';
-
- if (service.HasUpdateAvailable) {
- versionHtml += '
' + Globalize.translate('LiveTvUpdateAvailable') + '';
- }
- else {
- versionHtml += '

' + Globalize.translate('LabelVersionUpToDate');
- }
-
- $('#activeServiceVersion', page).html(versionHtml).trigger('create');
-
- var status = liveTvInfo.Status;
-
- if (liveTvInfo.Status == 'Ok') {
-
- status = '
' + status + '';
- } else {
-
- if (liveTvInfo.StatusMessage) {
- status += ' (' + liveTvInfo.StatusMessage + ')';
+ for (var j = 0, numTuners = liveTvInfo.Services[i].Tuners.length; j < numTuners; j++) {
+ tuners.push(liveTvInfo.Services[i].Tuners[j]);
}
-
- status = '
' + status + '';
}
- $('#activeServiceStatus', page).html(status);
-
- renderTuners(page, service.Tuners || []);
+ renderTuners(page, tuners);
Dashboard.hideLoadingMsg();
}