diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-04-05 09:02:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 09:02:58 +0200 |
| commit | ddd157a84ced582d781179a43cc25d40bc3ac803 (patch) | |
| tree | 7c51cf969de97f6951605d06445a3524a37ddfbe | |
| parent | 84035862f7239e5d05ac0ab848442c9230ad7efc (diff) | |
| parent | 94d4d20c39bcacc7650a290189fe9ef3e4df6712 (diff) | |
| download | nextcloud-server-ddd157a84ced582d781179a43cc25d40bc3ac803.tar.gz nextcloud-server-ddd157a84ced582d781179a43cc25d40bc3ac803.zip | |
Merge pull request #3741 from nextcloud/user-settings-design
User mgmt settings design improvements
| -rw-r--r-- | core/css/inputs.scss | 17 | ||||
| -rw-r--r-- | settings/templates/users/main.php | 26 |
2 files changed, 29 insertions, 14 deletions
diff --git a/core/css/inputs.scss b/core/css/inputs.scss index 37405172d3a..13a164e13f2 100644 --- a/core/css/inputs.scss +++ b/core/css/inputs.scss @@ -1,12 +1,12 @@ /** * @copyright Copyright (c) 2016, John Molakvoæ <skjnldsv@protonmail.com> * @copyright Copyright (c) 2016, Morris Jobke <hey@morrisjobke.de> - * @copyright Copyright (c) 2016, Jan-Christoph Borchardt <hey@jancborchardt.net> * @copyright Copyright (c) 2016, Joas Schilling <coding@schilljs.com> * @copyright Copyright (c) 2016, Julius Haertl <jus@bitgrid.net> * @copyright Copyright (c) 2016, jowi <sjw@gmx.ch> * @copyright Copyright (c) 2015, Joas Schilling <nickvergessen@owncloud.com> * @copyright Copyright (c) 2015, Hendrik Leppelsack <hendrik@leppelsack.de> + * @copyright Copyright (c) 2014-2017, Jan-Christoph Borchardt <hey@jancborchardt.net> * * @license GNU AGPL version 3 or any later version * @@ -301,6 +301,21 @@ input { } } } +#app-settings-content { + input { + &[type='checkbox'], + &[type='radio'] { + &.radio, + &.checkbox { + + label { + display: inline-block; + width: 100%; + padding: 5px 0; + } + } + } + } +} /* Select2 overriding. Merged to core with vendor stylesheet */ .select2-drop { diff --git a/settings/templates/users/main.php b/settings/templates/users/main.php index 4fd8572029a..3688f2296cd 100644 --- a/settings/templates/users/main.php +++ b/settings/templates/users/main.php @@ -52,17 +52,24 @@ translation('settings'); </label> </p> <p> + <input type="checkbox" name="UserBackend" value="UserBackend" id="CheckboxUserBackend" + class="checkbox" <?php if ($_['show_backend'] === 'true') print_unescaped('checked="checked"'); ?> /> + <label for="CheckboxUserBackend"> + <?php p($l->t('Show user backend')) ?> + </label> + </p> + <p> <input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin" class="checkbox" <?php if ($_['show_last_login'] === 'true') print_unescaped('checked="checked"'); ?> /> <label for="CheckboxLastLogin"> - <?php p($l->t('Show last log in')) ?> + <?php p($l->t('Show last login')) ?> </label> </p> <p> - <input type="checkbox" name="UserBackend" value="UserBackend" id="CheckboxUserBackend" - class="checkbox" <?php if ($_['show_backend'] === 'true') print_unescaped('checked="checked"'); ?> /> - <label for="CheckboxUserBackend"> - <?php p($l->t('Show user backend')) ?> + <input type="checkbox" name="EmailAddress" value="EmailAddress" id="CheckboxEmailAddress" + class="checkbox" <?php if ($_['show_email'] === 'true') print_unescaped('checked="checked"'); ?> /> + <label for="CheckboxEmailAddress"> + <?php p($l->t('Show email address')) ?> </label> </p> <p> @@ -73,14 +80,7 @@ translation('settings'); </label> </p> <p class="info-text"> - <?php p($l->t('When the password of the new user is left empty an activation email with a link to set the password is send to the user')) ?> - </p> - <p> - <input type="checkbox" name="EmailAddress" value="EmailAddress" id="CheckboxEmailAddress" - class="checkbox" <?php if ($_['show_email'] === 'true') print_unescaped('checked="checked"'); ?> /> - <label for="CheckboxEmailAddress"> - <?php p($l->t('Show email address')) ?> - </label> + <?php p($l->t('When the password of a new user is left empty, an activation email with a link to set the password is sent.')) ?> </p> </div> </div> |