summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-01-09 15:55:45 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2018-02-27 12:50:18 +0100
commit7f6b27aef7a3fd696a3836964bf0592e3ffe9d00 (patch)
tree1fa4fdaa56e6db0537ef048dfa6de2fa16077c7c /settings/js
parent2f1aa251305be4dbe0b178ff523346a65dd3cf62 (diff)
downloadnextcloud-server-7f6b27aef7a3fd696a3836964bf0592e3ffe9d00.tar.gz
nextcloud-server-7f6b27aef7a3fd696a3836964bf0592e3ffe9d00.zip
New user form in table
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Added value and empty check to properly display a confirm button/input Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> w3c html form table compliance and menu fixes Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Various design fixes Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Fix wording to consistent 'Add user' Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> Focus new username input on toggle Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Removed unwanted th after rebase Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> quote fix Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Th to td Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> 🙈 Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Email input to email type Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Fixed table template cells and fix email input enabling Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Always show email and fixed min-width of name, username, mail and fullname columns Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Use button id Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/users/users.js44
1 files changed, 7 insertions, 37 deletions
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 31f9605e48f..58c15cf1c93 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -32,7 +32,13 @@ var UserList = {
// initially the list might already contain user entries (not fully ajaxified yet)
// initialize these entries
this.$el.find('.quota-user').singleSelect().on('change', this.onQuotaSelect);
- OC.registerMenu($('.app-navigation-new > button'), $('#newuser'))
+ OC.registerMenu(
+ $('#new-user-button'),
+ $('#newuserHeader'),
+ function() {
+ $('#newusername').focus();
+ }
+ );
},
/**
@@ -1136,24 +1142,6 @@ $(document).ready(function () {
}
});
- if ($('#CheckboxEmailAddress').is(':checked')) {
- $("#userlist .mailAddress").show();
- }
- // Option to display/hide the "Mail Address" column
- $('#CheckboxEmailAddress').click(function () {
- if ($('#CheckboxEmailAddress').is(':checked')) {
- $("#userlist .mailAddress").show();
- if (OC.isUserAdmin()) {
- OCP.AppConfig.setValue('core', 'umgmt_show_email', 'true');
- }
- } else {
- $("#userlist .mailAddress").hide();
- if (OC.isUserAdmin()) {
- OCP.AppConfig.setValue('core', 'umgmt_show_email', 'false');
- }
- }
- });
-
if ($('#CheckboxUserBackend').is(':checked')) {
$("#userlist .userBackend").show();
}
@@ -1172,24 +1160,6 @@ $(document).ready(function () {
}
});
- if ($('#CheckboxMailOnUserCreate').is(':checked')) {
- $("#newemail").show();
- }
- // Option to display/hide the "E-Mail" input field
- $('#CheckboxMailOnUserCreate').click(function () {
- if ($('#CheckboxMailOnUserCreate').is(':checked')) {
- $("#newemail").show();
- if (OC.isUserAdmin()) {
- OCP.AppConfig.setValue('core', 'umgmt_send_email', 'true');
- }
- } else {
- $("#newemail").hide();
- if (OC.isUserAdmin()) {
- OCP.AppConfig.setValue('core', 'umgmt_send_email', 'false');
- }
- }
- });
-
// calculate initial limit of users to load
var initialUserCountLimit = UserList.initialUsersToLoad,
containerHeight = $('#app-content').height();