Browse Source

Fix nav menus in pentaho dashboards

producao
Marcio Mazza 10 years ago
parent
commit
9c7481b7fe
  1. 3
      sigi/apps/saberes/templates/saberes/dashboard.html
  2. 4
      templates/admin/base.html

3
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 }}

4
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 %}

Loading…
Cancel
Save