cwinfo/powerdns-admin
4
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2025-06-14 12:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into new_ui

Browse Source 
- Fixed conflicts in login.html
- Fixed bug that would switch auth_method after the first failed login
attempt.
This commit is contained in:
Ivan Filippov
2016-04-29 12:26:10 -06:00
parent 8c7110b820 283822eef0
commit 7c5814beed
4 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/templates/login.html
View File

@ -27,7 +27,7 @@
<body class="hold-transition login-page">
<div class="login-box">
<div class="login-logo">
<a href="{{ url_for('index') }}"><b>PowerDNS</b>-Admin</a>
<a href="{{ url_for('index') }}">Sign In {{ login_title }}</a>
</div>
<!-- /.login-logo -->
<div class="login-box-body">
@ -56,18 +56,26 @@
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
{% if ldap_enabled %}
{% if ldap_enabled and basic_enabled %}
<div class="form-group">
<select class="form-control" name="auth_method">
<option value="LOCAL">Local Authentication</option>
<option value="LOCAL">LOCAL Authentication</option>
<option value="LDAP">LDAP Authentication</option>
</select>
</div>
{% else %}
<div class="form-group">
<input type="hidden" name="auth_method" value="LOCAL">
{% elif ldap_enabled and not basic_enabled %}
<div class="form-group">
<input type="hidden" name="auth_method" value="LDAP">
</div>
{% endif %}
{% elif basic_enabled and not ldap_enabled %}
<div class="form-group">
<input type="hidden" name="auth_method" value="LOCAL">
</div>
{% else %}
<div class="form-group">
<input type="hidden" name="auth_method" value="LOCAL">
</div>
{% endif %}
<div class="row">
<div class="col-xs-8">