mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

remove more reliance on ActiveService

Browse source
This commit is contained in:
Luke Pulverenti 2015-03-12 11:51:48 -04:00
parent 920da071b8
commit 4f904fd8d8
4 changed files with 49 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/livetvsettings.html
View file

@ -17,12 +17,6 @@
<form class="liveTvSettingsForm" style="display: none;"> <form class="liveTvSettingsForm" style="display: none;">
<ul data-role="listview" class="ulForm"> <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> <li>
<label for="selectGuideDays">${LabelNumberOfGuideDays}</label> <label for="selectGuideDays">${LabelNumberOfGuideDays}</label>
<select id="selectGuideDays" data-mini="true"> <select id="selectGuideDays" data-mini="true">

6
dashboard-ui/livetvstatus.html
View file

@ -18,10 +18,8 @@
<div class="liveTvStatusContent" style="display: none;"> <div class="liveTvStatusContent" style="display: none;">
<div style="margin-top: 2.5em;"> <h2>${HeaderServices}</h2>
<p>${LabelService} <span id="activeServiceName"></span></p> <div class="servicesList">
<p>${LabelStatus} <span id="activeServiceStatus"></span></p>
<p>${LabelVersion} <span id="activeServiceVersion"></span></p>
</div> </div>
<br /> <br />

3
dashboard-ui/scripts/livetvsettings.js
View file

@ -18,8 +18,6 @@
return '<option value="' + s.Name + '">' + s.Name + '</option>'; return '<option value="' + s.Name + '">' + s.Name + '</option>';
}); });
$('#selectActiveService', page).html(serviceOptions).val(config.ActiveService || '').selectmenu('refresh');
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
} }
@ -53,7 +51,6 @@
config.GuideDays = $('#selectGuideDays', form).val() || null; config.GuideDays = $('#selectGuideDays', form).val() || null;
config.ActiveService = $('#selectActiveService', form).val() || null;
ApiClient.updateNamedConfiguration("livetv", config).done(Dashboard.processServerConfigurationUpdateResult); ApiClient.updateNamedConfiguration("livetv", config).done(Dashboard.processServerConfigurationUpdateResult);
}); });

79
dashboard-ui/scripts/livetvstatus.js
View file

@ -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) { function loadPage(page, liveTvInfo) {
if (liveTvInfo.IsEnabled) { if (liveTvInfo.IsEnabled) {
@ -109,43 +150,17 @@
$('.noLiveTvServices', page).show(); $('.noLiveTvServices', page).show();
} }
var service = liveTvInfo.Services.filter(function (s) { $('.servicesList', page).html(liveTvInfo.Services.map(getServiceHtml).join('')).trigger('create');
return s.Name == liveTvInfo.ActiveServiceName;
})[0] || {}; var tuners = [];
for (var i = 0, length = liveTvInfo.Services.length; i < length; i++) {
var serviceUrl = service.HomePageUrl || '#'; for (var j = 0, numTuners = liveTvInfo.Services[i].Tuners.length; j < numTuners; j++) {
tuners.push(liveTvInfo.Services[i].Tuners[j]);
$('#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'); renderTuners(page, tuners);
var status = liveTvInfo.Status;
if (liveTvInfo.Status == 'Ok') {
status = '<span style="color:green;">' + status + '</span>';
} else {
if (liveTvInfo.StatusMessage) {
status += ' (' + liveTvInfo.StatusMessage + ')';
}
status = '<span style="color:red;">' + status + '</span>';
}
$('#activeServiceStatus', page).html(status);
renderTuners(page, service.Tuners || []);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
} }