From 4ac652b1276fedf4415b60ed2663b1d4804cb45c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 19 Jul 2015 12:34:03 +0200 Subject: [PATCH] feat(invite): began work on invited signup view, also added backdrop to login view, #2353 --- pkg/api/api.go | 2 + public/app/controllers/all.js | 1 + public/app/controllers/invitedCtrl.js | 19 +++++ public/app/partials/login.html | 2 + public/app/partials/signup_invited.html | 89 ++++++++++++++++++++++++ public/app/routes/all.js | 4 ++ public/css/less/grafana.less | 16 +++++ public/css/less/login.less | 13 +++- public/img/background_tease.jpg | Bin 0 -> 177485 bytes 9 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 public/app/controllers/invitedCtrl.js create mode 100644 public/app/partials/signup_invited.html create mode 100644 public/img/background_tease.jpg diff --git a/pkg/api/api.go b/pkg/api/api.go index b41100e80ed..a0e136ffd8c 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -22,6 +22,7 @@ func Register(r *macaron.Macaron) { r.Post("/login", bind(dtos.LoginCommand{}), wrap(LoginPost)) r.Get("/login/:name", OAuthLogin) r.Get("/login", LoginView) + r.Get("/signup/invited", Index) // authed views r.Get("/profile/", reqSignedIn, Index) @@ -39,6 +40,7 @@ func Register(r *macaron.Macaron) { r.Get("/dashboard/*", reqSignedIn, Index) // sign up + r.Get("/signup", Index) r.Post("/api/user/signup", bind(m.CreateUserCommand{}), wrap(SignUp)) // reset password diff --git a/public/app/controllers/all.js b/public/app/controllers/all.js index 99b9a496484..500feea3516 100644 --- a/public/app/controllers/all.js +++ b/public/app/controllers/all.js @@ -6,6 +6,7 @@ define([ './inspectCtrl', './jsonEditorCtrl', './loginCtrl', + './invitedCtrl', './resetPasswordCtrl', './sidemenuCtrl', './errorCtrl', diff --git a/public/app/controllers/invitedCtrl.js b/public/app/controllers/invitedCtrl.js new file mode 100644 index 00000000000..7fe7dde7054 --- /dev/null +++ b/public/app/controllers/invitedCtrl.js @@ -0,0 +1,19 @@ +define([ + 'angular', +], +function (angular) { + 'use strict'; + + var module = angular.module('grafana.controllers'); + + module.controller('InvitedCtrl', function($scope, contextSrv) { + + contextSrv.sidemenu = false; + + $scope.init = function() { + }; + + $scope.init(); + + }); +}); diff --git a/public/app/partials/login.html b/public/app/partials/login.html index a5894866d5a..f311c929b66 100644 --- a/public/app/partials/login.html +++ b/public/app/partials/login.html @@ -1,4 +1,6 @@
+