diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-08-02 20:23:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 20:23:21 +0200 |
| commit | 01298cfa72105802533a2f0757c45a50c6d9bc67 (patch) | |
| tree | 8928e01a103d88d039597dd7816cc1618ccc7b83 /lib | |
| parent | 9057621d64589d1a45040e9dfbf87dd908e9acbb (diff) | |
| parent | 84f99db7ab96746b9dc3fa662c136912c34274eb (diff) | |
| download | nextcloud-server-01298cfa72105802533a2f0757c45a50c6d9bc67.tar.gz nextcloud-server-01298cfa72105802533a2f0757c45a50c6d9bc67.zip | |
Merge pull request #10480 from nextcloud/bugfix/10420/settings
Settings design polishing
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Settings/Admin/Encryption.php | 4 | ||||
| -rw-r--r-- | lib/private/Settings/Manager.php | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/private/Settings/Admin/Encryption.php b/lib/private/Settings/Admin/Encryption.php index 012f5791610..65f507154ad 100644 --- a/lib/private/Settings/Admin/Encryption.php +++ b/lib/private/Settings/Admin/Encryption.php @@ -77,7 +77,7 @@ class Encryption implements ISettings { * @return string the section ID, e.g. 'sharing' */ public function getSection() { - return 'encryption'; + return 'security'; } /** @@ -88,6 +88,6 @@ class Encryption implements ISettings { * E.g.: 70 */ public function getPriority() { - return 0; + return 10; } } diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index e9f2a6f5976..260e33d1929 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -230,7 +230,6 @@ class Manager implements IManager { 1 => [new Section('server', $this->l->t('Basic settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))], 5 => [new Section('sharing', $this->l->t('Sharing'), 0, $this->url->imagePath('core', 'actions/share.svg'))], 10 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('core', 'actions/password.svg'))], - 45 => [new Section('encryption', $this->l->t('Encryption'), 0, $this->url->imagePath('core', 'actions/password.svg'))], 50 => [new Section('groupware', $this->l->t('Groupware'), 0, $this->url->imagePath('core', 'places/contacts.svg'))], 98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))], ]; @@ -270,7 +269,7 @@ class Manager implements IManager { $form = new Admin\Mail($this->config); $forms[$form->getPriority()] = [$form]; } - if ($section === 'encryption') { + if ($section === 'security') { /** @var ISettings $form */ $form = new Admin\Encryption($this->encryptionManager, $this->userManager); $forms[$form->getPriority()] = [$form]; |