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

restore people fields

Browse source
This commit is contained in:
Luke Pulverenti 2015-08-21 11:34:42 -04:00
parent aa454b2f24
commit e17ea4ac1e
5 changed files with 52 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dashboard-ui/itemdetails.html
View file

@ -86,9 +86,12 @@
<p class="itemGenres"></p>
</div>
<h2 class="tagline"></h2>
<p class="itemOverview smoothScrollY"></p>
<p id="itemBirthday"></p>
<p id="itemBirthLocation"></p>
<p id="itemDeathDate"></p>
<p id="seriesAirTime"></p>
<p class="airDate"></p>
<p class="itemOverview smoothScrollY"></p>
</div>
<div class="collectionItems"></div>
<div id="childrenCollapsible" class="hide detailSection">

12
dashboard-ui/scripts/edititemmetadata.js
View file

@ -320,14 +320,14 @@
}
if (item.Type == "Person") {
$('#lblPremiereDate', page).html(Globalize.translate('LabelBirthDate'));
$('#lblYear', page).html(Globalize.translate('LabelBirthYear'));
$('#lblEndDate', page).html(Globalize.translate('LabelDeathDate'));
page.querySelector('#txtPremiereDate').label = Globalize.translate('LabelBirthDate');
page.querySelector('#txtProductionYear').label = Globalize.translate('LabelBirthYear');
page.querySelector('#txtEndDate').label = Globalize.translate('LabelDeathDate');
$('#fldPlaceOfBirth', page).show();
} else {
$('#lblPremiereDate', page).html(Globalize.translate('LabelReleaseDate'));
$('#lblYear', page).html(Globalize.translate('LabelYear'));
$('#lblEndDate', page).html(Globalize.translate('LabelEndDate'));
page.querySelector('#txtPremiereDate').label = Globalize.translate('LabelReleaseDate');
page.querySelector('#txtProductionYear').label = Globalize.translate('LabelYear');
page.querySelector('#txtEndDate').label = Globalize.translate('LabelEndDate');
$('#fldPlaceOfBirth', page).hide();
}

36
dashboard-ui/scripts/itemdetailpage.js
View file

@ -166,6 +166,42 @@
}
LiveTvHelpers.renderOriginalAirDate($('.airDate', page), item);
if (item.Type == "Person" && item.PremiereDate) {
try {
var birthday = parseISO8601Date(item.PremiereDate, { toLocal: true }).toDateString();
$('#itemBirthday', page).show().html(Globalize.translate('BirthDateValue').replace('{0}', birthday));
}
catch (err) {
$('#itemBirthday', page).hide();
}
} else {
$('#itemBirthday', page).hide();
}
if (item.Type == "Person" && item.EndDate) {
try {
var deathday = parseISO8601Date(item.EndDate, { toLocal: true }).toDateString();
$('#itemDeathDate', page).show().html(Globalize.translate('DeathDateValue').replace('{0}', deathday));
}
catch (err) {
$('#itemBirthday', page).hide();
}
} else {
}
if (item.Type == "Person" && item.ProductionLocations && item.ProductionLocations.length) {
var gmap = '<a class="textlink" target="_blank" href="https://maps.google.com/maps?q=' + item.ProductionLocations[0] + '">' + item.ProductionLocations[0] + '</a>';
$('#itemBirthLocation', page).show().html(Globalize.translate('BirthPlaceValue').replace('{0}', gmap)).trigger('create');
} else {
$('#itemBirthLocation', page).hide();
}
});
if (item.LocationType == "Offline") {

10
dashboard-ui/scripts/slideshow.js
View file

@ -6,12 +6,14 @@
menuItems.push({
name: Globalize.translate('OptionBackdropSlideshow'),
id: 'backdrops'
id: 'backdrops',
ironIcon: 'video-library'
});
menuItems.push({
name: Globalize.translate('OptionPhotoSlideshow'),
id: 'photos'
id: 'photos',
ironIcon: 'photo-library'
});
require(['actionsheet'], function () {
@ -176,7 +178,7 @@
var keyframes = [
{ opacity: '0', offset: 0 },
{ opacity: '1', offset: 1 }];
var timing = { duration: 1500, iterations: 1 };
var timing = { duration: 1200, iterations: 1 };
newCardImageContainer.animate(keyframes, timing).onfinish = onAnimationFinished;
} else {
onAnimationFinished();
@ -216,7 +218,7 @@
var keyframes = [
{ opacity: '1', offset: 0 },
{ opacity: '0', offset: 1 }];
var timing = { duration: 400, iterations: iterations };
var timing = { duration: 500, iterations: iterations };
return elem.animate(keyframes, timing);
}

1
dashboard-ui/thirdparty/emby-icons.html vendored
View file

@ -115,7 +115,6 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
<g id="navigate-next"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" /></g>
<g id="grid-on"><path d="M20 2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zM8 20H4v-4h4v4zm0-6H4v-4h4v4zm0-6H4V4h4v4zm6 12h-4v-4h4v4zm0-6h-4v-4h4v4zm0-6h-4V4h4v4zm6 12h-4v-4h4v4zm0-6h-4v-4h4v4zm0-6h-4V4h4v4z" /></g>
<g id="slideshow"><path d="M10 8v8l5-4-5-4zm9-5H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V5h14v14z" /></g>
<g id="movie"><path d="M18 4l2 4h-3l-2-4h-2l2 4h-3l-2-4H8l2 4H7L5 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V4h-4z" /></g>
<g id="new-releases"><path d="M23 12l-2.44-2.78.34-3.68-3.61-.82-1.89-3.18L12 3 8.6 1.54 6.71 4.72l-3.61.81.34 3.68L1 12l2.44 2.78-.34 3.69 3.61.82 1.89 3.18L12 21l3.4 1.46 1.89-3.18 3.61-.82-.34-3.68L23 12zm-10 5h-2v-2h2v2zm0-4h-2V7h2v6z" /></g>
<g id="photo"><path d="M21 19V5c0-1.1-.9-2-2-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5-4.5z" /></g>
<g id="photo-album"><path d="M18 2H6c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zM6 4h5v8l-2.5-1.5L6 12V4zm0 15l3-3.86 2.14 2.58 3-3.86L18 19H6z" /></g>