From aff376f8734c683125aed4993e0d743d3137801a Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Wed, 14 Nov 2018 16:21:54 +0100
Subject: [PATCH] Fixed highlighting of NavLinks in user's profile

---
 scm-ui/public/locales/en/commons.json       |  2 ++
 scm-ui/src/containers/ChangeUserPassword.js |  6 +++---
 scm-ui/src/containers/Profile.js            | 18 ++++++++++++------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/scm-ui/public/locales/en/commons.json b/scm-ui/public/locales/en/commons.json
index 422e8aa8ef..47a8735e5b 100644
--- a/scm-ui/public/locales/en/commons.json
+++ b/scm-ui/public/locales/en/commons.json
@@ -40,10 +40,12 @@
     "previous": "Previous"
   },
   "profile": {
+    "navigation-label": "Navigation",
     "actions-label": "Actions",
     "username": "Username",
     "displayName": "Display Name",
     "mail": "E-Mail",
+    "information": "Information",
     "change-password": "Change password",
     "error-title": "Error",
     "error-subtitle": "Cannot display profile",
diff --git a/scm-ui/src/containers/ChangeUserPassword.js b/scm-ui/src/containers/ChangeUserPassword.js
index 51b1e0a70d..6fa38d470f 100644
--- a/scm-ui/src/containers/ChangeUserPassword.js
+++ b/scm-ui/src/containers/ChangeUserPassword.js
@@ -7,9 +7,9 @@ import {
   PasswordConfirmation,
   SubmitButton
 } from "@scm-manager/ui-components";
-import {translate} from "react-i18next";
-import type {Me} from "@scm-manager/ui-types";
-import {changePassword} from "../modules/changePassword";
+import { translate } from "react-i18next";
+import type { Me } from "@scm-manager/ui-types";
+import { changePassword } from "../modules/changePassword";
 
 type Props = {
   me: Me,
diff --git a/scm-ui/src/containers/Profile.js b/scm-ui/src/containers/Profile.js
index 6117712ebc..b40f5f3ee0 100644
--- a/scm-ui/src/containers/Profile.js
+++ b/scm-ui/src/containers/Profile.js
@@ -2,7 +2,7 @@
 
 import React from "react";
 
-import { NavLink, Route, withRouter } from "react-router-dom";
+import { Route, withRouter } from "react-router-dom";
 import { getMe } from "../modules/auth";
 import { compose } from "redux";
 import { connect } from "react-redux";
@@ -12,7 +12,8 @@ import {
   ErrorPage,
   Page,
   Navigation,
-  Section
+  Section,
+  NavLink
 } from "@scm-manager/ui-components";
 import ChangeUserPassword from "./ChangeUserPassword";
 import ProfileInfo from "./ProfileInfo";
@@ -68,10 +69,15 @@ class Profile extends React.Component<Props, State> {
           </div>
           <div className="column">
             <Navigation>
-              <Section label={t("profile.actions-label")} />
-              <NavLink to={`${url}/password`}>
-                {t("profile.change-password")}
-              </NavLink>
+              <Section label={t("profile.navigation-label")}>
+                <NavLink to={`${url}`} label={t("profile.information")} />
+              </Section>
+              <Section label={t("profile.actions-label")}>
+                <NavLink
+                  to={`${url}/password`}
+                  label={t("profile.change-password")}
+                />
+              </Section>
             </Navigation>
           </div>
         </div>