From 0fa6a2782785a057f9a55fa9288e058ad56c77ab Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 5 Feb 2015 16:14:08 -0500 Subject: [PATCH] update translations --- dashboard-ui/css/librarybrowser.css | 2 +- dashboard-ui/scripts/librarylist.js | 2 +- dashboard-ui/scripts/syncactivity.js | 9 --------- dashboard-ui/scripts/userlibraryaccess.js | 12 ++++++++++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index be2c7f2154..f1c4a4ac60 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -450,7 +450,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .portraitDetailImageContainer img { - max-width: 240px; + max-width: 210px; max-height: 300px; } diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index bd61d803b0..5e0b0cbd40 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -405,7 +405,7 @@ } html += '
  • ' + Globalize.translate('ButtonOpen') + '
  • '; - html += '
  • ' + Globalize.translate('ButtonOpenInNewTab') + '
  • '; + //html += '
  • ' + Globalize.translate('ButtonOpenInNewTab') + '
  • '; if (options.showPlayOptions !== false) { diff --git a/dashboard-ui/scripts/syncactivity.js b/dashboard-ui/scripts/syncactivity.js index cc8ce68a4c..1d4508babf 100644 --- a/dashboard-ui/scripts/syncactivity.js +++ b/dashboard-ui/scripts/syncactivity.js @@ -153,11 +153,9 @@ var cardBoxCssClass = 'cardBox visualCardBox'; var syncJobPage = 'syncjob.html'; - var showHelpButtons = false; if ($(page).hasClass('mySyncPage')) { syncJobPage = 'mysyncjob.html'; - showHelpButtons = true; } for (var i = 0, length = jobs.length; i < length; i++) { @@ -179,13 +177,6 @@ html += '
    ' + targetName + '
    '; - if (showHelpButtons) { - html += ''; - html += ''; - html += Globalize.translate('ButtonHelp'); - html += ''; - } - html += ''; } diff --git a/dashboard-ui/scripts/userlibraryaccess.js b/dashboard-ui/scripts/userlibraryaccess.js index a041e1feab..0fd0de9de2 100644 --- a/dashboard-ui/scripts/userlibraryaccess.js +++ b/dashboard-ui/scripts/userlibraryaccess.js @@ -30,7 +30,11 @@ $('.folderAccess', page).html(html).trigger('create'); - $('#chkEnableAllFolders', page).checked(user.Policy.EnableAllFolders).checkboxradio('refresh').trigger('change'); + if (user.Policy.BlockedMediaFolders != null) { + $('#chkEnableAllFolders', page).checked(user.Policy.BlockedMediaFolders.length == 0).checkboxradio('refresh').trigger('change'); + } else { + $('#chkEnableAllFolders', page).checked(user.Policy.EnableAllFolders).checkboxradio('refresh').trigger('change'); + } } function loadChannels(page, user, channels) { @@ -69,7 +73,11 @@ $('.channelAccessContainer', page).hide(); } - $('#chkEnableAllChannels', page).checked(user.Policy.EnableAllChannels).checkboxradio('refresh').trigger('change'); + if (user.Policy.BlockedChannels != null) { + $('#chkEnableAllChannels', page).checked(user.Policy.BlockedChannels.length == 0).checkboxradio('refresh').trigger('change'); + } else { + $('#chkEnableAllChannels', page).checked(user.Policy.EnableAllChannels).checkboxradio('refresh').trigger('change'); + } } function loadDevices(page, user, devices) {