From 2b534794797d8239611185c48f67e87c2d8f1b74 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 15 Apr 2013 21:09:27 -0400 Subject: [PATCH] fix gallery not passing in item --- dashboard-ui/css/librarybrowser.css | 8 ++++++-- dashboard-ui/css/site.css | 6 +----- dashboard-ui/scripts/Itemdetailpage.js | 5 +---- dashboard-ui/scripts/gamedetailpage.js | 5 +---- dashboard-ui/scripts/librarybrowser.js | 21 ++++++++++++--------- dashboard-ui/scripts/tvseries.js | 5 ++--- 6 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 43b761c14..29084da7e 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -66,7 +66,7 @@ @media all and (min-width: 650px) { .libraryPage .ui-content { - padding: 10px 15px 100px; + padding: 10px 20px 100px; } } @@ -107,7 +107,7 @@ } .detailPageName { - margin: 0 0 5px; + margin: 0 0 .4em; } .itemMiscInfo { @@ -236,6 +236,10 @@ display: none; } +.detailPagePrimaryInfo { + margin-bottom: 1.5em; +} + @media all and (min-width: 650px) { .detailPagePrimaryInfo { padding: 0 10px; diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index e601bc502..6d7d44676 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -725,7 +725,7 @@ progress { display: inline-block; width: 45%; padding-left: 20px; - max-width: 1000px; + max-width: 1300px; } .galleryImage { @@ -742,10 +742,6 @@ progress { .itemDetailBlock { width: 55%; } - - .itemDetailBlock { - padding-left: 30px; - } } diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js index e2e7ecffe..d4c333e6b 100644 --- a/dashboard-ui/scripts/Itemdetailpage.js +++ b/dashboard-ui/scripts/Itemdetailpage.js @@ -161,10 +161,7 @@ function renderGallery(page, item) { - var imageTags = item.ImageTags || {}; - var html = ''; - - html += LibraryBrowser.renderGallery(imageTags); + var html = LibraryBrowser.getGalleryHtml(item); $('#galleryContent', page).html(html).trigger('create'); } diff --git a/dashboard-ui/scripts/gamedetailpage.js b/dashboard-ui/scripts/gamedetailpage.js index 711fb0dc5..0c8d74586 100644 --- a/dashboard-ui/scripts/gamedetailpage.js +++ b/dashboard-ui/scripts/gamedetailpage.js @@ -85,10 +85,7 @@ function renderGallery(page, item) { - var imageTags = item.ImageTags || {}; - var html = ''; - - html += LibraryBrowser.renderGallery(imageTags); + var html = LibraryBrowser.getGalleryHtml(item); $('#galleryContent', page).html(html).trigger('create'); } diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 959befbc9..b8637895e 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -979,35 +979,38 @@ return html; }, - renderGallery: function (imageTags) { - var html; + getGalleryHtml: function (item) { + + var html = ''; var i, length; - if (imageTags.Logo) { + var imageTags = item.ImageTags || {}; - html += LibraryBrowser.createGalleryImage(item.Id, "Logo", item.ImageTags.Logo); + if (imageTags.Logo) { + + html += LibraryBrowser.createGalleryImage(item.Id, "Logo", imageTags.Logo); } if (imageTags.Thumb) { - html += LibraryBrowser.createGalleryImage(item.Id, "Thumb", item.ImageTags.Thumb); + html += LibraryBrowser.createGalleryImage(item.Id, "Thumb", imageTags.Thumb); } if (imageTags.Art) { - html += LibraryBrowser.createGalleryImage(item.Id, "Art", item.ImageTags.Art); + html += LibraryBrowser.createGalleryImage(item.Id, "Art", imageTags.Art); } if (imageTags.Menu) { - html += LibraryBrowser.createGalleryImage(item.Id, "Menu", item.ImageTags.Menu); + html += LibraryBrowser.createGalleryImage(item.Id, "Menu", imageTags.Menu); } if (imageTags.Disc) { - html += LibraryBrowser.createGalleryImage(item.Id, "Disc", item.ImageTags.Disc); + html += LibraryBrowser.createGalleryImage(item.Id, "Disc", imageTags.Disc); } if (imageTags.Box) { - html += LibraryBrowser.createGalleryImage(item.Id, "Box", item.ImageTags.Box); + html += LibraryBrowser.createGalleryImage(item.Id, "Box", imageTags.Box); } if (item.BackdropImageTags) { diff --git a/dashboard-ui/scripts/tvseries.js b/dashboard-ui/scripts/tvseries.js index 15733b5ae..7f416c88b 100644 --- a/dashboard-ui/scripts/tvseries.js +++ b/dashboard-ui/scripts/tvseries.js @@ -93,10 +93,9 @@ function renderGallery(page, item) { - var imageTags = item.ImageTags || {}; - var html = ''; + var html = ''; - html += LibraryBrowser.renderGallery(imageTags); + html += LibraryBrowser.getGalleryHtml(item); $('#galleryContent', page).html(html).trigger('create'); }