+
+
+
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index e3b9d05dd6..b562771fc4 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -739,6 +739,7 @@
var url;
var useBackgroundColor;
+ var maxwidth;
if (imageTags.Primary) {
@@ -798,24 +799,37 @@
else if (item.MediaType == "Audio") {
url = "css/images/items/detail/audio.png";
useBackgroundColor = true;
+ maxwidth = 150;
}
else if (item.MediaType == "Game") {
url = "css/images/items/detail/game.png";
useBackgroundColor = true;
+ maxwidth = 150;
}
else if (item.Type == "Person") {
url = "css/images/items/detail/person.png";
useBackgroundColor = true;
+ maxwidth = 100;
+ }
+ else if (item.Type == "Genre" || item.Type == "Studio") {
+ url = "css/images/items/detail/video.png";
+ useBackgroundColor = true;
+ maxwidth = 100;
}
else {
url = "css/images/items/detail/video.png";
useBackgroundColor = true;
+ maxwidth = 150;
}
if (url) {
var style = useBackgroundColor ? "background-color:" + LibraryBrowser.getMetroColor(item.Id) + ";" : "";
+ if (maxwidth) {
+ style += "max-width:" + maxwidth + "px;";
+ }
+
html += "

";
}
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index bd0e76c4cf..54dead500c 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -149,6 +149,9 @@
videoCodec: 'theora',
audioCodec: 'Vorbis'
}));
+
+ // HLS must be at the top for safari
+ // Webm must be ahead of mp4 due to the issue of mp4 playing too fast in chrome
(this).src([
{ type: "application/x-mpegURL", src: hlsVideoUrl },
diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js
index 01c651c7e5..98f524b291 100644
--- a/dashboard-ui/scripts/movietrailers.js
+++ b/dashboard-ui/scripts/movietrailers.js
@@ -1,6 +1,6 @@
(function ($, document) {
- var view = "Backdrop";
+ var view = "Poster";
// The base query options
var query = {
diff --git a/dashboard-ui/scripts/tvseason.js b/dashboard-ui/scripts/tvseason.js
index 85048c6775..758c6f625b 100644
--- a/dashboard-ui/scripts/tvseason.js
+++ b/dashboard-ui/scripts/tvseason.js
@@ -19,6 +19,7 @@
Dashboard.setPageTitle(name);
$('#itemName', page).html(name);
+ $('#seriesName', page).html('
' + item.SeriesName + '').trigger('create');
setInitialCollapsibleState(page, item);
renderDetails(page, item);
diff --git a/dashboard-ui/tvseason.html b/dashboard-ui/tvseason.html
index bd6673a99d..75950bcab7 100644
--- a/dashboard-ui/tvseason.html
+++ b/dashboard-ui/tvseason.html
@@ -19,8 +19,6 @@