user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ldap/master'

Browse Source 
# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py
This commit is contained in:
Ozzieisaacs
2020-04-05 17:31:41 +02:00
parent 587174b771 b782489a8c
commit 8bee424cc0
7 changed files with 187 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cps/templates/admin.html
View File

@@ -35,7 +35,12 @@
{% endif %}
{% endfor %}
</table>
<div class="btn btn-default" id="admin_new_user"><a href="{{url_for('admin.new_user')}}">{{_('Add New User')}}</a></div>
{% if not (config.config_login_type == 1) %}
<div class="btn btn-default" id="admin_new_user"><a href="{{url_for('admin.new_user')}}">{{_('Add New User')}}</a></div>
{% else %}
<div class="btn btn-default" id="import_ldap_users">{{_('Import LDAP Users')}}</div>
<!--a href="#" id="import_ldap_users" name="import_ldap_users"><button type="submit" class="btn btn-default">{{_('Import LDAP Users')}}</button></a-->
{% endif %}
</div>
</div>