cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

update naming project

Browse Source
This commit is contained in:
Luke Pulverenti 2016-07-22 00:59:58 -04:00
parent 3be5ea01cf
commit 707725bb93
6 changed files with 67 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dashboard-ui/css/card.css
View File

@ -182,7 +182,7 @@
}
.visualCardBox .outerCardFooter {
padding: 3px;
padding: .5em .3em;
position: relative;
}
@ -230,7 +230,7 @@
}
.outerCardFooter .cardText + .cardText {
opacity: .8;
opacity: .6;
}
.outerCardFooter .cardText:first-child {

18
dashboard-ui/css/librarybrowser.css
View File

@ -57,6 +57,24 @@
contain: style;
}
.textActionButton {
border: 0 !important;
background: transparent;
border: 0 !important;
padding: 0 !important;
cursor: pointer;
outline: none !important;
color: inherit;
vertical-align: middle;
font-family: inherit;
font-size: inherit;
}
.textActionButton:hover {
text-decoration: underline;
opacity: 1;
}
.pageWithAbsoluteTabs .pageTabContent, .libraryPage > .ui-content {
padding-top: 10px;
}

3
dashboard-ui/scripts/homeupcoming.js
View File

@ -115,7 +115,8 @@
showDetailsMenu: true,
centerText: true,
context: 'home-upcoming',
overlayMoreButton: true
overlayMoreButton: true,
showParentTitle: true
});
html += '</div>';

47
dashboard-ui/scripts/librarybrowser.js
View File

@ -1447,7 +1447,7 @@
var footerCssClass = progressHtml ? 'cardFooter fullCardFooter' : 'cardFooter';
html += LibraryBrowser.getCardFooterText(item, options, showTitle, imgUrl, forceName, footerCssClass, progressHtml);
html += LibraryBrowser.getCardFooterText(item, options, showTitle, imgUrl, forceName, footerCssClass, progressHtml, false);
footerOverlayed = true;
}
else if (progressHtml) {
@ -1475,7 +1475,7 @@
html += '</div>';
if (!options.overlayText && !footerOverlayed) {
html += LibraryBrowser.getCardFooterText(item, options, showTitle, imgUrl, forceName, 'cardFooter outerCardFooter', progressHtml);
html += LibraryBrowser.getCardFooterText(item, options, showTitle, imgUrl, forceName, 'cardFooter outerCardFooter', progressHtml, true);
}
// cardBox
@ -1487,7 +1487,20 @@
return html;
},
getCardFooterText: function (item, options, showTitle, imgUrl, forceName, footerClass, progressHtml) {
getTextActionButton: function (item, text) {
if (!text) {
text = itemHelper.getDisplayName(item);
}
var html = '<button data-id="' + item.Id + '" data-type="' + item.Type + '" data-mediatype="' + item.MediaType + '" data-isfolder="' + item.IsFolder + '" type="button" class="itemAction textActionButton" data-action="link">';
html += text;
html += '</button>';
return html;
},
getCardFooterText: function (item, options, showTitle, imgUrl, forceName, footerClass, progressHtml, isOuterFooter) {
var html = '';
@ -1509,9 +1522,22 @@
var lines = [];
if (options.showParentTitle) {
var parentTitleUnderneath = item.Type == 'MusicAlbum' || item.Type == 'Audio' || item.Type == 'MusicVideo';
if (options.showParentTitle && !parentTitleUnderneath) {
lines.push(item.EpisodeTitle ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || ""));
if (isOuterFooter && item.Type == 'Episode' && item.SeriesName && item.SeriesId) {
lines.push(LibraryBrowser.getTextActionButton({
Id: item.SeriesId,
Name: item.SeriesName,
Type: 'Series',
IsFolder: true
}));
}
else {
lines.push(item.EpisodeTitle ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || ""));
}
}
if (showTitle || forceName) {
@ -1519,6 +1545,17 @@
lines.push(htmlEncode(name));
}
if (options.showParentTitle && parentTitleUnderneath) {
if (isOuterFooter && item.AlbumArtists && item.AlbumArtists.length) {
item.AlbumArtists[0].Type = 'MusicArtist';
item.AlbumArtists[0].IsFolder = true;
lines.push(LibraryBrowser.getTextActionButton(item.AlbumArtists[0]));
} else {
lines.push(item.EpisodeTitle ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || ""));
}
}
if (options.showItemCounts) {
var itemCountHtml = LibraryBrowser.getItemCountsHtml(options, item);

1
dashboard-ui/scripts/movies.js
View File

@ -205,6 +205,7 @@
var alphaPickerElement = tabContent.querySelector('.alphaPicker');
alphaPickerElement.addEventListener('alphavaluechanged', function (e) {
var newValue = e.detail.value;
alert(newValue);
var query = getQuery(tabContent);
query.NameStartsWithOrGreater = newValue;
query.StartIndex = 0;

3
dashboard-ui/scripts/tvupcoming.js
View File

@ -116,7 +116,8 @@
lazy: true,
showDetailsMenu: true,
centerText: true,
overlayMoreButton: true
overlayMoreButton: true,
showParentTitle: true
});
html += '</div>';