diff --git a/dashboard-ui/css/detailtable.css b/dashboard-ui/css/detailtable.css index 9567146ba1..4d55431943 100644 --- a/dashboard-ui/css/detailtable.css +++ b/dashboard-ui/css/detailtable.css @@ -1,13 +1,16 @@ -.detailTable { - border-collapse: collapse; - border-spacing: 0; +.detailTableContainer { width: 100%; max-width: 1200px; - text-align: left; + text-align: center; + margin: 0 auto; } -.centeredDetailTable { - margin: auto; +.detailTable { + border-collapse: collapse; + border-spacing: 0; + text-align: left; + width: 100%; + margin: 0 auto; } .stretchedDetailTable { @@ -36,6 +39,7 @@ font-weight: normal; text-align: left; vertical-align: top; + white-space: nowrap; } .detailTable .imgUserItemRating { diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 23a4b54ca0..c9624e4ebf 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -293,7 +293,7 @@ } .libraryTabs .ui-btn-inner { - padding: 1em 20px!important; + padding: .5em 15px!important; } } diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index bf96fd99de..224c26492e 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -125,6 +125,15 @@ pre, textarea.pre { right: 10px; } +.headerSearch { + display: none; + margin-right: 2em; +} + + .headerSearch input { + width: 200px; + } + .header .imageLink { display: inline-block; } @@ -265,6 +274,10 @@ form, .readOnlyContent { @media all and (min-width: 650px) { + .headerSearch { + display: inline-block; + } + .imgLogoIcon { height: 50px; } diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html index 29ca54b291..874d54f020 100644 --- a/dashboard-ui/itembynamedetails.html +++ b/dashboard-ui/itembynamedetails.html @@ -112,9 +112,16 @@ - -
+
+ +
+ +
+
diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js index 9263b0f0c5..5f6fe464dc 100644 --- a/dashboard-ui/scripts/Itemdetailpage.js +++ b/dashboard-ui/scripts/Itemdetailpage.js @@ -261,13 +261,13 @@ ParentId: getParameterByName('id'), SortBy: "SortName", - Fields: "PrimaryImageAspectRatio,ItemCounts,DisplayMediaType,DateCreated,UserData" + Fields: "PrimaryImageAspectRatio,ItemCounts,DisplayMediaType,DateCreated,UserData,AudioInfo" }).done(function (result) { if (item.Type == "MusicAlbum") { - $('#itemSongs', page).html(LibraryBrowser.getSongTableHtml(result.Items)).trigger('create'); + $('#itemSongs', page).html(LibraryBrowser.getSongTableHtml(result.Items, { showArtist: true })).trigger('create'); } else { var html = LibraryBrowser.getPosterDetailViewHtml({ diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js index bb495db6f0..ab8fec3fbe 100644 --- a/dashboard-ui/scripts/itembynamedetailpage.js +++ b/dashboard-ui/scripts/itembynamedetailpage.js @@ -29,7 +29,7 @@ getItemPromise = ApiClient.getGenre(name, Dashboard.getCurrentUserId()); } else { - + name = getParameterByName('artist'); if (name) { @@ -72,7 +72,7 @@ function renderHeader(page, item) { var context = getParameterByName('context'); - + if (context == "movies") { enableCustomHeader(page, "Movies"); $('#standardLogo', page).hide(); @@ -206,6 +206,13 @@ }); } + function renderGallery(page, item) { + + var html = LibraryBrowser.getGalleryHtml(item); + + $('#galleryContent', page).html(html).trigger('create'); + } + function bindRadioEvents(page) { $("#radioMovies", page).on("click", function () { @@ -293,6 +300,13 @@ renderUserDataIcons(page, item); LibraryBrowser.renderLinks($('#itemLinks', page), item); + if (LibraryBrowser.shouldDisplayGallery(item)) { + $('#galleryCollapsible', page).show(); + renderGallery(page, item); + } else { + $('#galleryCollapsible', page).hide(); + } + if (item.Type == "Person" && item.PremiereDate) { try { @@ -348,7 +362,7 @@ else if (currentItem.Type == "Artist") { query.Artists = currentItem.Name; } -} + } function loadItems(page, options) { diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 50cd2cbdf7..11579499c8 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -202,13 +202,9 @@ var html = ''; - var cssClass = options.center ? "centeredDetailTable detailTable" : "detailTable"; + var cssClass = "detailTable"; - if (options.strech) { - cssClass += " stretchedDetailTable"; - } - - html += ''; + html += '
'; html += ''; @@ -220,7 +216,7 @@ html += ''; } if (options.showArtist) { - html += ''; + html += ''; } html += ''; @@ -254,8 +250,11 @@ if (options.showArtist) { - if (item.Artist) { - html += ''; + if (item.Artists && item.Artists.length) { + + var artist = item.Artists[0]; + + html += ''; } else { html += ''; } @@ -272,7 +271,7 @@ html += ''; } - html += '
AlbumArtistsArtistDuration' + item.Artist + '' + artist + '
'; + html += '
'; return html; }, @@ -445,7 +444,7 @@ if (options.showParentTitle) { html += "
"; - html += item.SeriesName || item.Album || item.Artist || " "; + html += item.SeriesName || item.Album || " "; html += "
"; } @@ -1368,36 +1367,36 @@ if (imageTags.Banner) { - html += LibraryBrowser.createGalleryImage(item.Id, "Banner", imageTags.Banner); + html += LibraryBrowser.createGalleryImage(item, "Banner", imageTags.Banner); } if (imageTags.Logo) { - html += LibraryBrowser.createGalleryImage(item.Id, "Logo", imageTags.Logo); + html += LibraryBrowser.createGalleryImage(item, "Logo", imageTags.Logo); } if (imageTags.Thumb) { - html += LibraryBrowser.createGalleryImage(item.Id, "Thumb", imageTags.Thumb); + html += LibraryBrowser.createGalleryImage(item, "Thumb", imageTags.Thumb); } if (imageTags.Art) { - html += LibraryBrowser.createGalleryImage(item.Id, "Art", imageTags.Art); + html += LibraryBrowser.createGalleryImage(item, "Art", imageTags.Art); } if (imageTags.Menu) { - html += LibraryBrowser.createGalleryImage(item.Id, "Menu", imageTags.Menu); + html += LibraryBrowser.createGalleryImage(item, "Menu", imageTags.Menu); } if (imageTags.Box) { - html += LibraryBrowser.createGalleryImage(item.Id, "Box", imageTags.Box); + html += LibraryBrowser.createGalleryImage(item, "Box", imageTags.Box); } if (item.BackdropImageTags) { for (i = 0, length = item.BackdropImageTags.length; i < length; i++) { - html += LibraryBrowser.createGalleryImage(item.Id, "Backdrop", item.BackdropImageTags[i], i); + html += LibraryBrowser.createGalleryImage(item, "Backdrop", item.BackdropImageTags[i], i); } } @@ -1405,18 +1404,18 @@ if (item.ScreenshotImageTags) { for (i = 0, length = item.ScreenshotImageTags.length; i < length; i++) { - html += LibraryBrowser.createGalleryImage(item.Id, "Screenshot", item.ScreenshotImageTags[i], i); + html += LibraryBrowser.createGalleryImage(item, "Screenshot", item.ScreenshotImageTags[i], i); } } if (imageTags.Disc) { - html += LibraryBrowser.createGalleryImage(item.Id, "Disc", imageTags.Disc); + html += LibraryBrowser.createGalleryImage(item, "Disc", imageTags.Disc); } return html; }, - createGalleryImage: function (itemId, type, tag, index) { + createGalleryImage: function (item, type, tag, index) { var downloadWidth = 400; var lightboxWidth = 800; @@ -1426,21 +1425,19 @@ html += '
'; html += ''; - html += ''; html += '
'; html += '
'; html += 'Close'; - html += ''; html += '
'; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 5d00752ff7..99f88e83cf 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -695,6 +695,9 @@ var Dashboard = { headerHtml += '
'; if (user && !page.hasClass('wizardPage')) { + + headerHtml += Dashboard.getSearchHtml(); + headerHtml += '' + user.Name + ''; if (user.PrimaryImageTag) { @@ -721,12 +724,32 @@ var Dashboard = { header.append(headerHtml); + $('#searchForm', header).on("submit", Dashboard.onSearchSubmit); + Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) { if (pluginSecurityInfo.IsMBSupporter) { $('').insertBefore('.btnTools', header); } }); }, + + onSearchSubmit: function() { + + Dashboard.alert('Coming soon.'); + + return false; + }, + + getSearchHtml: function() { + + var html = '
'; + + html += ''; + + html += '
'; + + return html; + }, ensureToolsMenu: function (page) { @@ -1087,16 +1110,7 @@ $(function () { Dashboard.jQueryMobileInit(); -$(document).on('pagebeforeshow', ".page", function () { - - Dashboard.refreshSystemInfoFromServer(); - - var page = $(this); - - Dashboard.ensureHeader(page); - Dashboard.ensurePageTitle(page); - -}).on('pageinit', ".page", function () { +$(document).on('pageinit', ".page", function () { var page = $(this); @@ -1120,4 +1134,14 @@ $(document).on('pagebeforeshow', ".page", function () { } }); } + +}).on('pagebeforeshow', ".page", function () { + + Dashboard.refreshSystemInfoFromServer(); + + var page = $(this); + + Dashboard.ensureHeader(page); + Dashboard.ensurePageTitle(page); + }); \ No newline at end of file diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js index 2118f5a58f..3874e0860b 100644 --- a/dashboard-ui/scripts/songs.js +++ b/dashboard-ui/scripts/songs.js @@ -24,9 +24,7 @@ html += LibraryBrowser.getSongTableHtml(result.Items, { showAlbum: true, - showArtist: true, - center: true, - strech: true + showArtist: true }); html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);