summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-07-19 20:57:54 +0200
committerGitHub <noreply@github.com>2016-07-19 20:57:54 +0200
commit21b05b646f25bb5ce8f48fb0ba800624c9c57847 (patch)
treeb21958a8a3a13062ff78f10e2f746008ea22f3a1 /settings
parent56496f98abc666a89fcf683dffedcf864c2d43f2 (diff)
parent9b22be2023bd441e4a54e9a5f1be85be421c0341 (diff)
downloadnextcloud-server-21b05b646f25bb5ce8f48fb0ba800624c9c57847.tar.gz
nextcloud-server-21b05b646f25bb5ce8f48fb0ba800624c9c57847.zip
Merge pull request #452 from nextcloud/session-passwords-design
Adjust wording and layout of Sessions and App passwords personal settings
Diffstat (limited to 'settings')
-rw-r--r--settings/css/settings.css10
-rw-r--r--settings/templates/personal.php11
2 files changed, 10 insertions, 11 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 0af53cebf31..a190cd91b00 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -38,8 +38,7 @@ input#openid, input#webdav { width:20em; }
#displaynameform,
#lostpassword,
#groups,
-#passwordform,
-#language {
+#passwordform {
display: inline-block;
margin-bottom: 0;
padding-bottom: 0;
@@ -104,17 +103,18 @@ table.nostyle td { padding: 0.2em 0; }
#apppasswords table {
width: 100%;
min-height: 150px;
- padding-top: 25px;
+ padding-top: 5px;
+ max-width: 580px;
}
#sessions table th,
#apppasswords table th {
- font-weight: 800;
+ opacity: .5;
}
#sessions table th,
#sessions table td,
#apppasswords table th,
#apppasswords table td {
- padding: 10px;
+ padding: 10px 10px 10px 0;
}
#sessions .token-list td,
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 2f656d39fbb..e3164eb5b98 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -167,12 +167,12 @@ if($_['passwordChangeSupported']) {
<div id="sessions" class="section">
<h2><?php p($l->t('Sessions'));?></h2>
- <span class="hidden-when-empty"><?php p($l->t('These are the web, desktop and mobile clients currently logged in to your account.'));?></span>
+ <span class="hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></span>
<table>
<thead class="token-list-header">
<tr>
- <th><?php p($l->t('Browser'));?></th>
- <th><?php p($l->t('Most recent activity'));?></th>
+ <th><?php p($l->t('Device'));?></th>
+ <th><?php p($l->t('Recent activity'));?></th>
<th></th>
</tr>
</thead>
@@ -183,19 +183,18 @@ if($_['passwordChangeSupported']) {
<div id="apppasswords" class="section">
<h2><?php p($l->t('App passwords'));?></h2>
- <span class="hidden-when-empty"><?php p($l->t("You've linked these apps."));?></span>
+ <p><?php p($l->t('Passcodes that give an app or device permissions to access your account.'));?></p>
<table>
<thead class="hidden-when-empty">
<tr>
<th><?php p($l->t('Name'));?></th>
- <th><?php p($l->t('Most recent activity'));?></th>
+ <th><?php p($l->t('Recent activity'));?></th>
<th></th>
</tr>
</thead>
<tbody class="token-list icon-loading">
</tbody>
</table>
- <p><?php p($l->t('An app password is a passcode that gives an app or device permissions to access your %s account.', [$theme->getName()]));?></p>
<div id="app-password-form">
<input id="app-password-name" type="text" placeholder="<?php p($l->t('App name')); ?>">
<button id="add-app-password" class="button"><?php p($l->t('Create new app password')); ?></button>