From 9a160606636f8c3b75ff989b7063ca23fedd951c Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 18 Mar 2014 21:35:40 -0400 Subject: [PATCH 1/4] #712 - group multiple versions --- dashboard-ui/movies.html | 2 +- dashboard-ui/scripts/librarybrowser.js | 2 +- dashboard-ui/scripts/librarylist.js | 89 ++++++++++++++++++++------ dashboard-ui/scripts/movies.js | 6 ++ 4 files changed, 78 insertions(+), 21 deletions(-) diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html index 88eac124bd..a97c258e1a 100644 --- a/dashboard-ui/movies.html +++ b/dashboard-ui/movies.html @@ -40,7 +40,7 @@ diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 7aa544efdc..5673048b72 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -665,7 +665,7 @@ cssClass += ' ' + options.shape + 'PosterItem'; - html += ''; + html += ''; // Ribbon if (item.MediaType == "Video" && options.formatIndicators) { diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index f95219a413..e7e7da346b 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -166,6 +166,27 @@ function onMenuCommand(command, elem) { var id = elem.getAttribute('data-itemid'); + var page = $(elem).parents('.page'); + + if (command == 'SplitVersions') { + splitVersions(id, page); + } + } + + function splitVersions(id, page) { + + Dashboard.showLoadingMsg(); + + $.ajax({ + type: "DELETE", + url: ApiClient.getUrl("Videos/" + id + "/AlternateVersions") + + }).done(function () { + + Dashboard.hideLoadingMsg(); + + $('.itemsContainer', page).trigger('needsrefresh'); + }); } function getContextMenuOptions(elem) { @@ -173,7 +194,6 @@ var items = []; var id = elem.getAttribute('data-itemid'); - var mediatype = elem.getAttribute('data-mediatype'); items.push({ type: 'header', text: 'Edit' }); @@ -181,12 +201,12 @@ items.push({ type: 'link', text: 'Images', url: 'edititemimages.html?id=' + id }); - //if (mediatype == 'Video' && elem.getAttribute('data-locationtype') == 'FileSystem' && !elem.getAttribute('data-primaryversionid')) { + if (elem.getAttribute('data-alternateversioncount') != '0') { - // items.push({ type: 'divider' }); - // items.push({ type: 'header', text: 'Manage' }); - // items.push({ type: 'command', text: 'Alternate Versions', name: 'AlternateVersions' }); - //} + items.push({ type: 'divider' }); + items.push({ type: 'header', text: 'Manage' }); + items.push({ type: 'command', text: 'Split Versions', name: 'SplitVersions' }); + } return items; } @@ -260,11 +280,11 @@ if (user.Configuration.IsAdministrator) { - //sequence.createContextMenu({ - // getOptions: getContextMenuOptions, - // command: onMenuCommand, - // selector: '.posterItem' - //}); + sequence.createContextMenu({ + getOptions: getContextMenuOptions, + command: onMenuCommand, + selector: '.posterItem' + }); } }); @@ -290,6 +310,8 @@ selectionCommands.show(); $('.itemSelectionPanel', page).show(); + + $('.chkItemSelect:checked', page).checked(false).checkboxradio('refresh'); } Dashboard.hideLoadingMsg(); @@ -301,25 +323,25 @@ $('.itemSelectionPanel', page).hide(); } - + function getSelectedItems(page) { - + var selection = $('.chkItemSelect:checked', page); return selection.parents('.posterItem') - .map(function() { + .map(function () { return this.getAttribute('data-itemid'); }).get(); } - + function combineVersions(page) { var selection = getSelectedItems(page); - + if (selection.length < 2) { - + Dashboard.alert({ message: "Please select two or more items to combine.", title: "Error" @@ -328,7 +350,36 @@ return; } - hideSelections(); + var names = $('.chkItemSelect:checked', page).parents('.posterItem').get().reverse().map(function (e) { + + return $('.posterItemText', e).html(); + + }).join('
'); + + var msg = "The following titles will be grouped into one item:

" + names; + + msg += "

Media Browser clients will choose the optimal version to play based on device and network conditions. Are you sure you wish to continue?"; + + Dashboard.confirm(msg, "Group Versions", function (confirmResult) { + + if (confirmResult) { + + Dashboard.showLoadingMsg(); + + $.ajax({ + type: "POST", + url: ApiClient.getUrl("Videos/MergeVersions", { Ids: selection.join(',') }) + + }).done(function () { + + Dashboard.hideLoadingMsg(); + + hideSelections(); + + $('.itemsContainer', page).trigger('needsrefresh'); + }); + } + }); } $(document).on('pageinit', ".libraryPage", function () { @@ -342,7 +393,7 @@ $('.itemsContainer', page).on('listrender', function () { hideSelections(page); }); - + $('.btnMergeVersions', page).on('click', function () { combineVersions(page); }); diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js index 2c635083c0..d6390e9105 100644 --- a/dashboard-ui/scripts/movies.js +++ b/dashboard-ui/scripts/movies.js @@ -345,6 +345,12 @@ reloadItems(page); }); + $('.itemsContainer', page).on('needsrefresh', function() { + + reloadItems(page); + + }); + }).on('pagebeforeshow', "#moviesPage", function () { var page = this; From b36be70d40a8c3f7b1d4d0de034200cb9876dcd8 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 18 Mar 2014 21:43:08 -0400 Subject: [PATCH 2/4] add missing semicolons --- dashboard-ui/scripts/mediaplayer.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 3906985161..4d52d7dbda 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -24,7 +24,7 @@ self.updateCanClientSeek = function (elem) { var duration = elem.duration; canClientSeek = duration && !isNaN(duration) && duration != Number.POSITIVE_INFINITY && duration != Number.NEGATIVE_INFINITY; - } + }; $(window).on("beforeunload popstate", function () { @@ -59,11 +59,11 @@ muteButton.hide(); unmuteButton.show(); } - } + }; self.getCurrentTicks = function (mediaElement) { return Math.floor(10000000 * (mediaElement || currentMediaElement).currentTime) + self.startTimeTicksOffset; - } + }; self.onPlaybackStopped = function () { @@ -86,14 +86,14 @@ } self.resetEnhancements(); } - } + }; self.playNextAfterEnded = function () { $(this).off('ended.playnext'); self.nextTrack(); - } + }; self.startProgressInterval = function (itemId) { @@ -144,7 +144,7 @@ } return '.mp4'; - } + }; self.changeStream = function (ticks, params) { @@ -209,7 +209,7 @@ }); } - } + }; function onPositionSliderChange() { @@ -275,7 +275,7 @@ } currentTimeElement.html(timeText); - } + }; function playAudio(item, startPositionTicks) { @@ -757,7 +757,7 @@ if (trimmed) { trimmed += "..."; } else { - trimmed = "---" + trimmed = "---"; } return trimmed; } From 39c57da6237c2131bffcd8b452e11a3e58c2fbc3 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 19 Mar 2014 00:59:45 -0400 Subject: [PATCH 3/4] #712 - Group multiple versions --- dashboard-ui/collections.html | 5 ++--- dashboard-ui/css/librarybrowser.css | 4 ---- dashboard-ui/episodes.html | 5 ++--- dashboard-ui/gamegenres.html | 2 +- dashboard-ui/games.html | 5 ++--- dashboard-ui/gamestudios.html | 2 +- dashboard-ui/itemdetails.html | 3 ++- dashboard-ui/itemlist.html | 5 ++--- dashboard-ui/livetvseriestimers.html | 2 +- dashboard-ui/moviegenres.html | 2 +- dashboard-ui/moviepeople.html | 2 +- dashboard-ui/movies.html | 7 +++---- dashboard-ui/moviestudios.html | 2 +- dashboard-ui/movietrailers.html | 5 ++--- dashboard-ui/musicalbumartists.html | 2 +- dashboard-ui/musicalbums.html | 5 ++--- dashboard-ui/musicartists.html | 2 +- dashboard-ui/musicgenres.html | 1 - dashboard-ui/musicvideos.html | 5 ++--- dashboard-ui/scripts/episodes.js | 3 --- dashboard-ui/scripts/gamespage.js | 3 --- dashboard-ui/scripts/itemdetailpage.js | 16 ++++++++++----- dashboard-ui/scripts/itemlistpage.js | 3 --- dashboard-ui/scripts/librarybrowser.js | 23 +++++----------------- dashboard-ui/scripts/librarylist.js | 25 +++++++++++++++--------- dashboard-ui/scripts/moviecollections.js | 3 --- dashboard-ui/scripts/movies.js | 3 --- dashboard-ui/scripts/movietrailers.js | 3 --- dashboard-ui/scripts/musicalbums.js | 3 --- dashboard-ui/scripts/musicvideos.js | 3 --- dashboard-ui/scripts/songs.js | 3 --- dashboard-ui/scripts/tvshows.js | 3 --- dashboard-ui/songs.html | 5 ++--- dashboard-ui/tvgenres.html | 2 +- dashboard-ui/tvpeople.html | 2 +- dashboard-ui/tvshows.html | 5 ++--- dashboard-ui/tvstudios.html | 2 +- 37 files changed, 66 insertions(+), 110 deletions(-) diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html index 2c0cc6e8ad..6acb307939 100644 --- a/dashboard-ui/collections.html +++ b/dashboard-ui/collections.html @@ -17,7 +17,6 @@
-
@@ -45,7 +44,7 @@ -
+
@@ -76,7 +75,7 @@
-
+
Filters: diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index ae48f93e03..73844d260c 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -36,10 +36,6 @@ font-size: 90%; } -.viewSummary { - padding: .5em 0; -} - .viewMenuLink { text-decoration: none; color: #ccc!important; diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html index b0045117c8..c5b6143dd1 100644 --- a/dashboard-ui/episodes.html +++ b/dashboard-ui/episodes.html @@ -27,11 +27,10 @@
-
-
+
@@ -83,7 +82,7 @@
-
+
diff --git a/dashboard-ui/gamegenres.html b/dashboard-ui/gamegenres.html index 3371685cc3..14db812856 100644 --- a/dashboard-ui/gamegenres.html +++ b/dashboard-ui/gamegenres.html @@ -22,7 +22,7 @@
-
+
diff --git a/dashboard-ui/games.html b/dashboard-ui/games.html index c41ae75bc2..35445807b6 100644 --- a/dashboard-ui/games.html +++ b/dashboard-ui/games.html @@ -22,13 +22,12 @@
-
-
+
@@ -68,7 +67,7 @@
-
+
diff --git a/dashboard-ui/gamestudios.html b/dashboard-ui/gamestudios.html index 89c7bef510..b0f1160b64 100644 --- a/dashboard-ui/gamestudios.html +++ b/dashboard-ui/gamestudios.html @@ -22,7 +22,7 @@
-
+
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index fbdd6246e1..a18c334c38 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -176,8 +176,9 @@
-
+
Alternate Versions +
diff --git a/dashboard-ui/itemlist.html b/dashboard-ui/itemlist.html index 815b5c5990..3808cc7467 100644 --- a/dashboard-ui/itemlist.html +++ b/dashboard-ui/itemlist.html @@ -29,11 +29,10 @@
-
-
+
@@ -79,7 +78,7 @@
-
+
diff --git a/dashboard-ui/livetvseriestimers.html b/dashboard-ui/livetvseriestimers.html index 26804ba5eb..3a7d41341b 100644 --- a/dashboard-ui/livetvseriestimers.html +++ b/dashboard-ui/livetvseriestimers.html @@ -23,7 +23,7 @@
-
+
diff --git a/dashboard-ui/moviegenres.html b/dashboard-ui/moviegenres.html index 8117410759..13267fcdd7 100644 --- a/dashboard-ui/moviegenres.html +++ b/dashboard-ui/moviegenres.html @@ -26,7 +26,7 @@
-
+
diff --git a/dashboard-ui/moviepeople.html b/dashboard-ui/moviepeople.html index 063c7bc48c..06780c3702 100644 --- a/dashboard-ui/moviepeople.html +++ b/dashboard-ui/moviepeople.html @@ -28,7 +28,7 @@
-
+
diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html index a97c258e1a..8603e4b8f9 100644 --- a/dashboard-ui/movies.html +++ b/dashboard-ui/movies.html @@ -32,11 +32,10 @@
- +
-
-
+
@@ -107,7 +106,7 @@
-
+
diff --git a/dashboard-ui/moviestudios.html b/dashboard-ui/moviestudios.html index 0015df0479..48e0bad88e 100644 --- a/dashboard-ui/moviestudios.html +++ b/dashboard-ui/moviestudios.html @@ -26,7 +26,7 @@
-
+
diff --git a/dashboard-ui/movietrailers.html b/dashboard-ui/movietrailers.html index 308248a9c8..83bcff0363 100644 --- a/dashboard-ui/movietrailers.html +++ b/dashboard-ui/movietrailers.html @@ -26,11 +26,10 @@
-
-
+
@@ -81,7 +80,7 @@
-
+
diff --git a/dashboard-ui/musicalbumartists.html b/dashboard-ui/musicalbumartists.html index 3bde053304..503f4a7147 100644 --- a/dashboard-ui/musicalbumartists.html +++ b/dashboard-ui/musicalbumartists.html @@ -27,7 +27,7 @@
-
+
diff --git a/dashboard-ui/musicalbums.html b/dashboard-ui/musicalbums.html index ff56ef41af..ee502e4654 100644 --- a/dashboard-ui/musicalbums.html +++ b/dashboard-ui/musicalbums.html @@ -32,11 +32,10 @@
-
-
+
@@ -74,7 +73,7 @@
-
+
diff --git a/dashboard-ui/musicartists.html b/dashboard-ui/musicartists.html index 9152311dcc..b2266659be 100644 --- a/dashboard-ui/musicartists.html +++ b/dashboard-ui/musicartists.html @@ -27,7 +27,7 @@
-
+
diff --git a/dashboard-ui/musicgenres.html b/dashboard-ui/musicgenres.html index e2b99c480d..8ee43350d5 100644 --- a/dashboard-ui/musicgenres.html +++ b/dashboard-ui/musicgenres.html @@ -21,7 +21,6 @@
-
diff --git a/dashboard-ui/musicvideos.html b/dashboard-ui/musicvideos.html index f8fdf18556..ddf0a98baa 100644 --- a/dashboard-ui/musicvideos.html +++ b/dashboard-ui/musicvideos.html @@ -26,11 +26,10 @@
-
-
+
@@ -85,7 +84,7 @@
-
+
diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js index 622b0c8bd4..d9f13eb4de 100644 --- a/dashboard-ui/scripts/episodes.js +++ b/dashboard-ui/scripts/episodes.js @@ -28,9 +28,6 @@ updateFilterControls(); - var checkSortOption = $('.radioSortBy:checked', page); - $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); - html += LibraryBrowser.getPosterViewHtml({ items: result.Items, useAverageAspectRatio: true, diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js index 4a6cdddc97..9de7c08bc3 100644 --- a/dashboard-ui/scripts/gamespage.js +++ b/dashboard-ui/scripts/gamespage.js @@ -27,9 +27,6 @@ updateFilterControls(page); - var checkSortOption = $('.radioSortBy:checked', page); - $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); - html = LibraryBrowser.getPosterViewHtml({ items: result.Items, shape: "auto", diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 2e783dc3b5..d2a5ac9af8 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -901,23 +901,29 @@ userId: user.Id }); - $.getJSON(url).done(function (result) { + $.getJSON(url).done(function (items) { - if (result.Items.length) { + if (items.length) { $('#alternateVersionsCollapsible', page).show(); var html = LibraryBrowser.getPosterViewHtml({ - items: result.Items, + items: items.map(function (i) { + var extended = $.extend({}, item, i); + extended.Id = item.Id; + return extended; + }), shape: "portrait", context: 'movies', useAverageAspectRatio: true, showTitle: true, centerText: true, - formatIndicators: true + formatIndicators: true, + linkItem: false, + showProgress: false }); - $('#alternateVersionsContent', page).html(html).trigger('create').createPosterItemMenus(); + $('#alternateVersionsContent', page).html(html).trigger('create'); } else { $('#alternateVersionsCollapsible', page).hide(); } diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js index 317ad1249e..a777c2107e 100644 --- a/dashboard-ui/scripts/itemlistpage.js +++ b/dashboard-ui/scripts/itemlistpage.js @@ -30,9 +30,6 @@ updateFilterControls(page); - var checkSortOption = $('.radioSortBy:checked', page); - $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); - if (view == "Backdrop") { html = LibraryBrowser.getPosterViewHtml({ diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 5673048b72..0337402364 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -665,7 +665,9 @@ cssClass += ' ' + options.shape + 'PosterItem'; - html += ''; + var href = options.linkItem === false ? '#' : LibraryBrowser.getHref(item, options.context); + + html += ''; // Ribbon if (item.MediaType == "Video" && options.formatIndicators) { @@ -706,7 +708,7 @@ imageCssClass += " coveredPosterItemImage"; } - var progressHtml = LibraryBrowser.getItemProgressBarHtml(item); + var progressHtml = options.showProgress === false ? '' : LibraryBrowser.getItemProgressBarHtml(item); html += '
'; @@ -731,7 +733,7 @@ var chkItemSelectId = 'chkItemSelect' + i; // Render this pre-enhanced to save on jquery mobile dom manipulation - html += '
'; + html += '
'; } @@ -1158,21 +1160,6 @@ } }, - getViewSummaryHtml: function (query, checkedSortOption) { - - var html = ''; - - if (query.SortBy) { - - var id = checkedSortOption[0].id; - var sortBy = checkedSortOption.siblings('label[for=' + id + ']').text(); - - html += 'Sorted by ' + sortBy.trim().toLowerCase() + ', ' + (query.SortOrder || 'ascending').toLowerCase(); - } - - return html; - }, - getPagingHtml: function (query, totalRecordCount, updatePageSizeSetting, pageSizes, showLimit) { if (query.Limit && updatePageSizeSetting !== false) { diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index e7e7da346b..ed448b68a1 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -175,18 +175,25 @@ function splitVersions(id, page) { - Dashboard.showLoadingMsg(); + Dashboard.confirm("Are you sure you wish to split the versions apart into separate items?", "Split Versions Apart", function (confirmResult) { - $.ajax({ - type: "DELETE", - url: ApiClient.getUrl("Videos/" + id + "/AlternateVersions") + if (confirmResult) { - }).done(function () { + Dashboard.showLoadingMsg(); - Dashboard.hideLoadingMsg(); + $.ajax({ + type: "DELETE", + url: ApiClient.getUrl("Videos/" + id + "/AlternateVersions") - $('.itemsContainer', page).trigger('needsrefresh'); + }).done(function () { + + Dashboard.hideLoadingMsg(); + + $('.itemsContainer', page).trigger('needsrefresh'); + }); + } }); + } function getContextMenuOptions(elem) { @@ -205,7 +212,7 @@ items.push({ type: 'divider' }); items.push({ type: 'header', text: 'Manage' }); - items.push({ type: 'command', text: 'Split Versions', name: 'SplitVersions' }); + items.push({ type: 'command', text: 'Split Versions Apart', name: 'SplitVersions' }); } return items; @@ -221,7 +228,7 @@ return; } - if ($('.itemSelectionPanel', elem).length) { + if ($('.itemSelectionPanel:visible', elem).length) { return; } diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js index ac9db18fc2..15fdc48755 100644 --- a/dashboard-ui/scripts/moviecollections.js +++ b/dashboard-ui/scripts/moviecollections.js @@ -28,9 +28,6 @@ if (result.TotalRecordCount) { - var checkSortOption = $('.radioSortBy:checked', page); - $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); - html = LibraryBrowser.getPosterViewHtml({ items: result.Items, shape: "portrait", diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js index d6390e9105..8cb64c2e10 100644 --- a/dashboard-ui/scripts/movies.js +++ b/dashboard-ui/scripts/movies.js @@ -29,9 +29,6 @@ updateFilterControls(page); - var checkSortOption = $('.radioSortBy:checked', page); - $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); - if (view == "Thumb") { html = LibraryBrowser.getPosterViewHtml({ items: result.Items, diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js index 2b3f150fa5..e4364d0e4c 100644 --- a/dashboard-ui/scripts/movietrailers.js +++ b/dashboard-ui/scripts/movietrailers.js @@ -26,9 +26,6 @@ updateFilterControls(page); - var checkSortOption = $('.radioSortBy:checked', page); - $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); - html = LibraryBrowser.getPosterViewHtml({ items: result.Items, shape: "portrait", diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js index a8cdc6c399..45e4e2738a 100644 --- a/dashboard-ui/scripts/musicalbums.js +++ b/dashboard-ui/scripts/musicalbums.js @@ -28,9 +28,6 @@ updateFilterControls(page); - var checkSortOption = $('.radioSortBy:checked', page); - $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); - if (view == "Poster") { html = LibraryBrowser.getPosterViewHtml({ items: result.Items, diff --git a/dashboard-ui/scripts/musicvideos.js b/dashboard-ui/scripts/musicvideos.js index 1df1ba34a4..2cc211b7cd 100644 --- a/dashboard-ui/scripts/musicvideos.js +++ b/dashboard-ui/scripts/musicvideos.js @@ -26,9 +26,6 @@ updateFilterControls(page); - var checkSortOption = $('.radioSortBy:checked', page); - $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); - html = LibraryBrowser.getPosterViewHtml({ items: result.Items, shape: "square", diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js index 774ab87f16..8dd595c3cc 100644 --- a/dashboard-ui/scripts/songs.js +++ b/dashboard-ui/scripts/songs.js @@ -47,9 +47,6 @@ updateFilterControls(page); - var checkSortOption = $('.radioSortBy:checked', page); - $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); - html += LibraryBrowser.getSongTableHtml(result.Items, { showAlbum: true, showArtist: true, diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index 1e1a8ca3ab..12cfa73aa4 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -28,9 +28,6 @@ updateFilterControls(page); - var checkSortOption = $('.radioSortBy:checked', page); - $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); - if (view == "Thumb") { html = LibraryBrowser.getPosterViewHtml({ diff --git a/dashboard-ui/songs.html b/dashboard-ui/songs.html index 7a81b6ea99..c496b09bee 100644 --- a/dashboard-ui/songs.html +++ b/dashboard-ui/songs.html @@ -22,11 +22,10 @@
-
-
+
@@ -75,7 +74,7 @@
-
+
diff --git a/dashboard-ui/tvgenres.html b/dashboard-ui/tvgenres.html index 5d49788000..c132b70148 100644 --- a/dashboard-ui/tvgenres.html +++ b/dashboard-ui/tvgenres.html @@ -25,7 +25,7 @@
-
+
diff --git a/dashboard-ui/tvpeople.html b/dashboard-ui/tvpeople.html index 5b70ac2bb7..ccf22b4fc4 100644 --- a/dashboard-ui/tvpeople.html +++ b/dashboard-ui/tvpeople.html @@ -28,7 +28,7 @@
-
+
diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html index 9443ed8246..363a6e897e 100644 --- a/dashboard-ui/tvshows.html +++ b/dashboard-ui/tvshows.html @@ -34,11 +34,10 @@
-
-
+
@@ -78,7 +77,7 @@
-
+
Filters: diff --git a/dashboard-ui/tvstudios.html b/dashboard-ui/tvstudios.html index 8c0ceaed3c..21bc7dde02 100644 --- a/dashboard-ui/tvstudios.html +++ b/dashboard-ui/tvstudios.html @@ -25,7 +25,7 @@
-
+
From 6a50b9ce36decc6d787d306ee4eb60fd24bcee08 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 19 Mar 2014 13:44:55 -0400 Subject: [PATCH 4/4] #712 - group multiple versions --- dashboard-ui/css/librarybrowser.css | 11 ++- dashboard-ui/css/site.css | 5 - dashboard-ui/episodes.html | 6 ++ dashboard-ui/itemdetails.html | 21 ++-- dashboard-ui/scripts/episodes.js | 9 +- dashboard-ui/scripts/itemdetailpage.js | 111 ++++++++++++---------- dashboard-ui/scripts/librarybrowser.js | 2 +- dashboard-ui/scripts/librarylist.js | 6 +- dashboard-ui/scripts/movies.js | 2 +- dashboard-ui/scripts/scheduledtaskpage.js | 4 +- 10 files changed, 99 insertions(+), 78 deletions(-) diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 73844d260c..488d6160c4 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -428,7 +428,6 @@ a.itemTag:hover { background-position: center 15%; background-repeat: no-repeat; height: 550px; - border-bottom: 1px solid #111; position: relative; } @@ -767,6 +766,10 @@ a.itemTag:hover { .lnkSibling:not(.hide) { display: block; } + + .itemBackdrop { + border-bottom: 1px solid #111; + } } @media all and (min-width: 1000px) { @@ -1118,6 +1121,12 @@ a.itemTag:hover { padding: 1em; } + .itemSelectionPanel .ui-checkbox { + max-width: 90px; + margin-left: auto; + margin-right: auto; + } + .selectionCommandsControlGroup { display: inline-block; margin-left: .5em; diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 132ab59b1a..f6d6574d6d 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -683,7 +683,6 @@ h1 .imageLink { z-index: 99997; color: #fff; border: 0 !important; - max-height: 220px; } .footerNotification { @@ -700,10 +699,6 @@ h1 .imageLink { vertical-align: middle; } -#dashboardVersionWarning { - line-height: 50px; -} - /* * Gradient Shadow */ diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html index c5b6143dd1..8736aa4bb9 100644 --- a/dashboard-ui/episodes.html +++ b/dashboard-ui/episodes.html @@ -24,9 +24,15 @@
+
+
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index a18c334c38..cd4024bc23 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -131,6 +131,9 @@ + Trailer + @@ -156,7 +159,6 @@

-

@@ -169,16 +171,10 @@
-
-
- Trailers -
-
-
- Alternate Versions - + Media Versions +
@@ -220,10 +216,10 @@