diff --git a/.bowerrc b/.bowerrc new file mode 100644 index 000000000..d74581776 --- /dev/null +++ b/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "adagios/media/external" +} diff --git a/.gitignore b/.gitignore index aed4bd663..b7f30ec32 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ MANIFEST dist adagios.conf *.mo - +adagios/media/external diff --git a/Makefile b/Makefile index d3d91c3b0..eea1c5ba3 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,7 @@ clean: -rm -rf deb-build/ -rm -rf docs/*.1 -rm -f etc/version + -rm -rf adagios/media/external/* clean_hard: -rm -rf $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/adagios @@ -40,8 +41,11 @@ clean_hard: clean_hardest: clean_rpms -install: build manpage - $(PYTHON) setup.py install -f +install: build manpage frontend-deps + $(python) setup.py install -f + +frontend-deps: + bower install install_hard: clean_hard install diff --git a/README.bower b/README.bower new file mode 100644 index 000000000..39e4969ba --- /dev/null +++ b/README.bower @@ -0,0 +1,4 @@ +Not bower dependencies: +* html5shim (is used by bootstrap and dynamically downloaded from a CDN) +* jqplot (not properly bowerized yet) +* DT_bootstrap.{css,js} (upstream has changed and doesn't ship these files anymore diff --git a/adagios/bi/templates/business_process_standalone.html b/adagios/bi/templates/business_process_standalone.html index 634f643b4..d81541547 100644 --- a/adagios/bi/templates/business_process_standalone.html +++ b/adagios/bi/templates/business_process_standalone.html @@ -144,7 +144,7 @@ if (my_element.childElementCount == 0) { var spinner = document.createElement( 'img'); - spinner.setAttribute("src", "{% url "media" path="external/select2/spinner.gif" %}"); + spinner.setAttribute("src", "{% url "media" path="external/select2/select2-spinner.gif" %}"); my_element.appendChild( spinner ); var url = '{% url "bi.views.graphs_json" bp.name %}'; $.getJSON(url) diff --git a/adagios/bi/templates/business_process_view.html b/adagios/bi/templates/business_process_view.html index fe7d7901f..276857ee9 100644 --- a/adagios/bi/templates/business_process_view.html +++ b/adagios/bi/templates/business_process_view.html @@ -57,7 +57,7 @@ if (my_element.childElementCount == 0) { var spinner = document.createElement( 'img'); - spinner.setAttribute("src", "{% url "media" path="external/select2/spinner.gif" %}"); + spinner.setAttribute("src", "{% url "media" path="external/select2/select2-spinner.gif" %}"); my_element.appendChild( spinner ); var url = '{{ graphs_url }}'; $.getJSON(url) diff --git a/adagios/contrib/lib/dashboards/raymii.html b/adagios/contrib/lib/dashboards/raymii.html index a0d4743ab..c91accd9d 100644 --- a/adagios/contrib/lib/dashboards/raymii.html +++ b/adagios/contrib/lib/dashboards/raymii.html @@ -140,7 +140,7 @@