Merge pull request #2013 from michaelbukachi/bootstrap4

Minor UI fixes

examples/bootstrap4/app.py

@@ -26,6 +26,7 @@ class User(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.Unicode(64))
     email = db.Column(db.Unicode(64))
+    active = db.Column(db.Boolean, default=True)
 
     def __unicode__(self):
         return self.name

flask_admin/templates/bootstrap4/admin/base.html

@@ -87,6 +87,7 @@
     <script src="{{ admin_static.url(filename='vendor/bootstrap4/dropdown.js', v='4.3.1') }}" type="text/javascript"></script>
     <script src="{{ admin_static.url(filename='vendor/select2/select2.min.js', v='4.2.1') }}"
             type="text/javascript"></script>
+    <script src="{{ admin_static.url(filename='admin/js/helpers.js', v='1.0.0') }}" type="text/javascript"></script>
     {% if admin_view.extra_js %}
         {% for js_url in admin_view.extra_js %}
             <script src="{{ js_url }}" type="text/javascript"></script>

flask_admin/templates/bootstrap4/admin/lib.html

@@ -120,7 +120,7 @@
   {% set prepend = kwargs.pop('prepend', None) %}
   {% set append = kwargs.pop('append', None) %}
   <div class="form-group {{ kwargs.get('column_class', '') }}">
-    <label for="{{ field.id }}" class="control-label">{{ field.label.text }}
+    <label for="{{ field.id }}" class="control-label" {% if field.widget.input_type == 'checkbox' %}style="display: block"{% endif %}>{{ field.label.text }}
         {% if h.is_required_form_field(field) %}
           <strong style="color: red">&#42;</strong>
         {%- else -%}
@@ -135,7 +135,11 @@
       </div>
       {%- endif -%}
     {% endif %}
-      {% set _class = kwargs.setdefault('class', 'form-control') %}
+      {% if field.widget.input_type == 'checkbox' %}
+        {% set _class = kwargs.setdefault('class', 'form-control-lg') %}
+      {% else %}
+        {% set _class = kwargs.setdefault('class', 'form-control') %}
+      {% endif %}
       {%- if direct_error %} {% set _ = kwargs.update({'class': kwargs['class'] ~ ' is-invalid'}) %} {% endif -%}
       {{ field(**kwargs) | safe }}
       {%- if append -%}

flask_admin/templates/bootstrap4/admin/model/row_actions.html

@@ -31,7 +31,7 @@
   {% elif csrf_token %}
   <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
   {% endif %}
-  <button onclick="return safeConfirm('{{ _gettext('Are you sure you want to delete this record?') }}');" title="{{ _gettext('Delete record') }}">
+  <button onclick="return faHelpers.safeConfirm('{{ _gettext('Are you sure you want to delete this record?') }}');" title="{{ _gettext('Delete record') }}">
     <span class="fa fa-trash glyphicon glyphicon-trash"></span>
   </button>
 </form>