diff --git a/dashboard-ui/css/posteritem.css b/dashboard-ui/css/posteritem.css index 6dcbb5f47b..7e24011965 100644 --- a/dashboard-ui/css/posteritem.css +++ b/dashboard-ui/css/posteritem.css @@ -127,6 +127,11 @@ display: none; } +.smallBackdropPosterItem .posterItemOverlayInner>div { + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; +} .myLibraryPosterItem { width: 42%; diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js index 7da5f8ef54..0a8e59fff3 100644 --- a/dashboard-ui/scripts/channelitems.js +++ b/dashboard-ui/scripts/channelitems.js @@ -127,7 +127,9 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, false, getPageSizes())).trigger('create'); + var pagingHtml = LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, false, getPageSizes()); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -140,7 +142,7 @@ coverImage: true }); - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, false, getPageSizes()); + html += LibraryBrowser.getPagingHtml(pagingHtml); $('#items', page).html(html).trigger('create').createPosterItemMenus(); diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js index 5bf6095349..f918c391f0 100644 --- a/dashboard-ui/scripts/useredit.js +++ b/dashboard-ui/scripts/useredit.js @@ -3,13 +3,27 @@ function loadUser(page, user, loggedInUser) { if (!loggedInUser.Configuration.IsAdministrator) { + $('#fldIsAdmin', page).hide(); $('#featureAccessFields', page).hide(); $('#accessControlDiv', page).hide(); + } else { + $('#accessControlDiv', page).show(); $('#fldIsAdmin', page).show(); $('#featureAccessFields', page).show(); + $('.lnkEditUserPreferencesContainer', page).show(); + } + + if (!loggedInUser.Configuration.IsAdministrator || !user.Id || user.Id == loggedInUser.Id) { + + $('.lnkEditUserPreferencesContainer', page).hide(); + + } else { + + $('.lnkEditUserPreferencesContainer', page).show(); + $('.lnkEditUserPreferences', page).attr('href', 'mypreferencesdisplay.html?userId=' + user.Id); } Dashboard.setPageTitle(user.Name || Globalize.translate('AddUser')); diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html index 7691e2be3d..b0acaf09dc 100644 --- a/dashboard-ui/tvrecommended.html +++ b/dashboard-ui/tvrecommended.html @@ -8,7 +8,7 @@
${TabHome} - ${TabNextUp} + ${TabNextUp} ${TabFavorites} ${TabUpcoming}
diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html index 304d780d94..43651dc23c 100644 --- a/dashboard-ui/tvshows.html +++ b/dashboard-ui/tvshows.html @@ -6,7 +6,6 @@
- ${TabSuggested} ${TabLatest} ${TabShows} ${TabEpisodes} diff --git a/dashboard-ui/tvstudios.html b/dashboard-ui/tvstudios.html index 6ecfc4b7c6..1626877297 100644 --- a/dashboard-ui/tvstudios.html +++ b/dashboard-ui/tvstudios.html @@ -6,7 +6,6 @@
- ${TabSuggested} ${TabLatest} ${TabShows} ${TabEpisodes} diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html index 85fecaa634..01656be998 100644 --- a/dashboard-ui/useredit.html +++ b/dashboard-ui/useredit.html @@ -14,6 +14,10 @@ ${TabPassword}
+

+ ${ButtonEditOtherUserPreferences} +

+