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(login): hide divider if no oath

Browse Source 
closes #3980
This commit is contained in:
bergquist
2016-02-10 10:41:43 +01:00
parent 509b37eb91
commit b469904c7f
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,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.disableUserSignUp = config.disableUserSignUp; $scope.disableUserSignUp = config.disableUserSignUp;
$scope.loginHint = config.loginHint; $scope.loginHint = config.loginHint;
@@ -84,7 +85,5 @@ function (angular, coreModule, config) {
}; };
$scope.init(); $scope.init();
}); });
}); });

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

@@ -63,9 +63,7 @@
</div> </div>
</form> </form>
<div class="clearfix"></div> <div class="text-center login-divider" ng-if="oauthEnabled">
<div class="text-center login-divider">
<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
@@ -75,7 +73,7 @@
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="login-oauth text-center"> <div class="login-oauth text-center" ng-if="oauthEnabled">
<a class="btn btn-large btn-google" href="login/google" target="_self" ng-if="googleAuthEnabled"> <a class="btn btn-large btn-google" href="login/google" target="_self" ng-if="googleAuthEnabled">
<i class="fa fa-google"></i> <i class="fa fa-google"></i>
with Google with Google
@@ -86,6 +84,8 @@
</a> </a>
</div> </div>
<div class="clearfix"></div>
<div class="text-center password-recovery"> <div class="text-center password-recovery">
<div class="text-center"> <div class="text-center">
<a href="user/password/send-reset-email"> <a href="user/password/send-reset-email">

4
public/less/login.less
View File

@@ -88,6 +88,8 @@
} }
.login-oauth { .login-oauth {
margin-bottom: 15px;
.btn { .btn {
margin: 5px; margin: 5px;
} }
@@ -104,7 +106,7 @@
.password-recovery { .password-recovery {
background: @grafanaTargetBackground; background: @grafanaTargetBackground;
margin-top: 30px; margin-top: 10px;
padding: 10px; padding: 10px;
a { a {
color: @grayLight; color: @grayLight;