Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
flask-admin
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Python-Dev
flask-admin
Commits
8e11da2c
Commit
8e11da2c
authored
Jul 14, 2018
by
Ryan Beymer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
flask-admin/flask-admin#1486 - fix loading issue with popper, fix floats
parent
80ff3fcc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
base.html
flask_admin/templates/bootstrap4/admin/base.html
+2
-2
inline_list_base.html
...in/templates/bootstrap4/admin/model/inline_list_base.html
+2
-2
layout.html
flask_admin/templates/bootstrap4/admin/model/layout.html
+4
-4
No files found.
flask_admin/templates/bootstrap4/admin/base.html
View file @
8e11da2c
...
...
@@ -68,10 +68,10 @@
{% block tail_js %}
<script
src=
"{{ admin_static.url(filename='vendor/jquery-3.3.1.slim.min.js', v='2.1.4') }}"
type=
"text/javascript"
></script>
<script
src=
"{{ admin_static.url(filename='bootstrap/bootstrap4/bootstrap.min.js', v='4.1.2') }}"
type=
"text/javascript"
></script>
<script
src=
"{{ admin_static.url(filename='bootstrap/bootstrap4/popper.min.js') }}"
type=
"text/javascript"
></script>
<script
src=
"{{ admin_static.url(filename='bootstrap/bootstrap4/bootstrap.min.js', v='4.1.2') }}"
type=
"text/javascript"
></script>
<script
src=
"{{ admin_static.url(filename='vendor/moment.min.js', v='2.9.0') }}"
type=
"text/javascript"
></script>
<script
src=
"{{ admin_static.url(filename='vendor/select2/select2.min.js', v='3.5.2') }}"
type=
"text/javascript"
></script>
<script
src=
"{{ admin_static.url(filename='vendor/select2/select2.min.js', v='3.5.2') }}"
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/model/inline_list_base.html
View file @
8e11da2c
...
...
@@ -8,7 +8,7 @@
<legend>
<small>
{{ field.label.text }} #{{ loop.index }}
<div
class=
"
pull
-right"
>
<div
class=
"
float
-right"
>
{% if subfield.get_pk and subfield.get_pk() %}
<input
type=
"checkbox"
name=
"del-{{ subfield.id }}"
id=
"del-{{ subfield.id }}"
/>
<label
for=
"del-{{ subfield.id }}"
style=
"display: inline"
>
{{ _gettext('Delete?') }}
</label>
...
...
@@ -33,7 +33,7 @@
<div
class=
"inline-field well well-sm"
>
<legend>
<small>
{{ _gettext('New') }} {{ field.label.text }}
</small>
<div
class=
"
pull
-right"
>
<div
class=
"
float
-right"
>
<a
href=
"javascript:void(0)"
class=
"inline-remove-field"
>
<span
class=
"fas fa-times"
></span>
</a>
...
...
flask_admin/templates/bootstrap4/admin/model/layout.html
View file @
8e11da2c
{% macro filter_options(btn_class='dropdown-toggle') %}
<
a
class=
"{{ btn_class }}"
data-toggle=
"dropdown"
href=
"javascript:void(0)
"
>
{{ _gettext('Add Filter') }}
<b
class=
"caret"
></b>
</
a
>
<
button
class=
"btn {{ btn_class }}"
type=
"button"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false
"
>
{{ _gettext('Add Filter') }}
</
button
>
<ul
class=
"dropdown-menu field-filters"
>
{% for k in filter_groups %}
<li
class=
"dropdown-item"
>
...
...
@@ -46,7 +46,7 @@
{% if page_size != default_page_size %}
<input
type=
"hidden"
name=
"page_size"
value=
"{{ page_size }}"
>
{% endif %}
<div
class=
"
pull
-right"
>
<div
class=
"
float
-right"
>
<button
type=
"submit"
class=
"btn btn-primary"
style=
"display: none"
>
{{ _gettext('Apply') }}
</button>
{% if active_filters %}
<a
href=
"{{ clear_search_url }}"
class=
"btn btn-secondary"
>
{{ _gettext('Reset Filters') }}
</a>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment