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
3c650156
Commit
3c650156
authored
Dec 13, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ux: refactoring login page change
parent
aa4f1fa9
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
24 deletions
+21
-24
public/app/core/components/Login/Login.tsx
+2
-2
public/app/core/controllers/invited_ctrl.ts
+11
-0
public/app/core/controllers/reset_password_ctrl.ts
+1
-1
public/app/core/controllers/signup_ctrl.ts
+1
-1
public/app/partials/signup_invited.html
+6
-20
No files found.
public/app/core/components/Login/Login.tsx
View file @
3c650156
import
React
,
{
Component
}
from
'react'
;
import
React
,
{
Component
}
from
'react'
;
const
elementsInWidth
=
22
;
const
elementRows
=
50
;
...
...
@@ -55,7 +55,7 @@ export class Login extends Component {
<
login
-
bg
>
<
login
-
bg
-
fx
/>
<
BgElements
flipIndex=
{
this
.
state
.
flipIndex
}
/>
</
login
-
bg
login
-
box
>
</
login
-
bg
>
);
}
}
...
...
public/app/core/controllers/invited_ctrl.ts
View file @
3c650156
...
...
@@ -8,6 +8,17 @@ export class InvitedCtrl {
contextSrv
.
sidemenu
=
false
;
$scope
.
formModel
=
{};
$scope
.
navModel
=
{
main
:
{
icon
:
'gicon gicon-branding'
,
subTitle
:
'Register your Grafana account'
,
breadcrumbs
:
[
{
title
:
'Login'
,
url
:
'/login'
},
{
title
:
'Invite'
},
]
}
};
$scope
.
init
=
function
()
{
backendSrv
.
get
(
'/api/user/invite/'
+
$routeParams
.
code
).
then
(
function
(
invite
)
{
$scope
.
formModel
.
name
=
invite
.
name
;
...
...
public/app/core/controllers/reset_password_ctrl.ts
View file @
3c650156
...
...
@@ -19,7 +19,7 @@ export class ResetPasswordCtrl {
icon
:
'gicon gicon-branding'
,
subTitle
:
'Reset your Grafana password'
,
breadcrumbs
:
[
{
title
:
'Login'
,
ur
i
:
'/login'
},
{
title
:
'Login'
,
ur
l
:
'/login'
},
{
title
:
'Reset Password'
},
]
}
...
...
public/app/core/controllers/signup_ctrl.ts
View file @
3c650156
...
...
@@ -31,7 +31,7 @@ export class SignUpCtrl {
icon
:
'gicon gicon-branding'
,
subTitle
:
'Register your Grafana account'
,
breadcrumbs
:
[
{
title
:
'Login'
,
ur
i
:
'/login'
},
{
title
:
'Login'
,
ur
l
:
'/login'
},
{
title
:
'Sign Up'
},
]
}
...
...
public/app/partials/signup_invited.html
View file @
3c650156
<
div
class=
"login-container container"
>
<
page-header
model=
"navModel"
></page-header
>
<div
class=
"signup-page-background"
>
</div>
<div
class=
"login-content"
>
<div
class=
"login-branding"
>
<img
class=
"logo-icon"
src=
"public/img/grafana_icon.svg"
alt=
"Grafana"
/>
<i
class=
"icon-gf icon-gf-grafana_wordmark"
></i>
</div>
<div
class=
"invite-box"
>
<h3>
Hello {{greeting}}.
</h3>
<div
class=
"page-container page-body"
>
<h3
class=
"page-sub-heading"
>
Hello {{greeting}}.
</h3>
<div
class=
"modal-tagline p-b-2"
>
<em>
{{invitedBy}}
</em>
has invited you to join Grafana and the organization
<span
class=
"highlight-word"
>
{{contextSrv.user.orgName}}
</span></br>
Please complete the following to accept your invitation and continue:
...
...
@@ -42,13 +30,11 @@
</div>
<div
class=
"gf-form-button-row"
>
<button
type=
"submit"
class=
"btn btn-inverse"
ng-click=
"submit();"
ng-class=
"{'btn-inverse': !inviteForm.$valid, 'btn-primary': inviteForm.$valid}
"
>
Continue
<button
type=
"submit"
class=
"btn btn-success"
ng-click=
"submit();"
ng-disable=
"!inviteForm.$valid
"
>
Sign Up
</button>
</div>
</form>
</div>
</div>
</div>
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