From 9c7481b7fe1f94bb30bc98c673d67792617d0fb8 Mon Sep 17 00:00:00 2001
From: Marcio Mazza <mazza@interlegis.leg.br>
Date: Wed, 6 May 2015 09:49:58 -0300
Subject: [PATCH] Fix nav menus in pentaho dashboards

---
 sigi/apps/saberes/templates/saberes/dashboard.html | 3 +++
 templates/admin/base.html                          | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/sigi/apps/saberes/templates/saberes/dashboard.html b/sigi/apps/saberes/templates/saberes/dashboard.html
index 430c73f..675b67b 100644
--- a/sigi/apps/saberes/templates/saberes/dashboard.html
+++ b/sigi/apps/saberes/templates/saberes/dashboard.html
@@ -1,5 +1,8 @@
 {% extends "admin/base_site.html" %}
 
+{# turned off to avoid bootstrap version conflict #}
+{% block default_javascript %}{% endblock %}
+
 {% block extrahead %}
   {{ block.super }}
   {{ headers|safe }}
diff --git a/templates/admin/base.html b/templates/admin/base.html
index cc066d7..9f31fcd 100644
--- a/templates/admin/base.html
+++ b/templates/admin/base.html
@@ -26,9 +26,13 @@
         window.__admin_media_prefix__ = "{% filter escapejs %}{% static "admin/" %}{% endfilter %}";
     //]]>
     </script>
+
+    {% block default_javascript %}
+    {# We should be able to turn this off, to avoid conflict in integrated pages like petaho's dashboards #}
     <script src="{% static "admin/js/jquery-1.9.1.min.js" %}"></script>
     <script src="{% static "admin/js/jquery-migrate-1.2.1.min.js" %}"></script>
     <script src="{% static "bootstrap/js/bootstrap.min.js" %}"></script>
+    {% endblock %}
 
     {% block extrahead %}{% endblock %}