recordsansible/ara
Code Issues Proposed changes

Unbundle bootstrap.js and use xstatic packaged version

Browse Source 
Change-Id: Ie92325f426ee65ad5636758c73c961cf0da077b4
This commit is contained in:
David Moreau-Simard 2017-04-22 16:51:43 -04:00
parent 5224000f08
commit 7b1c5bf0c7
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ara/config.py
View File

@ -15,6 +15,7 @@
import os
import xstatic.main
import xstatic.pkg.jquery
import xstatic.pkg.bootstrap_scss
from ansible import __version__ as ansible_version
from ansible.constants import get_config
@ -128,5 +129,6 @@ DB_MIGRATIONS = os.path.join(INSTALL_PATH, 'db')
# Xstatic configuration
XSTATIC = dict(
jquery=xstatic.main.XStatic(xstatic.pkg.jquery).base_dir
jquery=xstatic.main.XStatic(xstatic.pkg.jquery).base_dir,
bootstrap=xstatic.main.XStatic(xstatic.pkg.bootstrap_scss).base_dir
)

7
ara/static/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
ara/templates/head.html
View File

@ -12,7 +12,7 @@
{% block scripts %}
<script src="{{ url_for('static.serve', module='jquery', file='jquery.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/jquery.dataTables.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
<script src="{{ url_for('static.serve', module='bootstrap', file='js/bootstrap.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/ara.js') }}"></script>
<script src="{{ url_for('static', filename='js/patternfly.min.js') }}"></script>
{% endblock %}

1
requirements.txt
View File

@ -14,4 +14,5 @@ debtcollector>=1.2.0
junit-xml>=1.7
XStatic>=1.0.0 # MIT License
XStatic-Bootstrap-SCSS>=3.3.7.1 # Apache 2.0 License
XStatic-jQuery>=1.8.2.1 # MIT License