From 7a8ea53f69ff9258bc1089a08fc3169885e50f03 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 16 May 2014 13:11:07 -0400 Subject: [PATCH] update translations --- dashboard-ui/css/librarymenu.css | 6 +- dashboard-ui/scripts/indexpage.js | 105 +------------------- dashboard-ui/scripts/librarymenu.js | 1 + dashboard-ui/scripts/useredit.js | 8 +- dashboard-ui/scripts/userparentalcontrol.js | 8 +- 5 files changed, 15 insertions(+), 113 deletions(-) diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 3dd301bbeb..b3a8292bf2 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -59,9 +59,6 @@ border-width: 0 !important; } - .headerButtonRight:last-child { - } - .desktopHomeLink { color: #ddd !important; text-decoration: none; @@ -232,6 +229,7 @@ background-image: url(images/items/folders/settings.png); background-position: 16px 8px; } + .reportsViewMenu { background-image: url(images/items/folders/report.png); } @@ -300,4 +298,4 @@ .headerSettingsButton { display: none; } -} +} \ No newline at end of file diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index 3256952732..b32b210a22 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -1,108 +1,5 @@ (function ($, document, apiClient) { - function fillSeriesSpotlight(elem, item, nextUp) { - - var html = '

' + item.Name + '

'; - - var imgUrl = ApiClient.getImageUrl(item.Id, { - type: "Backdrop", - tag: item.BackdropImageTags[0] - }); - - html += '
'; - - imgUrl = ApiClient.getImageUrl(item.Id, { - type: "Primary", - tag: item.ImageTags.Primary, - EnableImageEnhancers: false - }); - - html += '
'; - html += '
'; - - html += '
'; - html += '

' + LibraryBrowser.getMiscInfoHtml(item) + '

'; - html += '

' + (item.Overview || '') + '

'; - html += '
'; - - html += '
'; - html += '
'; - - if (nextUp && nextUp.ImageTags && nextUp.ImageTags.Primary) { - - html += '
'; - - imgUrl = ApiClient.getImageUrl(nextUp.Id, { - type: "Primary", - tag: nextUp.ImageTags.Primary, - EnableImageEnhancers: false - }); - - html += '
'; - - html += '
'; - html += LibraryBrowser.getPosterViewDisplayName(nextUp); - html += '
'; - - html += '
'; - html += '
'; - } - - html += '
'; - - html += '
'; - - $(elem).html(html); - } - - function reloadSpotlight(page, allPromise) { - - var options = { - - SortBy: "Random", - SortOrder: "Descending", - Limit: 1, - Recursive: true, - IncludeItemTypes: "Series", - ImageTypes: "Backdrop,Primary", - Fields: "Overview" - }; - - ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) { - - allPromise.done(function () { - - var index = 0; - $('.spotlightContainer', page).each(function () { - - var elem = this; - var item = result.Items[index]; - index++; - - if (item && item.Type == 'Series') { - - options = { - - Limit: 1, - UserId: Dashboard.getCurrentUserId(), - SeriesId: item.Id - }; - - ApiClient.getNextUpEpisodes(options).done(function (nextUpResult) { - - fillSeriesSpotlight(elem, item, nextUpResult.Items[0]); - }); - - } else { - $(this).hide(); - } - - }); - - }); - }); - } - $(document).on('pagebeforeshow', "#indexPage", function () { var screenWidth = $(window).width(); @@ -125,7 +22,7 @@ showTitle: true, centerText: true - })).createPosterItemMenus(); + })); }); diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 082c27cdd7..946dd5272d 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -290,6 +290,7 @@ $(document).scrollTop(0); } + }); $(function () { diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js index cef7aeac24..adf2f79b33 100644 --- a/dashboard-ui/scripts/useredit.js +++ b/dashboard-ui/scripts/useredit.js @@ -140,7 +140,13 @@ var deferred = $.Deferred(); deferred.resolveWith(null, [{ - Configuration: { IsAdministrator: true } + Configuration: { + IsAdministrator: true, + EnableLiveTvManagement: true, + EnableLiveTvAccess: true, + EnableRemoteControlOfOtherUsers: true, + EnableMediaPlayback: true + } }]); promise1 = deferred.promise(); diff --git a/dashboard-ui/scripts/userparentalcontrol.js b/dashboard-ui/scripts/userparentalcontrol.js index 3eb3f20e3e..1befa63d04 100644 --- a/dashboard-ui/scripts/userparentalcontrol.js +++ b/dashboard-ui/scripts/userparentalcontrol.js @@ -52,9 +52,9 @@ var id = 'mediaFolder' + i; - var checkedAttribute = user.Configuration.BlockedMediaFolders.indexOf(folder.Name) == -1 ? ' checked="checked"' : ''; + var checkedAttribute = user.Configuration.BlockedMediaFolders.indexOf(folder.Id) == -1 && user.Configuration.BlockedMediaFolders.indexOf(folder.Name) == -1 ? ' checked="checked"' : ''; - html += ''; + html += ''; html += ''; } @@ -77,9 +77,9 @@ var id = 'channels' + i; - var checkedAttribute = user.Configuration.BlockedChannels.indexOf(folder.Name) == -1 ? ' checked="checked"' : ''; + var checkedAttribute = user.Configuration.BlockedChannels.indexOf(folder.Id) == -1 ? ' checked="checked"' : ''; - html += ''; + html += ''; html += ''; }