IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Edit UI text (#32450)

Browse Source 
* UI text edits

* Update index.go
This commit is contained in:
Diana Payton 2021-03-29 11:30:11 -07:00 committed by GitHub
parent cf329f53b2
commit 4bf97e9f59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/api/index.go
View File

@ -33,7 +33,7 @@ func (hs *HTTPServer) getProfileNode(c *models.ReqContext) *dtos.NavLink {
if setting.AddChangePasswordLink() { if setting.AddChangePasswordLink() {
children = append(children, &dtos.NavLink{ children = append(children, &dtos.NavLink{
Text: "Change Password", Id: "change-password", Url: hs.Cfg.AppSubURL + "/profile/password", Text: "Change password", Id: "change-password", Url: hs.Cfg.AppSubURL + "/profile/password",
Icon: "lock", HideFromMenu: true, Icon: "lock", HideFromMenu: true,
}) })
} }
@ -170,7 +170,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto
navTree = append(navTree, &dtos.NavLink{ navTree = append(navTree, &dtos.NavLink{
Text: "Dashboards", Text: "Dashboards",
Id: "dashboards", Id: "dashboards",
SubTitle: "Manage dashboards & folders", SubTitle: "Manage dashboards and folders",
Icon: "apps", Icon: "apps",
Url: hs.Cfg.AppSubURL + "/", Url: hs.Cfg.AppSubURL + "/",
SortWeight: dtos.WeightDashboard, SortWeight: dtos.WeightDashboard,
@ -194,7 +194,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto
if setting.AlertingEnabled && (c.OrgRole == models.ROLE_ADMIN || c.OrgRole == models.ROLE_EDITOR) { if setting.AlertingEnabled && (c.OrgRole == models.ROLE_ADMIN || c.OrgRole == models.ROLE_EDITOR) {
alertChildNavs := []*dtos.NavLink{ alertChildNavs := []*dtos.NavLink{
{Text: "Alert Rules", Id: "alert-list", Url: hs.Cfg.AppSubURL + "/alerting/list", Icon: "list-ul"}, {Text: "Alert rules", Id: "alert-list", Url: hs.Cfg.AppSubURL + "/alerting/list", Icon: "list-ul"},
{ {
Text: "Notification channels", Id: "channels", Url: hs.Cfg.AppSubURL + "/alerting/notifications", Text: "Notification channels", Id: "channels", Url: hs.Cfg.AppSubURL + "/alerting/notifications",
Icon: "comment-alt-share", Icon: "comment-alt-share",
@ -203,7 +203,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto
navTree = append(navTree, &dtos.NavLink{ navTree = append(navTree, &dtos.NavLink{
Text: "Alerting", Text: "Alerting",
SubTitle: "Alert rules & notifications", SubTitle: "Alert rules and notifications",
Id: "alerting", Id: "alerting",
Icon: "bell", Icon: "bell",
Url: hs.Cfg.AppSubURL + "/alerting/list", Url: hs.Cfg.AppSubURL + "/alerting/list",
@ -222,7 +222,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto
if c.OrgRole == models.ROLE_ADMIN { if c.OrgRole == models.ROLE_ADMIN {
configNodes = append(configNodes, &dtos.NavLink{ configNodes = append(configNodes, &dtos.NavLink{
Text: "Data Sources", Text: "Data sources",
Icon: "database", Icon: "database",
Description: "Add and configure data sources", Description: "Add and configure data sources",
Id: "datasources", Id: "datasources",
@ -264,7 +264,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto
Url: hs.Cfg.AppSubURL + "/org", Url: hs.Cfg.AppSubURL + "/org",
}) })
configNodes = append(configNodes, &dtos.NavLink{ configNodes = append(configNodes, &dtos.NavLink{
Text: "API Keys", Text: "API keys",
Id: "apikeys", Id: "apikeys",
Description: "Create & manage API keys", Description: "Create & manage API keys",
Icon: "key-skeleton-alt", Icon: "key-skeleton-alt",
@ -300,7 +300,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto
navTree = append(navTree, &dtos.NavLink{ navTree = append(navTree, &dtos.NavLink{
Text: "Server Admin", Text: "Server Admin",
SubTitle: "Manage all users & orgs", SubTitle: "Manage all users and orgs",
HideFromTabs: true, HideFromTabs: true,
Id: "admin", Id: "admin",
Icon: "shield", Icon: "shield",

2
public/app/features/expressions/ExpressionQueryEditor.tsx
View File

@ -41,7 +41,7 @@ const upsamplingTypes: Array<SelectableValue<string>> = [
]; ];
const mathPlaceholder = const mathPlaceholder =
'Math operations on one more queries, you reference the query by ${refId} ie. $A, $B, $C etc\n' + 'Math operations on one more queries, you reference the query by ${refId}, such as $A, $B, $C etc\n' +
'Example: $A + $B\n' + 'Example: $A + $B\n' +
'Available functions: abs(), log(), nan(), inf(), null()'; 'Available functions: abs(), log(), nan(), inf(), null()';

2
public/app/features/folders/components/NewDashboardsFolder.tsx
View File

@ -46,7 +46,7 @@ export class NewDashboardsFolder extends PureComponent<Props> {
return ( return (
<Page navModel={this.props.navModel}> <Page navModel={this.props.navModel}>
<Page.Contents> <Page.Contents>
<h3>New Dashboard Folder</h3> <h3>New dashboard folder</h3>
<Form defaultValues={initialFormModel} onSubmit={this.onSubmit}> <Form defaultValues={initialFormModel} onSubmit={this.onSubmit}>
{({ register, errors }) => ( {({ register, errors }) => (
<> <>