Merge branch 'master' into Develop

# Conflicts: # cps/ub.py
2020-05-13 20:03:54 +02:00
parent 0cc2b49296 ac37483d47
commit 273572f44c
3 changed files with 8 additions and 1 deletions
@@ -47,6 +47,7 @@
    <a href="{{ url_for('admin.admin') }}" id="back" class="btn btn-default">{{_('Cancel')}}</a>
  </form>
    {% if g.allow_registration %}
+  <div class="col-md-10 col-lg-6">
    <h2>{{_('Allowed Domains (Whitelist)')}}</h2>
    <form id="domain_add_allow" action="{{ url_for('admin.add_domain',allow=1)}}" method="POST">
    <div class="form-group required">
@@ -81,6 +82,7 @@
    </div>
    <button id="domain_deny_submit" class="btn btn-default">{{_('Add')}}</button>
    </form>
+    </div>

    {% endif %}
 </div>