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

fix: fixes to signup flow, fixes #9816

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-02-20 13:39:16 +01:00
parent 69ccbffaed
commit dceac3aa71
4 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/controllers/invited_ctrl.ts
View File

@@ -12,7 +12,7 @@ export class InvitedCtrl {
icon: 'gicon gicon-branding', icon: 'gicon gicon-branding',
text: 'Invite', text: 'Invite',
subTitle: 'Register your Grafana account', subTitle: 'Register your Grafana account',
breadcrumbs: [{ title: 'Login', url: '/login' }], breadcrumbs: [{ title: 'Login', url: 'login' }],
}, },
}; };

7
public/app/core/controllers/signup_ctrl.ts
View File

@@ -10,6 +10,13 @@ export class SignUpCtrl {
$scope.formModel = {}; $scope.formModel = {};
var params = $location.search(); 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.orgName = params.email;
$scope.formModel.email = params.email; $scope.formModel.email = params.email;
$scope.formModel.username = params.email; $scope.formModel.username = params.email;

38
public/app/features/org/partials/select_org.html
View File

@@ -1,44 +1,26 @@
<div class="container"> <page-header model="navModel"></page-header>
<div class="signup-page-background"> <div class="page-container page-body">
</div>
<div class="login-content"> <div class="signup">
<div class="login-form">
<div class="login-branding">
<img src="img/logo_transparent_200x75.png">
</div>
<div class="invite-box">
<h3>
<i class="fa fa-users"></i>&nbsp;
Change active organization
</h3>
<div class="modal-tagline"> <div class="modal-tagline">
You have been added to another Organization <br> You have been added to another Organization due to an open invitation!
due to an open invitation!
<br><br>
Please select which organization you want to <br> Please select which organization you want to <br>
use right now (you can change this later at any time). use right now (you can change this later at any time).
</div> </div>
<div style="display: inline-block; width: 400px; margin: 30px 0"> <div style="display: inline-block; width: 400px; margin: 30px 0">
<table class="filter-table"> <div ng-repeat="org in orgs">
<tr ng-repeat="org in orgs"> <a ng-click="setUsingOrg(org)" class="btn btn-success">
<td class="nobg max-width-btns"> {{org.name}} ({{org.role}})
<a ng-click="setUsingOrg(org)" class="btn btn-inverse"> </a>
{{org.name}} ({{org.role}}) </div>
</a>
</td>
</tr>
</table>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

8
public/app/features/org/select_org_ctrl.ts
View File

@@ -6,6 +6,14 @@ export class SelectOrgCtrl {
constructor($scope, backendSrv, contextSrv) { constructor($scope, backendSrv, contextSrv) {
contextSrv.sidemenu = false; contextSrv.sidemenu = false;
$scope.navModel = {
main: {
icon: 'gicon gicon-branding',
subTitle: 'Preferences',
text: 'Select active organization',
},
};
$scope.init = function() { $scope.init = function() {
$scope.getUserOrgs(); $scope.getUserOrgs();
}; };