diff --git a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json index 845de2758a..75f9aadbc3 100644 --- a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json +++ b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json @@ -29,14 +29,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-a11y-keys-behavior", + "homepage": "https://github.com/polymerelements/iron-a11y-keys-behavior", "_release": "1.0.6", "_resolution": { "type": "version", "tag": "v1.0.6", "commit": "af5c98b1cf9b3d180a6326c99ac9c7057eee647f" }, - "_source": "git://github.com/PolymerElements/iron-a11y-keys-behavior.git", + "_source": "git://github.com/polymerelements/iron-a11y-keys-behavior.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-a11y-keys-behavior" + "_originalSource": "polymerelements/iron-a11y-keys-behavior" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json index d289efd9cf..c9e9b86273 100644 --- a/dashboard-ui/bower_components/paper-ripple/.bower.json +++ b/dashboard-ui/bower_components/paper-ripple/.bower.json @@ -30,14 +30,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/polymerelements/paper-ripple", + "homepage": "https://github.com/PolymerElements/paper-ripple", "_release": "1.0.2", "_resolution": { "type": "version", "tag": "v1.0.2", "commit": "b546dbe6ad0b1f58cac80caec3136cf3232e12fc" }, - "_source": "git://github.com/polymerelements/paper-ripple.git", + "_source": "git://github.com/PolymerElements/paper-ripple.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/paper-ripple" + "_originalSource": "PolymerElements/paper-ripple" } \ No newline at end of file diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 43f9600e0f..0c9b161471 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -1023,19 +1023,22 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .playedIndicator { - display: block; + display: flex; + justify-content: center; + align-items: center; position: absolute; top: 5px; right: 5px; text-align: center; vertical-align: middle; - width: 24px; - height: 24px; + width: 26px; + height: 26px; border-radius: 50%; color: #fff; background: rgb(82, 181, 75); - background: rgba(82, 181, 75, .9); - line-height: 19px; + background: rgba(82, 181, 75, .95); + line-height: 21px; + line-height: initial; font-weight: 500; } @@ -1044,11 +1047,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { display: inline-block; } -.textIndicator { - height: 22px; - padding-top: 2px; -} - .mediaSourceIndicator { display: block; position: absolute; @@ -1536,10 +1534,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { display: none !important; } -.peopleTabDisabled .tvPeopleTab, .peopleTabDisabled .moviePeopleTab { - display: none !important; -} - .tvEpisodesTabDisabled .tvEpisodesTab { display: none !important; } diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 6bbd143518..05a854b0c6 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -14,8 +14,7 @@ ${TabShows} ${TabEpisodes} ${TabGenres} - ${TabPeople} - ${TabNetworks} + ${TabNetworks} diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html index 559a032efb..8a5aa823b9 100644 --- a/dashboard-ui/movies.html +++ b/dashboard-ui/movies.html @@ -13,7 +13,6 @@ ${TabTrailers} ${TabCollections} ${TabGenres} - ${TabPeople} ${TabStudios}
@@ -22,8 +21,7 @@ ${TabTrailers} ${TabCollections} ${TabGenres} - ${TabPeople} - ${TabStudios} + ${TabStudios}
@@ -109,17 +107,6 @@
-
-
-
-
-
-
-
-
- - -
@@ -238,57 +225,6 @@
-
-
-
- -
-

- ${HeaderFilters} -

-
- - -
- -
- - -
- -
- - -
-
-
-

- ${HeaderPersonTypes} -

