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
dceac3aa
Commit
dceac3aa
authored
Feb 20, 2018
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: fixes to signup flow, fixes #9816
parent
69ccbffa
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
29 deletions
+26
-29
public/app/core/controllers/invited_ctrl.ts
+1
-1
public/app/core/controllers/signup_ctrl.ts
+7
-0
public/app/features/org/partials/select_org.html
+10
-28
public/app/features/org/select_org_ctrl.ts
+8
-0
No files found.
public/app/core/controllers/invited_ctrl.ts
View file @
dceac3aa
...
...
@@ -12,7 +12,7 @@ export class InvitedCtrl {
icon
:
'gicon gicon-branding'
,
text
:
'Invite'
,
subTitle
:
'Register your Grafana account'
,
breadcrumbs
:
[{
title
:
'Login'
,
url
:
'
/
login'
}],
breadcrumbs
:
[{
title
:
'Login'
,
url
:
'login'
}],
},
};
...
...
public/app/core/controllers/signup_ctrl.ts
View file @
dceac3aa
...
...
@@ -10,6 +10,13 @@ export class SignUpCtrl {
$scope
.
formModel
=
{};
var
params
=
$location
.
search
();
// validate email is semi ok
if
(
params
.
email
&&
!
params
.
email
.
match
(
/^
\S
+@
\S
+$/
))
{
console
.
log
(
'invalid email'
);
return
;
}
$scope
.
formModel
.
orgName
=
params
.
email
;
$scope
.
formModel
.
email
=
params
.
email
;
$scope
.
formModel
.
username
=
params
.
email
;
...
...
public/app/features/org/partials/select_org.html
View file @
dceac3aa
<
div
class=
"container"
>
<
page-header
model=
"navModel"
></page-header
>
<div
class=
"signup-page-background"
>
</div>
<div
class=
"login-content"
>
<div
class=
"login-branding"
>
<img
src=
"img/logo_transparent_200x75.png"
>
</div>
<div
class=
"page-container page-body"
>
<div
class=
"invite-box"
>
<h3>
<i
class=
"fa fa-users"
></i>
Change active organization
</h3>
<div
class=
"signup"
>
<div
class=
"login-form"
>
<div
class=
"modal-tagline"
>
You have been added to another Organization
<br>
due to an open invitation!
<br><br>
You have been added to another Organization due to an open invitation!
Please select which organization you want to
<br>
use right now (you can change this later at any time).
</div>
<div
style=
"display: inline-block; width: 400px; margin: 30px 0"
>
<table
class=
"filter-table"
>
<tr
ng-repeat=
"org in orgs"
>
<td
class=
"nobg max-width-btns"
>
<a
ng-click=
"setUsingOrg(org)"
class=
"btn btn-inverse"
>
{{org.name}} ({{org.role}})
</a>
</td>
</tr>
</table>
<div
ng-repeat=
"org in orgs"
>
<a
ng-click=
"setUsingOrg(org)"
class=
"btn btn-success"
>
{{org.name}} ({{org.role}})
</a>
</div>
</div>
</div>
</div>
</div>
public/app/features/org/select_org_ctrl.ts
View file @
dceac3aa
...
...
@@ -6,6 +6,14 @@ export class SelectOrgCtrl {
constructor
(
$scope
,
backendSrv
,
contextSrv
)
{
contextSrv
.
sidemenu
=
false
;
$scope
.
navModel
=
{
main
:
{
icon
:
'gicon gicon-branding'
,
subTitle
:
'Preferences'
,
text
:
'Select active organization'
,
},
};
$scope
.
init
=
function
()
{
$scope
.
getUserOrgs
();
};
...
...
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