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 stream sharing

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-11 17:33:38 -04:00
parent 8bf645c346
commit a511a2fa84
10 changed files with 89 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.295",
"_release": "1.4.295",
"version": "1.4.296",
"_release": "1.4.296",
"_resolution": {
"type": "version",
"tag": "1.4.295",
"commit": "1cfe41bab16e66d13ef8a613b251ee3edccde3a8"
"tag": "1.4.296",
"commit": "b1299a1ac50def9b8cdd03ec54b6170eb6c983f4"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

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

@ -292,8 +292,9 @@ button {
margin-right: 2em;
}
.cardCenteredText {
.cardDefaultText {
white-space: normal;
text-align: center;
}
.textActionButton {

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

@ -804,7 +804,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
}
var showMediaTitle = (showTitle && !titleAdded) || (options.showParentTitleOrTitle && !lines.length);
if (!showMediaTitle && showTitle && forceName && !titleAdded) {
if (!showMediaTitle && !titleAdded && (showTitle || forceName)) {
showMediaTitle = true;
}
@ -959,7 +959,12 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
lines.push(globalize.translate('sharedcomponents#SeriesYearToPresent', item.ProductionYear || ''));
} else {
lines.push(item.ProductionYear || '');
if (item.EndDate && item.ProductionYear) {
lines.push(item.ProductionYear + ' - ' + datetime.parseISO8601Date(item.EndDate).getFullYear());
} else {
lines.push(item.ProductionYear || '');
}
}
}
@ -1160,7 +1165,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
var imgInfo = getCardImageUrl(item, apiClient, options);
var imgUrl = imgInfo.imgUrl;
var forceName = imgInfo.forceName || !imgUrl;
var forceName = imgInfo.forceName;
var showTitle = options.showTitle === 'auto' ? true : (options.showTitle || item.Type === 'PhotoAlbum' || item.Type === 'Folder');
var overlayText = options.overlayText;
@ -1336,7 +1341,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
if (!imgUrl) {
var defaultName = item.Type === 'Program' || item.Type == 'Timer' || item.EpisodeTitle ? item.Name : itemHelper.getDisplayName(item);
cardImageContainerOpen += '<div class="cardText cardCenteredText">' + defaultName + '</div>';
cardImageContainerOpen += '<div class="cardText cardDefaultText">' + defaultName + '</div>';
}
var tagName = (layoutManager.tv || !scalable) && !overlayButtons ? 'button' : 'div';

4
dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json vendored
View file

@ -10,7 +10,7 @@
"Repeat": "Repeat",
"TrackCount": "{0} tracks",
"ItemCount": "{0} items",
"ValueSeriesYearToPresent": "{0}-Present",
"ValueSeriesYearToPresent": "{0} - Present",
"ReleaseYearValue": "Release year: {0}",
"OriginalAirDateValue": "Original air date: {0}",
"EndsAtValue": "Ends at {0}",
@ -223,7 +223,7 @@
"PackageInstallCompleted": "{0} installation completed.",
"PackageInstallFailed": "{0} installation failed.",
"PackageInstallCancelled": "{0} installation cancelled.",
"SeriesYearToPresent": "{0}-Present",
"SeriesYearToPresent": "{0} - Present",
"ValueOneSong": "1 song",
"ValueSongCount": "{0} songs",
"ValueOneMovie": "1 movie",