aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpl2016-12-13 15:13:05 +0100
committerjpl2016-12-13 15:13:14 +0100
commitf960d35bb1c34386783d2cc791e178eb87c7772d (patch)
tree62a57bf6b01804719406af155f8cd34293d73bf4
parent2d4e6b45b0295e8c01deaebb04f8be009a7f9d87 (diff)
downloadchouette-core-f960d35bb1c34386783d2cc791e178eb87c7772d.tar.bz2
fix openlayers.imgpath call on application layout
-rw-r--r--app/assets/javascripts/application.js1
-rw-r--r--app/views/layouts/application.html.slim8
2 files changed, 4 insertions, 5 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 99112295e..835a716e4 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -4,6 +4,7 @@
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// the compiled file.
//
+//= require turbolinks
//= require jquery
//= require jquery_ujs
//= require jquery-ui
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index fad7a3ed7..c3f0975d2 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -17,11 +17,9 @@ html lang=I18n.locale
= javascript_include_tag "http://maps.google.com/maps/api/js?v=3.2&sensor=false"
= javascript_include_tag "http://openlayers.org/api/OpenLayers.js"
- / Todo from @jpl: check if it works...
- <script type="text/JavaScript">
- OpenLayers.ImgPath = polymorphic_path_patch('/assets/openlayers/')
- </script>
-
+ = javascript_tag do
+ | OpenLayers.ImgPath = "#{polymorphic_path_patch('/assets/openlayers/')}"
+
= analytics_init if Rails.env.production?
= csrf_meta_tag