diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-02-23 12:04:00 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2018-02-27 12:50:18 +0100 |
| commit | bb5d4c8c21d339057c45e5f244d944157065b26f (patch) | |
| tree | e0c7d8cd3a8be4515c5f4f70ac72672c240969fa /settings | |
| parent | 7f6b27aef7a3fd696a3836964bf0592e3ffe9d00 (diff) | |
| download | nextcloud-server-bb5d4c8c21d339057c45e5f244d944157065b26f.tar.gz nextcloud-server-bb5d4c8c21d339057c45e5f244d944157065b26f.zip | |
Changed button types and do not hide form on outside click
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.scss | 17 | ||||
| -rw-r--r-- | settings/js/users/users.js | 18 | ||||
| -rw-r--r-- | settings/templates/users/part.userlist.php | 3 |
3 files changed, 25 insertions, 13 deletions
diff --git a/settings/css/settings.scss b/settings/css/settings.scss index 69e9b593d95..aea132eaac9 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -137,7 +137,7 @@ input { } .personal-settings-setting-box input { - &[type="text"], &[type="email"], &[type="tel"], &[type="url"] { + &[type='text'], &[type='email'], &[type='tel'], &[type='url'] { width: 100%; } } @@ -183,7 +183,7 @@ input { } } > form span { - &[class^="icon-checkmark"], &[class^="icon-error"] { + &[class^='icon-checkmark'], &[class^='icon-error'] { position: relative; right: 8px; top: -28px; @@ -561,8 +561,15 @@ span.usersLastLoginTooltip { position: relative; top: -1px; } - #newuserHeader input:not([type="submit"]) { - width: 100%; + #newuserHeader input{ + &:not([type='submit']), + &:not([type='reset']) { + width: 100%; + } + &[type='submit'], + &[type='reset'] { + width: 50%; + } } } @@ -837,7 +844,7 @@ span.version { margin-bottom: 18px; } -/* capitalize "Other" category */ +/* capitalize 'Other' category */ #app-category-925 { text-transform: capitalize; diff --git a/settings/js/users/users.js b/settings/js/users/users.js index 58c15cf1c93..d00423a99f3 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -32,13 +32,17 @@ 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( - $('#new-user-button'), - $('#newuserHeader'), - function() { - $('#newusername').focus(); - } - ); + $('#new-user-button').on('click', function(event) { + event.preventDefault(); + $('#newuserHeader').slideToggle(OC.menuSpeed); + $('#newusername').focus(); + }); + $('#newreset').on('click', function(event) { + $('#newuserHeader').slideToggle(OC.menuSpeed); + }); + $('.has-tooltip').tooltip({ + placement: 'bottom' + }); }, /** diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php index e4e5aa3df7b..10b2f8c06db 100644 --- a/settings/templates/users/part.userlist.php +++ b/settings/templates/users/part.userlist.php @@ -65,7 +65,8 @@ <td class="userBackend" scope="col"></td> <td class="lastLogin" scope="col"></td> <td class="userActions"> - <input type="submit" id="newsubmit" class="button icon-confirm has-tooltip" value="<?php p($l->t('Add user'))?>" /> + <input type="submit" id="newsubmit" class="button icon-checkmark has-tooltip" value="" title="<?php p($l->t('Add user'))?>" /> + <input type="reset" id="newreset" class="button icon-close has-tooltip" value="" title="<?php p($l->t('Cancel'))?>" /> </td> </tr> </thead> |