mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
completed tuner hosts
This commit is contained in:
parent
0e4e4da6c8
commit
68526e2c1d
13 changed files with 248 additions and 54 deletions
|
@ -19,9 +19,10 @@
|
|||
<a href="syncsettings.html" data-role="button">${TabSettings}</a>
|
||||
</div>
|
||||
<div data-role="controlgroup" data-type="horizontal" class="localnav livetvTabs" data-mini="true" style="display:none;">
|
||||
<a href="livetvstatus.html" data-role="button">${TabStatus}</a>
|
||||
<a href="#" data-role="button" class="ui-btn-active">${TabServices}</a>
|
||||
<a href="livetvstatus.html" data-role="button">${TabTuners}</a>
|
||||
<a href="#" data-role="button">${TabGuide}</a>
|
||||
<a href="livetvsettings.html" data-role="button">${TabSettings}</a>
|
||||
<a href="#" data-role="button" class="ui-btn-active">${TabExternalServices}</a>
|
||||
</div>
|
||||
|
||||
<div data-role="controlgroup" data-type="horizontal" class="localnav notificationsTabs" data-mini="true" style="display:none;">
|
||||
|
|
|
@ -18,9 +18,11 @@
|
|||
</div>
|
||||
<div class="sectionTabs livetvSectionTabs" style="display:none;">
|
||||
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
|
||||
<a href="livetvstatus.html" data-role="button">${TabStatus}</a>
|
||||
<a href="#" data-role="button" class="ui-btn-active">${TabServices}</a>
|
||||
|
||||
<a href="livetvstatus.html" data-role="button">${TabTuners}</a>
|
||||
<a href="#" data-role="button">${TabGuide}</a>
|
||||
<a href="livetvsettings.html" data-role="button">${TabSettings}</a>
|
||||
<a href="#" data-role="button" class="ui-btn-active">${TabExternalServices}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
@ -23,14 +23,14 @@
|
|||
"web-component-tester": "*"
|
||||
},
|
||||
"private": true,
|
||||
"homepage": "https://github.com/polymer/polymer",
|
||||
"homepage": "https://github.com/Polymer/polymer",
|
||||
"_release": "1.0.7",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "v1.0.7",
|
||||
"commit": "b39d0015ce5428232409eb3aca7ddefea899f894"
|
||||
},
|
||||
"_source": "git://github.com/polymer/polymer.git",
|
||||
"_source": "git://github.com/Polymer/polymer.git",
|
||||
"_target": "^1.0.0",
|
||||
"_originalSource": "polymer/polymer"
|
||||
"_originalSource": "Polymer/polymer"
|
||||
}
|
27
dashboard-ui/cordova/actionsheet.js
vendored
27
dashboard-ui/cordova/actionsheet.js
vendored
|
@ -7,6 +7,33 @@
|
|||
// showCancel
|
||||
// title
|
||||
|
||||
// If any items have an icon, give them all an icon just to make sure they're all lined up evenly
|
||||
var renderIcon = options.items.filter(function (o) {
|
||||
return o.ironIcon;
|
||||
}).length;
|
||||
|
||||
if (renderIcon) {
|
||||
|
||||
// iOS supports unicode icons
|
||||
if ($.browser.safari) {
|
||||
|
||||
for (var i = 0, length = options.items.length; i < length; i++) {
|
||||
|
||||
var option = options.items[i];
|
||||
|
||||
switch (option.ironIcon) {
|
||||
|
||||
case 'check':
|
||||
option.name = '\\u2713 ' + option.name;
|
||||
break;
|
||||
default:
|
||||
option.name = '\\u2001 ' + option.name;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var innerOptions = {
|
||||
'title': options.title,
|
||||
'buttonLabels': options.items.map(function (i) {
|
||||
|
|
|
@ -153,7 +153,7 @@
|
|||
@media all and (min-width: 1920px) {
|
||||
|
||||
.ehsContent {
|
||||
width: 97%;
|
||||
width: 96%;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -10,9 +10,10 @@
|
|||
<div class="content-primary">
|
||||
|
||||
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
|
||||
<a href="livetvstatus.html" data-role="button">${TabStatus}</a>
|
||||
<a href="appservices.html?context=livetv" data-role="button">${TabServices}</a>
|
||||
<a href="livetvstatus.html" data-role="button">${TabTuners}</a>
|
||||
<a href="#" data-role="button">${TabGuide}</a>
|
||||
<a href="#" data-role="button" class="ui-btn-active">${TabSettings}</a>
|
||||
<a href="appservices.html?context=livetv" data-role="button">${TabExternalServices}</a>
|
||||
</div>
|
||||
|
||||
<form class="liveTvSettingsForm" style="display: none;">
|
||||
|
|
|
@ -10,28 +10,24 @@
|
|||
<div class="content-primary">
|
||||
|
||||
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
|
||||
<a href="#" data-role="button" class="ui-btn-active">${TabStatus}</a>
|
||||
<a href="appservices.html?context=livetv" data-role="button">${TabServices}</a>
|
||||
<a href="#" data-role="button" class="ui-btn-active">${TabTuners}</a>
|
||||
<a href="#" data-role="button">${TabGuide}</a>
|
||||
<a href="livetvsettings.html" data-role="button">${TabSettings}</a>
|
||||
<a href="appservices.html?context=livetv" data-role="button">${TabExternalServices}</a>
|
||||
</div>
|
||||
|
||||
<div class="readOnlyContent" style="margin-top: 2em;">
|
||||
|
||||
<div class="liveTvStatusContent" style="display: none;">
|
||||
|
||||
<h2>${HeaderServices}</h2>
|
||||
<div class="servicesList">
|
||||
</div>
|
||||
<br />
|
||||
|
||||
<div class="refreshGuidePanel">
|
||||
<button type="button" class="btnRefreshGuide" data-icon="refresh" data-mini="true">${ButtonRefreshGuideData}</button>
|
||||
<progress max="100" min="0" style="width: 100%;" class="refreshGuideProgress"></progress>
|
||||
<div style="margin-top: 5px;">${LabelLastResult} <span class="lastRefreshGuideResult"></span></div>
|
||||
<h1>${HeaderTunerDevices}</h1>
|
||||
<paper-button raised class="submit btnAddDevice block"><iron-icon icon="add"></iron-icon><span>${ButtonAddDevice}</span></paper-button>
|
||||
<div class="devicesList">
|
||||
</div>
|
||||
|
||||
<br />
|
||||
<h2>${HeaderTvTuners}</h2>
|
||||
<br />
|
||||
<h1>${HeaderTvTuners}</h1>
|
||||
|
||||
<table data-role="table" data-mode="reflow" class="tblTuners stripedTable ui-responsive table-stroke">
|
||||
<thead>
|
||||
|
@ -48,12 +44,45 @@
|
|||
</table>
|
||||
</div>
|
||||
|
||||
<div class="servicesSection" style="display:none;">
|
||||
<br />
|
||||
<br />
|
||||
<h1>${HeaderExternalServices}</h1>
|
||||
<div class="servicesList">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="noLiveTvServices" style="display: none;">
|
||||
|
||||
<p>${LiveTvPluginRequired}</p>
|
||||
|
||||
<p><a href="plugincatalog.html">${LiveTvPluginRequiredHelp}</a></p>
|
||||
</div>
|
||||
|
||||
<paper-dialog class="dlgAddDevice" entry-animation="fade-in-animation" exit-animation="fade-out-animation" style="height:300px;width:250px;" with-backdrop>
|
||||
<h2>${HeaderAddDevice}</h2>
|
||||
|
||||
<form class="formAddDevice">
|
||||
<div>
|
||||
<div>
|
||||
<label for="selectTunerDeviceType">${LabelType}</label>
|
||||
<select id="selectTunerDeviceType" data-mini="true">
|
||||
<option value="hdhomerun">HD Homerun</option>
|
||||
<option value="m3u">M3U</option>
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<br />
|
||||
<label for="txtDevicePath">${LabelIpAddressPath}</label>
|
||||
<input type="text" id="txtDevicePath" required="required" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="buttons">
|
||||
<paper-button dialog-dismiss>${ButtonCancel}</paper-button>
|
||||
<button data-role="none" type="submit" class="clearButton"><paper-button><span>${ButtonOk}</span></paper-button></button>
|
||||
</div>
|
||||
</form>
|
||||
</paper-dialog>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -81,7 +81,6 @@
|
|||
var context = getParameterByName('context');
|
||||
|
||||
$('.sectionTabs', page).hide();
|
||||
$('.' + context + 'SectionTabs', page).show();
|
||||
|
||||
if (context == 'sync') {
|
||||
Dashboard.setPageTitle(Globalize.translate('TitleSync'));
|
||||
|
@ -96,6 +95,17 @@
|
|||
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Notifications');
|
||||
}
|
||||
|
||||
}).on('pagebeforeshowready', "#appServicesPage", function () {
|
||||
|
||||
// This needs both events for the helpurl to get done at the right time
|
||||
|
||||
var page = this;
|
||||
|
||||
var context = getParameterByName('context');
|
||||
|
||||
$('.sectionTabs', page).hide();
|
||||
$('.' + context + 'SectionTabs', page).show();
|
||||
|
||||
}).on('pageshowready', "#appServicesPage", function () {
|
||||
|
||||
// This needs both events for the helpurl to get done at the right time
|
||||
|
|
|
@ -150,7 +150,19 @@
|
|||
$('.noLiveTvServices', page).show();
|
||||
}
|
||||
|
||||
$('.servicesList', page).html(liveTvInfo.Services.map(getServiceHtml).join('')).trigger('create');
|
||||
var servicesToDisplay = liveTvInfo.Services.filter(function (s) {
|
||||
|
||||
return s.IsVisible;
|
||||
|
||||
});
|
||||
|
||||
if (servicesToDisplay.length) {
|
||||
$('.servicesSection', page).show();
|
||||
} else {
|
||||
$('.servicesSection', page).hide();
|
||||
}
|
||||
|
||||
$('.servicesList', page).html(servicesToDisplay.map(getServiceHtml).join('')).trigger('create');
|
||||
|
||||
var tuners = [];
|
||||
for (var i = 0, length = liveTvInfo.Services.length; i < length; i++) {
|
||||
|
@ -162,9 +174,83 @@
|
|||
|
||||
renderTuners(page, tuners);
|
||||
|
||||
ApiClient.getNamedConfiguration("livetv").done(function (config) {
|
||||
|
||||
renderDevices(page, config.TunerHosts);
|
||||
});
|
||||
|
||||
Dashboard.hideLoadingMsg();
|
||||
}
|
||||
|
||||
function renderDevices(page, devices) {
|
||||
|
||||
var html = '';
|
||||
|
||||
html += '<ul data-role="listview" data-inset="true" data-split-icon="delete">';
|
||||
|
||||
for (var i = 0, length = devices.length; i < length; i++) {
|
||||
|
||||
var device = devices[i];
|
||||
html += '<li>';
|
||||
html += '<a href="#">';
|
||||
|
||||
html += '<h3>';
|
||||
if (device.Type == 'm3u') {
|
||||
html += "M3U";
|
||||
}
|
||||
else if (device.Type == 'hdhomerun') {
|
||||
html += "HD Homerun";
|
||||
} else {
|
||||
html += device.Type;
|
||||
}
|
||||
html += '</h3>';
|
||||
|
||||
html += '<p>';
|
||||
html += device.Url;
|
||||
html += '</p>';
|
||||
|
||||
html += '</a>';
|
||||
html += '<a href="#" class="btnDeleteDevice">';
|
||||
html += '</a>';
|
||||
html += '</li>';
|
||||
}
|
||||
|
||||
html += '</ul>';
|
||||
|
||||
var elem = $('.devicesList', page).html(html).trigger('create');
|
||||
|
||||
$('.btnDeleteDevice', elem).on('click', function () {
|
||||
|
||||
var id = this.getAttribute('data-id');
|
||||
|
||||
deleteDevice(page, id);
|
||||
});
|
||||
}
|
||||
|
||||
function deleteDevice(page, id) {
|
||||
|
||||
var message = Globalize.translate('MessageConfirmDeleteTunerDevice');
|
||||
|
||||
Dashboard.confirm(message, Globalize.translate('HeaderDeleteDevice'), function (confirmResult) {
|
||||
|
||||
if (confirmResult) {
|
||||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
ApiClient.ajax({
|
||||
type: "DELETE",
|
||||
url: ApiClient.getUrl('LiveTv/TunerHosts', {
|
||||
Id: id
|
||||
})
|
||||
|
||||
}).done(function () {
|
||||
|
||||
reload(page);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function reload(page) {
|
||||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
@ -176,29 +262,45 @@
|
|||
});
|
||||
}
|
||||
|
||||
$(document).on('pageshowready', "#liveTvStatusPage", function () {
|
||||
function submitAddDeviceForm(page) {
|
||||
|
||||
page.querySelector('.dlgAddDevice').close();
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
ApiClient.ajax({
|
||||
type: "POST",
|
||||
url: ApiClient.getUrl('LiveTv/TunerHosts'),
|
||||
data: JSON.stringify({
|
||||
Type: $('#selectTunerDeviceType', page).val(),
|
||||
Url: $('#txtDevicePath', page).val()
|
||||
}),
|
||||
contentType: "application/json"
|
||||
|
||||
}).done(function () {
|
||||
|
||||
reload(page);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
$(document).on('pageinitdepends', "#liveTvStatusPage", function () {
|
||||
|
||||
var page = this;
|
||||
|
||||
$('.btnAddDevice', page).on('click', function () {
|
||||
page.querySelector('.dlgAddDevice').open();
|
||||
});
|
||||
|
||||
$('.dlgAddDevice', page).on('submit', function () {
|
||||
submitAddDeviceForm(page);
|
||||
return false;
|
||||
});
|
||||
|
||||
}).on('pageshowready', "#liveTvStatusPage", function () {
|
||||
|
||||
var page = this;
|
||||
|
||||
reload(page);
|
||||
|
||||
// on here
|
||||
$('.btnRefreshGuide', page).taskButton({
|
||||
mode: 'on',
|
||||
progressElem: $('.refreshGuideProgress', page),
|
||||
lastResultElem: $('.lastRefreshGuideResult', page),
|
||||
taskKey: 'RefreshGuide'
|
||||
});
|
||||
|
||||
}).on('pagebeforehide', "#liveTvStatusPage", function () {
|
||||
|
||||
var page = this;
|
||||
|
||||
// off here
|
||||
$('.btnRefreshGuide', page).taskButton({
|
||||
mode: 'off'
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
})(jQuery, document, window);
|
||||
|
|
|
@ -58,6 +58,7 @@
|
|||
options.push({ name: '1080p - 8Mbps', maxHeight: 1080, bitrate: 8000001 });
|
||||
options.push({ name: '1080p - 6Mbps', maxHeight: 1080, bitrate: 6000001 });
|
||||
options.push({ name: '1080p - 5Mbps', maxHeight: 1080, bitrate: 5000001 });
|
||||
options.push({ name: '1080p - 4Mbps', maxHeight: 1080, bitrate: 4000002 });
|
||||
|
||||
} else if (maxAllowedWidth >= 1260) {
|
||||
options.push({ name: '720p - 10Mbps', maxHeight: 720, bitrate: 10000000 });
|
||||
|
@ -119,14 +120,22 @@
|
|||
})[0].maxHeight;
|
||||
}
|
||||
|
||||
var isVlc = AppInfo.isNativeApp && $.browser.android;
|
||||
var bitrateSetting = AppSettings.maxStreamingBitrate();
|
||||
|
||||
if (isVlc) {
|
||||
// Work around vlc 1080p stutter for now
|
||||
if ((maxHeight || 1080) >= 1080) {
|
||||
bitrateSetting = Math.min(bitrateSetting, 4000002);
|
||||
}
|
||||
}
|
||||
|
||||
var canPlayWebm = self.canPlayWebm();
|
||||
|
||||
var profile = {};
|
||||
|
||||
profile.MaxStreamingBitrate = bitrateSetting;
|
||||
profile.MaxStaticBitrate = 40000000;
|
||||
profile.MaxStaticBitrate = 4000000;
|
||||
profile.MusicStreamingTranscodingBitrate = Math.min(bitrateSetting, 192000);
|
||||
|
||||
profile.DirectPlayProfiles = [];
|
||||
|
@ -303,8 +312,6 @@
|
|||
}]
|
||||
});
|
||||
|
||||
var isVlc = AppInfo.isNativeApp && $.browser.android;
|
||||
|
||||
if (!isVlc) {
|
||||
profile.CodecProfiles.push({
|
||||
Type: 'VideoAudio',
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
});
|
||||
}
|
||||
|
||||
function getPluginCardHtml(plugin, pluginConfigurationPages) {
|
||||
function getPluginCardHtml(plugin, getTextLinesCallback, pluginConfigurationPages) {
|
||||
|
||||
var configPage = $.grep(pluginConfigurationPages, function (pluginConfigurationPage) {
|
||||
return pluginConfigurationPage.PluginId == plugin.Id;
|
||||
|
@ -96,6 +96,10 @@
|
|||
html += plugin.Version;
|
||||
html += "</div>";
|
||||
|
||||
if (getTextLinesCallback) {
|
||||
html += getTextLinesCallback(plugin);
|
||||
}
|
||||
|
||||
// cardFooter
|
||||
html += "</div>";
|
||||
|
||||
|
@ -108,16 +112,16 @@
|
|||
return html;
|
||||
}
|
||||
|
||||
function renderPlugins(page, plugins) {
|
||||
function renderPlugins(page, plugins, getTextLinesCallback) {
|
||||
|
||||
ApiClient.getJSON(ApiClient.getUrl("dashboard/configurationpages") + "?pageType=PluginConfiguration").done(function (configPages) {
|
||||
|
||||
populateList(page, plugins, configPages);
|
||||
populateList(page, plugins, getTextLinesCallback, configPages);
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
function populateList(page, plugins, pluginConfigurationPages) {
|
||||
function populateList(page, plugins, getTextLinesCallback, pluginConfigurationPages) {
|
||||
|
||||
plugins = plugins.sort(function (plugin1, plugin2) {
|
||||
|
||||
|
@ -126,7 +130,7 @@
|
|||
});
|
||||
|
||||
var html = plugins.map(function (p) {
|
||||
return getPluginCardHtml(p, pluginConfigurationPages);
|
||||
return getPluginCardHtml(p, getTextLinesCallback, pluginConfigurationPages);
|
||||
|
||||
}).join('');
|
||||
|
||||
|
@ -187,7 +191,7 @@
|
|||
|
||||
ActionSheetElement.show({
|
||||
items: menuItems,
|
||||
positionTo: card,
|
||||
positionTo: elem,
|
||||
callback: function (resultId) {
|
||||
|
||||
switch (resultId) {
|
||||
|
|
|
@ -66,6 +66,15 @@ html, body, .ui-btn, .pageTitle {
|
|||
color: #FF2D55 !important;
|
||||
}
|
||||
|
||||
.channelTimeslotHeader {
|
||||
border-right-color: #FF2D55 !important;
|
||||
}
|
||||
|
||||
.channelTimeslotHeader, .timeslotHeader {
|
||||
background: #FF2D55 !important;
|
||||
}
|
||||
|
||||
|
||||
.libraryViewNav {
|
||||
border-top: 1px solid #333 !important;
|
||||
}
|
||||
|
|
|
@ -149,6 +149,8 @@ paper-button .fa {
|
|||
color: inherit;
|
||||
width: 100%;
|
||||
vertical-align: middle;
|
||||
font-family: inherit;
|
||||
font-weight: inherit;
|
||||
}
|
||||
|
||||
.clearLink {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue