diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index c81e827de0..d3293ed275 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -7,6 +7,11 @@ padding-top: 35px !important; } +.headerArrowImage { + height: 24px; + margin-left: .5em; +} + .viewMenuBar { background: #444; background-image: linear-gradient(#444,#2d2d2d); @@ -635,7 +640,6 @@ a.itemTag:hover { padding: 3px 10px; border-bottom-left-radius: 10px; color: #fff; - background: rgb(0, 143, 187); background: rgba(0, 143, 187, .8); } diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html index 4c74ada541..47a8d7602d 100644 --- a/dashboard-ui/episodes.html +++ b/dashboard-ui/episodes.html @@ -45,7 +45,7 @@ - + diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html index 78f7850be4..7d444c47b9 100644 --- a/dashboard-ui/index.html +++ b/dashboard-ui/index.html @@ -16,7 +16,7 @@
-

Media Collections

+

Media Collections

diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html index 1d6a30d52b..c7086acb84 100644 --- a/dashboard-ui/movies.html +++ b/dashboard-ui/movies.html @@ -52,7 +52,7 @@ - + diff --git a/dashboard-ui/scripts/boxsets.js b/dashboard-ui/scripts/boxsets.js index 3900197ca9..244d367de5 100644 --- a/dashboard-ui/scripts/boxsets.js +++ b/dashboard-ui/scripts/boxsets.js @@ -38,6 +38,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js index 6b898fd13a..46a2a1b896 100644 --- a/dashboard-ui/scripts/episodes.js +++ b/dashboard-ui/scripts/episodes.js @@ -13,8 +13,6 @@ StartIndex: 0 }; - LibraryBrowser.loadSavedQueryValues('episodes', query); - function reloadItems(page) { Dashboard.showLoadingMsg(); @@ -44,6 +42,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); @@ -65,7 +67,9 @@ reloadItems(page); }); - LibraryBrowser.saveQueryValues('episodes', query); + if (getParameterByName('savequery') != 'false') { + LibraryBrowser.saveQueryValues('episodes', query); + } Dashboard.hideLoadingMsg(); }); @@ -226,6 +230,23 @@ query.Limit = limit; query.StartIndex = 0; } + + LibraryBrowser.loadSavedQueryValues('episodes', query); + + var filters = getParameterByName('filters'); + if (filters) { + query.Filters = filters; + } + + var sortby = getParameterByName('sortby'); + if (sortby) { + query.SortBy = sortby; + } + + var sortorder = getParameterByName('sortorder'); + if (sortorder) { + query.SortOrder = sortorder; + } reloadItems(this); @@ -234,13 +255,13 @@ // Reset form values using the last used query $('.radioSortBy', this).each(function () { - this.checked = query.SortBy == this.getAttribute('data-sortby'); + this.checked = (query.SortBy || '').toLowerCase() == (this.getAttribute('data-sortby') || '').toLowerCase(); }).checkboxradio('refresh'); $('.radioSortOrder', this).each(function () { - this.checked = query.SortOrder == this.getAttribute('data-sortorder'); + this.checked = (query.SortOrder || '').toLowerCase() == (this.getAttribute('data-sortorder') || '').toLowerCase(); }).checkboxradio('refresh'); @@ -249,7 +270,7 @@ var filters = "," + (query.Filters || ""); var filterName = this.getAttribute('data-filter'); - this.checked = filters.indexOf(',' + filterName) != -1; + this.checked = filters.toLowerCase().indexOf(',' + filterName.toLowerCase()) != -1; }).checkboxradio('refresh'); diff --git a/dashboard-ui/scripts/gamegenrepage.js b/dashboard-ui/scripts/gamegenrepage.js index 21255ac3cc..aa032c9dab 100644 --- a/dashboard-ui/scripts/gamegenrepage.js +++ b/dashboard-ui/scripts/gamegenrepage.js @@ -37,6 +37,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js index efc1789616..bacfa7b569 100644 --- a/dashboard-ui/scripts/gamespage.js +++ b/dashboard-ui/scripts/gamespage.js @@ -63,6 +63,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/gamestudiospage.js b/dashboard-ui/scripts/gamestudiospage.js index 17796c59c3..ce2a5c9c23 100644 --- a/dashboard-ui/scripts/gamestudiospage.js +++ b/dashboard-ui/scripts/gamestudiospage.js @@ -38,6 +38,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/gamesystemspage.js b/dashboard-ui/scripts/gamesystemspage.js index 4814243595..5b964543a6 100644 --- a/dashboard-ui/scripts/gamesystemspage.js +++ b/dashboard-ui/scripts/gamesystemspage.js @@ -40,6 +40,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js index abdfbe6dd7..aa519506b9 100644 --- a/dashboard-ui/scripts/itemlistpage.js +++ b/dashboard-ui/scripts/itemlistpage.js @@ -47,6 +47,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js index 711b847467..640ad4c40e 100644 --- a/dashboard-ui/scripts/moviegenres.js +++ b/dashboard-ui/scripts/moviegenres.js @@ -38,6 +38,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/moviepeople.js b/dashboard-ui/scripts/moviepeople.js index 80dd2cb5e8..0bf39b83b4 100644 --- a/dashboard-ui/scripts/moviepeople.js +++ b/dashboard-ui/scripts/moviepeople.js @@ -39,6 +39,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/moviestudios.js b/dashboard-ui/scripts/moviestudios.js index 1a454a6268..8ecef03130 100644 --- a/dashboard-ui/scripts/moviestudios.js +++ b/dashboard-ui/scripts/moviestudios.js @@ -38,6 +38,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js index f1bc2dde73..9a0570ad5b 100644 --- a/dashboard-ui/scripts/movietrailers.js +++ b/dashboard-ui/scripts/movietrailers.js @@ -49,6 +49,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js index c06c20e576..3221476295 100644 --- a/dashboard-ui/scripts/musicalbums.js +++ b/dashboard-ui/scripts/musicalbums.js @@ -53,6 +53,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js index 6529e4bbfb..85ec1af94b 100644 --- a/dashboard-ui/scripts/musicartists.js +++ b/dashboard-ui/scripts/musicartists.js @@ -39,6 +39,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/musicgenres.js b/dashboard-ui/scripts/musicgenres.js index 8e042ebc47..2cef3cb51a 100644 --- a/dashboard-ui/scripts/musicgenres.js +++ b/dashboard-ui/scripts/musicgenres.js @@ -38,6 +38,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/musicvideos.js b/dashboard-ui/scripts/musicvideos.js index 99267b3530..83478ead2e 100644 --- a/dashboard-ui/scripts/musicvideos.js +++ b/dashboard-ui/scripts/musicvideos.js @@ -62,6 +62,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js index dd6a6dd06a..5506ca7a16 100644 --- a/dashboard-ui/scripts/songs.js +++ b/dashboard-ui/scripts/songs.js @@ -60,6 +60,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/tvgenres.js b/dashboard-ui/scripts/tvgenres.js index 1561c9bf8b..0af8b451b8 100644 --- a/dashboard-ui/scripts/tvgenres.js +++ b/dashboard-ui/scripts/tvgenres.js @@ -38,6 +38,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/tvpeople.js b/dashboard-ui/scripts/tvpeople.js index a1f34a2294..31d7f7a00e 100644 --- a/dashboard-ui/scripts/tvpeople.js +++ b/dashboard-ui/scripts/tvpeople.js @@ -39,6 +39,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index 1ae8151f75..467b2059c7 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -59,6 +59,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/tvstudios.js b/dashboard-ui/scripts/tvstudios.js index 8a28f07d7c..ed516eb9d5 100644 --- a/dashboard-ui/scripts/tvstudios.js +++ b/dashboard-ui/scripts/tvstudios.js @@ -38,6 +38,10 @@ $('#items', page).html(html).trigger('create'); + $('.btnChangeToDefaultSort', page).on('click', function () { + $('.defaultSort', page)[0].click(); + }); + $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; reloadItems(page); diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html index fb6feee06e..5cf7c7ba36 100644 --- a/dashboard-ui/tvrecommended.html +++ b/dashboard-ui/tvrecommended.html @@ -18,13 +18,13 @@
-

Latest Unwatched Episodes

+

Latest Unwatched Episodes