mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
support channels with dlna
This commit is contained in:
parent
b89707f7b9
commit
27cc543b5f
13 changed files with 20 additions and 34 deletions
|
@ -379,7 +379,7 @@ a.itemTag:hover {
|
||||||
|
|
||||||
.itemBackdrop {
|
.itemBackdrop {
|
||||||
background-size: cover;
|
background-size: cover;
|
||||||
background-position: center 13%;
|
background-position: center 15%;
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
height: 600px;
|
height: 600px;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
@ -664,13 +664,6 @@ a.itemTag:hover {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media all and (min-width: 1000px) {
|
|
||||||
|
|
||||||
.itemBackdrop {
|
|
||||||
background-size: 100% auto;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media all and (min-width: 750px) {
|
@media all and (min-width: 750px) {
|
||||||
.detailPageContent {
|
.detailPageContent {
|
||||||
max-width: 900px;
|
max-width: 900px;
|
||||||
|
|
|
@ -432,7 +432,7 @@ h1 .imageLink {
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-primary {
|
.content-primary {
|
||||||
padding: 80px 0 3em 0;
|
padding: 80px 15px 3em 0;
|
||||||
margin: 0 0 0 260px;
|
margin: 0 0 0 260px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
<a href="#" data-role="button" class="ui-btn-active">${TabDashboard}</a>
|
<a href="#" data-role="button" class="ui-btn-active">${TabDashboard}</a>
|
||||||
<a href="dashboardgeneral.html" data-role="button">${TabSettings}</a>
|
<a href="dashboardgeneral.html" data-role="button">${TabSettings}</a>
|
||||||
<a href="serversecurity.html" data-role="button">${TabSecurity}</a>
|
<a href="serversecurity.html" data-role="button">${TabSecurity}</a>
|
||||||
<a href="dashboardsync.html" data-role="button">${TabSync}</a>
|
<!--<a href="dashboardsync.html" data-role="button">${TabSync}</a>-->
|
||||||
</div>
|
</div>
|
||||||
<div class="dashboardContent">
|
<div class="dashboardContent">
|
||||||
<div class="readOnlyContent dashboardHomeLeftColumn">
|
<div class="readOnlyContent dashboardHomeLeftColumn">
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
<a href="dashboard.html" data-role="button">${TabDashboard}</a>
|
<a href="dashboard.html" data-role="button">${TabDashboard}</a>
|
||||||
<a href="#" data-role="button" class="ui-btn-active">${TabSettings}</a>
|
<a href="#" data-role="button" class="ui-btn-active">${TabSettings}</a>
|
||||||
<a href="serversecurity.html" data-role="button">${TabSecurity}</a>
|
<a href="serversecurity.html" data-role="button">${TabSecurity}</a>
|
||||||
<a href="dashboardsync.html" data-role="button">${TabSync}</a>
|
<!--<a href="dashboardsync.html" data-role="button">${TabSync}</a>-->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<form class="dashboardGeneralForm">
|
<form class="dashboardGeneralForm">
|
||||||
|
|
|
@ -12,14 +12,15 @@
|
||||||
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
|
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
|
||||||
<a href="advanced.html" data-role="button">${TabGeneral}</a>
|
<a href="advanced.html" data-role="button">${TabGeneral}</a>
|
||||||
<a href="#" data-role="button" class="ui-btn-active">${TabNotifications}</a>
|
<a href="#" data-role="button" class="ui-btn-active">${TabNotifications}</a>
|
||||||
|
<a href="scheduledtasks.html" data-role="button">${TabScheduledTasks}</a>
|
||||||
<a href="encodingsettings.html" data-role="button">${TabTranscoding}</a>
|
<a href="encodingsettings.html" data-role="button">${TabTranscoding}</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="readOnlyContent">
|
<div class="readOnlyContent">
|
||||||
|
|
||||||
<div class="notificationsList" style="margin-top: 1em;">
|
<div class="notificationsList" style="margin-top: 1em;">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p style="display:none;" class="btnMarkReadContainer"><button class="btnMarkRead" type="button" data-icon="check">${ButtonMarkRead}</button></p>
|
<p style="display:none;" class="btnMarkReadContainer"><button class="btnMarkRead" type="button" data-icon="check">${ButtonMarkRead}</button></p>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -63,12 +63,7 @@
|
||||||
|
|
||||||
var port = systemInfo.HttpServerPortNumber;
|
var port = systemInfo.HttpServerPortNumber;
|
||||||
|
|
||||||
if (port == systemInfo.WebSocketPortNumber) {
|
$('#ports', page).html(Globalize.translate('LabelRunningOnPort').replace('{0}', '<b>' + port + '</b>'));
|
||||||
|
|
||||||
$('#ports', page).html(Globalize.translate('LabelRunningOnPort').replace('{0}', '<b>' + port + '</b>'));
|
|
||||||
} else {
|
|
||||||
$('#ports', page).html(Globalize.translate('LabelRunningOnPorts').replace('{0}', '<b>' + port + '</b>').replace('{1}', '<b>' + systemInfo.WebSocketPortNumber + '</b>'));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (systemInfo.CanSelfRestart) {
|
if (systemInfo.CanSelfRestart) {
|
||||||
$('.btnRestartContainer', page).removeClass('hide');
|
$('.btnRestartContainer', page).removeClass('hide');
|
||||||
|
|
|
@ -90,7 +90,10 @@
|
||||||
|
|
||||||
Dashboard.getCurrentUser().done(function (user) {
|
Dashboard.getCurrentUser().done(function (user) {
|
||||||
|
|
||||||
if (user.Configuration.EnableContentDeletion &&
|
if (item.Type == 'BoxSet') {
|
||||||
|
$('#fldDelete', page).show();
|
||||||
|
}
|
||||||
|
else if (user.Configuration.EnableContentDeletion &&
|
||||||
item.Type != "TvChannel" &&
|
item.Type != "TvChannel" &&
|
||||||
item.Type != "Genre" &&
|
item.Type != "Genre" &&
|
||||||
item.Type != "Studio" &&
|
item.Type != "Studio" &&
|
||||||
|
|
|
@ -133,9 +133,11 @@
|
||||||
html += '<div class="cardPadder"></div>';
|
html += '<div class="cardPadder"></div>';
|
||||||
html += '<a class="cardContent" href="#" data-ajax="false" data-haspw="' + user.HasPassword + '" data-username="' + user.Name + '" data-userid="' + user.Id + '">';
|
html += '<a class="cardContent" href="#" data-ajax="false" data-haspw="' + user.HasPassword + '" data-username="' + user.Name + '" data-userid="' + user.Id + '">';
|
||||||
|
|
||||||
|
var imgUrl;
|
||||||
|
|
||||||
if (user.PrimaryImageTag) {
|
if (user.PrimaryImageTag) {
|
||||||
|
|
||||||
var imgUrl = ApiClient.getUserImageUrl(user.Id, {
|
imgUrl = ApiClient.getUserImageUrl(user.Id, {
|
||||||
width: 300,
|
width: 300,
|
||||||
tag: user.PrimaryImageTag,
|
tag: user.PrimaryImageTag,
|
||||||
type: "Primary"
|
type: "Primary"
|
||||||
|
@ -147,7 +149,9 @@
|
||||||
|
|
||||||
var background = LibraryBrowser.getMetroColor(user.Id);
|
var background = LibraryBrowser.getMetroColor(user.Id);
|
||||||
|
|
||||||
html += '<div class="cardImage" style="background-color:' + background + ';"></div>';
|
imgUrl = 'css/images/logindefault.png';
|
||||||
|
|
||||||
|
html += '<div class="cardImage" style="background-image:url(\'' + imgUrl + '\');background-color:' + background + ';"></div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
html += '</a>';
|
html += '</a>';
|
||||||
|
|
|
@ -222,12 +222,10 @@
|
||||||
{ name: "Music", value: "music" },
|
{ name: "Music", value: "music" },
|
||||||
{ name: "TV shows", value: "tvshows" },
|
{ name: "TV shows", value: "tvshows" },
|
||||||
{ name: "Books*", value: "books" },
|
{ name: "Books*", value: "books" },
|
||||||
{ name: "Collections", value: "boxsets" },
|
|
||||||
{ name: "Games*", value: "games" },
|
{ name: "Games*", value: "games" },
|
||||||
{ name: "Home videos", value: "homevideos" },
|
{ name: "Home videos", value: "homevideos" },
|
||||||
{ name: "Music videos", value: "musicvideos" },
|
{ name: "Music videos", value: "musicvideos" },
|
||||||
{ name: "Photos", value: "photos" },
|
{ name: "Photos", value: "photos" },
|
||||||
//{ name: "Trailers", value: "trailers" },
|
|
||||||
{ name: "Adult videos", value: "adultvideos" },
|
{ name: "Adult videos", value: "adultvideos" },
|
||||||
{ name: "Mixed movies & tv", value: "mixed" }
|
{ name: "Mixed movies & tv", value: "mixed" }
|
||||||
];
|
];
|
||||||
|
|
|
@ -110,6 +110,7 @@
|
||||||
|
|
||||||
function isAvailable(item, user) {
|
function isAvailable(item, user) {
|
||||||
|
|
||||||
|
return false;
|
||||||
return item.SupportsSync;
|
return item.SupportsSync;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -124,10 +124,8 @@
|
||||||
|
|
||||||
if (userId) {
|
if (userId) {
|
||||||
$('#userProfileNavigation', page).show();
|
$('#userProfileNavigation', page).show();
|
||||||
$('.serverNavigation', page).hide();
|
|
||||||
} else {
|
} else {
|
||||||
$('#userProfileNavigation', page).hide();
|
$('#userProfileNavigation', page).hide();
|
||||||
$('.serverNavigation', page).show();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Dashboard.getCurrentUser().done(function (loggedInUser) {
|
Dashboard.getCurrentUser().done(function (loggedInUser) {
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
<a href="dashboard.html" data-role="button">${TabDashboard}</a>
|
<a href="dashboard.html" data-role="button">${TabDashboard}</a>
|
||||||
<a href="dashboardgeneral.html" data-role="button">${TabSettings}</a>
|
<a href="dashboardgeneral.html" data-role="button">${TabSettings}</a>
|
||||||
<a href="#" data-role="button" class="ui-btn-active">${TabSecurity}</a>
|
<a href="#" data-role="button" class="ui-btn-active">${TabSecurity}</a>
|
||||||
<a href="dashboardsync.html" data-role="button">${TabSync}</a>
|
<!--<a href="dashboardsync.html" data-role="button">${TabSync}</a>-->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h2 style="margin-top: -10px;">
|
<h2 style="margin-top: -10px;">
|
||||||
|
|
|
@ -9,13 +9,6 @@
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<div class="content-primary">
|
<div class="content-primary">
|
||||||
|
|
||||||
<div data-role="controlgroup" data-type="horizontal" class="localnav serverNavigation" data-mini="true" style="display: none;">
|
|
||||||
<a href="dashboard.html" data-role="button">${TabDashboard}</a>
|
|
||||||
<a href="dashboardgeneral.html" data-role="button">${TabSettings}</a>
|
|
||||||
<a href="serversecurity.html" data-role="button">${TabSecurity}</a>
|
|
||||||
<a href="dashboardsync.html" data-role="button">${TabSync}</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div data-role="controlgroup" data-type="horizontal" class="localnav" id="userProfileNavigation" style="display: none;" data-mini="true">
|
<div data-role="controlgroup" data-type="horizontal" class="localnav" id="userProfileNavigation" style="display: none;" data-mini="true">
|
||||||
<a href="#" data-role="button" class="ui-btn-active">${TabProfile}</a>
|
<a href="#" data-role="button" class="ui-btn-active">${TabProfile}</a>
|
||||||
<a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">${TabImage}</a>
|
<a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">${TabImage}</a>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue