1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update user pages

This commit is contained in:
Luke Pulverenti 2016-04-09 15:04:14 -04:00
parent 1e4a9af13a
commit ef7cd8f80c
11 changed files with 107 additions and 119 deletions

View file

@ -16,14 +16,14 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.0.49", "version": "1.0.50",
"_release": "1.0.49", "_release": "1.0.50",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.0.49", "tag": "1.0.50",
"commit": "961b40aa65f6171f25603c924bc1ee8d6e0214ab" "commit": "7988bb63ffe48f61c7a1b69fb5f7ab73a8d30fdd"
}, },
"_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "~1.0.3", "_target": "~1.0.3",
"_originalSource": "emby-apiclient" "_originalSource": "emby-apiclient"
} }

View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.2.6", "version": "1.2.8",
"_release": "1.2.6", "_release": "1.2.8",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.2.6", "tag": "1.2.8",
"commit": "fe1b3e3069c875bb54cfede60ee94f8b8f876c90" "commit": "ab69b1f6c75888a55b4baa100f2d3c527633bf49"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

View file

@ -457,6 +457,12 @@ define([], function () {
return result; return result;
} }
function sendText(text) {
var elem = document.activeElement;
elem.value = text;
}
return { return {
autoFocus: autoFocus, autoFocus: autoFocus,
focus: focus, focus: focus,
@ -473,6 +479,7 @@ define([], function () {
}, },
moveDown: function (sourceElement) { moveDown: function (sourceElement) {
nav(sourceElement, 3); nav(sourceElement, 3);
} },
sendText: sendText
}; };
}); });

View file

@ -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) { function displayMessage(cmd) {
@ -115,6 +115,7 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager'], funct
break; break;
case 'SendString': case 'SendString':
// todo // todo
focusManager.sendText(cmd.Arguments.String);
break; break;
default: default:
console.log('processGeneralCommand does not recognize: ' + cmd.Name); console.log('processGeneralCommand does not recognize: ' + cmd.Name);

View file

@ -15,6 +15,9 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
}, },
showSettings: function () { showSettings: function () {
show('/settings/settings.html'); show('/settings/settings.html');
},
showSearch: function () {
skinManager.getCurrentSkin().search();
} }
}; };

View file

@ -45,7 +45,7 @@
"tag": "v1.0.11", "tag": "v1.0.11",
"commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5" "commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5"
}, },
"_source": "git://github.com/polymerelements/paper-behaviors.git", "_source": "git://github.com/PolymerElements/paper-behaviors.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/paper-behaviors" "_originalSource": "PolymerElements/paper-behaviors"
} }

View file

@ -32,14 +32,14 @@
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/polymerelements/paper-ripple", "homepage": "https://github.com/PolymerElements/paper-ripple",
"_release": "1.0.5", "_release": "1.0.5",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.5", "tag": "v1.0.5",
"commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5" "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
}, },
"_source": "git://github.com/polymerelements/paper-ripple.git", "_source": "git://github.com/PolymerElements/paper-ripple.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/paper-ripple" "_originalSource": "PolymerElements/paper-ripple"
} }

View file

@ -29,26 +29,26 @@
$('#chkIsAdmin', page).checked(user.Policy.IsAdministrator); $('#chkIsAdmin', page).checked(user.Policy.IsAdministrator);
$('#chkDisabled', page).checked(user.Policy.IsDisabled).checkboxradio("refresh"); $('#chkDisabled', page).checked(user.Policy.IsDisabled);
$('#chkIsHidden', page).checked(user.Policy.IsHidden).checkboxradio("refresh"); $('#chkIsHidden', page).checked(user.Policy.IsHidden);
$('#chkRemoteControlSharedDevices', page).checked(user.Policy.EnableSharedDeviceControl).checkboxradio("refresh"); $('#chkRemoteControlSharedDevices', page).checked(user.Policy.EnableSharedDeviceControl);
$('#chkEnableRemoteControlOtherUsers', page).checked(user.Policy.EnableRemoteControlOfOtherUsers).checkboxradio("refresh"); $('#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"); $('#chkManageLiveTv', page).checked(user.Policy.EnableLiveTvManagement);
$('#chkEnableLiveTvAccess', page).checked(user.Policy.EnableLiveTvAccess).checkboxradio("refresh"); $('#chkEnableLiveTvAccess', page).checked(user.Policy.EnableLiveTvAccess);
$('#chkEnableContentDeletion', page).checked(user.Policy.EnableContentDeletion).checkboxradio("refresh"); $('#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"); $('#chkEnableMediaPlayback', page).checked(user.Policy.EnableMediaPlayback);
$('#chkEnableAudioPlaybackTranscoding', page).checked(user.Policy.EnableAudioPlaybackTranscoding).checkboxradio("refresh"); $('#chkEnableAudioPlaybackTranscoding', page).checked(user.Policy.EnableAudioPlaybackTranscoding);
$('#chkEnableVideoPlaybackTranscoding', page).checked(user.Policy.EnableVideoPlaybackTranscoding).checkboxradio("refresh"); $('#chkEnableVideoPlaybackTranscoding', page).checked(user.Policy.EnableVideoPlaybackTranscoding);
$('#chkEnableSync', page).checked(user.Policy.EnableSync).checkboxradio("refresh"); $('#chkEnableSync', page).checked(user.Policy.EnableSync);
$('#chkEnableSyncTranscoding', page).checked(user.Policy.EnableSyncTranscoding).checkboxradio("refresh"); $('#chkEnableSyncTranscoding', page).checked(user.Policy.EnableSyncTranscoding);
$('#chkEnableSharing', page).checked(user.Policy.EnablePublicSharing).checkboxradio("refresh"); $('#chkEnableSharing', page).checked(user.Policy.EnablePublicSharing);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
} }

View file

@ -4,50 +4,44 @@
var html = ''; var html = '';
html += '<fieldset data-role="controlgroup">'; html += '<div class="paperCheckboxListLabel">' + Globalize.translate('HeaderLibraries') + '</div>';
html += '<legend>' + Globalize.translate('HeaderLibraries') + '</legend>'; html += '<div class="paperCheckboxList paperList" style="padding:.5em 1em;">';
for (var i = 0, length = mediaFolders.length; i < length; i++) { for (var i = 0, length = mediaFolders.length; i < length; i++) {
var folder = mediaFolders[i]; var folder = mediaFolders[i];
var id = 'mediaFolder' + i;
var checkedAttribute = ' checked="checked"'; var checkedAttribute = ' checked="checked"';
html += '<input class="chkFolder" data-id="' + folder.Id + '" type="checkbox" id="' + id + '"' + checkedAttribute + ' />'; html += '<paper-checkbox class="chkFolder" data-id="' + folder.Id + '"' + checkedAttribute + '>' + folder.Name + '</paper-checkbox>';
html += '<label for="' + id + '">' + folder.Name + '</label>';
} }
html += '</fieldset>'; html += '</div>';
$('.folderAccess', page).html(html).trigger('create'); $('.folderAccess', page).html(html).trigger('create');
$('#chkEnableAllFolders', page).checked(true).checkboxradio('refresh').trigger('change'); $('#chkEnableAllFolders', page).checked(true).trigger('change');
} }
function loadChannels(page, channels) { function loadChannels(page, channels) {
var html = ''; var html = '';
html += '<fieldset data-role="controlgroup">'; html += '<div class="paperCheckboxListLabel">' + Globalize.translate('HeaderChannels') + '</div>';
html += '<legend>' + Globalize.translate('HeaderChannels') + '</legend>'; html += '<div class="paperCheckboxList paperList" style="padding:.5em 1em;">';
for (var i = 0, length = channels.length; i < length; i++) { for (var i = 0, length = channels.length; i < length; i++) {
var folder = channels[i]; var folder = channels[i];
var id = 'channels' + i;
var checkedAttribute = ' checked="checked"'; var checkedAttribute = ' checked="checked"';
html += '<input class="chkChannel" data-id="' + folder.Id + '" type="checkbox" id="' + id + '"' + checkedAttribute + ' />'; html += '<paper-checkbox class="chkChannel" data-id="' + folder.Id + '"' + checkedAttribute + '>' + folder.Name + '</paper-checkbox>';
html += '<label for="' + id + '">' + folder.Name + '</label>';
} }
html += '</fieldset>'; html += '</div>';
$('.channelAccess', page).show().html(html).trigger('create'); $('.channelAccess', page).show().html(html).trigger('create');
@ -57,7 +51,7 @@
$('.channelAccessContainer', page).hide(); $('.channelAccessContainer', page).hide();
} }
$('#chkEnableAllChannels', page).checked(true).checkboxradio('refresh').trigger('change'); $('#chkEnableAllChannels', page).checked(true).trigger('change');
} }
function loadUser(page) { function loadUser(page) {
@ -88,23 +82,23 @@
user.Policy.EnableAllFolders = $('#chkEnableAllFolders', page).checked(); user.Policy.EnableAllFolders = $('#chkEnableAllFolders', page).checked();
user.Policy.EnabledFolders = user.Policy.EnableAllFolders ? user.Policy.EnabledFolders = user.Policy.EnableAllFolders ?
[] : [] :
$('.chkFolder:checked', page).map(function () { $('.chkFolder', page).get().filter(function (i) {
return i.checked;
return this.getAttribute('data-id'); }).map(function (i) {
return i.getAttribute('data-id');
}).get(); });
user.Policy.EnableAllChannels = $('#chkEnableAllChannels', page).checked(); user.Policy.EnableAllChannels = $('#chkEnableAllChannels', page).checked();
user.Policy.EnabledChannels = user.Policy.EnableAllChannels ? user.Policy.EnabledChannels = user.Policy.EnableAllChannels ?
[] : [] :
$('.chkChannel:checked', page).map(function () { $('.chkChannel', page).get().filter(function (i) {
return i.checked;
return this.getAttribute('data-id'); }).map(function (i) {
return i.getAttribute('data-id');
}).get(); });
ApiClient.updateUserPolicy(user.Id, user.Policy).then(function () { ApiClient.updateUserPolicy(user.Id, user.Policy).then(function () {
Dashboard.navigate("useredit.html?userId=" + user.Id); Dashboard.navigate("userprofiles.html");
}); });
}, function (response) { }, function (response) {

View file

@ -45,77 +45,62 @@
<paper-checkbox id="chkIsAdmin">${OptionAllowUserToManageServer}</paper-checkbox> <paper-checkbox id="chkIsAdmin">${OptionAllowUserToManageServer}</paper-checkbox>
</li> </li>
</ul> </ul>
<fieldset id="featureAccessFields" data-role="controlgroup"> <div id="featureAccessFields">
<legend>${HeaderFeatureAccess}</legend> <div class="paperCheckboxListLabel">${HeaderFeatureAccess}</div>
<input type="checkbox" id="chkEnableContentDeletion" name="chkEnableContentDeletion" /> <div class="paperCheckboxList paperList" style="padding:.5em 1em;">
<label for="chkEnableContentDeletion">${OptionAllowDeleteLibraryContent}</label> <paper-checkbox id="chkEnableContentDeletion">${OptionAllowDeleteLibraryContent}</paper-checkbox>
<input type="checkbox" id="chkEnableDownloading" /> <paper-checkbox id="chkEnableDownloading">${OptionAllowContentDownloading}</paper-checkbox>
<label for="chkEnableDownloading">${OptionAllowContentDownloading}</label> <paper-checkbox id="chkEnableLiveTvAccess">${OptionAllowBrowsingLiveTv}</paper-checkbox>
<input type="checkbox" id="chkEnableLiveTvAccess" name="chkEnableLiveTvAccess" /> <paper-checkbox id="chkManageLiveTv">${OptionAllowManageLiveTv}</paper-checkbox>
<label for="chkEnableLiveTvAccess">${OptionAllowBrowsingLiveTv}</label> </div>
<input type="checkbox" id="chkManageLiveTv" name="chkManageLiveTv" /> </div>
<label for="chkManageLiveTv">${OptionAllowManageLiveTv}</label>
</fieldset>
<br />
<div> <div>
<fieldset data-role="controlgroup"> <br />
<legend>${HeaderPlayback}</legend> <div class="paperCheckboxListLabel">${HeaderPlayback}</div>
<input type="checkbox" id="chkEnableMediaPlayback" /> <div class="paperCheckboxList paperList" style="padding:.5em 1em;">
<label for="chkEnableMediaPlayback">${OptionAllowMediaPlayback}</label> <paper-checkbox id="chkEnableMediaPlayback">${OptionAllowMediaPlayback}</paper-checkbox>
<input type="checkbox" id="chkEnableAudioPlaybackTranscoding" /> <paper-checkbox id="chkEnableAudioPlaybackTranscoding">${OptionAllowAudioPlaybackTranscoding}</paper-checkbox>
<label for="chkEnableAudioPlaybackTranscoding">${OptionAllowAudioPlaybackTranscoding}</label> <paper-checkbox id="chkEnableVideoPlaybackTranscoding">${OptionAllowVideoPlaybackTranscoding}</paper-checkbox>
<input type="checkbox" id="chkEnableVideoPlaybackTranscoding" /> </div>
<label for="chkEnableVideoPlaybackTranscoding">${OptionAllowVideoPlaybackTranscoding}</label>
</fieldset>
<div class="fieldDescription">${OptionAllowMediaPlaybackTranscodingHelp}</div> <div class="fieldDescription">${OptionAllowMediaPlaybackTranscodingHelp}</div>
<br /> <br />
</div> </div>
<div> <div>
<fieldset data-role="controlgroup"> <br />
<legend>${HeaderRemoteControl}</legend> <div class="paperCheckboxListLabel">${HeaderRemoteControl}</div>
<input type="checkbox" id="chkEnableRemoteControlOtherUsers" name="chkEnableRemoteControlOtherUsers" /> <div class="paperCheckboxList paperList" style="padding:.5em 1em;">
<label for="chkEnableRemoteControlOtherUsers">${OptionAllowRemoteControlOthers}</label> <paper-checkbox id="chkEnableRemoteControlOtherUsers">${OptionAllowRemoteControlOthers}</paper-checkbox>
<input type="checkbox" id="chkRemoteControlSharedDevices" /> <paper-checkbox id="chkRemoteControlSharedDevices">${OptionAllowRemoteSharedDevices}</paper-checkbox>
<label for="chkRemoteControlSharedDevices">${OptionAllowRemoteSharedDevices}</label> </div>
</fieldset>
<div class="fieldDescription">${OptionAllowRemoteSharedDevicesHelp}</div> <div class="fieldDescription">${OptionAllowRemoteSharedDevicesHelp}</div>
<br /> <br />
</div> </div>
<div> <div>
<fieldset data-role="controlgroup"> <br />
<legend>${HeaderSharing}</legend> <div class="paperCheckboxListLabel">${HeaderSync}</div>
<input type="checkbox" id="chkEnableSharing" /> <div class="paperCheckboxList paperList" style="padding:.5em 1em;">
<label for="chkEnableSharing">${OptionAllowLinkSharing}</label> <paper-checkbox id="chkEnableSync">${OptionAllowSyncContent}</paper-checkbox>
</fieldset> <paper-checkbox id="chkEnableSyncTranscoding">${OptionAllowSyncTranscoding}</paper-checkbox>
<div class="fieldDescription">${OptionAllowLinkSharingHelp}</div> </div>
<br /> <br />
</div> </div>
<div> <div>
<fieldset data-role="controlgroup"> <br />
<legend>${HeaderSync}</legend> <paper-checkbox id="chkEnableSharing">${OptionAllowLinkSharing}</paper-checkbox>
<input type="checkbox" id="chkEnableSync" /> <div class="fieldDescription paperCheckboxFieldDescription">${OptionAllowLinkSharingHelp}</div>
<label for="chkEnableSync">${OptionAllowSyncContent}</label>
<input type="checkbox" id="chkEnableSyncTranscoding" />
<label for="chkEnableSyncTranscoding">${OptionAllowSyncTranscoding}</label>
</fieldset>
<br /> <br />
</div> </div>
<div id="fldIsEnabled" style="margin: 1em 0 2em;"> <div id="fldIsEnabled" style="margin: 1em 0 2em;">
<div data-role="controlgroup"> <paper-checkbox id="chkDisabled">${OptionDisableUser}</paper-checkbox>
<input type="checkbox" id="chkDisabled" name="chkDisabled" /> <div class="fieldDescription paperCheckboxFieldDescription">${OptionDisableUserHelp}</div>
<label for="chkDisabled">${OptionDisableUser}</label>
</div>
<div class="fieldDescription">${OptionDisableUserHelp}</div>
</div> </div>
<div style="margin: 1em 0;"> <div style="margin: 1em 0;">
<input type="checkbox" id="chkDisableUserPreferences" data-mini="true" /> <paper-checkbox id="chkDisableUserPreferences">${OptionDisableUserPreferences}</paper-checkbox>
<label for="chkDisableUserPreferences">${OptionDisableUserPreferences}</label> <div class="fieldDescription paperCheckboxFieldDescription">${OptionDisableUserPreferencesHelp}</div>
<div class="fieldDescription">${OptionDisableUserPreferencesHelp}</div>
</div> </div>
<div id="fldIsHidden" style="margin: 2em 0 1em;"> <div id="fldIsHidden" style="margin: 2em 0 1em;">
<input type="checkbox" id="chkIsHidden" name="chkIsHidden" data-mini="true" /> <paper-checkbox id="chkIsHidden">${OptionHideUser}</paper-checkbox>
<label for="chkIsHidden">${OptionHideUser}</label> <div class="fieldDescription paperCheckboxFieldDescription">${OptionHideUserFromLoginHelp}</div>
<div class="fieldDescription">${OptionHideUserFromLoginHelp}</div>
</div> </div>
<br /> <br />
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">

View file

@ -1,4 +1,4 @@
<div id="newUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/usernew,paper-input,jqmcheckbox"> <div id="newUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/usernew,paper-input,paper-checkbox">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
@ -12,11 +12,10 @@
</ul> </ul>
<div class="folderAccessContainer"> <div class="folderAccessContainer">
<div class="ui-controlgroup-label">${HeaderLibraryAccess}</div> <h1>${HeaderLibraryAccess}</h1>
<div> <div>
<label for="chkEnableAllFolders">${OptionEnableAccessToAllLibraries}</label> <paper-checkbox id="chkEnableAllFolders">${OptionEnableAccessToAllLibraries}</paper-checkbox>
<input type="checkbox" id="chkEnableAllFolders" /> <div class="fieldDescription paperCheckboxFieldDescription">${LibraryAccessHelp}</div>
<div class="fieldDescription">${LibraryAccessHelp}</div>
</div> </div>
<div class="folderAccessListContainer"> <div class="folderAccessListContainer">
<br /> <br />
@ -27,11 +26,10 @@
<br /> <br />
<br /> <br />
<div class="channelAccessContainer" style="display:none;"> <div class="channelAccessContainer" style="display:none;">
<div class="ui-controlgroup-label">${HeaderChannelAccess}</div> <h1>${HeaderChannelAccess}</h1>
<div> <div>
<label for="chkEnableAllChannels">${OptionEnableAccessToAllChannels}</label> <paper-checkbox id="chkEnableAllChannels">${OptionEnableAccessToAllChannels}</paper-checkbox>
<input type="checkbox" id="chkEnableAllChannels" /> <div class="fieldDescription paperCheckboxFieldDescription">${ChannelAccessHelp}</div>
<div class="fieldDescription">${ChannelAccessHelp}</div>
</div> </div>
<div class="channelAccessListContainer"> <div class="channelAccessListContainer">
<br /> <br />