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

Merge pull request #3319 from SenorSmartyPants/LiveTVDisplay

Browse Source 
Add episode details to live TV DVR schedule
This commit is contained in:
Bill Thornton 2022-01-13 12:55:35 -05:00 committed by GitHub
commit 47b24659a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/cardbuilder/card.scss
View File

@ -333,6 +333,7 @@ button::-moz-focus-inner {
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
text-align: left;
}
.innerCardFooter > .cardText {
@ -355,7 +356,8 @@ button::-moz-focus-inner {
background-position: center center;
}
.cardTextCentered {
.cardTextCentered,
.cardTextCentered > .textActionButton {
text-align: center;
}

1
src/components/cardbuilder/cardBuilder.js
View File

@ -771,6 +771,7 @@ import ServerConnections from '../ServerConnections';
* @returns {string} HTML markup of the card's footer text element.
*/
function getCardFooterText(item, apiClient, options, showTitle, forceName, overlayText, imgUrl, footerClass, progressHtml, logoUrl, isOuterFooter) {
item = item.ProgramInfo || item;
let html = '';
if (logoUrl) {

2
src/components/itemHelper.js
View File

@ -20,7 +20,7 @@ export function getDisplayName(item, options = {}) {
}
if (item.Type === 'Episode' && item.ParentIndexNumber === 0) {
name = globalize.translate('ValueSpecialEpisodeName', name);
} else if ((item.Type === 'Episode' || item.Type === 'Program') && item.IndexNumber != null && item.ParentIndexNumber != null && options.includeIndexNumber !== false) {
} else if ((item.Type === 'Episode' || item.Type === 'Program' || item.Type === 'Recording') && item.IndexNumber != null && item.ParentIndexNumber != null && options.includeIndexNumber !== false) {
let displayIndexNumber = item.IndexNumber;
let number = displayIndexNumber;

2
src/controllers/livetv/livetvschedule.js
View File

@ -61,7 +61,7 @@ function renderActiveRecordings(context, promise) {
defaultShape: getBackdropShape(),
showParentTitle: false,
showParentTitleOrTitle: true,
showTitle: false,
showTitle: true,
showAirTime: true,
showAirEndTime: true,
showChannelName: true,

1
src/scripts/livetvcomponents.js
View File

@ -79,6 +79,7 @@ function getTimersHtml(timers, options) {
html += cardBuilder.getCardsHtml({
items: group.items,
shape: getBackdropShape(),
showTitle: true,
showParentTitleOrTitle: true,
showAirTime: true,
showAirEndTime: true,