From d6e7cee60779d85d05264ba360463ab9eabc7d35 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 27 Apr 2017 17:58:41 -0300
Subject: [PATCH] Fix icons in sidebar on personal page

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 apps/encryption/templates/settings-personal.php   | 2 +-
 apps/files_external/css/settings.css              | 4 ++++
 apps/files_external/templates/settings.php        | 2 +-
 apps/twofactor_backupcodes/templates/personal.php | 2 +-
 settings/css/settings.css                         | 3 +++
 settings/personal.php                             | 9 +++++++--
 settings/templates/certificates.php               | 2 +-
 7 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php
index e2bcb6813b..7d0a26eea9 100644
--- a/apps/encryption/templates/settings-personal.php
+++ b/apps/encryption/templates/settings-personal.php
@@ -5,7 +5,7 @@ script('encryption', 'settings-personal');
 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 ): ?>
 
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index 610bc2f0e6..bac89e26b0 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -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');
+}
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 9d8c179dd3..bbd79994e3 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -88,7 +88,7 @@
 ?>
 
 <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>
diff --git a/apps/twofactor_backupcodes/templates/personal.php b/apps/twofactor_backupcodes/templates/personal.php
index 23b06e2305..3076e16a16 100644
--- a/apps/twofactor_backupcodes/templates/personal.php
+++ b/apps/twofactor_backupcodes/templates/personal.php
@@ -7,6 +7,6 @@ style('twofactor_backupcodes', 'style');
 ?>
 
 <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>
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 0a1d4e046f..65709c9578 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -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;
diff --git a/settings/personal.php b/settings/personal.php
index 2c46a9f8dd..6cbcc330cd 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -220,8 +220,13 @@ $formsMap = array_map(function($form){
 	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,
diff --git a/settings/templates/certificates.php b/settings/templates/certificates.php
index 16f8dda31a..ac0a229380 100644
--- a/settings/templates/certificates.php
+++ b/settings/templates/certificates.php
@@ -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>