Skip to content
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

reword sessions to security in personal settings #5267

Merged
merged 1 commit into from
Jun 7, 2017
Merged

reword sessions to security in personal settings #5267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions settings/css/settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ input#openid, input#webdav {
background-image: url('../img/personal.svg?v=1');
}

.nav-icon-sessions {
.nav-icon-security {
background-image: url('../img/toggle-filelist.svg?v=1');
}

Expand Down Expand Up @@ -300,29 +300,29 @@ table.nostyle td {
padding: 0.2em 0;
}

#sessions table {
#security table {
width: 100%;
min-height: 50px;
padding-top: 5px;
max-width: 580px;
}

#sessions table th{
#security table th{
opacity: .5;
}

#sessions table th,
#sessions table td {
#security table th,
#security table td {
padding: 10px 10px 10px 0;
}

#sessions .token-list td.more {
#security .token-list td.more {
overflow: visible;
position: relative;
width: 16px;
}

#sessions .token-list td {
#security .token-list td {
border-top: 1px solid #DDD;
text-overflow: ellipsis;
max-width: 200px;
Expand All @@ -332,48 +332,48 @@ table.nostyle td {
position: relative;
}

#sessions tr > *:nth-child(2) {
#security tr > *:nth-child(2) {
text-align: right;
}

#sessions .token-list td > a.icon {
#security .token-list td > a.icon {
opacity: 0;
transition: opacity 0.5s;
}

#sessions .token-list a.icon {
#security .token-list a.icon {
margin-top: 4px;
display: block;
}

#sessions .token-list tr:hover td > a.icon,
#sessions .token-list tr.active td > a.icon {
#security .token-list tr:hover td > a.icon,
#security .token-list tr.active td > a.icon {
opacity: 0.6;
}

#sessions .token-list td div.configure {
#security .token-list td div.configure {
display: none;
}

#sessions .token-list tr.active div.configure {
#security .token-list tr.active div.configure {
display: block;
position: absolute;
top: 45px;
right: -5px;
padding: 10px;
}

#sessions .token-list div.configure:after {
#security .token-list div.configure:after {
right: 13px;
}

#sessions .token-list tr.active div.configure > * {
#security .token-list tr.active div.configure > * {
margin-top: 5px;
margin-bottom: 5px;
display: inline-block;
}

#sessions .token-list tr.active a.icon-delete {
#security .token-list tr.active a.icon-delete {
background-position: left;
padding-left: 20px;
}
Expand Down
2 changes: 1 addition & 1 deletion settings/js/authtoken_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
initialize: function (options) {
this.collection = options.collection;

var el = '#sessions';
var el = '#security';
this._view = new SubView({
el: el,
collection: this.collection
Expand Down
2 changes: 1 addition & 1 deletion settings/personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
// add hardcoded forms from the template
$formsAndMore = [];
$formsAndMore[]= ['anchor' => 'personal-settings', 'section-name' => $l->t('Personal info')];
$formsAndMore[]= ['anchor' => 'sessions', 'section-name' => $l->t('Sessions')];
$formsAndMore[]= ['anchor' => 'security', 'section-name' => $l->t('Security')];
$formsAndMore[]= ['anchor' => 'clientsbox', 'section-name' => $l->t('Sync clients')];

$forms=OC_App::getForms('personal');
Expand Down
6 changes: 3 additions & 3 deletions settings/templates/personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,9 +334,9 @@
<?php }?>
</div>

<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>
<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, mobile clients and app specific passwords that currently have access to your account.'));?></p>
<table class="icon-loading">
<thead class="token-list-header">
<tr>
Expand Down