- -
- - -
- -
- - -
- -
- - -
- -
- - -
-
-
-
-
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index f8ca2deb12..0d4eb22037 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -2383,7 +2383,7 @@ if (item.Type == "Series" || item.Type == "Season" || item.Type == "BoxSet" || item.MediaType == "Video" || item.MediaType == "Game" || item.MediaType == "Book") { if (item.UserData.UnplayedItemCount) { - return '
' + item.UserData.UnplayedItemCount + '
'; + return '
' + item.UserData.UnplayedItemCount + '
'; } if (item.Type != 'TvChannel') { @@ -2399,7 +2399,7 @@ getGroupCountIndicator: function (item) { if (item.ChildCount) { - return '
' + item.ChildCount + '
'; + return '
' + item.ChildCount + '
'; } return ''; diff --git a/dashboard-ui/scripts/moviepeople.js b/dashboard-ui/scripts/moviepeople.js deleted file mode 100644 index 54529babe6..0000000000 --- a/dashboard-ui/scripts/moviepeople.js +++ /dev/null @@ -1,177 +0,0 @@ -(function ($, document) { - - var pageSizeKey = 'people'; - var data = {}; - - function getQuery() { - - var key = getSavedQueryKey(); - var pageData = data[key]; - - if (!pageData) { - pageData = data[key] = { - query: { - SortBy: "SortName", - SortOrder: "Ascending", - IncludeItemTypes: "Movie,Trailer", - Recursive: true, - Fields: "DateCreated,ItemCounts", - PersonTypes: "", - StartIndex: 0, - Limit: 100 - } - }; - - pageData.query.ParentId = LibraryMenu.getTopParentId(); - LibraryBrowser.loadSavedQueryValues(key, pageData.query); - } - return pageData.query; - } - - function getSavedQueryKey() { - - return getWindowUrl() + 'people'; - } - - function reloadItems(page, viewPanel) { - - Dashboard.showLoadingMsg(); - - var query = getQuery(); - ApiClient.getPeople(Dashboard.getCurrentUserId(), query).done(function (result) { - - // Scroll back up so they can see the results from the beginning - window.scrollTo(0, 0); - - var html = ''; - var pagingHtml = LibraryBrowser.getQueryPagingHtml({ - startIndex: query.StartIndex, - limit: query.Limit, - totalRecordCount: result.TotalRecordCount, - viewButton: true, - viewIcon: 'filter-list', - showLimit: false, - updatePageSizeSetting: false, - pageSizeKey: pageSizeKey, - viewPanelClass: 'peopleViewPanel' - }); - - page.querySelector('.listTopPaging').innerHTML = pagingHtml; - - updateFilterControls(page, viewPanel); - - html = LibraryBrowser.getPosterViewHtml({ - items: result.Items, - shape: "portrait", - showTitle: true, - showItemCounts: true, - coverImage: true, - lazy: true - }); - - var elem = page.querySelector('.itemsContainer'); - elem.innerHTML = html + pagingHtml; - ImageLoader.lazyChildren(elem); - - $('.btnNextPage', page).on('click', function () { - query.StartIndex += query.Limit; - reloadItems(page, viewPanel); - }); - - $('.btnPreviousPage', page).on('click', function () { - query.StartIndex -= query.Limit; - reloadItems(page, viewPanel); - }); - - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); - - Dashboard.hideLoadingMsg(); - }); - } - - function updateFilterControls(tabContent, viewPanel) { - - var query = getQuery(); - $('.chkPersonTypeFilter', viewPanel).each(function () { - - var filters = "," + (query.PersonTypes || ""); - var filterName = this.getAttribute('data-filter'); - - this.checked = filters.indexOf(',' + filterName) != -1; - - }); - - $('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater); - } - - function initPage(tabContent, viewPanel) { - - $('.chkStandardFilter', viewPanel).on('change', function () { - - var query = getQuery(); - var filterName = this.getAttribute('data-filter'); - var filters = query.Filters || ""; - - filters = (',' + filters).replace(',' + filterName, '').substring(1); - - if (this.checked) { - filters = filters ? (filters + ',' + filterName) : filterName; - } - - query.StartIndex = 0; - query.Filters = filters; - - reloadItems(tabContent, viewPanel); - }); - - $('.chkPersonTypeFilter', viewPanel).on('change', function () { - - var query = getQuery(); - var filterName = this.getAttribute('data-filter'); - var filters = query.PersonTypes || ""; - - filters = (',' + filters).replace(',' + filterName, '').substring(1); - - if (this.checked) { - filters = filters ? (filters + ',' + filterName) : filterName; - } - - query.StartIndex = 0; - query.PersonTypes = filters; - - reloadItems(tabContent, viewPanel); - }); - - $('.alphabetPicker', tabContent).on('alphaselect', function (e, character) { - - var query = getQuery(); - query.NameStartsWithOrGreater = character; - query.StartIndex = 0; - - reloadItems(tabContent, viewPanel); - - }).on('alphaclear', function (e) { - - var query = getQuery(); - query.NameStartsWithOrGreater = ''; - - reloadItems(tabContent, viewPanel); - }); - } - - window.MoviesPage.initPeopleTab = function (page, tabContent) { - - var viewPanel = page.querySelector('.peopleViewPanel'); - initPage(tabContent, viewPanel); - }; - - window.MoviesPage.renderPeopleTab = function (page, tabContent) { - - if (LibraryBrowser.needsRefresh(tabContent)) { - var viewPanel = page.querySelector('.peopleViewPanel'); - reloadItems(tabContent, viewPanel); - updateFilterControls(tabContent, viewPanel); - } - }; - -})(jQuery, document); \ No newline at end of file diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js index becdc57205..7295ac313c 100644 --- a/dashboard-ui/scripts/moviesrecommended.js +++ b/dashboard-ui/scripts/moviesrecommended.js @@ -299,11 +299,6 @@ renderMethod = 'renderGenresTab'; break; case 5: - depends.push('scripts/moviepeople'); - renderMethod = 'renderPeopleTab'; - initMethod = 'initPeopleTab'; - break; - case 6: depends.push('scripts/moviestudios'); renderMethod = 'renderStudiosTab'; break; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 6ac05a30b8..6fac235fb8 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1777,7 +1777,6 @@ var AppInfo = {}; if (!AppInfo.hasLowImageBandwidth) { AppInfo.enableStudioTabs = true; - AppInfo.enablePeopleTabs = true; AppInfo.enableTvEpisodesTab = true; AppInfo.enableMovieTrailersTab = true; } @@ -1915,10 +1914,6 @@ var AppInfo = {}; elem.classList.add('studioTabDisabled'); } - if (!AppInfo.enablePeopleTabs) { - elem.classList.add('peopleTabDisabled'); - } - if (!AppInfo.enableTvEpisodesTab) { elem.classList.add('tvEpisodesTabDisabled'); } diff --git a/dashboard-ui/scripts/tvpeople.js b/dashboard-ui/scripts/tvpeople.js deleted file mode 100644 index cc04405b2f..0000000000 --- a/dashboard-ui/scripts/tvpeople.js +++ /dev/null @@ -1,178 +0,0 @@ -(function ($, document) { - - var pageSizeKey = 'people'; - var data = {}; - - function getQuery() { - - var key = getSavedQueryKey(); - var pageData = data[key]; - - if (!pageData) { - pageData = data[key] = { - query: { - SortBy: "SortName", - SortOrder: "Ascending", - IncludeItemTypes: "Series,Episode", - Recursive: true, - Fields: "DateCreated,ItemCounts", - PersonTypes: "", - StartIndex: 0, - Limit: 100 - } - }; - - pageData.query.ParentId = LibraryMenu.getTopParentId(); - LibraryBrowser.loadSavedQueryValues(key, pageData.query); - } - return pageData.query; - } - - function getSavedQueryKey() { - - return getWindowUrl() + 'people'; - } - - function reloadItems(page, viewPanel) { - - Dashboard.showLoadingMsg(); - - var query = getQuery(); - ApiClient.getPeople(Dashboard.getCurrentUserId(), query).done(function (result) { - - // Scroll back up so they can see the results from the beginning - window.scrollTo(0, 0); - - var html = ''; - var pagingHtml = LibraryBrowser.getQueryPagingHtml({ - startIndex: query.StartIndex, - limit: query.Limit, - totalRecordCount: result.TotalRecordCount, - viewButton: true, - viewIcon: 'filter-list', - showLimit: false, - updatePageSizeSetting: false, - pageSizeKey: pageSizeKey, - viewPanelClass: 'peopleViewPanel' - }); - - page.querySelector('.listTopPaging').innerHTML = pagingHtml; - - updateFilterControls(page, viewPanel); - - html = LibraryBrowser.getPosterViewHtml({ - items: result.Items, - shape: "portrait", - context: 'tv', - showTitle: true, - showItemCounts: true, - coverImage: true, - lazy: true - }); - - var elem = page.querySelector('.itemsContainer'); - elem.innerHTML = html + pagingHtml; - ImageLoader.lazyChildren(elem); - - $('.btnNextPage', page).on('click', function () { - query.StartIndex += query.Limit; - reloadItems(page, viewPanel); - }); - - $('.btnPreviousPage', page).on('click', function () { - query.StartIndex -= query.Limit; - reloadItems(page, viewPanel); - }); - - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); - - Dashboard.hideLoadingMsg(); - }); - } - - function updateFilterControls(tabContent, viewPanel) { - - var query = getQuery(); - $('.chkPersonTypeFilter', viewPanel).each(function () { - - var filters = "," + (query.PersonTypes || ""); - var filterName = this.getAttribute('data-filter'); - - this.checked = filters.indexOf(',' + filterName) != -1; - - }); - - $('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater); - } - - function initPage(tabContent, viewPanel) { - - $('.chkStandardFilter', viewPanel).on('change', function () { - - var query = getQuery(); - var filterName = this.getAttribute('data-filter'); - var filters = query.Filters || ""; - - filters = (',' + filters).replace(',' + filterName, '').substring(1); - - if (this.checked) { - filters = filters ? (filters + ',' + filterName) : filterName; - } - - query.StartIndex = 0; - query.Filters = filters; - - reloadItems(tabContent, viewPanel); - }); - - $('.chkPersonTypeFilter', viewPanel).on('change', function () { - - var query = getQuery(); - var filterName = this.getAttribute('data-filter'); - var filters = query.PersonTypes || ""; - - filters = (',' + filters).replace(',' + filterName, '').substring(1); - - if (this.checked) { - filters = filters ? (filters + ',' + filterName) : filterName; - } - - query.StartIndex = 0; - query.PersonTypes = filters; - - reloadItems(tabContent, viewPanel); - }); - - $('.alphabetPicker', tabContent).on('alphaselect', function (e, character) { - - var query = getQuery(); - query.NameStartsWithOrGreater = character; - query.StartIndex = 0; - - reloadItems(tabContent, viewPanel); - - }).on('alphaclear', function (e) { - - var query = getQuery(); - query.NameStartsWithOrGreater = ''; - - reloadItems(tabContent, viewPanel); - }); - } - - window.TvPage.initPeopleTab = function (page, tabContent) { - - var viewPanel = page.querySelector('.peopleViewPanel'); - initPage(tabContent, viewPanel); - }; - - window.TvPage.renderPeopleTab = function (page, tabContent) { - - if (LibraryBrowser.needsRefresh(tabContent)) { - var viewPanel = page.querySelector('.peopleViewPanel'); - reloadItems(tabContent, viewPanel); - updateFilterControls(tabContent, viewPanel); - } - }; - -})(jQuery, document); \ No newline at end of file diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js index f9aaddfd88..a05a320529 100644 --- a/dashboard-ui/scripts/tvrecommended.js +++ b/dashboard-ui/scripts/tvrecommended.js @@ -222,11 +222,6 @@ renderMethod = 'renderGenresTab'; break; case 6: - depends.push('scripts/tvpeople'); - renderMethod = 'renderPeopleTab'; - initMethod = 'initPeopleTab'; - break; - case 7: depends.push('scripts/tvstudios'); renderMethod = 'renderStudiosTab'; break; @@ -284,15 +279,6 @@ var page = this; - if (LibraryBrowser.needsRefresh(page)) { - reload(page); - } - }); - - pageIdOn('pageshow', "tvRecommendedPage", function () { - - var page = this; - if (!page.getAttribute('data-title')) { var parentId = LibraryMenu.getTopParentId(); diff --git a/dashboard-ui/tv.html b/dashboard-ui/tv.html index 197d01893b..f1aebec9eb 100644 --- a/dashboard-ui/tv.html +++ b/dashboard-ui/tv.html @@ -14,7 +14,6 @@ ${TabShows} ${TabEpisodes} ${TabGenres} - ${TabPeople} ${TabNetworks}
@@ -24,8 +23,7 @@ ${TabShows} ${TabEpisodes} ${TabGenres} - ${TabPeople} - ${TabNetworks} + ${TabNetworks}
@@ -35,7 +33,7 @@