diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 6f3a5e9ec0..75eb3a49df 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -86,9 +86,12 @@

-

+

+

+

+

diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index 90f6dfab4f..1b911a3f26 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -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(); } diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index bb4a1e0895..c50fcc5d92 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -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 = '' + item.ProductionLocations[0] + ''; + + $('#itemBirthLocation', page).show().html(Globalize.translate('BirthPlaceValue').replace('{0}', gmap)).trigger('create'); + } else { + $('#itemBirthLocation', page).hide(); + } }); if (item.LocationType == "Offline") { diff --git a/dashboard-ui/scripts/slideshow.js b/dashboard-ui/scripts/slideshow.js index bf8cbf5812..bfd224e669 100644 --- a/dashboard-ui/scripts/slideshow.js +++ b/dashboard-ui/scripts/slideshow.js @@ -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); } diff --git a/dashboard-ui/thirdparty/emby-icons.html b/dashboard-ui/thirdparty/emby-icons.html index dd74fa69c6..7d1aefcaad 100644 --- a/dashboard-ui/thirdparty/emby-icons.html +++ b/dashboard-ui/thirdparty/emby-icons.html @@ -115,7 +115,6 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for -