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

Merge branch 'recreate-4675' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-recreate-4675

Browse Source
This commit is contained in:
bergquist 2016-06-25 15:53:42 +02:00
commit 092b6517dc
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/login.go
View File

@ -29,6 +29,7 @@ func LoginView(c *middleware.Context) {
viewData.Settings["githubAuthEnabled"] = setting.OAuthService.GitHub viewData.Settings["githubAuthEnabled"] = setting.OAuthService.GitHub
viewData.Settings["disableUserSignUp"] = !setting.AllowUserSignUp viewData.Settings["disableUserSignUp"] = !setting.AllowUserSignUp
viewData.Settings["loginHint"] = setting.LoginHint viewData.Settings["loginHint"] = setting.LoginHint
viewData.Settings["oauthOnly"] = setting.DisableUserPassLogin
if !tryLoginUsingRememberCookie(c) { if !tryLoginUsingRememberCookie(c) {
c.HTML(200, VIEW_INDEX, viewData) c.HTML(200, VIEW_INDEX, viewData)

16
pkg/setting/setting.go
View File

@ -82,13 +82,14 @@ var (
ExternalEnabled bool ExternalEnabled bool
// User settings // User settings
AllowUserSignUp bool AllowUserSignUp bool
AllowUserOrgCreate bool AllowUserOrgCreate bool
AutoAssignOrg bool AutoAssignOrg bool
AutoAssignOrgRole string AutoAssignOrgRole string
VerifyEmailEnabled bool VerifyEmailEnabled bool
LoginHint string LoginHint string
DefaultTheme string DefaultTheme string
DisableUserPassLogin bool
// Http auth // Http auth
AdminUser string AdminUser string
@ -485,6 +486,7 @@ func NewConfigContext(args *CommandLineArgs) error {
VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false) VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false)
LoginHint = users.Key("login_hint").String() LoginHint = users.Key("login_hint").String()
DefaultTheme = users.Key("default_theme").String() DefaultTheme = users.Key("default_theme").String()
DisableUserPassLogin = users.Key("disable_user_pass_login").MustBool(false)
// anonymous access // anonymous access
AnonymousEnabled = Cfg.Section("auth.anonymous").Key("enabled").MustBool(false) AnonymousEnabled = Cfg.Section("auth.anonymous").Key("enabled").MustBool(false)

1
public/app/core/controllers/login_ctrl.js
View File

@ -18,6 +18,7 @@ function (angular, coreModule, config) {
$scope.googleAuthEnabled = config.googleAuthEnabled; $scope.googleAuthEnabled = config.googleAuthEnabled;
$scope.githubAuthEnabled = config.githubAuthEnabled; $scope.githubAuthEnabled = config.githubAuthEnabled;
$scope.oauthEnabled = config.githubAuthEnabled || config.googleAuthEnabled; $scope.oauthEnabled = config.githubAuthEnabled || config.googleAuthEnabled;
$scope.oauthOnly = config.oauthOnly;
$scope.disableUserSignUp = config.disableUserSignUp; $scope.disableUserSignUp = config.disableUserSignUp;
$scope.loginHint = config.loginHint; $scope.loginHint = config.loginHint;

6
public/app/partials/login.html
View File

@ -17,7 +17,7 @@
</button> </button>
</div> </div>
<form name="loginForm" class="login-form gf-form-group"> <form name="loginForm" class="login-form gf-form-group" ng-if="!oauthOnly">
<div class="gf-form" ng-if="loginMode"> <div class="gf-form" ng-if="loginMode">
<span class="gf-form-label width-7">User</span> <span class="gf-form-label width-7">User</span>
<input type="text" name="username" class="gf-form-input max-width-14" required ng-model='formModel.user' placeholder={{loginHint}}> <input type="text" name="username" class="gf-form-input max-width-14" required ng-model='formModel.user' placeholder={{loginHint}}>
@ -40,7 +40,7 @@
</form> </form>
<div ng-if="loginMode"> <div ng-if="loginMode">
<div class="text-center login-divider" ng-if="oauthEnabled"> <div class="text-center login-divider" ng-if="oauthEnabled && !oauthOnly">
<div class="login-divider-line"> <div class="login-divider-line">
<span class="login-divider-text"> <span class="login-divider-text">
Or login with Or login with
@ -64,7 +64,7 @@
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="text-center password-recovery"> <div class="text-center password-recovery" ng-if="!oauthOnly">
<div class="text-center"> <div class="text-center">
<a href="user/password/send-reset-email"> <a href="user/password/send-reset-email">
Forgot your password? Forgot your password?