Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 15:35:49 +01:00
Code Issues Packages Projects Releases Activity

updated user navigation

Browse Source
This commit is contained in:
Florian Scholdei
2019-01-18 09:51:27 +01:00
parent 68302fef92
commit af164d31f4
4 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scm-ui/public/locales/en/users.json
View File

@@ -26,12 +26,6 @@
"cancel": "No" "cancel": "No"
} }
}, },
"edit-user-button": {
"label": "Edit"
},
"set-password-button": {
"label": "Set password"
},
"user-form": { "user-form": {
"submit": "Submit" "submit": "Submit"
}, },
@@ -42,10 +36,10 @@
"single-user": { "single-user": {
"error-title": "Error", "error-title": "Error",
"error-subtitle": "Unknown user error", "error-subtitle": "Unknown user error",
"navigation-label": "Navigation", "navigationLabel": "User Navigation",
"actions-label": "Actions", "informationNavLink": "Information",
"information-label": "Information", "editNavLink": "Edit",
"back-label": "Back" "setPasswordNavLink": "Set password"
}, },
"validation": { "validation": {
"mail-invalid": "This email is invalid", "mail-invalid": "This email is invalid",

2
scm-ui/src/users/components/navLinks/EditUserNavLink.js
View File

@@ -17,7 +17,7 @@ class EditUserNavLink extends React.Component<Props> {
if (!this.isEditable()) { if (!this.isEditable()) {
return null; return null;
} }
return <NavLink label={t("edit-user-button.label")} to={editUrl} />; return <NavLink label={t("single-user.editNavLink")} to={editUrl} />;
} }
isEditable = () => { isEditable = () => {

2
scm-ui/src/users/components/navLinks/SetPasswordNavLink.js
View File

@@ -17,7 +17,7 @@ class ChangePasswordNavLink extends React.Component<Props> {
if (!this.hasPermissionToSetPassword()) { if (!this.hasPermissionToSetPassword()) {
return null; return null;
} }
return <NavLink label={t("set-password-button.label")} to={passwordUrl} />; return <NavLink label={t("single-user.setPasswordNavLink")} to={passwordUrl} />;
} }
hasPermissionToSetPassword = () => { hasPermissionToSetPassword = () => {

8
scm-ui/src/users/containers/SingleUser.js
View File

@@ -109,10 +109,10 @@ class SingleUser extends React.Component<Props> {
</div> </div>
<div className="column"> <div className="column">
<Navigation> <Navigation>
<Section label={t("single-user.navigation-label")}> <Section label={t("single-user.navigationLabel")}>
<NavLink <NavLink
to={`${url}`} to={`${url}`}
label={t("single-user.information-label")} label={t("single-user.informationNavLink")}
/> />
<EditUserNavLink user={user} editUrl={`${url}/edit`} /> <EditUserNavLink user={user} editUrl={`${url}/edit`} />
<SetPasswordNavLink <SetPasswordNavLink
@@ -120,10 +120,6 @@ class SingleUser extends React.Component<Props> {
passwordUrl={`${url}/password`} passwordUrl={`${url}/password`}
/> />
</Section> </Section>
<Section label={t("single-user.actions-label")}>
<DeleteUserNavLink user={user} deleteUser={this.deleteUser} />
<NavLink to="/users" label={t("single-user.back-label")} />
</Section>
</Navigation> </Navigation>
</div> </div>
</div> </div>