Skip to content

Fix icons in sidebar on personal page #4569

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
rullzer merged 1 commit into from
Apr 28, 2017
Merged

Fix icons in sidebar on personal page #4569

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
2 changes: 1 addition & 1 deletion apps/encryption/templates/settings-personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
script('core', 'multiselect');
?>
<form id="ocDefaultEncryptionModule" class="section">
<h2><?php p($l->t('Basic encryption module')); ?></h2>
<h2 data-anchor-name="basic-encryption-module"><?php p($l->t('Basic encryption module')); ?></h2>

<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED ): ?>

Expand Down
4 changes: 4 additions & 0 deletions apps/files_external/css/settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,7 @@ td.mountPoint, td.backend { width:160px; }
#externalStorage .mountOptionsDropdown {
margin-right: 40px;
}

.nav-icon-external-storage {
background-image: url('../img/app-dark.svg?v=1');
}
2 changes: 1 addition & 1 deletion apps/files_external/templates/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ function writeParameterInput($parameter, $options, $classes = []) {
?>

<form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
<h2><?php p($l->t('External storage')); ?></h2>
<h2 data-anchor-name="external-storage"><?php p($l->t('External storage')); ?></h2>
<?php if (isset($_['dependencies']) and ($_['dependencies']<>'') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?>
<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'>
<thead>
Expand Down
2 changes: 1 addition & 1 deletion apps/twofactor_backupcodes/templates/personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
?>

<div class="section">
<h2><?php p($l->t('Second-factor backup codes')); ?></h2>
<h2 data-anchor-name="second-factor-backup-codes"><?php p($l->t('Second-factor backup codes')); ?></h2>
<div id="twofactor-backupcodes-settings"></div>
</div>
3 changes: 3 additions & 0 deletions settings/css/settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ input#openid, input#webdav { width:20em; }
.nav-icon-second-factor-backup-codes {
background-image: url('../img/password.svg?v=1');
}
.nav-icon-ssl-root-certificate {
background-image: url('../img/password.svg?v=1');
}

#avatarform {
min-width: 145px;
Expand Down
9 changes: 7 additions & 2 deletions settings/personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,13 @@
if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
$sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
$sectionName = str_replace('</h2>', '', $sectionName);
$anchor = strtolower($sectionName);
$anchor = str_replace(' ', '-', $anchor);
if (strpos($regs['class'], 'data-anchor-name') !== false) {
preg_match('%.*data-anchor-name="(?P<anchor>[^"]*)"%i', $regs['class'], $matches);
$anchor = $matches['anchor'];
} else {
$anchor = strtolower($sectionName);
$anchor = str_replace(' ', '-', $anchor);
}

return array(
'anchor' => $anchor,
Expand Down
2 changes: 1 addition & 1 deletion settings/templates/certificates.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="section">
<h2><?php p($l->t('SSL Root Certificates')); ?></h2>
<h2 data-anchor-name="ssl-root-certificate"><?php p($l->t('SSL Root Certificates')); ?></h2>
<table id="sslCertificate" class="grid" data-type="<?php p($_['type']); ?>">
<thead>
<tr>
Expand Down