Commit 7c8cca19cac5e44065932fa3be173928fa32e5de
1 parent
27dbb2ab
Exists in
master
and in
39 other branches
Fixing jquery conflicts
Showing
3 changed files
with
8 additions
and
5 deletions
Show diff stats
src/proxy/diazo/jenkins.xml
... | ... | @@ -3,9 +3,12 @@ |
3 | 3 | xmlns:css="http://namespaces.plone.org/diazo/css" |
4 | 4 | xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> |
5 | 5 | |
6 | - <drop css:theme="script[data-framework='jquery']" /> | |
7 | 6 | <replace css:theme="#jenkins-css" content="//head/link" /> |
8 | 7 | <replace css:theme="#jenkins-js" content="//head/script" /> |
9 | 8 | <before css:theme-children="#main-content" css:content="#main-table" /> |
10 | 9 | |
10 | + <after theme-children="/html/head"> | |
11 | + <script>jQuery.noConflict();</script> | |
12 | + </after> | |
13 | + | |
11 | 14 | </rules> | ... | ... |
src/templates/base.html
... | ... | @@ -22,9 +22,9 @@ |
22 | 22 | <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css" |
23 | 23 | type="text/css" media="screen" /> |
24 | 24 | |
25 | - <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js" data-framework="jquery"></script> | |
26 | - <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.debouncedresize.js" data-framework="jquery"></script> | |
27 | - <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.cookie.js" data-framework="jquery"></script> | |
25 | + <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js"></script> | |
26 | + <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.debouncedresize.js"></script> | |
27 | + <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.cookie.js"></script> | |
28 | 28 | <script src="{{ STATIC_URL }}third-party/bootstrap/js/bootstrap.min.js"></script> |
29 | 29 | |
30 | 30 | {% block head_js %}{% endblock %} | ... | ... |
src/tz/templates/tz/set_utc_offset.html