diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index eee3b1cd8c..2498c9b13c 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -172,11 +172,15 @@ .labelPageSize { margin-left: 1em!important; + display: inline !important; } +.pageSizeContainer { + display: inline-block; +} @media all and (max-width: 650px) { - .labelPageSize, .selectPageSize { + .pageSizeContainer { display: none!important; } } diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html index 5dc6b3a58c..1e05788a0b 100644 --- a/dashboard-ui/livetvsettings.html +++ b/dashboard-ui/livetvsettings.html @@ -8,18 +8,17 @@
+ +
+ Status + Settings +
+
'; diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js index 838c4a3e6b..f4d7fcd760 100644 --- a/dashboard-ui/scripts/episodes.js +++ b/dashboard-ui/scripts/episodes.js @@ -46,11 +46,6 @@ $('#items', page).html(html).trigger('create').createPosterItemHoverMenu(); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/gamegenrepage.js b/dashboard-ui/scripts/gamegenrepage.js index d2248f98bd..092ddfd70a 100644 --- a/dashboard-ui/scripts/gamegenrepage.js +++ b/dashboard-ui/scripts/gamegenrepage.js @@ -41,11 +41,6 @@ $('#items', page).html(html).trigger('create'); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js index 27790d5aa2..6e75cefc6c 100644 --- a/dashboard-ui/scripts/gamespage.js +++ b/dashboard-ui/scripts/gamespage.js @@ -44,11 +44,6 @@ $('#items', page).html(html).trigger('create').createPosterItemHoverMenu(); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/gamestudiospage.js b/dashboard-ui/scripts/gamestudiospage.js index 2094271b27..410de2bcd5 100644 --- a/dashboard-ui/scripts/gamestudiospage.js +++ b/dashboard-ui/scripts/gamestudiospage.js @@ -42,11 +42,6 @@ $('#items', page).html(html).trigger('create'); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/gamesystemspage.js b/dashboard-ui/scripts/gamesystemspage.js index 3efc54d878..90c865eff3 100644 --- a/dashboard-ui/scripts/gamesystemspage.js +++ b/dashboard-ui/scripts/gamesystemspage.js @@ -36,11 +36,6 @@ $('#items', page).html(html).trigger('create'); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js index e678d9c0ec..802ce0673e 100644 --- a/dashboard-ui/scripts/itembynamedetailpage.js +++ b/dashboard-ui/scripts/itembynamedetailpage.js @@ -488,12 +488,6 @@ $('#items', page).html(html).trigger('create').createPosterItemHoverMenu(); - $('.selectPage', page).on('change', function () { - - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - loadItems(page, query); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex = query.StartIndex + query.Limit; diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js index 605b3624c0..feab5d30ca 100644 --- a/dashboard-ui/scripts/itemlistpage.js +++ b/dashboard-ui/scripts/itemlistpage.js @@ -49,11 +49,6 @@ $('#items', page).html(html).trigger('create'); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 27029284fc..f510a30a9a 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1434,20 +1434,6 @@ var html = ''; - var pageCount = Math.ceil(totalRecordCount / query.Limit); - var pageNumber = (query.StartIndex / query.Limit) + 1; - - var dropdownHtml = ''; - var recordsEnd = Math.min(query.StartIndex + query.Limit, totalRecordCount); // 20 is the minimum page size @@ -1460,10 +1446,6 @@ var startAtDisplay = totalRecordCount ? query.StartIndex + 1 : 0; html += startAtDisplay + '-' + recordsEnd + ' of ' + totalRecordCount; - if (showControls) { - //html += ', page ' + dropdownHtml + ' of ' + pageCount; - } - html += ''; if (showControls) { @@ -1471,7 +1453,7 @@ html += '
'; html += ''; - html += ''; + html += ''; html += '
'; if (showLimit !== false) { @@ -1497,7 +1479,7 @@ } // Add styles to defeat jquery mobile - html += ''; + html += '
'; } } diff --git a/dashboard-ui/scripts/libraryfileorganizerlog.js b/dashboard-ui/scripts/libraryfileorganizerlog.js index a6153c4d43..64b8276d23 100644 --- a/dashboard-ui/scripts/libraryfileorganizerlog.js +++ b/dashboard-ui/scripts/libraryfileorganizerlog.js @@ -295,11 +295,6 @@ $('.listBottomPaging', page).empty(); } - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/livetvchannels.js b/dashboard-ui/scripts/livetvchannels.js index 5932584565..d0f632696b 100644 --- a/dashboard-ui/scripts/livetvchannels.js +++ b/dashboard-ui/scripts/livetvchannels.js @@ -25,11 +25,6 @@ $('#items', page).html(html).trigger('create'); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js index cecbeb0ed8..23016d769a 100644 --- a/dashboard-ui/scripts/livetvguide.js +++ b/dashboard-ui/scripts/livetvguide.js @@ -70,11 +70,6 @@ var channelPagingHtml = LibraryBrowser.getPagingHtml(channelQuery, channelsResult.TotalRecordCount, false, [10, 20, 30, 50, 100]); $('.channelPaging', page).html(channelPagingHtml).trigger('create'); - $('.selectPage', page).on('change', function () { - channelQuery.StartIndex = (parseInt(this.value) - 1) * channelQuery.Limit; - reloadChannels(page); - }); - $('.btnNextPage', page).on('click', function () { channelQuery.StartIndex += channelQuery.Limit; reloadChannels(page); diff --git a/dashboard-ui/scripts/livetvrecordinglist.js b/dashboard-ui/scripts/livetvrecordinglist.js index 277c160ddc..6301efb79b 100644 --- a/dashboard-ui/scripts/livetvrecordinglist.js +++ b/dashboard-ui/scripts/livetvrecordinglist.js @@ -37,11 +37,6 @@ $('#items', page).html(html).trigger('create').createPosterItemHoverMenu(); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/livetvsettings.js b/dashboard-ui/scripts/livetvsettings.js index 06a4604a38..436f45fa01 100644 --- a/dashboard-ui/scripts/livetvsettings.js +++ b/dashboard-ui/scripts/livetvsettings.js @@ -20,37 +20,6 @@ $('#selectActiveService', page).html(serviceOptions).selectmenu('refresh'); - var service = liveTvInfo.Services.filter(function (s) { - return s.Name == liveTvInfo.ActiveServiceName; - - })[0] || {}; - - if (service.HomePageUrl) { - $('#activeServiceName', page).html('' + liveTvInfo.ActiveServiceName + '').trigger('create'); - } else { - $('#activeServiceName', page).html(liveTvInfo.ActiveServiceName); - } - - var versionHtml = service.Version || 'Unknown'; - - if (service.HasUpdateAvailable) { - versionHtml += ' (Update available)'; - } else { - versionHtml += ' Up to date!'; - } - $('#activeServiceVersion', page).html(versionHtml); - - var status = liveTvInfo.Status; - - if (status != 'Ok') { - - if (liveTvInfo.StatusMessage) { - status += ' (' + liveTvInfo.StatusMessage + ')'; - } - status = '' + status + ''; - } - $('#activeServiceStatus', page).html(status); - Dashboard.hideLoadingMsg(); } diff --git a/dashboard-ui/scripts/livetvstatus.js b/dashboard-ui/scripts/livetvstatus.js new file mode 100644 index 0000000000..746a163030 --- /dev/null +++ b/dashboard-ui/scripts/livetvstatus.js @@ -0,0 +1,68 @@ +(function ($, document, window) { + + function loadPage(page, liveTvInfo) { + + if (liveTvInfo.IsEnabled) { + + $('.liveTvStatusContent', page).show(); + $('.noLiveTvServices', page).hide(); + + } else { + $('.liveTvStatusContent', page).hide(); + $('.noLiveTvServices', page).show(); + } + + var service = liveTvInfo.Services.filter(function (s) { + return s.Name == liveTvInfo.ActiveServiceName; + + })[0] || {}; + + var serviceUrl = service.HomePageUrl || '#'; + + $('#activeServiceName', page).html('' + liveTvInfo.ActiveServiceName + '').trigger('create'); + + var versionHtml = service.Version || 'Unknown'; + + if (service.HasUpdateAvailable) { + versionHtml += ' (Update available)'; + } + else { + versionHtml += ' Up to date!'; + } + + $('#activeServiceVersion', page).html(versionHtml); + + var status = liveTvInfo.Status; + + if (liveTvInfo.Status == 'Ok') { + + status = '' + status + ''; + } else { + + if (liveTvInfo.StatusMessage) { + status += ' (' + liveTvInfo.StatusMessage + ')'; + } + + status = '' + status + ''; + } + + $('#activeServiceStatus', page).html(status); + + Dashboard.hideLoadingMsg(); + } + + $(document).on('pageshow', "#liveTvStatusPage", function () { + + Dashboard.showLoadingMsg(); + + var page = this; + + ApiClient.getLiveTvInfo().done(function (liveTvInfo) { + + loadPage(page, liveTvInfo); + + }); + + }); + +})(jQuery, document, window); diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js index d3a193815f..7d4209b514 100644 --- a/dashboard-ui/scripts/moviecollections.js +++ b/dashboard-ui/scripts/moviecollections.js @@ -42,11 +42,6 @@ $('#items', page).html(html).trigger('create').createPosterItemHoverMenu(); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js index 727daff407..ddee659703 100644 --- a/dashboard-ui/scripts/moviegenres.js +++ b/dashboard-ui/scripts/moviegenres.js @@ -42,11 +42,6 @@ $('#items', page).html(html).trigger('create'); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/moviepeople.js b/dashboard-ui/scripts/moviepeople.js index e8fd55a317..e88c554e76 100644 --- a/dashboard-ui/scripts/moviepeople.js +++ b/dashboard-ui/scripts/moviepeople.js @@ -44,11 +44,6 @@ $('#items', page).html(html).trigger('create'); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js index c656b3dc63..c964c2fb61 100644 --- a/dashboard-ui/scripts/movies.js +++ b/dashboard-ui/scripts/movies.js @@ -68,11 +68,6 @@ $('#items', page).html(html).trigger('create').createPosterItemHoverMenu(); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/moviestudios.js b/dashboard-ui/scripts/moviestudios.js index 3605f6f72b..b82908bcc6 100644 --- a/dashboard-ui/scripts/moviestudios.js +++ b/dashboard-ui/scripts/moviestudios.js @@ -42,11 +42,6 @@ $('#items', page).html(html).trigger('create'); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js index 3c57ed440c..978d3f4839 100644 --- a/dashboard-ui/scripts/movietrailers.js +++ b/dashboard-ui/scripts/movietrailers.js @@ -42,11 +42,6 @@ $('#items', page).html(html).trigger('create').createPosterItemHoverMenu(); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/musicalbumartists.js b/dashboard-ui/scripts/musicalbumartists.js index 57151a75b1..4c4edb09f7 100644 --- a/dashboard-ui/scripts/musicalbumartists.js +++ b/dashboard-ui/scripts/musicalbumartists.js @@ -42,11 +42,6 @@ $('#items', page).html(html).trigger('create').createPosterItemHoverMenu(); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js index 1e4b09d1b6..54b353b97f 100644 --- a/dashboard-ui/scripts/musicalbums.js +++ b/dashboard-ui/scripts/musicalbums.js @@ -59,11 +59,6 @@ $('#items', page).html(html).trigger('create').createPosterItemHoverMenu(); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js index e2b920db07..fbc1ca5816 100644 --- a/dashboard-ui/scripts/musicartists.js +++ b/dashboard-ui/scripts/musicartists.js @@ -41,11 +41,6 @@ $('#items', page).html(html).trigger('create').createPosterItemHoverMenu(); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/musicgenres.js b/dashboard-ui/scripts/musicgenres.js index 6854ce1ee2..865fea0f5b 100644 --- a/dashboard-ui/scripts/musicgenres.js +++ b/dashboard-ui/scripts/musicgenres.js @@ -42,11 +42,6 @@ $('#items', page).html(html).trigger('create'); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/musicvideos.js b/dashboard-ui/scripts/musicvideos.js index 4ea11fccb7..1df1ba34a4 100644 --- a/dashboard-ui/scripts/musicvideos.js +++ b/dashboard-ui/scripts/musicvideos.js @@ -42,11 +42,6 @@ $('#items', page).html(html).trigger('create'); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 38e26a83a2..bdbc305ac9 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -755,7 +755,7 @@ var Dashboard = { selected: page.hasClass("pluginConfigurationPage") }, { name: "Live TV", - href: "livetvsettings.html", + href: "livetvstatus.html", selected: page.hasClass("liveTvSettingsPage") }, { name: "Users", diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js index 035b4a58ab..a3b64e01c9 100644 --- a/dashboard-ui/scripts/songs.js +++ b/dashboard-ui/scripts/songs.js @@ -62,11 +62,6 @@ $('#items', page).html(html).trigger('create'); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/tvgenres.js b/dashboard-ui/scripts/tvgenres.js index b5314e865c..9a693a0864 100644 --- a/dashboard-ui/scripts/tvgenres.js +++ b/dashboard-ui/scripts/tvgenres.js @@ -45,11 +45,6 @@ $('#items', page).html(html).trigger('create'); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/tvpeople.js b/dashboard-ui/scripts/tvpeople.js index 1f7cfd97b4..26a6550148 100644 --- a/dashboard-ui/scripts/tvpeople.js +++ b/dashboard-ui/scripts/tvpeople.js @@ -44,11 +44,6 @@ $('#items', page).html(html).trigger('create'); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index f5cd211d34..605c548684 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -72,11 +72,6 @@ $('#items', page).html(html).trigger('create').createPosterItemHoverMenu(); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page); diff --git a/dashboard-ui/scripts/tvstudios.js b/dashboard-ui/scripts/tvstudios.js index cddafc09a9..01815fce71 100644 --- a/dashboard-ui/scripts/tvstudios.js +++ b/dashboard-ui/scripts/tvstudios.js @@ -45,11 +45,6 @@ $('#items', page).html(html).trigger('create'); - $('.selectPage', page).on('change', function () { - query.StartIndex = (parseInt(this.value) - 1) * query.Limit; - reloadItems(page); - }); - $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; reloadItems(page);