Skip to content

Adjust wording and layout of Sessions and App passwords personal settings #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 19, 2016
Merged

Adjust wording and layout of Sessions and App passwords personal settings #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1c0c90
simplify wording of Sessions and App passwords sections
jancborchardt Jul 19, 2016
762cc2a
adjust layout of Sessions and App passwords sections
jancborchardt Jul 19, 2016
9b22be2
set max width for sessions tables so it doesn’t go crazy on large scr…
jancborchardt Jul 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions settings/css/settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down
11 changes: 5 additions & 6 deletions settings/templates/personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,12 @@

<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>
Expand All @@ -183,19 +183,18 @@

<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>
Expand Down