From 9913041d5c2f410547dc4538f2f92353eb8dc308 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 6 Mar 2013 11:46:07 +0100 Subject: [PATCH] calls jquery.noConflict --- templates/layout-myslice.html | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/templates/layout-myslice.html b/templates/layout-myslice.html index d7a1565e..800b4b00 100644 --- a/templates/layout-myslice.html +++ b/templates/layout-myslice.html @@ -1,37 +1,23 @@ -{# This is required by insert_above #} -{% insert_handler %} +{# This is required by insert_above #}{% insert_handler %} MySlice - {{ title }} -{# This is where insert_str will end up #} -{% media_container prelude %} - - +{# This is where insert_str will end up #}{% media_container prelude %} + + {{ header_prelude }} - - -{# let's add these ones no matter what #} +{# let's add these ones no matter what #} {% insert_str prelude "jquery/js/jquery.js" %} +{% insert prelude_js %} "var _$_=jQuery.noConflict();" {% endinsert %} {% insert_str prelude "js/plugin_init.js" %} {% insert_str prelude "css/myslice.css" %} - - {% block container %}
- - {% block topmenu %} {% include 'widget-topmenu.html' %} {% endblock topmenu %} -
@@ -39,7 +25,6 @@ "The main content area (define block 'content_main')" {% endblock content_main %}
-
{% block content_related %} "The related content area (define block 'related_main')" @@ -48,6 +33,5 @@
{% endblock container %} - -- 2.43.0