mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update live streams

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-05 03:15:29 -04:00
parent 0d820807fa
commit f0eb199063
13 changed files with 194 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

19
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css vendored
View file

@ -1,3 +1,8 @@
button::-moz-focus-inner {
padding: 0;
border: 0
}
.card {
border: 0;
font-size: inherit !important;
@ -196,6 +201,20 @@
background-position: center bottom;
}
.cardImage-img {
max-height: 100%;
max-width: 100%;
align-self: flex-end;
position: static;
}
.coveredImage-img {
max-height: none;
max-width: none;
height: 100%;
width: 100%;
}
.coveredImage {
background-size: 100% 100%;
background-position: center center;

53
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js vendored
View file

@ -712,18 +712,19 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
for (i = 0, length = lines.length; i < length; i++) {
var currentCssClass = cssClass;
var text = lines[i];
if (i === 1 && isOuterFooter) {
cssClass += ' cardText-secondary';
if (valid > 0 && isOuterFooter) {
currentCssClass += ' cardText-secondary';
}
if (isOuterFooter && cardLayout) {
cssClass += ' cardText-rightmargin';
currentCssClass += ' cardText-rightmargin';
}
if (text) {
html += "<div class='" + cssClass + "'>";
html += "<div class='" + currentCssClass + "'>";
html += text;
html += "</div>";
valid++;
@ -740,7 +741,8 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
return html;
}
function getCardFooterText(item, apiClient, options, showTitle, forceName, overlayText, imgUrl, footerClass, progressHtml, isOuterFooter) {
var uniqueFooterIndex = 0;
function getCardFooterText(item, apiClient, options, showTitle, forceName, overlayText, imgUrl, footerClass, progressHtml, isOuterFooter, cardFooterId, vibrantSwatch) {
var html = '';
@ -982,7 +984,18 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
}
if (html) {
html = '<div class="' + footerClass + '">' + html;
var style = '';
if (options.vibrant && vibrantSwatch) {
var swatch = vibrantSwatch.split('|');
if (swatch.length) {
var index = 0;
style = ' style="color:' + swatch[index + 1] + ';background-color:' + swatch[index] + ';"';
}
}
html = '<div id="' + cardFooterId + '" class="' + footerClass + '"' + style + '>' + html;
//cardFooter
html += "</div>";
@ -1139,7 +1152,9 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
}
var cardImageContainerClass = 'cardImageContainer';
if (options.coverImage || imgInfo.coverImage) {
var coveredImage = options.coverImage || imgInfo.coverImage;
if (coveredImage) {
cardImageContainerClass += ' coveredImage';
if (item.MediaType === 'Photo' || item.Type === 'PhotoAlbum' || item.Type === 'Folder' || item.ProgramInfo || item.Type === 'Program') {
@ -1167,10 +1182,13 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
var footerOverlayed = false;
var cardFooterId = 'cardFooter' + uniqueFooterIndex;
uniqueFooterIndex++;
if (overlayText) {
footerCssClass = progressHtml ? 'innerCardFooter fullInnerCardFooter' : 'innerCardFooter';
innerCardFooter += getCardFooterText(item, apiClient, options, showTitle, forceName, overlayText, imgUrl, footerCssClass, progressHtml, false);
innerCardFooter += getCardFooterText(item, apiClient, options, showTitle, forceName, overlayText, imgUrl, footerCssClass, progressHtml, false, cardFooterId);
footerOverlayed = true;
}
else if (progressHtml) {
@ -1186,10 +1204,12 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
innerCardFooter += '<div class="mediaSourceIndicator">' + mediaSourceCount + '</div>';
}
var vibrantSwatch = options.vibrant && imgUrl ? imageLoader.getCachedVibrantInfo(imgUrl) : null;
var outerCardFooter = '';
if (!overlayText && !footerOverlayed) {
footerCssClass = options.cardLayout ? 'cardFooter visualCardBox-cardFooter' : 'cardFooter transparent';
outerCardFooter = getCardFooterText(item, apiClient, options, showTitle, forceName, overlayText, imgUrl, footerCssClass, progressHtml, true);
outerCardFooter = getCardFooterText(item, apiClient, options, showTitle, forceName, overlayText, imgUrl, footerCssClass, progressHtml, true, cardFooterId, vibrantSwatch);
}
if (outerCardFooter && !options.cardLayout && options.allowBottomPadding !== false) {
@ -1241,7 +1261,19 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
cardContentOpen = '<button type="button" class="clearButton cardContent itemAction" data-action="' + action + '">';
cardContentClose = '</button>';
}
if (options.vibrant && imgUrl && !vibrantSwatch) {
cardImageContainerOpen = imgUrl ? ('<div class="' + cardImageContainerClass + '">') : ('<div class="' + cardImageContainerClass + '">');
var imgClass = 'cardImage cardImage-img lazy';
if (coveredImage) {
imgClass += ' coveredImage-img';
}
cardImageContainerOpen += '<img class="' + imgClass + '" data-vibrant="' + cardFooterId + '" data-swatch="db" data-src="' + imgUrl + '" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" />';
} else {
cardImageContainerOpen = imgUrl ? ('<div class="' + cardImageContainerClass + ' lazy" data-src="' + imgUrl + '">') : ('<div class="' + cardImageContainerClass + '">');
}
var cardScalableClass = options.cardLayout ? 'cardScalable visualCardBox-cardScalable' : 'cardScalable';
cardImageContainerOpen = '<div class="' + cardBoxClass + '"><div class="' + cardScalableClass + '"><div class="cardPadder-' + options.shape + '"></div>' + cardContentOpen + cardImageContainerOpen;
@ -1439,10 +1471,11 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
playedIndicator = document.createElement('div');
playedIndicator.classList.add('playedIndicator');
playedIndicator.classList.add('indicator');
indicatorsElem = ensureIndicators(card, indicatorsElem);
indicatorsElem.appendChild(playedIndicator);
}
playedIndicator.innerHTML = '<i class="md-icon">check</i>';
playedIndicator.innerHTML = '<i class="md-icon indicatorIcon">check</i>';
} else {
playedIndicator = card.querySelector('.playedIndicator');

18
dashboard-ui/bower_components/emby-webcomponents/images/basicimagefetcher.js vendored
View file

@ -1,16 +1,24 @@
define([], function () {
define(['dom'], function (dom) {
function loadImage(elem, url) {
if (elem.tagName !== "IMG") {
elem.style.backgroundImage = "url('" + url + "')";
return Promise.resolve(elem);
return Promise.resolve();
} else {
elem.setAttribute("src", url);
return Promise.resolve(elem);
}
return loadImageIntoImg(elem, url);
}
function loadImageIntoImg(elem, url) {
return new Promise(function (resolve, reject) {
dom.addEventListener(elem, 'load', resolve, {
once: true
});
elem.setAttribute("src", url);
});
}
return {

98
dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js vendored
View file

@ -1,4 +1,4 @@
define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser', 'dom'], function (visibleinviewport, imageFetcher, layoutManager, events, browser, dom) {
define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser', 'dom', 'appSettings', 'vibrant'], function (visibleinviewport, imageFetcher, layoutManager, events, browser, dom, appSettings) {
var thresholdX;
var thresholdY;
@ -47,16 +47,105 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser
if (!source) {
source = elem.getAttribute('data-src');
}
if (source) {
imageFetcher.loadImage(elem, source).then(function () {
fillVibrant(elem, source);
if (enableFade && !layoutManager.tv && enableEffects !== false) {
imageFetcher.loadImage(elem, source).then(fadeIn);
} else {
imageFetcher.loadImage(elem, source);
fadeIn(elem);
}
elem.removeAttribute("data-src");
});
}
}
function fillVibrant(img, url) {
if (img.tagName != 'IMG') {
return;
}
var vibrantElement = img.getAttribute('data-vibrant');
if (!vibrantElement) {
return;
}
vibrantElement = document.getElementById(vibrantElement);
if (!vibrantElement) {
return;
}
var swatch = getVibrantInfo(img, url).split('|');
if (swatch.length) {
var index = 0;
vibrantElement.style['backgroundColor'] = swatch[index];
vibrantElement.style['color'] = swatch[index + 1];
}
/*
* Results into:
* Vibrant #7a4426
* Muted #7b9eae
* DarkVibrant #348945
* DarkMuted #141414
* LightVibrant #f3ccb4
*/
}
function getSettingsKey(url) {
return 'vibrant2-' + url.split('?')[0];
}
function getCachedVibrantInfo(url) {
return appSettings.get(getSettingsKey(url));
}
function getVibrantInfo(img, url) {
var value = getCachedVibrantInfo(url);
if (value) {
return value;
}
var vibrant = new Vibrant(img);
var swatches = vibrant.swatches();
value = '';
var swatch = swatches['DarkVibrant'];
if (swatch) {
value += swatch.getHex() + '|' + swatch.getBodyTextColor();
}
swatch = swatches['DarkMuted'];
if (swatch) {
value += '|' + swatch.getHex() + '|' + swatch.getBodyTextColor();
} else {
value += '||';
}
swatch = swatches['Vibrant'];
if (swatch) {
value += '|' + swatch.getHex() + '|' + swatch.getBodyTextColor();
} else {
value += '||';
}
swatch = swatches['Muted'];
if (swatch) {
value += '|' + swatch.getHex() + '|' + swatch.getBodyTextColor();
} else {
value += '||';
}
if (value) {
appSettings.set(getSettingsKey(url), value);
}
return value;
}
function fadeIn(elem) {
var duration = layoutManager.tv ? 160 : 300;
@ -268,6 +357,7 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser
self.lazyImage = fillImage;
self.lazyChildren = lazyChildren;
self.getPrimaryImageAspectRatio = getPrimaryImageAspectRatio;
self.getCachedVibrantInfo = getCachedVibrantInfo;
return self;
});

6
dashboard-ui/css/site.css
View file

@ -420,6 +420,12 @@ div[data-role='page'] {
background-color: #fff;
}
.ui-body-a .visualCardBox {
border: 0;
margin: 6px;
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
}
.ui-body-a .cardFooter .cardText + .cardText {
opacity: .8;
}

6
dashboard-ui/livetvseriestimer.html
View file

@ -20,12 +20,6 @@
</div>
<h1 style="margin-top:0;">${HeaderSchedule}</h1>
<div style="display:flex;align-items:center;margin:1em 0;justify-content:flex-end;">
<i class="md-icon" style="color:#cc3333;font-size:1.5em;">&#xE062;</i>
<div style="margin-left:.3em;">${WillRecord}</div>
<i class="md-icon" style="color:gray;font-size:1.5em;margin-left: 1em;">&#xE062;</i>
<div style="margin-left:.3em;">${NotScheduledToRecord}</div>
</div>
<div class="scheduleTab seriesTimerSchedule">
</div>
</div>

2
dashboard-ui/scripts/dashboardpage.js
View file

@ -32,7 +32,7 @@
label: Globalize.translate('LabelFriendlyServerName'),
description: Globalize.translate('LabelFriendlyServerNameHelp'),
value: page.querySelector('.serverNameHeader').innerHTML,
submitText: Globalize.translate('ButtonSave')
confirmText: Globalize.translate('ButtonSave')
}).then(function (value) {

1
dashboard-ui/scripts/livetvcomponents.js
View file

@ -90,6 +90,7 @@
showChannelName: true,
lazy: true,
cardLayout: true,
vibrant: true,
action: 'edit',
cardFooterAside: 'none',
preferThumb: true,

1
dashboard-ui/scripts/livetvrecordings.js
View file

@ -84,6 +84,7 @@
coverImage: true,
lazy: true,
cardLayout: true,
vibrant: true,
allowBottomPadding: !enableScrollX(),
preferThumb: 'auto'

1
dashboard-ui/scripts/livetvseriestimers.js
View file

@ -35,6 +35,7 @@
shape: 'backdrop',
showTitle: true,
cardLayout: true,
vibrant: true,
cardFooterAside: 'none',
preferThumb: true,
coverImage: true,

3
dashboard-ui/scripts/medialibrarypage.js
View file

@ -75,7 +75,8 @@
require(['prompt'], function (prompt) {
prompt({
label: Globalize.translate('LabelNewName')
label: Globalize.translate('LabelNewName'),
confirmText: Globalize.translate('ButtonRename')
}).then(function (newName) {
if (newName && newName != virtualFolder.Name) {

6
dashboard-ui/scripts/movies.js
View file

@ -113,7 +113,8 @@
lazy: true,
cardLayout: true,
showTitle: true,
showYear: true
showYear: true,
vibrant: true
});
}
else if (viewStyle == "Banner") {
@ -143,7 +144,8 @@
showTitle: true,
showYear: true,
lazy: true,
cardLayout: true
cardLayout: true,
vibrant: true
});
}
else {

6
dashboard-ui/scripts/tvshows.js
View file

@ -113,7 +113,8 @@
lazy: true,
cardLayout: true,
showTitle: true,
showSeriesYear: true
showSeriesYear: true,
vibrant: true
});
}
else if (viewStyle == "Banner") {
@ -143,7 +144,8 @@
showTitle: true,
showYear: true,
lazy: true,
cardLayout: true
cardLayout: true,
vibrant: true
});
}
else {