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

Merge branch 'master' into connection-manager-global

Browse source
This commit is contained in:
Julien Machiels 2020-09-01 10:16:21 +02:00 • committed by GitHub
commit 3cbe0f7264
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
139 changed files with 1032 additions and 3566 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/dashboard/dashboard.html
View file

@ -17,7 +17,7 @@
<div style="margin-top:1em;">
<button is="emby-button" type="button" id="btnRestartServer" class="raised" onclick="DashboardPage.restart(this);" style="margin-left:0;">
<span>${ButtonRestart}</span>
<span>${Restart}</span>
</button>
<button is="emby-button" type="button" id="btnShutdown" class="raised" onclick="DashboardPage.shutdown(this);">
<span>${ButtonShutdown}</span>

4
src/controllers/dashboard/dashboard.js
View file

@ -721,9 +721,9 @@ import 'emby-itemscontainer';
restart: function (btn) {
import('confirm').then(({default: confirm}) => {
confirm({
title: globalize.translate('HeaderRestart'),
title: globalize.translate('Restart'),
text: globalize.translate('MessageConfirmRestart'),
confirmText: globalize.translate('ButtonRestart'),
confirmText: globalize.translate('Restart'),
primary: 'delete'
}).then(function () {
const page = dom.parentWithClass(btn, 'page');

12
src/controllers/dashboard/dlna/profile.html
View file

@ -29,7 +29,7 @@
<div class="checkboxList paperList checkboxList-paperList">
<label>
<input is="emby-checkbox" type="checkbox" id="chkAudio" data-value="Audio" class="chkMediaType" />
<span>${OptionProfileAudio}</span>
<span>${Audio}</span>
</label>
<label>
<input is="emby-checkbox" type="checkbox" id="chkPhoto" data-value="Photo" class="chkMediaType" />
@ -279,7 +279,7 @@
<div data-role="content">
<div class="selectContainer">
<select id="selectDirectPlayProfileType" name="selectDirectPlayProfileType" is="emby-select" label="${LabelType}">
<option value="Audio">${OptionProfileAudio}</option>
<option value="Audio">${Audio}</option>
<option value="Photo">${OptionProfilePhoto}</option>
<option value="Video">${OptionProfileVideo}</option>
</select>
@ -327,7 +327,7 @@
<div class="tabContent tabTranscodingBasics" style="display: none;">
<div class="selectContainer">
<select id="selectTranscodingProfileType" name="selectTranscodingProfileType" is="emby-select" label="${LabelType}">
<option value="Audio">${OptionProfileAudio}</option>
<option value="Audio">${Audio}</option>
<option value="Photo">${OptionProfilePhoto}</option>
<option value="Video">${OptionProfileVideo}</option>
</select>
@ -403,7 +403,7 @@
<div class="tabContent tabContainerBasics">
<div class="selectContainer">
<select id="selectContainerProfileType" name="selectContainerProfileType" is="emby-select" label="${LabelType}">
<option value="Audio">${OptionProfileAudio}</option>
<option value="Audio">${Audio}</option>
<option value="Photo">${OptionProfilePhoto}</option>
<option value="Video">${OptionProfileVideo}</option>
</select>
@ -436,7 +436,7 @@
<select id="selectCodecProfileType" name="selectCodecProfileType" is="emby-select" label="${LabelType}">
<option value="Video">${OptionProfileVideo}</option>
<option value="VideoAudio">${OptionProfileVideoAudio}</option>
<option value="Audio">${OptionProfileAudio}</option>
<option value="Audio">${Audio}</option>
</select>
</div>
<div class="inputContainer">
@ -462,7 +462,7 @@
<div data-role="content">
<div class="selectContainer">
<select id="selectResponseProfileType" name="selectResponseProfileType" is="emby-select" label="${LabelType}">
<option value="Audio">${OptionProfileAudio}</option>
<option value="Audio">${Audio}</option>
<option value="Photo">${OptionProfilePhoto}</option>
<option value="Video">${OptionProfileVideo}</option>
</select>

2
src/controllers/dashboard/dlna/profiles.js
View file

@ -81,7 +81,7 @@ import 'emby-button';
function getTabs() {
return [{
href: 'dlnasettings.html',
name: globalize.translate('TabSettings')
name: globalize.translate('Settings')
}, {
href: 'dlnaprofiles.html',
name: globalize.translate('TabProfiles')

2
src/controllers/dashboard/dlna/settings.html
View file

@ -7,7 +7,7 @@
<div class="verticalSection">
<div class="sectionTitleContainer flex align-items-center">
<h2 class="sectionTitle">${TabSettings}</h2>
<h2 class="sectionTitle">${Settings}</h2>
<a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/networking/dlna.html">${Help}</a>
</div>
</div>

2
src/controllers/dashboard/dlna/settings.js
View file

@ -38,7 +38,7 @@ import globalize from 'globalize';
function getTabs() {
return [{
href: 'dlnasettings.html',
name: globalize.translate('TabSettings')
name: globalize.translate('Settings')
}, {
href: 'dlnaprofiles.html',
name: globalize.translate('TabProfiles')

6
src/controllers/dashboard/encodingsettings.html
View file

@ -11,7 +11,7 @@
<div class="selectContainer">
<select is="emby-select" id="selectVideoDecoder" label="${LabelHardwareAccelerationType}">
<option value="">${OptionNone}</option>
<option value="">${None}</option>
<option value="amf">AMD AMF</option>
<option value="qsv">Intel Quick Sync</option>
<option value="mediacodec">MediaCodec Android</option>
@ -91,7 +91,7 @@
<div class="selectContainer">
<select is="emby-select" id="selectThreadCount" label="${LabelTranscodingThreadCount}">
<option value="-1">${OptionAuto}</option>
<option value="-1">${Auto}</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
@ -132,7 +132,7 @@
<div class="selectContainer">
<select is="emby-select" id="selectEncoderPreset" label="${LabelEncoderPreset}">
<option value="">${OptionAuto}</option>
<option value="">${Auto}</option>
<option value="veryslow">veryslow</option>
<option value="slower">slower</option>
<option value="slow">slow</option>

3
src/controllers/dashboard/encodingsettings.js
View file

@ -48,7 +48,8 @@ import libraryMenu from 'libraryMenu';
data: JSON.stringify({
Path: form.querySelector('.txtEncoderPath').value,
PathType: 'Custom'
})
}),
contentType: 'application/json'
}).then(Dashboard.processServerConfigurationUpdateResult, onSaveEncodingPathFailure);
});
}

2
src/controllers/dashboard/general.html
View file

@ -4,7 +4,7 @@
<form class="dashboardGeneralForm">
<div class="verticalSection">
<div class="sectionTitleContainer flex align-items-center">
<h2 class="sectionTitle">${TabSettings}</h2>
<h2 class="sectionTitle">${Settings}</h2>
<a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/server/settings.html">${Help}</a>
</div>
</div>

2
src/controllers/dashboard/library.js
View file

@ -234,7 +234,7 @@ import 'emby-itemrefreshindicator';
value: 'books',
message: getLink('BookLibraryHelp', 'https://docs.jellyfin.org/general/server/media/books.html')
}, {
name: globalize.translate('OptionHomeVideos'),
name: globalize.translate('Photos'),
value: 'homevideos'
}, {
name: globalize.translate('FolderTypeMusicVideos'),

2
src/controllers/dashboard/metadatanfo.js
View file

@ -6,7 +6,7 @@ import globalize from 'globalize';
/* eslint-disable indent */
function loadPage(page, config, users) {
let html = '<option value="" selected="selected">' + globalize.translate('OptionNone') + '</option>';
let html = '<option value="" selected="selected">' + globalize.translate('None') + '</option>';
html += users.map(function (user) {
return '<option value="' + user.Id + '">' + user.Name + '</option>';
}).join('');

2
src/controllers/dashboard/plugins/installed/index.js
View file

@ -118,7 +118,7 @@ function showPluginMenu(page, elem) {
if (configHref) {
menuItems.push({
name: globalize.translate('ButtonSettings'),
name: globalize.translate('Settings'),
id: 'open',
icon: 'mode_edit'
});

2
src/controllers/dashboard/users/useredit.html
View file

@ -11,7 +11,7 @@
</div>
<div data-role="controlgroup" data-type="horizontal" class="localnav" id="userProfileNavigation" data-mini="true">
<a href="#" is="emby-linkbutton" data-role="button" class="ui-btn-active">${TabProfile}</a>
<a href="#" is="emby-linkbutton" data-role="button" class="ui-btn-active">${Profile}</a>
<a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a>
<a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a>
<a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a>

2
src/controllers/dashboard/users/userlibraryaccess.html
View file

@ -11,7 +11,7 @@
</div>
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${TabProfile}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${Profile}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);" class="ui-btn-active">${TabAccess}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a>

2
src/controllers/dashboard/users/userparentalcontrol.html
View file

@ -9,7 +9,7 @@
</div>
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${TabProfile}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${Profile}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);" class="ui-btn-active">${TabParentalControl}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a>

14
src/controllers/dashboard/users/userparentalcontrol.js
View file

@ -40,25 +40,25 @@ import 'paper-icon-button-light';
function loadUnratedItems(page, user) {
const items = [{
name: globalize.translate('OptionBlockBooks'),
name: globalize.translate('Books'),
value: 'Book'
}, {
name: globalize.translate('OptionBlockChannelContent'),
name: globalize.translate('Channels'),
value: 'ChannelContent'
}, {
name: globalize.translate('OptionBlockLiveTvChannels'),
name: globalize.translate('LiveTV'),
value: 'LiveTvChannel'
}, {
name: globalize.translate('OptionBlockMovies'),
name: globalize.translate('Movies'),
value: 'Movie'
}, {
name: globalize.translate('OptionBlockMusic'),
name: globalize.translate('Music'),
value: 'Music'
}, {
name: globalize.translate('OptionBlockTrailers'),
name: globalize.translate('Trailers'),
value: 'Trailer'
}, {
name: globalize.translate('OptionBlockTvShows'),
name: globalize.translate('Shows'),
value: 'Series'
}];
let html = '';

4
src/controllers/dashboard/users/userpassword.html
View file

@ -9,7 +9,7 @@
</div>
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${TabProfile}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${Profile}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);" class="ui-btn-active">${HeaderPassword}</a>
@ -31,7 +31,7 @@
<div>
<button is="emby-button" type="submit" class="raised button-submit block"><span>${Save}</span></button>
<button is="emby-button" type="button" id="btnResetPassword" class="raised button-cancel block hide">
<span>${ButtonResetPassword}</span>
<span>${ResetPassword}</span>
</button>
</div>
</div>

4
src/controllers/dashboard/users/userpasswordpage.js
View file

@ -145,14 +145,14 @@ import 'emby-button';
function resetPassword() {
const msg = globalize.translate('PasswordResetConfirmation');
import('confirm').then(({default: confirm}) => {
confirm(msg, globalize.translate('HeaderResetPassword')).then(function () {
confirm(msg, globalize.translate('ResetPassword')).then(function () {
const userId = params.userId;
loading.show();
ApiClient.resetUserPassword(userId).then(function () {
loading.hide();
Dashboard.alert({
message: globalize.translate('PasswordResetComplete'),
title: globalize.translate('HeaderResetPassword')
title: globalize.translate('ResetPassword')
});
loadUser(view, params);
});

22
src/controllers/favorites.js
View file

@ -28,7 +28,7 @@ import 'emby-scroller';
function getSections() {
return [{
name: 'HeaderFavoriteMovies',
name: 'Movies',
types: 'Movie',
shape: getPosterShape(),
showTitle: true,
@ -37,7 +37,7 @@ import 'emby-scroller';
overlayText: false,
centerText: true
}, {
name: 'HeaderFavoriteShows',
name: 'Shows',
types: 'Series',
shape: getPosterShape(),
showTitle: true,
@ -46,7 +46,7 @@ import 'emby-scroller';
overlayText: false,
centerText: true
}, {
name: 'HeaderFavoriteEpisodes',
name: 'Episodes',
types: 'Episode',
shape: getThumbShape(),
preferThumb: false,
@ -56,7 +56,7 @@ import 'emby-scroller';
overlayText: false,
centerText: true
}, {
name: 'HeaderFavoriteVideos',
name: 'Videos',
types: 'Video',
shape: getThumbShape(),
preferThumb: true,
@ -65,7 +65,7 @@ import 'emby-scroller';
overlayText: false,
centerText: true
}, {
name: 'HeaderFavoriteCollections',
name: 'Collections',
types: 'BoxSet',
shape: getPosterShape(),
showTitle: true,
@ -73,7 +73,7 @@ import 'emby-scroller';
overlayText: false,
centerText: true
}, {
name: 'HeaderFavoritePlaylists',
name: 'Playlists',
types: 'Playlist',
shape: getSquareShape(),
preferThumb: false,
@ -84,7 +84,7 @@ import 'emby-scroller';
overlayPlayButton: true,
coverImage: true
}, {
name: 'HeaderFavoritePeople',
name: 'People',
types: 'Person',
shape: getPosterShape(),
preferThumb: false,
@ -95,7 +95,7 @@ import 'emby-scroller';
overlayPlayButton: true,
coverImage: true
}, {
name: 'HeaderFavoriteArtists',
name: 'Artists',
types: 'MusicArtist',
shape: getSquareShape(),
preferThumb: false,
@ -106,7 +106,7 @@ import 'emby-scroller';
overlayPlayButton: true,
coverImage: true
}, {
name: 'HeaderFavoriteAlbums',
name: 'Albums',
types: 'MusicAlbum',
shape: getSquareShape(),
preferThumb: false,
@ -117,7 +117,7 @@ import 'emby-scroller';
overlayPlayButton: true,
coverImage: true
}, {
name: 'HeaderFavoriteSongs',
name: 'Songs',
types: 'Audio',
shape: getSquareShape(),
preferThumb: false,
@ -129,7 +129,7 @@ import 'emby-scroller';
action: 'instantmix',
coverImage: true
}, {
name: 'HeaderFavoriteBooks',
name: 'Books',
types: 'Book',
shape: getPosterShape(),
showTitle: true,

24
src/controllers/itemDetails/index.html
View file

@ -7,11 +7,11 @@
<div class="detailPagePrimaryContainer padded-left padded-right">
<div class="infoWrapper infoText">
<div class="nameContainer"></div>
<div class="itemMiscInfo itemMiscInfo-primary" style="margin-bottom: 0.6em"></div>
<div class="itemMiscInfo itemMiscInfo-secondary" style="margin-bottom: 0.6em"></div>
<div class="itemMiscInfo itemMiscInfo-primary" style="margin-bottom: 0.6em;"></div>
<div class="itemMiscInfo itemMiscInfo-secondary" style="margin-bottom: 0.6em;"></div>
</div>
<div class="mainDetailButtons">
<div class="mainDetailButtons focuscontainer-x">
<button is="emby-button" type="button" class="button-flat btnResume hide detailButton" title="${ButtonResume}" data-mode="resume">
<div class="detailButton-content">
<span class="material-icons detailButton-icon play_arrow"></span>
@ -95,17 +95,17 @@
<div class="itemDetailsGroup">
<div class="detailsGroupItem genresGroup hide">
<div class="genresLabel label"></div>
<div class="genres content"></div>
<div class="genres content focuscontainer-x"></div>
</div>
<div class="detailsGroupItem directorsGroup hide">
<div class="directorsLabel label"></div>
<div class="directors content"></div>
<div class="directors content focuscontainer-x"></div>
</div>
<div class="detailsGroupItem writersGroup hide">
<div class="writersLabel label"></div>
<div class="writers content"></div>
<div class="writers content focuscontainer-x"></div>
</div>
</div>
@ -124,7 +124,7 @@
</div>
</form>
<div class="recordingFields hide" style="margin: .5em 0 1.5em;"></div>
<div class="recordingFields hide" style="margin: 0.5em 0 1.5em;"></div>
<div class="detailSectionContent">
<div class="itemLastPlayed hide"></div>
@ -139,14 +139,14 @@
<p id="itemDeathDate"></p>
<p id="seriesAirTime"></p>
<div class="itemTags hide" style="margin: .7em 0;font-size:92%;"></div>
<div class="itemExternalLinks hide" style="margin: .7em 0;font-size:92%;"></div>
<div class="itemTags focuscontainer-x hide" style="margin: 0.7em 0; font-size: 92%;"></div>
<div class="itemExternalLinks focuscontainer-x hide" style="margin: 0.7em 0; font-size: 92%;"></div>
<div class="seriesRecordingEditor"></div>
</div>
</div>
</div>
<div class="seriesTimerScheduleSection verticalSection detailVerticalSection hide" style="margin-top:-3em;">
<div class="seriesTimerScheduleSection verticalSection detailVerticalSection hide" style="margin-top: -3em;">
<h2 class="sectionTitle">${Schedule}</h2>
<div class="seriesTimerSchedule padded-right"></div>
</div>
@ -205,14 +205,14 @@
</div>
<div id="specialsCollapsible" class="verticalSection detailVerticalSection hide">
<h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderSpecialFeatures}</h2>
<h2 class="sectionTitle sectionTitle-cards padded-right">${SpecialFeatures}</h2>
<div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true">
<div id="specialsContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
</div>
</div>
<div id="musicVideosCollapsible" class="verticalSection detailVerticalSection hide">
<h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderMusicVideos}</h2>
<h2 class="sectionTitle sectionTitle-cards padded-right">${MusicVideos}</h2>
<div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true">
<div id="musicVideosContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
</div>

51
src/controllers/itemDetails/index.js
View file

@ -205,7 +205,7 @@ function renderVideoSelections(page, mediaSources) {
});
const select = page.querySelector('.selectVideo');
select.setLabel(globalize.translate('LabelVideo'));
select.setLabel(globalize.translate('Video'));
const selectedId = tracks.length ? tracks[0].Index : -1;
select.innerHTML = tracks.map(function (v) {
const selected = v.Index === selectedId ? ' selected' : '';
@ -413,7 +413,7 @@ function renderName(item, container, context) {
}, {
context: context
});
parentNameHtml.push('<a style="color:inherit;" class="button-link" is="emby-linkbutton" href="' + parentRoute + '">' + item.SeriesName + '</a>');
parentNameHtml.push('<a style="color:inherit;" class="button-link" tabindex="-1" is="emby-linkbutton" href="' + parentRoute + '">' + item.SeriesName + '</a>');
} else if (item.IsSeries || item.EpisodeTitle) {
parentNameHtml.push(item.Name);
}
@ -428,7 +428,7 @@ function renderName(item, container, context) {
}, {
context: context
});
parentNameHtml.push('<a style="color:inherit;" class="button-link" is="emby-linkbutton" href="' + parentRoute + '">' + item.SeriesName + '</a>');
parentNameHtml.push('<a style="color:inherit;" class="button-link" tabindex="-1" is="emby-linkbutton" href="' + parentRoute + '">' + item.SeriesName + '</a>');
} else if (item.ParentIndexNumber != null && item.Type === 'Episode') {
parentRoute = appRouter.getRouteUrl({
Id: item.SeasonId,
@ -439,7 +439,7 @@ function renderName(item, container, context) {
}, {
context: context
});
parentNameHtml.push('<a style="color:inherit;" class="button-link" is="emby-linkbutton" href="' + parentRoute + '">' + item.SeasonName + '</a>');
parentNameHtml.push('<a style="color:inherit;" class="button-link" tabindex="-1" is="emby-linkbutton" href="' + parentRoute + '">' + item.SeasonName + '</a>');
} else if (item.ParentIndexNumber != null && item.IsSeries) {
parentNameHtml.push(item.SeasonName || 'S' + item.ParentIndexNumber);
} else if (item.Album && item.AlbumId && (item.Type === 'MusicVideo' || item.Type === 'Audio')) {
@ -452,7 +452,7 @@ function renderName(item, container, context) {
}, {
context: context
});
parentNameHtml.push('<a style="color:inherit;" class="button-link" is="emby-linkbutton" href="' + parentRoute + '">' + item.Album + '</a>');
parentNameHtml.push('<a style="color:inherit;" class="button-link" tabindex="-1" is="emby-linkbutton" href="' + parentRoute + '">' + item.Album + '</a>');
} else if (item.Album) {
parentNameHtml.push(item.Album);
}
@ -569,9 +569,12 @@ function reloadFromItem(instance, page, params, item, user) {
// Start rendering the artwork first
renderImage(page, item);
renderLogo(page, item, apiClient);
// Save some screen real estate in TV mode
if (!layoutManager.tv) {
renderLogo(page, item, apiClient);
renderDetailPageBackdrop(page, item, apiClient);
}
renderBackdrop(item);
renderDetailPageBackdrop(page, item, apiClient);
// Render the main information for the item
page.querySelector('.detailPagePrimaryContainer').classList.add('detailRibbon');
@ -763,6 +766,9 @@ function renderDetailImage(elem, item, imageLoader) {
elem.innerHTML = cardHtml;
imageLoader.lazyChildren(elem);
// Avoid breaking the design by preventing focus of the poster using the keyboard.
elem.querySelector('button').tabIndex = -1;
}
function renderImage(page, item) {
@ -1058,7 +1064,12 @@ function renderDetails(page, item, apiClient, context, isStatic) {
renderOverview(page, item);
renderMiscInfo(page, item);
reloadUserDataButtons(page, item);
renderLinks(page, item);
// Don't allow redirection to other websites from the TV layout
if (!layoutManager.tv) {
renderLinks(page, item);
}
renderTags(page, item);
renderSeriesAirTime(page, item, isStatic);
}
@ -1336,16 +1347,25 @@ function renderChildren(page, item) {
const childrenItemsContainer = page.querySelector('.childrenItemsContainer');
if (item.Type == 'MusicAlbum') {
const equalSet = (arr1, arr2) => arr1.every(x => arr2.indexOf(x) !== -1) && arr1.length === arr2.length;
let showArtist = false;
for (const track of result.Items) {
if (!equalSet(track.ArtistItems.map(x => x.Id), track.AlbumArtists.map(x => x.Id))) {
showArtist = true;
break;
}
}
const discNumbers = result.Items.map(x => x.ParentIndexNumber);
html = listView.getListViewHtml({
items: result.Items,
smallIcon: true,
showIndex: true,
showIndex: new Set(discNumbers).size > 1 || (discNumbers.length >= 1 && discNumbers[0] > 1),
index: 'disc',
showIndexNumberLeft: true,
playFromHere: true,
action: 'playallfromhere',
image: false,
artist: 'auto',
artist: showArtist,
containerAlbumArtists: item.AlbumArtists
});
isList = true;
@ -1980,6 +2000,17 @@ export default function (view, params) {
let currentItem;
const self = this;
const apiClient = params.serverId ? window.connectionManager.getApiClient(params.serverId) : ApiClient;
const btnResume = view.querySelector('.mainDetailButtons .btnResume');
const btnPlay = view.querySelector('.mainDetailButtons .btnPlay');
if (layoutManager.tv && !btnResume.classList.contains('hide')) {
btnResume.classList.add('fab');
btnResume.classList.add('detailFloatingButton');
} else if (layoutManager.tv && btnResume.classList.contains('hide')) {
btnPlay.classList.add('fab');
btnPlay.classList.add('detailFloatingButton');
}
view.querySelectorAll('.btnPlay');
bindAll(view, '.btnPlay', 'click', onPlayClick);
bindAll(view, '.btnResume', 'click', onPlayClick);

2
src/controllers/livetvsettings.html
View file

@ -11,7 +11,7 @@
<form class="liveTvSettingsForm">
<div class="selectContainer">
<select is="emby-select" id="selectGuideDays" label="${LabelNumberOfGuideDays}">
<option value="">${OptionAuto}</option>
<option value="">${Auto}</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>

2
src/controllers/movies/moviecollections.js
View file

@ -210,7 +210,7 @@ import 'emby-itemscontainer';
tabContent.querySelector('.btnSort').addEventListener('click', function (e) {
libraryBrowser.showSortMenu({
items: [{
name: globalize.translate('OptionNameSort'),
name: globalize.translate('Name'),
id: 'SortName'
}, {
name: globalize.translate('OptionImdbRating'),

4
src/controllers/movies/movies.js
View file

@ -195,7 +195,7 @@ import 'emby-itemscontainer';
btnSort.addEventListener('click', function (e) {
libraryBrowser.showSortMenu({
items: [{
name: globalize.translate('OptionNameSort'),
name: globalize.translate('Name'),
id: 'SortName,ProductionYear'
}, {
name: globalize.translate('OptionImdbRating'),
@ -219,7 +219,7 @@ import 'emby-itemscontainer';
name: globalize.translate('OptionReleaseDate'),
id: 'PremiereDate,SortName,ProductionYear'
}, {
name: globalize.translate('OptionRuntime'),
name: globalize.translate('Runtime'),
id: 'Runtime,SortName,ProductionYear'
}],
callback: function () {

2
src/controllers/movies/movietrailers.js
View file

@ -235,7 +235,7 @@ import 'emby-itemscontainer';
tabContent.querySelector('.btnSort').addEventListener('click', function (e) {
libraryBrowser.showSortMenu({
items: [{
name: globalize.translate('OptionNameSort'),
name: globalize.translate('Name'),
id: 'SortName'
}, {
name: globalize.translate('OptionImdbRating'),

4
src/controllers/music/musicalbums.js
View file

@ -238,10 +238,10 @@ import 'emby-itemscontainer';
tabContent.querySelector('.btnSort').addEventListener('click', (e) => {
libraryBrowser.showSortMenu({
items: [{
name: globalize.translate('OptionNameSort'),
name: globalize.translate('Name'),
id: 'SortName'
}, {
name: globalize.translate('OptionAlbumArtist'),
name: globalize.translate('AlbumArtist'),
id: 'AlbumArtist,SortName'
}, {
name: globalize.translate('OptionCommunityRating'),

8
src/controllers/music/songs.js
View file

@ -158,13 +158,13 @@ import 'emby-itemscontainer';
name: globalize.translate('OptionTrackName'),
id: 'Name'
}, {
name: globalize.translate('OptionAlbum'),
name: globalize.translate('Album'),
id: 'Album,SortName'
}, {
name: globalize.translate('OptionAlbumArtist'),
name: globalize.translate('AlbumArtist'),
id: 'AlbumArtist,Album,SortName'
}, {
name: globalize.translate('OptionArtist'),
name: globalize.translate('Artist'),
id: 'Artist,Album,SortName'
}, {
name: globalize.translate('OptionDateAdded'),
@ -179,7 +179,7 @@ import 'emby-itemscontainer';
name: globalize.translate('OptionReleaseDate'),
id: 'PremiereDate,AlbumArtist,Album,SortName'
}, {
name: globalize.translate('OptionRuntime'),
name: globalize.translate('Runtime'),
id: 'Runtime,AlbumArtist,Album,SortName'
}],
callback: function () {

2
src/controllers/playback/queue/index.html
View file

@ -135,7 +135,7 @@
<button is="paper-icon-button-light" class="btnShowSearch btnCommand autoSize" title="${Search}" data-command="GoToSearch">
<span class="material-icons search"></span>
</button>
<button is="paper-icon-button-light" class="bthShowSettings btnCommand autoSize" title="${ButtonSettings}" data-command="GoToSettings">
<button is="paper-icon-button-light" class="bthShowSettings btnCommand autoSize" title="${Settings}" data-command="GoToSettings">
<span class="material-icons settings"></span>
</button>
</div>

2
src/controllers/playback/video/index.js
View file

@ -692,7 +692,7 @@ import 'css!assets/css/videoosd';
lastUpdateTime = now;
const player = this;
currentRuntimeTicks = playbackManager.duration(player);
const currentTime = playbackManager.currentTime(player);
const currentTime = playbackManager.currentTime(player) * 10000;
updateTimeDisplay(currentTime, currentRuntimeTicks, playbackManager.playbackStartTime(player), playbackManager.getBufferedRanges(player));
const item = currentItem;
refreshProgramInfoIfNeeded(player, item);

3
src/controllers/session/resetPassword/index.js
View file

@ -31,7 +31,8 @@ import globalize from 'globalize';
dataType: 'json',
data: JSON.stringify({
Pin: view.querySelector('#txtPin').value
})
}),
contentType: 'application/json'
}).then(processForgotPasswordResult);
e.preventDefault();
return false;

2
src/controllers/session/selectServer/index.html
View file

@ -2,7 +2,7 @@
<div class="margin-auto-y">
<div class="verticalSection flex-shrink-zero w-100 flex flex-direction-column">
<div class="padded-left padded-right flex align-items-center justify-content-center">
<h1 class="sectionTitle sectionTitle-cards">${HeaderSelectServer}</h1>
<h1 class="sectionTitle sectionTitle-cards">${SelectServer}</h1>
</div>
<div class="padded-top padded-bottom-focusscale flex-grow flex" data-horizontal="true" data-centerfocus="card">
<div is="emby-itemscontainer" class="scrollSlider focuscontainer-x servers flex-grow" style="display: block; text-align: center;" data-hovermenu="false" data-multiselect="false"></div>

4
src/controllers/shows/episodes.js
View file

@ -195,7 +195,7 @@ import 'emby-itemscontainer';
tabContent.querySelector('.btnSort').addEventListener('click', function (e) {
libraryBrowser.showSortMenu({
items: [{
name: globalize.translate('OptionNameSort'),
name: globalize.translate('Name'),
id: 'SeriesSortName,SortName'
}, {
name: globalize.translate('OptionTvdbRating'),
@ -216,7 +216,7 @@ import 'emby-itemscontainer';
name: globalize.translate('OptionPlayCount'),
id: 'PlayCount,SeriesSortName,SortName'
}, {
name: globalize.translate('OptionRuntime'),
name: globalize.translate('Runtime'),
id: 'Runtime,SeriesSortName,SortName'
}],
callback: function () {

2
src/controllers/shows/tvshows.js
View file

@ -250,7 +250,7 @@ import 'emby-itemscontainer';
tabContent.querySelector('.btnSort').addEventListener('click', function (e) {
libraryBrowser.showSortMenu({
items: [{
name: globalize.translate('OptionNameSort'),
name: globalize.translate('Name'),
id: 'SortName'
}, {
name: globalize.translate('OptionImdbRating'),

8
src/controllers/user/menu/index.html
View file

@ -1,4 +1,4 @@
<div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderSettings}" data-backbutton="true">
<div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${Settings}" data-backbutton="true">
<div class="padded-left padded-right padded-bottom-page padded-top">
<div class="readOnlyContent" style="margin: 0 auto;">
<div class="verticalSection verticalSection-extrabottompadding">
@ -7,7 +7,7 @@
<div class="listItem">
<span class="material-icons listItemIcon listItemIcon-transparent person"></span>
<div class="listItemBody">
<div class="listItemBodyText">${ButtonProfile}</div>
<div class="listItemBodyText">${Profile}</div>
</div>
</div>
</a>
@ -57,7 +57,7 @@
</div>
</a>
</div>
<div class="adminSection verticalSection verticalSection-extrabottompadding">
<div class="adminSection verticalSection verticalSection-extrabottompadding hide">
<h2 class="sectionTitle" style="padding-left:.25em;">${HeaderAdmin}</h2>
<a is="emby-linkbutton" href="dashboard.html" style="display:block;padding:0;margin:0;" class="listItem-border">
<div class="listItem">
@ -82,7 +82,7 @@
<div class="listItem">
<span class="material-icons listItemIcon listItemIcon-transparent wifi"></span>
<div class="listItemBody">
<div class="listItemBodyText">${HeaderSelectServer}</div>
<div class="listItemBodyText">${SelectServer}</div>
</div>
</div>
</a>

17
src/controllers/user/menu/index.js
View file

@ -1,4 +1,5 @@
import appHost from 'apphost';
import layoutManager from 'layoutManager';
import 'listViewStyle';
import 'emby-button';
@ -38,19 +39,19 @@ export default function (view, params) {
page.querySelector('.selectServer').classList.add('hide');
}
// hide the actions if user preferences are being edited for a different user
ApiClient.getUser(userId).then(function (user) {
page.querySelector('.headerUsername').innerHTML = user.Name;
if (user.Policy.IsAdministrator && !layoutManager.tv) {
page.querySelector('.adminSection').classList.remove('hide');
}
});
// Hide the actions if user preferences are being edited for a different user
if (params.userId && params.userId !== Dashboard.getCurrentUserId) {
page.querySelector('.userSection').classList.add('hide');
page.querySelector('.adminSection').classList.add('hide');
}
ApiClient.getUser(userId).then(function (user) {
page.querySelector('.headerUsername').innerHTML = user.Name;
if (!user.Policy.IsAdministrator) {
page.querySelector('.adminSection').classList.add('hide');
}
});
import('autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(view);
});

4
src/controllers/user/profile/index.html
View file

@ -1,4 +1,4 @@
<div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage noSecondaryNavPage" data-title="${HeaderProfile}" data-menubutton="false">
<div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage noSecondaryNavPage" data-title="${Profile}" data-menubutton="false">
<div class="padded-left padded-right padded-bottom-page">
<div class="readOnlyContent" style="margin: 0 auto; padding: 0 1em;">
<div style="position:relative;display:inline-block;max-width:200px;">
@ -35,7 +35,7 @@
<span>${Save}</span>
</button>
<button is="emby-button" type="button" id="btnResetPassword" class="raised cancel block hide">
<span>${ButtonResetPassword}</span>
<span>${ResetPassword}</span>
</button>
</div>
</div>

3
src/controllers/wizard/remote/index.js
View file

@ -12,7 +12,8 @@ function save(page) {
apiClient.ajax({
type: 'POST',
data: JSON.stringify(config),
url: apiClient.getUrl('Startup/RemoteAccess')
url: apiClient.getUrl('Startup/RemoteAccess'),
contentType: 'application/json'
}).then(function () {
loading.hide();
navigateToNextPage();

3
src/controllers/wizard/settings/index.js
View file

@ -12,7 +12,8 @@ function save(page) {
apiClient.ajax({
type: 'POST',
data: JSON.stringify(config),
url: apiClient.getUrl('Startup/Configuration')
url: apiClient.getUrl('Startup/Configuration'),
contentType: 'application/json'
}).then(function () {
loading.hide();
navigateToNextPage();

3
src/controllers/wizard/start/index.js
View file

@ -18,7 +18,8 @@ function save(page) {
apiClient.ajax({
type: 'POST',
data: JSON.stringify(config),
url: apiClient.getUrl('Startup/Configuration')
url: apiClient.getUrl('Startup/Configuration'),
contentType: 'application/json'
}).then(function () {
Dashboard.navigate('wizarduser.html');
});

3
src/controllers/wizard/user/index.js
View file

@ -27,7 +27,8 @@ function submit(form) {
Name: form.querySelector('#txtUsername').value,
Password: form.querySelector('#txtManualPassword').value
}),
url: apiClient.getUrl('Startup/User')
url: apiClient.getUrl('Startup/User'),
contentType: 'application/json'
}).then(onUpdateUserComplete);
}