Download as
Browse Code »

Commit 4099cdaef3a9bda6ec2ddaedd86eba97a0e971bb

Authored by Sergio Oliveira
1 parent cdd7ecfa
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

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
  Diff comments   View file @4099cda
@@ -3,26 +3,22 @@ @@ -3,26 +3,22 @@
3 3
4 {% block head_css %} 4 {% block head_css %}
5 <link href="{% static 'noosfero/css/bootstrap-colab-style.css' %}" 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 <link href="{% static 'noosfero/css/screen.css' %}" media="screen, projection" rel="stylesheet" type="text/css"> 7 <link href="{% static 'noosfero/css/screen.css' %}" media="screen, projection" rel="stylesheet" type="text/css">
8 <style> 8 <style>
9 9
10 </style> 10 </style>
11 {% endblock %} 11 {% endblock %}
12 12
13 -{% block head_js %}  
14 -<script>jQuery.noConflict();</script>  
15 -{% endblock %}  
16 -  
17 {% block navbar %} 13 {% block navbar %}
18 <div class="colab-style"> 14 <div class="colab-style">
19 - {{ block.super }} 15 + {{ block.super }}
20 </div> 16 </div>
21 {% endblock %} 17 {% endblock %}
22 18
23 {% block footer %} 19 {% block footer %}
24 <div class="colab-style"> 20 <div class="colab-style">
25 - {{ block.super }} 21 + {{ block.super }}
26 </div> 22 </div>
27 {% endblock %} 23 {% endblock %}
28 24
@@ -30,4 +26,4 @@ @@ -30,4 +26,4 @@
30 {{ block.super }} 26 {{ block.super }}
31 <script src="{% static 'noosfero/js/jquery.dropdown.js' %}" type="text/javascript"></script> 27 <script src="{% static 'noosfero/js/jquery.dropdown.js' %}" type="text/javascript"></script>
32 <script src="{% static 'noosfero/js/collapse.js' %}" type="text/javascript"></script> 28 <script src="{% static 'noosfero/js/collapse.js' %}" type="text/javascript"></script>
33 -{% endblock %}  
34 \ No newline at end of file 29 \ No newline at end of file
  30 +{% endblock %}