Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
a54df0c3
Unverified
Commit
a54df0c3
authored
Sep 04, 2020
by
Pranit Bauva
Committed by
GitHub
Sep 04, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Login: Honour `root_url` for Forget Password related links (#27368)
Closes #27226
parent
bba47705
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
public/app/core/components/ForgottenPassword/ForgottenPassword.tsx
+3
-1
public/app/core/components/Login/LoginPage.tsx
+3
-1
No files found.
public/app/core/components/ForgottenPassword/ForgottenPassword.tsx
View file @
a54df0c3
...
...
@@ -4,6 +4,8 @@ import { getBackendSrv } from '@grafana/runtime';
import
{
css
}
from
'emotion'
;
import
{
GrafanaTheme
}
from
'@grafana/data'
;
import
config
from
'app/core/config'
;
interface
EmailDTO
{
userOrEmail
:
string
;
}
...
...
@@ -53,7 +55,7 @@ export const ForgottenPassword: FC = () => {
</
Field
>
<
HorizontalGroup
>
<
Button
>
Send reset email
</
Button
>
<
LinkButton
variant=
"link"
href=
"/login"
>
<
LinkButton
variant=
"link"
href=
{
`${config.appSubUrl}/login`
}
>
Back to login
</
LinkButton
>
</
HorizontalGroup
>
...
...
public/app/core/components/Login/LoginPage.tsx
View file @
a54df0c3
...
...
@@ -12,6 +12,8 @@ import { Branding } from 'app/core/components/Branding/Branding';
import
{
HorizontalGroup
,
LinkButton
}
from
'@grafana/ui'
;
import
{
LoginLayout
,
InnerBox
}
from
'./LoginLayout'
;
import
config
from
'app/core/config'
;
const
forgottenPasswordStyles
=
css
`
padding: 0;
margin-top: 4px;
...
...
@@ -51,7 +53,7 @@ export const LoginPage: FC = () => {
<
LinkButton
className=
{
forgottenPasswordStyles
}
variant=
"link"
href=
"/user/password/send-reset-email"
href=
{
`${config.appSubUrl}/user/password/send-reset-email`
}
>
Forgot your password?
</
LinkButton
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment