diff options
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/templates/settings/personal/security.php (renamed from settings/templates/settings/personal/app-passwords.php) | 20 | ||||
| -rw-r--r-- | settings/templates/settings/personal/sessions.php | 48 |
2 files changed, 11 insertions, 57 deletions
diff --git a/settings/templates/settings/personal/app-passwords.php b/settings/templates/settings/personal/security.php index b9f8c4867e5..3a324bf8d21 100644 --- a/settings/templates/settings/personal/app-passwords.php +++ b/settings/templates/settings/personal/security.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + script('settings', [ 'authtoken', 'authtoken_collection', @@ -29,16 +30,17 @@ 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"> - <tr> - <th><?php p($l->t('Name'));?></th> - <th><?php p($l->t('Last activity'));?></th> - <th></th> - </tr> + <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> diff --git a/settings/templates/settings/personal/sessions.php b/settings/templates/settings/personal/sessions.php deleted file mode 100644 index 60b38d6648c..00000000000 --- a/settings/templates/settings/personal/sessions.php +++ /dev/null @@ -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> |