From 4f904fd8d89367a0a6d807eee7404651eb078335 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 12 Mar 2015 11:51:48 -0400
Subject: [PATCH] remove more reliance on ActiveService

---
 dashboard-ui/livetvsettings.html       |  6 --
 dashboard-ui/livetvstatus.html         |  6 +-
 dashboard-ui/scripts/livetvsettings.js |  3 -
 dashboard-ui/scripts/livetvstatus.js   | 79 +++++++++++++++-----------
 4 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html
index 8a294baa5d..721de2ea5f 100644
--- a/dashboard-ui/livetvsettings.html
+++ b/dashboard-ui/livetvsettings.html
@@ -17,12 +17,6 @@
                 <form class="liveTvSettingsForm" style="display: none;">
 
                     <ul data-role="listview" class="ulForm">
-                        <li>
-                            <label for="selectActiveService">${LabelActiveService}</label>
-                            <select id="selectActiveService" data-mini="true" required="required"></select>
-                            <div class="fieldDescription">${LabelActiveServiceHelp}</div>
-                        </li>
-
                         <li>
                             <label for="selectGuideDays">${LabelNumberOfGuideDays}</label>
                             <select id="selectGuideDays" data-mini="true">
diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html
index 3ddf4c5187..77e81a36ae 100644
--- a/dashboard-ui/livetvstatus.html
+++ b/dashboard-ui/livetvstatus.html
@@ -18,10 +18,8 @@
 
                     <div class="liveTvStatusContent" style="display: none;">
 
-                        <div style="margin-top: 2.5em;">
-                            <p>${LabelService} <span id="activeServiceName"></span></p>
-                            <p>${LabelStatus} <span id="activeServiceStatus"></span></p>
-                            <p>${LabelVersion} <span id="activeServiceVersion"></span></p>
+                        <h2>${HeaderServices}</h2>
+                        <div class="servicesList">
                         </div>
                         <br />
 
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 '<option value="' + s.Name + '">' + s.Name + '</option>';
         });
 
-        $('#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 += '<div>';
+
+        var serviceUrl = service.HomePageUrl || '#';
+
+        html += '<p><a href="' + serviceUrl + '" target="_blank">' + service.Name + '</a></p>';
+
+        var versionHtml = service.Version || 'Unknown';
+
+        if (service.HasUpdateAvailable) {
+            versionHtml += ' <a style="margin-left: .25em;" href="' + serviceUrl + '" target="_blank">' + Globalize.translate('LiveTvUpdateAvailable') + '</a>';
+        }
+        else {
+            versionHtml += '<img src="css/images/checkmarkgreen.png" style="height: 17px; margin-left: 10px; margin-right: 0; position: relative; top: 5px; border-radius:3px;" /> ' + Globalize.translate('LabelVersionUpToDate');
+        }
+
+        html += '<p>' + versionHtml + '</p>';
+
+        var status = service.Status;
+
+        if (service.Status == 'Ok') {
+
+            status = '<span style="color:green;">' + status + '</span>';
+        } else {
+
+            if (service.StatusMessage) {
+                status += ' (' + service.StatusMessage + ')';
+            }
+
+            status = '<span style="color:red;">' + status + '</span>';
+        }
+
+        html += '<p>' + Globalize.translate('ValueStatus', status) + '</p>';
+
+        html += '</div>';
+
+        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('<a href="' + serviceUrl + '" target="_blank">' + liveTvInfo.ActiveServiceName + '</a>').trigger('create');
-
-        var versionHtml = service.Version || 'Unknown';
-
-        if (service.HasUpdateAvailable) {
-            versionHtml += ' <a style="margin-left: .25em;" href="' + serviceUrl + '" target="_blank">' + Globalize.translate('LiveTvUpdateAvailable') + '</a>';
-        }
-        else {
-            versionHtml += '<img src="css/images/checkmarkgreen.png" style="height: 17px; margin-left: 10px; margin-right: 0; position: relative; top: 5px; border-radius:3px;" /> ' + Globalize.translate('LabelVersionUpToDate');
-        }
-
-        $('#activeServiceVersion', page).html(versionHtml).trigger('create');
-
-        var status = liveTvInfo.Status;
-
-        if (liveTvInfo.Status == 'Ok') {
-
-            status = '<span style="color:green;">' + status + '</span>';
-        } 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 = '<span style="color:red;">' + status + '</span>';
         }
 
-        $('#activeServiceStatus', page).html(status);
-
-        renderTuners(page, service.Tuners || []);
+        renderTuners(page, tuners);
 
         Dashboard.hideLoadingMsg();
     }