Commit 3c650156 by Torkel Ödegaard

ux: refactoring login page change

parent aa4f1fa9
import React, { Component } from 'react'; import React, { Component } from 'react';
const elementsInWidth = 22; const elementsInWidth = 22;
const elementRows = 50; const elementRows = 50;
...@@ -55,7 +55,7 @@ export class Login extends Component { ...@@ -55,7 +55,7 @@ export class Login extends Component {
<login-bg> <login-bg>
<login-bg-fx /> <login-bg-fx />
<BgElements flipIndex={this.state.flipIndex} /> <BgElements flipIndex={this.state.flipIndex} />
</login-bglogin-box> </login-bg>
); );
} }
} }
......
...@@ -8,6 +8,17 @@ export class InvitedCtrl { ...@@ -8,6 +8,17 @@ export class InvitedCtrl {
contextSrv.sidemenu = false; contextSrv.sidemenu = false;
$scope.formModel = {}; $scope.formModel = {};
$scope.navModel = {
main: {
icon: 'gicon gicon-branding',
subTitle: 'Register your Grafana account',
breadcrumbs: [
{ title: 'Login', url: '/login' },
{ title: 'Invite' },
]
}
};
$scope.init = function() { $scope.init = function() {
backendSrv.get('/api/user/invite/' + $routeParams.code).then(function(invite) { backendSrv.get('/api/user/invite/' + $routeParams.code).then(function(invite) {
$scope.formModel.name = invite.name; $scope.formModel.name = invite.name;
......
...@@ -19,7 +19,7 @@ export class ResetPasswordCtrl { ...@@ -19,7 +19,7 @@ export class ResetPasswordCtrl {
icon: 'gicon gicon-branding', icon: 'gicon gicon-branding',
subTitle: 'Reset your Grafana password', subTitle: 'Reset your Grafana password',
breadcrumbs: [ breadcrumbs: [
{ title: 'Login', uri: '/login' }, { title: 'Login', url: '/login' },
{ title: 'Reset Password' }, { title: 'Reset Password' },
] ]
} }
......
...@@ -31,7 +31,7 @@ export class SignUpCtrl { ...@@ -31,7 +31,7 @@ export class SignUpCtrl {
icon: 'gicon gicon-branding', icon: 'gicon gicon-branding',
subTitle: 'Register your Grafana account', subTitle: 'Register your Grafana account',
breadcrumbs: [ breadcrumbs: [
{ title: 'Login', uri: '/login' }, { title: 'Login', url: '/login' },
{ title: 'Sign Up' }, { title: 'Sign Up' },
] ]
} }
......
<div class="login-container container"> <page-header model="navModel"></page-header>
<div class="signup-page-background"> <div class="page-container page-body">
</div> <h3 class="page-sub-heading">Hello {{greeting}}.</h3>
<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="modal-tagline p-b-2"> <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: <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 @@ ...@@ -42,13 +30,11 @@
</div> </div>
<div class="gf-form-button-row"> <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}"> <button type="submit" class="btn btn-success" ng-click="submit();" ng-disable="!inviteForm.$valid">
Continue Sign Up
</button> </button>
</div> </div>
</form> </form>
</div>
</div>
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment