diff --git a/dashboard-ui/bower_components/emby-apiclient/.bower.json b/dashboard-ui/bower_components/emby-apiclient/.bower.json index 2b62013c80..01b5f08f3c 100644 --- a/dashboard-ui/bower_components/emby-apiclient/.bower.json +++ b/dashboard-ui/bower_components/emby-apiclient/.bower.json @@ -16,14 +16,14 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.0.49", - "_release": "1.0.49", + "version": "1.0.50", + "_release": "1.0.50", "_resolution": { "type": "version", - "tag": "1.0.49", - "commit": "961b40aa65f6171f25603c924bc1ee8d6e0214ab" + "tag": "1.0.50", + "commit": "7988bb63ffe48f61c7a1b69fb5f7ab73a8d30fdd" }, - "_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", + "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_target": "~1.0.3", "_originalSource": "emby-apiclient" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 7fe3fe9146..c8173849f3 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.2.6", - "_release": "1.2.6", + "version": "1.2.8", + "_release": "1.2.8", "_resolution": { "type": "version", - "tag": "1.2.6", - "commit": "fe1b3e3069c875bb54cfede60ee94f8b8f876c90" + "tag": "1.2.8", + "commit": "ab69b1f6c75888a55b4baa100f2d3c527633bf49" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/focusmanager.js b/dashboard-ui/bower_components/emby-webcomponents/focusmanager.js index 671bfcafd2..01acfa6a64 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/focusmanager.js +++ b/dashboard-ui/bower_components/emby-webcomponents/focusmanager.js @@ -457,6 +457,12 @@ define([], function () { return result; } + function sendText(text) { + var elem = document.activeElement; + + elem.value = text; + } + return { autoFocus: autoFocus, focus: focus, @@ -473,6 +479,7 @@ define([], function () { }, moveDown: function (sourceElement) { nav(sourceElement, 3); - } + }, + sendText: sendText }; }); \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-webcomponents/input/api.js b/dashboard-ui/bower_components/emby-webcomponents/input/api.js index aa4c0365db..0a3414f309 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/input/api.js +++ b/dashboard-ui/bower_components/emby-webcomponents/input/api.js @@ -1,4 +1,4 @@ -define(['connectionManager', 'playbackManager', 'events', 'inputManager'], function (connectionManager, playbackManager, events, inputManager) { +define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focusManager'], function (connectionManager, playbackManager, events, inputManager, focusManager) { function displayMessage(cmd) { @@ -115,6 +115,7 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager'], funct break; case 'SendString': // todo + focusManager.sendText(cmd.Arguments.String); break; default: console.log('processGeneralCommand does not recognize: ' + cmd.Name); diff --git a/dashboard-ui/bower_components/emby-webcomponents/router.js b/dashboard-ui/bower_components/emby-webcomponents/router.js index aa753b6f95..fa392549c0 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/router.js +++ b/dashboard-ui/bower_components/emby-webcomponents/router.js @@ -15,6 +15,9 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b }, showSettings: function () { show('/settings/settings.html'); + }, + showSearch: function () { + skinManager.getCurrentSkin().search(); } }; diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json index a6b333d335..2b04bf9f8a 100644 --- a/dashboard-ui/bower_components/paper-behaviors/.bower.json +++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json @@ -45,7 +45,7 @@ "tag": "v1.0.11", "commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5" }, - "_source": "git://github.com/polymerelements/paper-behaviors.git", + "_source": "git://github.com/PolymerElements/paper-behaviors.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/paper-behaviors" + "_originalSource": "PolymerElements/paper-behaviors" } \ 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 2f654d71c6..157225ee71 100644 --- a/dashboard-ui/bower_components/paper-ripple/.bower.json +++ b/dashboard-ui/bower_components/paper-ripple/.bower.json @@ -32,14 +32,14 @@ "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" }, "ignore": [], - "homepage": "https://github.com/polymerelements/paper-ripple", + "homepage": "https://github.com/PolymerElements/paper-ripple", "_release": "1.0.5", "_resolution": { "type": "version", "tag": "v1.0.5", "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5" }, - "_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/scripts/useredit.js b/dashboard-ui/scripts/useredit.js index eedb2c68e6..f78022fa3b 100644 --- a/dashboard-ui/scripts/useredit.js +++ b/dashboard-ui/scripts/useredit.js @@ -29,26 +29,26 @@ $('#chkIsAdmin', page).checked(user.Policy.IsAdministrator); - $('#chkDisabled', page).checked(user.Policy.IsDisabled).checkboxradio("refresh"); - $('#chkIsHidden', page).checked(user.Policy.IsHidden).checkboxradio("refresh"); - $('#chkRemoteControlSharedDevices', page).checked(user.Policy.EnableSharedDeviceControl).checkboxradio("refresh"); - $('#chkEnableRemoteControlOtherUsers', page).checked(user.Policy.EnableRemoteControlOfOtherUsers).checkboxradio("refresh"); + $('#chkDisabled', page).checked(user.Policy.IsDisabled); + $('#chkIsHidden', page).checked(user.Policy.IsHidden); + $('#chkRemoteControlSharedDevices', page).checked(user.Policy.EnableSharedDeviceControl); + $('#chkEnableRemoteControlOtherUsers', page).checked(user.Policy.EnableRemoteControlOfOtherUsers); - $('#chkEnableDownloading', page).checked(user.Policy.EnableContentDownloading).checkboxradio("refresh"); + $('#chkEnableDownloading', page).checked(user.Policy.EnableContentDownloading); - $('#chkManageLiveTv', page).checked(user.Policy.EnableLiveTvManagement).checkboxradio("refresh"); - $('#chkEnableLiveTvAccess', page).checked(user.Policy.EnableLiveTvAccess).checkboxradio("refresh"); - $('#chkEnableContentDeletion', page).checked(user.Policy.EnableContentDeletion).checkboxradio("refresh"); + $('#chkManageLiveTv', page).checked(user.Policy.EnableLiveTvManagement); + $('#chkEnableLiveTvAccess', page).checked(user.Policy.EnableLiveTvAccess); + $('#chkEnableContentDeletion', page).checked(user.Policy.EnableContentDeletion); - $('#chkDisableUserPreferences', page).checked((!user.Policy.EnableUserPreferenceAccess)).checkboxradio("refresh"); + $('#chkDisableUserPreferences', page).checked((!user.Policy.EnableUserPreferenceAccess)); - $('#chkEnableMediaPlayback', page).checked(user.Policy.EnableMediaPlayback).checkboxradio("refresh"); - $('#chkEnableAudioPlaybackTranscoding', page).checked(user.Policy.EnableAudioPlaybackTranscoding).checkboxradio("refresh"); - $('#chkEnableVideoPlaybackTranscoding', page).checked(user.Policy.EnableVideoPlaybackTranscoding).checkboxradio("refresh"); + $('#chkEnableMediaPlayback', page).checked(user.Policy.EnableMediaPlayback); + $('#chkEnableAudioPlaybackTranscoding', page).checked(user.Policy.EnableAudioPlaybackTranscoding); + $('#chkEnableVideoPlaybackTranscoding', page).checked(user.Policy.EnableVideoPlaybackTranscoding); - $('#chkEnableSync', page).checked(user.Policy.EnableSync).checkboxradio("refresh"); - $('#chkEnableSyncTranscoding', page).checked(user.Policy.EnableSyncTranscoding).checkboxradio("refresh"); - $('#chkEnableSharing', page).checked(user.Policy.EnablePublicSharing).checkboxradio("refresh"); + $('#chkEnableSync', page).checked(user.Policy.EnableSync); + $('#chkEnableSyncTranscoding', page).checked(user.Policy.EnableSyncTranscoding); + $('#chkEnableSharing', page).checked(user.Policy.EnablePublicSharing); Dashboard.hideLoadingMsg(); } diff --git a/dashboard-ui/scripts/usernew.js b/dashboard-ui/scripts/usernew.js index 59480a8c40..ebd2650f3d 100644 --- a/dashboard-ui/scripts/usernew.js +++ b/dashboard-ui/scripts/usernew.js @@ -4,50 +4,44 @@ var html = ''; - html += '
'; + html += '
' + Globalize.translate('HeaderLibraries') + '
'; - html += '' + Globalize.translate('HeaderLibraries') + ''; + html += '
'; for (var i = 0, length = mediaFolders.length; i < length; i++) { var folder = mediaFolders[i]; - var id = 'mediaFolder' + i; - var checkedAttribute = ' checked="checked"'; - html += ''; - html += ''; + html += '' + folder.Name + ''; } - html += '
'; + html += ''; $('.folderAccess', page).html(html).trigger('create'); - $('#chkEnableAllFolders', page).checked(true).checkboxradio('refresh').trigger('change'); + $('#chkEnableAllFolders', page).checked(true).trigger('change'); } function loadChannels(page, channels) { var html = ''; - html += '
'; + html += '
' + Globalize.translate('HeaderChannels') + '
'; - html += '' + Globalize.translate('HeaderChannels') + ''; + html += '
'; for (var i = 0, length = channels.length; i < length; i++) { var folder = channels[i]; - var id = 'channels' + i; - var checkedAttribute = ' checked="checked"'; - html += ''; - html += ''; + html += '' + folder.Name + ''; } - html += '
'; + html += ''; $('.channelAccess', page).show().html(html).trigger('create'); @@ -57,7 +51,7 @@ $('.channelAccessContainer', page).hide(); } - $('#chkEnableAllChannels', page).checked(true).checkboxradio('refresh').trigger('change'); + $('#chkEnableAllChannels', page).checked(true).trigger('change'); } function loadUser(page) { @@ -88,23 +82,23 @@ user.Policy.EnableAllFolders = $('#chkEnableAllFolders', page).checked(); user.Policy.EnabledFolders = user.Policy.EnableAllFolders ? [] : - $('.chkFolder:checked', page).map(function () { - - return this.getAttribute('data-id'); - - }).get(); + $('.chkFolder', page).get().filter(function (i) { + return i.checked; + }).map(function (i) { + return i.getAttribute('data-id'); + }); user.Policy.EnableAllChannels = $('#chkEnableAllChannels', page).checked(); user.Policy.EnabledChannels = user.Policy.EnableAllChannels ? [] : - $('.chkChannel:checked', page).map(function () { - - return this.getAttribute('data-id'); - - }).get(); + $('.chkChannel', page).get().filter(function (i) { + return i.checked; + }).map(function (i) { + return i.getAttribute('data-id'); + }); ApiClient.updateUserPolicy(user.Id, user.Policy).then(function () { - Dashboard.navigate("useredit.html?userId=" + user.Id); + Dashboard.navigate("userprofiles.html"); }); }, function (response) { diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html index 30231a0696..a20e640f57 100644 --- a/dashboard-ui/useredit.html +++ b/dashboard-ui/useredit.html @@ -45,77 +45,62 @@ ${OptionAllowUserToManageServer} -
- ${HeaderFeatureAccess} - - - - - - - - -
-
+
+
${HeaderFeatureAccess}
+
+ ${OptionAllowDeleteLibraryContent} + ${OptionAllowContentDownloading} + ${OptionAllowBrowsingLiveTv} + ${OptionAllowManageLiveTv} +
+
-
- ${HeaderPlayback} - - - - - - -
+
+
${HeaderPlayback}
+
+ ${OptionAllowMediaPlayback} + ${OptionAllowAudioPlaybackTranscoding} + ${OptionAllowVideoPlaybackTranscoding} +
${OptionAllowMediaPlaybackTranscodingHelp}

-
- ${HeaderRemoteControl} - - - - -
+
+
${HeaderRemoteControl}
+
+ ${OptionAllowRemoteControlOthers} + ${OptionAllowRemoteSharedDevices} +
${OptionAllowRemoteSharedDevicesHelp}

-
- ${HeaderSharing} - - -
-
${OptionAllowLinkSharingHelp}
+
+
${HeaderSync}
+
+ ${OptionAllowSyncContent} + ${OptionAllowSyncTranscoding} +

-
- ${HeaderSync} - - - - -
+
+ ${OptionAllowLinkSharing} +
${OptionAllowLinkSharingHelp}

-
- - -
-
${OptionDisableUserHelp}
+ ${OptionDisableUser} +
${OptionDisableUserHelp}
- - -
${OptionDisableUserPreferencesHelp}
+ ${OptionDisableUserPreferences} +
${OptionDisableUserPreferencesHelp}
- - -
${OptionHideUserFromLoginHelp}
+ ${OptionHideUser} +
${OptionHideUserFromLoginHelp}

-
${HeaderLibraryAccess}
+

${HeaderLibraryAccess}

- - -
${LibraryAccessHelp}
+ ${OptionEnableAccessToAllLibraries} +
${LibraryAccessHelp}

@@ -27,11 +26,10 @@