diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index c10da498c2..c882ecd0a1 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -725,19 +725,13 @@ } var shape = item.Type == "MusicAlbum" || item.Type == "MusicArtist" ? getSquareShape() : getPortraitShape(); - var screenWidth = window.innerWidth; - var screenHeight = window.innerHeight; var options = { userId: Dashboard.getCurrentUserId(), - limit: screenWidth > 800 && shape == "detailPagePortrait" ? 4 : 4, + limit: 8, fields: "PrimaryImageAspectRatio,UserData,SyncInfo,CanDelete" }; - if (screenWidth >= 800 && screenHeight >= 1000) { - options.limit *= 2; - } - if (enableScrollX()) { options.limit = 12; } diff --git a/dashboard-ui/scripts/wizardcomponents.js b/dashboard-ui/scripts/wizardcomponents.js index 7338ee0bab..78956254ee 100644 --- a/dashboard-ui/scripts/wizardcomponents.js +++ b/dashboard-ui/scripts/wizardcomponents.js @@ -24,6 +24,17 @@ view.querySelector('.downloadInstructions').innerHTML = instructions; + } else if (systemInfo.OperatingSystem == 'Linux' && systemInfo.SystemArchitecture != 'Arm') { + + view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', 'http://johnvansickle.com/ffmpeg'); + if (systemInfo.SystemArchitecture == 'X86') { + instructions = 'Download x86 build'; + } + else if (systemInfo.SystemArchitecture == 'X64') { + instructions = 'Download x86_64 build'; + } + view.querySelector('.downloadInstructions').innerHTML = instructions; + } else if (systemInfo.OperatingSystem == 'Osx' && systemInfo.SystemArchitecture == 'X64') { view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', 'http://evermeet.cx/ffmpeg');