Fix help icons

This commit is contained in:
René Pfeuffer
2019-01-25 12:32:19 +01:00
parent 3a44193459
commit 6f97bd56d3
3 changed files with 33 additions and 11 deletions

View File

@@ -91,10 +91,9 @@
"group": "Group", "group": "Group",
"error-title": "Error", "error-title": "Error",
"error-subtitle": "Unknown permissions error", "error-subtitle": "Unknown permissions error",
"name": "User or Group", "name": "User or group",
"role": "Role", "role": "Role",
"permissions": "Permissions", "permissions": "Permissions",
"permissions-help": "Use this to specify your own set of permissions regardless of predefined roles",
"group-permission": "Group Permission", "group-permission": "Group Permission",
"user-permission": "User Permission", "user-permission": "User Permission",
"edit-permission": { "edit-permission": {
@@ -119,9 +118,10 @@
"name-input-invalid": "Permission is not allowed to be empty! If it is not empty, your input name is invalid or it already exists!" "name-input-invalid": "Permission is not allowed to be empty! If it is not empty, your input name is invalid or it already exists!"
}, },
"help": { "help": {
"groupPermissionHelpText": "States if a permission is a group permission.", "groupPermissionHelpText": "States if a permission is a group permission. iF this is not checked, it is a user permission.",
"nameHelpText": "Manage permissions for a specific user or group", "nameHelpText": "Manage permissions for a specific user or group",
"roleHelpText": "READ = read; WRITE = read and write; OWNER = read, write and also the ability to manage the properties and permissions" "roleHelpText": "READ = read; WRITE = read and write; OWNER = read, write and also the ability to manage the properties and permissions",
"permissionsHelpText": "Use this to specify your own set of permissions regardless of predefined roles"
}, },
"autocomplete": { "autocomplete": {
"no-group-options": "No group suggestion available", "no-group-options": "No group suggestion available",

View File

@@ -199,7 +199,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
<div className="column is-half"> <div className="column is-half">
<LabelWithHelpIcon <LabelWithHelpIcon
label={t("permission.permissions")} label={t("permission.permissions")}
helpText={t("permission.permissions.help")} helpText={t("permission.help.permissionsHelpText")}
/> />
<Button <Button
label={t("permission.advanced-button.label")} label={t("permission.advanced-button.label")}

View File

@@ -21,7 +21,11 @@ import {
modifyPermissionReset, modifyPermissionReset,
deletePermissionReset deletePermissionReset
} from "../modules/permissions"; } from "../modules/permissions";
import { Loading, ErrorPage } from "@scm-manager/ui-components"; import {
Loading,
ErrorPage,
LabelWithHelpIcon
} from "@scm-manager/ui-components";
import type { import type {
AvailableRepositoryPermissions, AvailableRepositoryPermissions,
Permission, Permission,
@@ -142,12 +146,30 @@ class Permissions extends React.Component<Props> {
<table className="has-background-light table is-hoverable is-fullwidth"> <table className="has-background-light table is-hoverable is-fullwidth">
<thead> <thead>
<tr> <tr>
<th>{t("permission.name")}</th> <th>
<th className="is-hidden-mobile"> <LabelWithHelpIcon
{t("permission.group-permission")} label={t("permission.name")}
helpText={t("permission.help.nameHelpText")}
/>
</th>
<th className="is-hidden-mobile">
<LabelWithHelpIcon
label={t("permission.group-permission")}
helpText={t("permission.help.groupPermissionHelpText")}
/>
</th>
<th>
<LabelWithHelpIcon
label={t("permission.role")}
helpText={t("permission.help.roleHelpText")}
/>
</th>
<th>
<LabelWithHelpIcon
label={t("permission.permissions")}
helpText={t("permission.help.permissionsHelpText")}
/>
</th> </th>
<th>{t("permission.role")}</th>
<th>{t("permission.permissions")}</th>
<th /> <th />
</tr> </tr>
</thead> </thead>