Skip to content

Commit

Permalink
Merge pull request #5267 from nextcloud/personal-sessions-renamwe
Browse files Browse the repository at this point in the history
reword sessions to security in personal settings
  • Loading branch information
nickvergessen authored Jun 7, 2017
2 parents a3c5d43 + 340fdc1 commit 3678be0
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
34 changes: 17 additions & 17 deletions settings/css/settings.css
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,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
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,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

0 comments on commit 3678be0

Please sign in to comment.