Add bower support

.bowerrc

@@ -0,0 +1,3 @@
+{
+ "directory": "adagios/media/external"
+}

.gitignore

@@ -9,4 +9,4 @@ MANIFEST
 dist
 adagios.conf
 *.mo
-
+adagios/media/external

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
 

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

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)

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)

adagios/contrib/lib/dashboards/raymii.html

@@ -140,7 +140,7 @@ <h3>{% trans "Acknowledged Minor Issues" %}</h3>
 <script src="{% url "media" path="js/adagios.js" %}"></script>
 <script src="{% url "media" path="js/adagios_status.js" %}"></script>
 
-<script src="{% url "media" path="external/datepicker/js/bootstrap-datepicker.js" %}"></script>
+<script src="{% url "media" path="external/bootstrap-datepicker/js/bootstrap-datepicker.js" %}"></script>
 
 
 <script type="text/javascript" xmlns="http://www.w3.org/1999/html">

adagios/media/css/import_contrib.css

@@ -1,5 +1,7 @@
 @import url(glyph-free.css);
-@import url(../external/datatables/css/jquery.dataTables.css);
+@import url(../external/datatables/media/css/jquery.dataTables.css);
 @import url(../external/datatables/DT_bootstrap.css);
 @import url(../external/select2/select2.css);
-@import url(../external/datepicker/css/datepicker.css);
+@import url(../external/select2/select2-bootstrap.css);
+@import url(../external/bootstrap-datepicker/css/datepicker.css);
+@import url(../external/datatable/css/datatable-bootstrap.min.css);