Commit 4099cdaef3a9bda6ec2ddaedd86eba97a0e971bb
1 parent
cdd7ecfa
Exists in
master
and in
39 other branches
Removed declaration of jQuery.noConflict()
This was already set by Noosfero
Showing
1 changed file
with
4 additions
and
8 deletions
Show diff stats
colab/proxy/noosfero/templates/proxy/noosfero.html
| ... | ... | @@ -3,26 +3,22 @@ |
| 3 | 3 | |
| 4 | 4 | {% block head_css %} |
| 5 | 5 | <link href="{% static 'noosfero/css/bootstrap-colab-style.css' %}" |
| 6 | - media="screen, projection" rel="stylesheet" type="text/css"> | |
| 6 | + media="screen, projection" rel="stylesheet" type="text/css"> | |
| 7 | 7 | <link href="{% static 'noosfero/css/screen.css' %}" media="screen, projection" rel="stylesheet" type="text/css"> |
| 8 | 8 | <style> |
| 9 | 9 | |
| 10 | 10 | </style> |
| 11 | 11 | {% endblock %} |
| 12 | 12 | |
| 13 | -{% block head_js %} | |
| 14 | -<script>jQuery.noConflict();</script> | |
| 15 | -{% endblock %} | |
| 16 | - | |
| 17 | 13 | {% block navbar %} |
| 18 | 14 | <div class="colab-style"> |
| 19 | - {{ block.super }} | |
| 15 | + {{ block.super }} | |
| 20 | 16 | </div> |
| 21 | 17 | {% endblock %} |
| 22 | 18 | |
| 23 | 19 | {% block footer %} |
| 24 | 20 | <div class="colab-style"> |
| 25 | - {{ block.super }} | |
| 21 | + {{ block.super }} | |
| 26 | 22 | </div> |
| 27 | 23 | {% endblock %} |
| 28 | 24 | |
| ... | ... | @@ -30,4 +26,4 @@ |
| 30 | 26 | {{ block.super }} |
| 31 | 27 | <script src="{% static 'noosfero/js/jquery.dropdown.js' %}" type="text/javascript"></script> |
| 32 | 28 | <script src="{% static 'noosfero/js/collapse.js' %}" type="text/javascript"></script> |
| 33 | -{% endblock %} | |
| 34 | 29 | \ No newline at end of file |
| 30 | +{% endblock %} | ... | ... |