Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
parent
d7a2290ce1
commit
07cf046216
|
@ -418,14 +418,9 @@ class Manager implements IManager {
|
|||
);
|
||||
$forms[$form->getPriority()] = [$form];
|
||||
}
|
||||
if($section === 'sessions') {
|
||||
if($section === 'security') {
|
||||
/** @var ISettings $form */
|
||||
$form = new Personal\Sessions();
|
||||
$forms[$form->getPriority()] = [$form];
|
||||
}
|
||||
if($section === 'app-passwords') {
|
||||
/** @var ISettings $form */
|
||||
$form = new Personal\AppPasswords();
|
||||
$form = new Personal\Security();
|
||||
$forms[$form->getPriority()] = [$form];
|
||||
}
|
||||
if($section === 'sync-clients') {
|
||||
|
@ -472,8 +467,7 @@ class Manager implements IManager {
|
|||
public function getPersonalSections() {
|
||||
$sections = [
|
||||
0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))],
|
||||
5 => [new Section('sessions', $this->l->t('Sessions'), 0, $this->url->imagePath('settings', 'admin.svg'))],
|
||||
10 => [new Section('app-passwords', $this->l->t('App passwords'), 0, $this->url->imagePath('settings', 'password.svg'))],
|
||||
5 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('settings', 'password.svg'))],
|
||||
15 => [new Section('sync-clients', $this->l->t('Sync clients'), 0, $this->url->imagePath('settings', 'change.svg'))],
|
||||
98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
|
||||
];
|
||||
|
|
|
@ -1,59 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
|
||||
*
|
||||
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Settings\Personal;
|
||||
|
||||
|
||||
use OCP\AppFramework\Http\TemplateResponse;
|
||||
use OCP\Settings\ISettings;
|
||||
|
||||
class AppPasswords implements ISettings {
|
||||
|
||||
/**
|
||||
* @return TemplateResponse returns the instance with all parameters set, ready to be rendered
|
||||
* @since 9.1
|
||||
*/
|
||||
public function getForm() {
|
||||
return new TemplateResponse('settings', 'settings/personal/app-passwords');
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string the section ID, e.g. 'sharing'
|
||||
* @since 9.1
|
||||
*/
|
||||
public function getSection() {
|
||||
return 'app-passwords';
|
||||
}
|
||||
|
||||
/**
|
||||
* @return int whether the form should be rather on the top or bottom of
|
||||
* the admin section. The forms are arranged in ascending order of the
|
||||
* priority values. It is required to return a value between 0 and 100.
|
||||
*
|
||||
* E.g.: 70
|
||||
* @since 9.1
|
||||
*/
|
||||
public function getPriority() {
|
||||
return 5;
|
||||
}
|
||||
}
|
|
@ -27,14 +27,14 @@ namespace OC\Settings\Personal;
|
|||
use OCP\AppFramework\Http\TemplateResponse;
|
||||
use OCP\Settings\ISettings;
|
||||
|
||||
class Sessions implements ISettings {
|
||||
class Security implements ISettings {
|
||||
|
||||
/**
|
||||
* @return TemplateResponse returns the instance with all parameters set, ready to be rendered
|
||||
* @since 9.1
|
||||
*/
|
||||
public function getForm() {
|
||||
return new TemplateResponse('settings', 'settings/personal/sessions');
|
||||
return new TemplateResponse('settings', 'settings/personal/security');
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -42,7 +42,7 @@ class Sessions implements ISettings {
|
|||
* @since 9.1
|
||||
*/
|
||||
public function getSection() {
|
||||
return 'sessions';
|
||||
return 'security';
|
||||
}
|
||||
|
||||
/**
|
|
@ -20,6 +20,7 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
script('settings', [
|
||||
'authtoken',
|
||||
'authtoken_collection',
|
||||
|
@ -29,13 +30,14 @@ script('settings', [
|
|||
|
||||
?>
|
||||
|
||||
<div id="apppasswords" class="section">
|
||||
<h2><?php p($l->t('App passwords'));?></h2>
|
||||
<p class="settings-hint"><?php p($l->t('Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too.'));?></p>
|
||||
|
||||
<div id="security" class="section">
|
||||
<h2><?php p($l->t('Security'));?></h2>
|
||||
<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></p>
|
||||
<table class="icon-loading">
|
||||
<thead class="hidden-when-empty">
|
||||
<thead class="token-list-header">
|
||||
<tr>
|
||||
<th><?php p($l->t('Name'));?></th>
|
||||
<th><?php p($l->t('Device'));?></th>
|
||||
<th><?php p($l->t('Last activity'));?></th>
|
||||
<th></th>
|
||||
</tr>
|
|
@ -1,48 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
|
||||
*
|
||||
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
script('settings', [
|
||||
'authtoken',
|
||||
'authtoken_collection',
|
||||
'authtoken_view',
|
||||
'settings/authtoken-init'
|
||||
]);
|
||||
|
||||
?>
|
||||
|
||||
|
||||
<div id="sessions" class="section">
|
||||
<h2><?php p($l->t('Sessions'));?></h2>
|
||||
<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></p>
|
||||
<table class="icon-loading">
|
||||
<thead class="token-list-header">
|
||||
<tr>
|
||||
<th><?php p($l->t('Device'));?></th>
|
||||
<th><?php p($l->t('Last activity'));?></th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="token-list">
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
Loading…
Reference in New Issue