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

feat(config): changed name of allow_user_login_pass to disable_login_form, changed the section of the config option to [auth], impacts merged PR #5423

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-09-28 15:27:08 +02:00
parent 3e657357e5
commit 2750c8a801
7 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ function (angular, _, coreModule, config) {
$scope.oauth = config.oauth;
$scope.oauthEnabled = _.keys(config.oauth).length > 0;
$scope.allowUserPassLogin = config.allowUserPassLogin;
$scope.disableLoginForm = config.disableLoginForm;
$scope.disableUserSignUp = config.disableUserSignUp;
$scope.loginHint = config.loginHint;

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

@@ -17,7 +17,7 @@
</button>
</div>
<form name="loginForm" class="login-form gf-form-group" ng-show="allowUserPassLogin">
<form name="loginForm" class="login-form gf-form-group" ng-hide="disableLoginForm">
<div class="gf-form" ng-if="loginMode">
<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}}>
@@ -40,7 +40,7 @@
</form>
<div ng-if="loginMode">
<div class="text-center login-divider" ng-show="oauthEnabled && allowUserPassLogin">
<div class="text-center login-divider" ng-show="oauthEnabled && !disableLoginForm">
<div class="login-divider-line">
<span class="login-divider-text">
Or login with
@@ -71,7 +71,7 @@
<div class="clearfix"></div>
<div class="text-center password-recovery" ng-show="allowUserPassLogin">
<div class="text-center password-recovery" ng-hide="disableLoginForm">
<div class="text-center">
<a href="user/password/send-reset-email">
Forgot your password?