diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 7279948360..8b8aad7d0c 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -85,11 +85,11 @@ } } -/*@media all and (min-width: 1000px) { - .libraryPage > .ui-content, .libraryPage > .ui-panel-content-wrap { - margin-top: -20px!important; +@media all and (min-width: 1000px) { + .libraryPage:not(.folderListPage) > .ui-content, .libraryPage:not(.folderListPage) > .ui-panel-content-wrap { + margin-top: -35px!important; } -}*/ +} @media all and (min-width: 1200px) { diff --git a/dashboard-ui/itemlist.html b/dashboard-ui/itemlist.html index b973e70c31..ad139477a9 100644 --- a/dashboard-ui/itemlist.html +++ b/dashboard-ui/itemlist.html @@ -4,7 +4,7 @@ -
+

diff --git a/dashboard-ui/scripts/boxsets.js b/dashboard-ui/scripts/boxsets.js index f771d47d3f..2276f503f8 100644 --- a/dashboard-ui/scripts/boxsets.js +++ b/dashboard-ui/scripts/boxsets.js @@ -21,20 +21,16 @@ var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); html += LibraryBrowser.getPosterDetailViewHtml({ items: result.Items, useAverageAspectRatio: true }); - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - var elem = $('#items', page).html(html).trigger('create'); + $('#items', page).html(html).trigger('create'); $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; diff --git a/dashboard-ui/scripts/gamegenrepage.js b/dashboard-ui/scripts/gamegenrepage.js index 16a1724637..af34cdac93 100644 --- a/dashboard-ui/scripts/gamegenrepage.js +++ b/dashboard-ui/scripts/gamegenrepage.js @@ -20,9 +20,7 @@ var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); html += LibraryBrowser.getPosterDetailViewHtml({ items: result.Items, @@ -31,11 +29,9 @@ countNamePlural: "Games" }); - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - var elem = $('#items', page).html(html).trigger('create'); + $('#items', page).html(html).trigger('create'); $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js index dcbf117ff3..19a2c323c4 100644 --- a/dashboard-ui/scripts/gamespage.js +++ b/dashboard-ui/scripts/gamespage.js @@ -23,9 +23,7 @@ var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); for (var i = 0, length = result.Items.length; i < length; i++) { var item = result.Items[i]; @@ -41,11 +39,9 @@ } - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - var elem = $('#items', page).html(html).trigger('create'); + $('#items', page).html(html).trigger('create'); $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; diff --git a/dashboard-ui/scripts/gamestudiospage.js b/dashboard-ui/scripts/gamestudiospage.js index de082defd6..1c22b05cce 100644 --- a/dashboard-ui/scripts/gamestudiospage.js +++ b/dashboard-ui/scripts/gamestudiospage.js @@ -20,9 +20,7 @@ var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); html += LibraryBrowser.getPosterDetailViewHtml({ items: result.Items, @@ -31,11 +29,9 @@ countNamePlural: "Games" }); - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - var elem = $('#items', page).html(html).trigger('create'); + $('#items', page).html(html).trigger('create'); $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; diff --git a/dashboard-ui/scripts/gamesystemspage.js b/dashboard-ui/scripts/gamesystemspage.js index d8ebdfa71c..05ffc4800f 100644 --- a/dashboard-ui/scripts/gamesystemspage.js +++ b/dashboard-ui/scripts/gamesystemspage.js @@ -22,20 +22,16 @@ var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); html += LibraryBrowser.getPosterDetailViewHtml({ items: result.Items, useAverageAspectRatio: true }); - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - var elem = $('#items', page).html(html).trigger('create'); + $('#items', page).html(html).trigger('create'); $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js index 29b96d6151..98840f6803 100644 --- a/dashboard-ui/scripts/itembynamedetailpage.js +++ b/dashboard-ui/scripts/itembynamedetailpage.js @@ -254,18 +254,14 @@ ApiClient.getItems(Dashboard.getCurrentUserId(), query).done(function (result) { var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); html += LibraryBrowser.getPosterDetailViewHtml({ items: result.Items, useAverageAspectRatio: true }); - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); $('#items', page).html(html).trigger('create'); diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js index 66f9bbdafa..c01bcaf896 100644 --- a/dashboard-ui/scripts/itemlistpage.js +++ b/dashboard-ui/scripts/itemlistpage.js @@ -22,9 +22,7 @@ var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); if (view == "Backdrop") { html += LibraryBrowser.getPosterDetailViewHtml({ @@ -40,11 +38,9 @@ }); } - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - var elem = $('#items', page).html(html).trigger('create'); + $('#items', page).html(html).trigger('create'); $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 94c185e573..c246ee96fc 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -362,7 +362,7 @@ return "
New
"; } } catch (err) { - + } } @@ -492,15 +492,24 @@ var recordsEnd = Math.min(query.StartIndex + query.Limit, totalRecordCount); + var showControls = totalRecordCount > query.Limit; + html += '
'; html += ''; - html += (query.StartIndex + 1) + '-' + recordsEnd + ' of ' + totalRecordCount + ', page ' + dropdownHtml + ' of ' + pageCount; + html += (query.StartIndex + 1) + '-' + recordsEnd + ' of ' + totalRecordCount; + + if (showControls) { + html += ', page ' + dropdownHtml + ' of ' + pageCount; + } + html += ''; - html += ''; + if (showControls) { + html += ''; - html += ''; + html += ''; + } html += '
'; diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js index 0cdae7f4dd..439dabecba 100644 --- a/dashboard-ui/scripts/moviegenres.js +++ b/dashboard-ui/scripts/moviegenres.js @@ -20,9 +20,7 @@ var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); html += LibraryBrowser.getPosterDetailViewHtml({ items: result.Items, @@ -31,11 +29,9 @@ countNamePlural: "Movies" }); - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - var elem = $('#items', page).html(html).trigger('create'); + $('#items', page).html(html).trigger('create'); $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; diff --git a/dashboard-ui/scripts/moviepeople.js b/dashboard-ui/scripts/moviepeople.js index c0e0170829..d033aa6113 100644 --- a/dashboard-ui/scripts/moviepeople.js +++ b/dashboard-ui/scripts/moviepeople.js @@ -21,9 +21,7 @@ var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); html += LibraryBrowser.getPosterDetailViewHtml({ items: result.Items, @@ -32,11 +30,9 @@ countNamePlural: "Movies" }); - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - var elem = $('#items', page).html(html).trigger('create'); + $('#items', page).html(html).trigger('create'); $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js index 2c1607c4af..4005f12fad 100644 --- a/dashboard-ui/scripts/movies.js +++ b/dashboard-ui/scripts/movies.js @@ -22,9 +22,7 @@ var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); if (view == "Backdrop") { html += LibraryBrowser.getPosterDetailViewHtml({ @@ -40,11 +38,9 @@ }); } - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - var elem = $('#items', page).html(html).trigger('create'); + $('#items', page).html(html).trigger('create'); $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; diff --git a/dashboard-ui/scripts/moviestudios.js b/dashboard-ui/scripts/moviestudios.js index 678e519927..15e7475aea 100644 --- a/dashboard-ui/scripts/moviestudios.js +++ b/dashboard-ui/scripts/moviestudios.js @@ -20,9 +20,7 @@ var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); html += LibraryBrowser.getPosterDetailViewHtml({ items: result.Items, @@ -31,11 +29,9 @@ countNamePlural: "Movies" }); - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - var elem = $('#items', page).html(html).trigger('create'); + $('#items', page).html(html).trigger('create'); $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js index e9a69aad54..d3d2bfc081 100644 --- a/dashboard-ui/scripts/movietrailers.js +++ b/dashboard-ui/scripts/movietrailers.js @@ -22,9 +22,7 @@ var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); if (view == "Backdrop") { html += LibraryBrowser.getPosterDetailViewHtml({ @@ -40,11 +38,9 @@ }); } - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } - - var elem = $('#items', page).html(html).trigger('create'); + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + + $('#items', page).html(html).trigger('create'); $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; diff --git a/dashboard-ui/scripts/tvgenres.js b/dashboard-ui/scripts/tvgenres.js index ad27c11b60..179c05725f 100644 --- a/dashboard-ui/scripts/tvgenres.js +++ b/dashboard-ui/scripts/tvgenres.js @@ -20,9 +20,7 @@ var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); html += LibraryBrowser.getPosterDetailViewHtml({ items: result.Items, @@ -31,11 +29,9 @@ countNamePlural: "Shows" }); - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - var elem = $('#items', page).html(html).trigger('create'); + $('#items', page).html(html).trigger('create'); $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; diff --git a/dashboard-ui/scripts/tvpeople.js b/dashboard-ui/scripts/tvpeople.js index d025da91ca..5ba2f92f37 100644 --- a/dashboard-ui/scripts/tvpeople.js +++ b/dashboard-ui/scripts/tvpeople.js @@ -21,9 +21,7 @@ var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); html += LibraryBrowser.getPosterDetailViewHtml({ items: result.Items, @@ -32,11 +30,9 @@ countNamePlural: "Shows" }); - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - var elem = $('#items', page).html(html).trigger('create'); + $('#items', page).html(html).trigger('create'); $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index 7aef963af1..17bc77857f 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -22,9 +22,7 @@ var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); if (view == "Backdrop") { html += LibraryBrowser.getPosterDetailViewHtml({ @@ -40,11 +38,9 @@ }); } - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - var elem = $('#items', page).html(html).trigger('create'); + $('#items', page).html(html).trigger('create'); $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit; diff --git a/dashboard-ui/scripts/tvstudios.js b/dashboard-ui/scripts/tvstudios.js index d668beacde..27a5926d40 100644 --- a/dashboard-ui/scripts/tvstudios.js +++ b/dashboard-ui/scripts/tvstudios.js @@ -20,9 +20,7 @@ var html = ''; - var showPaging = result.TotalRecordCount > query.Limit; - - $('.listTopPaging', page).html(showPaging ? LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true) : '').trigger('create'); + $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); html += LibraryBrowser.getPosterDetailViewHtml({ items: result.Items, @@ -31,11 +29,9 @@ countNamePlural: "Shows" }); - if (showPaging) { - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - } + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - var elem = $('#items', page).html(html).trigger('create'); + $('#items', page).html(html).trigger('create'); $('.selectPage', page).on('change', function () { query.StartIndex = (parseInt(this.value) - 1) * query.Limit;