milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

display titles to the right of posters in detail pages

Browse source
This commit is contained in:
Luke Pulverenti 2013-04-17 23:53:19 -04:00
parent 2a9a088a9e
commit 5072eb0e1a
13 changed files with 141 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dashboard-ui/scripts/librarybrowser.js
View file

@ -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 += "<img class='itemDetailImage' src='" + url + "' style='" + style + "' />";
}

3
dashboard-ui/scripts/mediaplayer.js
View file

@ -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 },

2
dashboard-ui/scripts/movietrailers.js
View file

@ -1,6 +1,6 @@
(function ($, document) {
var view = "Backdrop";
var view = "Poster";
// The base query options
var query = {

1
dashboard-ui/scripts/tvseason.js
View file

@ -19,6 +19,7 @@
Dashboard.setPageTitle(name);
$('#itemName', page).html(name);
$('#seriesName', page).html('<a class="detailPageParentLink" href="tvseries.html?id=' + item.SeriesId + '">' + item.SeriesName + '</a>').trigger('create');
setInitialCollapsibleState(page, item);
renderDetails(page, item);