mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
update dialogs
This commit is contained in:
parent
ab738fae14
commit
46043aae83
53 changed files with 478 additions and 374 deletions
|
@ -11,7 +11,6 @@
|
|||
align-items: center;
|
||||
text-align: left;
|
||||
padding: .25em 1.15em;
|
||||
line-height: 160%;
|
||||
cursor: pointer;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
@ -64,6 +63,20 @@
|
|||
min-height: 3.44em;
|
||||
}
|
||||
|
||||
.listItemBody-nogrow {
|
||||
flex-grow: initial;
|
||||
flex-shrink: 0;
|
||||
width: 9em;
|
||||
opacity: .7;
|
||||
}
|
||||
|
||||
@media all and (max-width: 800px) {
|
||||
|
||||
.listItemBody-nogrow {
|
||||
width: 4em;
|
||||
}
|
||||
}
|
||||
|
||||
.two-line {
|
||||
min-height: 5.15em;
|
||||
padding-top: 0;
|
||||
|
@ -78,7 +91,7 @@
|
|||
|
||||
.listItemBodyText {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
padding: .25em 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
@ -152,10 +165,6 @@
|
|||
background-color: transparent !important;
|
||||
}
|
||||
|
||||
.listItemMediaInfo-padded {
|
||||
margin: .5em 0;
|
||||
}
|
||||
|
||||
.listItemMediaInfo {
|
||||
/* Don't display if flex not supported */
|
||||
display: none;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutManager', 'globalize', 'userdataButtons', 'apphost', 'css!./listview'], function (itemHelper, mediaInfo, indicators, connectionManager, layoutManager, globalize, userdataButtons, appHost) {
|
||||
define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutManager', 'globalize', 'datetime', 'userdataButtons', 'apphost', 'css!./listview'], function (itemHelper, mediaInfo, indicators, connectionManager, layoutManager, globalize, datetime, userdataButtons, appHost) {
|
||||
|
||||
function getIndex(item, options) {
|
||||
|
||||
|
@ -178,7 +178,11 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
|
|||
}
|
||||
}
|
||||
|
||||
var cssClass = "listItem listItem-nosidepadding listItem-border";
|
||||
var cssClass = "listItem listItem-nosidepadding";
|
||||
|
||||
if (options.border !== false) {
|
||||
cssClass += ' listItem-border';
|
||||
}
|
||||
|
||||
if (clickEntireItem) {
|
||||
cssClass += ' itemAction listItem-button';
|
||||
|
@ -210,38 +214,53 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
|
|||
html += '<button is="paper-icon-button-light" class="listViewDragHandle autoSize listItemButton"><i class="md-icon"></i></button>';
|
||||
}
|
||||
|
||||
var imgUrl = getImageUrl(item, downloadWidth);
|
||||
if (options.image !== false) {
|
||||
var imgUrl = getImageUrl(item, downloadWidth);
|
||||
|
||||
var imageClass = isLargeStyle ? 'listItemImage listItemImage-large' : 'listItemImage';
|
||||
var imageClass = isLargeStyle ? 'listItemImage listItemImage-large' : 'listItemImage';
|
||||
|
||||
if (imgUrl) {
|
||||
html += '<div class="' + imageClass + ' lazy" data-src="' + imgUrl + '" item-icon>';
|
||||
} else {
|
||||
html += '<div class="' + imageClass + '">';
|
||||
if (imgUrl) {
|
||||
html += '<div class="' + imageClass + ' lazy" data-src="' + imgUrl + '" item-icon>';
|
||||
} else {
|
||||
html += '<div class="' + imageClass + '">';
|
||||
}
|
||||
|
||||
var indicatorsHtml = '';
|
||||
indicatorsHtml += indicators.getPlayedIndicatorHtml(item);
|
||||
|
||||
if (indicatorsHtml) {
|
||||
html += '<div class="indicators listItemIndicators">' + indicatorsHtml + '</div>';
|
||||
}
|
||||
|
||||
var progressHtml = indicators.getProgressBarHtml(item, {
|
||||
containerClass: 'listItemProgressBar'
|
||||
});
|
||||
|
||||
if (progressHtml) {
|
||||
html += progressHtml;
|
||||
}
|
||||
html += '</div>';
|
||||
}
|
||||
|
||||
var indicatorsHtml = '';
|
||||
indicatorsHtml += indicators.getPlayedIndicatorHtml(item);
|
||||
|
||||
if (indicatorsHtml) {
|
||||
html += '<div class="indicators listItemIndicators">' + indicatorsHtml + '</div>';
|
||||
if (options.showProgramTimeColumn) {
|
||||
html += '<div class="listItemBody listItemBody-nogrow listItemBody-rightborder"><div class="listItemBodyText">';
|
||||
html += datetime.getDisplayTime(datetime.parseISO8601Date(item.StartDate));
|
||||
html += ' - ';
|
||||
html += datetime.getDisplayTime(datetime.parseISO8601Date(item.EndDate));
|
||||
html += '</div></div>';
|
||||
}
|
||||
|
||||
var progressHtml = indicators.getProgressBarHtml(item, {
|
||||
containerClass: 'listItemProgressBar'
|
||||
});
|
||||
|
||||
if (progressHtml) {
|
||||
html += progressHtml;
|
||||
}
|
||||
html += '</div>';
|
||||
|
||||
var textlines = [];
|
||||
|
||||
if (options.showParentTitle) {
|
||||
if (item.Type == 'Episode') {
|
||||
textlines.push(item.SeriesName || ' ');
|
||||
}
|
||||
|
||||
// Not needed, part of mediainfo
|
||||
//if (item.EpisodeTitle) {
|
||||
// textlines.push(item.Name || ' ');
|
||||
//}
|
||||
}
|
||||
|
||||
var displayName = itemHelper.getDisplayName(item);
|
||||
|
@ -273,7 +292,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
|
|||
}
|
||||
}
|
||||
|
||||
cssClass = 'listItemBody';
|
||||
cssClass = 'listItemBody two-line';
|
||||
if (!clickEntireItem) {
|
||||
cssClass += ' itemAction';
|
||||
}
|
||||
|
@ -287,9 +306,6 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
|
|||
if (!enableSideMediaInfo) {
|
||||
|
||||
var mediaInfoClass = 'secondary listItemMediaInfo listItemBodyText';
|
||||
if (layoutManager.tv) {
|
||||
mediaInfoClass += ' listItemMediaInfo-padded';
|
||||
}
|
||||
|
||||
html += '<div class="' + mediaInfoClass + '">' + mediaInfo.getPrimaryMediaInfoHtml(item) + '</div>';
|
||||
}
|
||||
|
@ -313,13 +329,16 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
|
|||
|
||||
if (!clickEntireItem) {
|
||||
html += '<button is="paper-icon-button-light" class="listItemButton itemAction autoSize" data-action="menu"><i class="md-icon">' + moreIcon + '</i></button>';
|
||||
html += '<span class="listViewUserDataButtons">';
|
||||
html += userdataButtons.getIconsHtml({
|
||||
item: item,
|
||||
includePlayed: false,
|
||||
cssClass: 'listItemButton'
|
||||
});
|
||||
html += '</span>';
|
||||
|
||||
if (options.enableUserDataButtons !== false) {
|
||||
html += '<span class="listViewUserDataButtons">';
|
||||
html += userdataButtons.getIconsHtml({
|
||||
item: item,
|
||||
includePlayed: false,
|
||||
cssClass: 'listItemButton'
|
||||
});
|
||||
html += '</span>';
|
||||
}
|
||||
}
|
||||
|
||||
html += '</' + outerTagName + '>';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue