';
- html += '
' + globalize.translate('HeaderTypeImageFetchers', availableTypeOptions.Type) + '
';
+ html += '
' + globalize.translate('HeaderTypeImageFetchers', globalize.translate('TypeOptionPlural' + availableTypeOptions.Type)) + '
';
const supportedImageTypes = availableTypeOptions.SupportedImageTypes || [];
if (supportedImageTypes.length > 1 || supportedImageTypes.length === 1 && supportedImageTypes[0] !== 'Primary') {
html += '
';
@@ -411,6 +411,8 @@ import template from './libraryoptionseditor.template.html';
parent.querySelector('.chkEnableEmbeddedEpisodeInfosContainer').classList.add('hide');
}
+ parent.querySelector('.chkAutomaticallyAddToCollectionContainer').classList.toggle('hide', contentType !== 'movies');
+
return populateMetadataSettings(parent, contentType);
}
@@ -511,6 +513,7 @@ import template from './libraryoptionseditor.template.html';
SkipSubtitlesIfAudioTrackMatches: parent.querySelector('#chkSkipIfAudioTrackPresent').checked,
SaveSubtitlesWithMedia: parent.querySelector('#chkSaveSubtitlesLocally').checked,
RequirePerfectSubtitleMatch: parent.querySelector('#chkRequirePerfectMatch').checked,
+ AutomaticallyAddToCollection: parent.querySelector('#chkAutomaticallyAddToCollection').checked,
MetadataSavers: Array.prototype.map.call(Array.prototype.filter.call(parent.querySelectorAll('.chkMetadataSaver'), elem => {
return elem.checked;
}), elem => {
@@ -562,6 +565,7 @@ import template from './libraryoptionseditor.template.html';
parent.querySelector('#chkSaveSubtitlesLocally').checked = options.SaveSubtitlesWithMedia;
parent.querySelector('#chkSkipIfAudioTrackPresent').checked = options.SkipSubtitlesIfAudioTrackMatches;
parent.querySelector('#chkRequirePerfectMatch').checked = options.RequirePerfectSubtitleMatch;
+ parent.querySelector('#chkAutomaticallyAddToCollection').checked = options.AutomaticallyAddToCollection;
Array.prototype.forEach.call(parent.querySelectorAll('.chkMetadataSaver'), elem => {
elem.checked = options.MetadataSavers ? options.MetadataSavers.includes(elem.getAttribute('data-pluginname')) : elem.getAttribute('data-defaultenabled') === 'true';
});
diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.template.html b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
index bd70bcb54e..bb94e0ee20 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.template.html
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
@@ -39,6 +39,14 @@
${LabelEnableRealtimeMonitorHelp}
diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js
index 6184ff3aaf..3bc9582796 100644
--- a/src/components/listview/listview.js
+++ b/src/components/listview/listview.js
@@ -133,21 +133,28 @@ import ServerConnections from '../ServerConnections';
continue;
}
+ let elem;
+
if (i === 0) {
if (isLargeStyle) {
- html += `<${largeTitleTagName} class="listItemBodyText">`;
+ elem = document.createElement(largeTitleTagName);
} else {
- html += '
';
+ elem = document.createElement('div');
}
} else {
- html += '
';
+ elem = document.createElement('div');
+ elem.classList.add('secondary');
}
- html += (textlines[i] || ' ');
- if (i === 0 && isLargeStyle) {
- html += ``;
+
+ elem.classList.add('listItemBodyText');
+
+ if (textlines[i]) {
+ elem.innerText = textlines[i];
} else {
- html += '
';
+ elem.innerHTML = ' ';
}
+
+ html += elem.outerHTML;
}
return html;
diff --git a/src/components/loading/loading.scss b/src/components/loading/loading.scss
index dae33aa9b8..170bcd1ee0 100644
--- a/src/components/loading/loading.scss
+++ b/src/components/loading/loading.scss
@@ -33,7 +33,7 @@
}
.mdl-spinner__layer-1 {
- border-color: rgb(66, 165, 245);
+ border-color: #00a4dc;
}
.mdl-spinner__layer-1-active {
@@ -42,7 +42,7 @@
}
.mdl-spinner__layer-2 {
- border-color: rgb(244, 67, 54);
+ border-color: #00a4dc;
}
.mdl-spinner__layer-2-active {
@@ -51,7 +51,7 @@
}
.mdl-spinner__layer-3 {
- border-color: rgb(253, 216, 53);
+ border-color: #00a4dc;
}
.mdl-spinner__layer-3-active {
@@ -60,7 +60,7 @@
}
.mdl-spinner__layer-4 {
- border-color: rgb(76, 175, 80);
+ border-color: #00a4dc;
}
.mdl-spinner__layer-4-active {
diff --git a/src/components/mediaLibraryCreator/mediaLibraryCreator.js b/src/components/mediaLibraryCreator/mediaLibraryCreator.js
index ffccd8e933..72795f66f1 100644
--- a/src/components/mediaLibraryCreator/mediaLibraryCreator.js
+++ b/src/components/mediaLibraryCreator/mediaLibraryCreator.js
@@ -102,8 +102,8 @@ import template from './mediaLibraryCreator.template.html';
function onAddButtonClick() {
const page = dom.parentWithClass(this, 'dlg-librarycreator');
- import('../directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
- const picker = new directoryBrowser();
+ import('../directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+ const picker = new DirectoryBrowser();
picker.show({
enableNetworkSharePath: true,
callback: function (path, networkSharePath) {
diff --git a/src/components/mediaLibraryEditor/mediaLibraryEditor.js b/src/components/mediaLibraryEditor/mediaLibraryEditor.js
index cfd1955c7b..dcb418f806 100644
--- a/src/components/mediaLibraryEditor/mediaLibraryEditor.js
+++ b/src/components/mediaLibraryEditor/mediaLibraryEditor.js
@@ -162,8 +162,8 @@ import template from './mediaLibraryEditor.template.html';
}
function showDirectoryBrowser(context, originalPath, networkPath) {
- import('../directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
- const picker = new directoryBrowser();
+ import('../directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
+ const picker = new DirectoryBrowser();
picker.show({
enableNetworkSharePath: true,
pathReadOnly: originalPath != null,
diff --git a/src/components/mediainfo/mediainfo.js b/src/components/mediainfo/mediainfo.js
index d27af89f01..72255530b2 100644
--- a/src/components/mediainfo/mediainfo.js
+++ b/src/components/mediainfo/mediainfo.js
@@ -106,10 +106,9 @@ import '../../elements/emby-button/emby-button';
const miscInfo = [];
let text;
let date;
- let minutes;
let count;
- const showFolderRuntime = item.Type === 'MusicAlbum' || item.MediaType === 'MusicArtist' || item.MediaType === 'Playlist' || item.MediaType === 'MusicGenre';
+ const showFolderRuntime = item.Type === 'MusicAlbum' || item.MediaType === 'MusicArtist' || item.Type === 'Playlist' || item.MediaType === 'Playlist' || item.MediaType === 'MusicGenre';
if (showFolderRuntime) {
count = item.SongCount || item.ChildCount;
@@ -119,7 +118,7 @@ import '../../elements/emby-button/emby-button';
}
if (item.RunTimeTicks) {
- miscInfo.push(datetime.getDisplayRunningTime(item.RunTimeTicks));
+ miscInfo.push(datetime.getDisplayDuration(item.RunTimeTicks));
}
} else if (item.Type === 'PhotoAlbum' || item.Type === 'BoxSet') {
count = item.ChildCount;
@@ -132,7 +131,8 @@ import '../../elements/emby-button/emby-button';
if ((item.Type === 'Episode' || item.MediaType === 'Photo') && options.originalAirDate !== false) {
if (item.PremiereDate) {
try {
- date = datetime.parseISO8601Date(item.PremiereDate);
+ //don't modify date to locale if episode. Only Dates (not times) are stored, or editable in the edit metadata dialog
+ date = datetime.parseISO8601Date(item.PremiereDate, item.Type !== 'Episode');
text = datetime.toLocaleDateString(date);
miscInfo.push(text);
@@ -257,11 +257,7 @@ import '../../elements/emby-button/emby-button';
if (item.Type === 'Audio') {
miscInfo.push(datetime.getDisplayRunningTime(item.RunTimeTicks));
} else {
- minutes = item.RunTimeTicks / 600000000;
-
- minutes = minutes || 1;
-
- miscInfo.push(`${Math.round(minutes)} mins`);
+ miscInfo.push(datetime.getDisplayDuration(item.RunTimeTicks));
}
}
diff --git a/src/components/metadataEditor/metadataEditor.js b/src/components/metadataEditor/metadataEditor.js
index 4d5eb62847..bce6af5c06 100644
--- a/src/components/metadataEditor/metadataEditor.js
+++ b/src/components/metadataEditor/metadataEditor.js
@@ -520,7 +520,7 @@ import template from './metadataEditor.template.html';
hideElement('#fldPath', context);
}
- if (item.Type === 'Series' || item.Type === 'Movie' || item.Type === 'Trailer') {
+ if (item.Type === 'Series' || item.Type === 'Movie' || item.Type === 'Trailer' || item.Type === 'Person') {
showElement('#fldOriginalName', context);
} else {
hideElement('#fldOriginalName', context);
@@ -637,7 +637,9 @@ import template from './metadataEditor.template.html';
}
if (item.Type === 'Person') {
- //todo
+ context.querySelector('#txtName').label(globalize.translate('LabelName'));
+ context.querySelector('#txtSortName').label(globalize.translate('LabelSortName'));
+ context.querySelector('#txtOriginalName').label(globalize.translate('LabelOriginalName'));
context.querySelector('#txtProductionYear').label(globalize.translate('LabelBirthYear'));
context.querySelector('#txtPremiereDate').label(globalize.translate('LabelBirthDate'));
context.querySelector('#txtEndDate').label(globalize.translate('LabelDeathDate'));
diff --git a/src/components/metadataEditor/metadataEditor.template.html b/src/components/metadataEditor/metadataEditor.template.html
index f080ecacdb..0f9c4516f7 100644
--- a/src/components/metadataEditor/metadataEditor.template.html
+++ b/src/components/metadataEditor/metadataEditor.template.html
@@ -252,7 +252,7 @@