hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict with jquery-ui lib

Browse Source
This commit is contained in:
Mike Ng
2018-03-27 15:01:47 +04:00
parent c988993700
commit e4689a180b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/web/common/index_bootstrap.html.twig
View File

@@ -19,7 +19,6 @@
<script type="text/javascript" src="/assets/vendors/modernizr/modernizr{% if not app.debug %}.min{% endif %}.js"></script> <script type="text/javascript" src="/assets/vendors/modernizr/modernizr{% if not app.debug %}.min{% endif %}.js"></script>
<script type="text/javascript" src="/assets/vendors/jquery/jquery{% if not app.debug %}.min{% endif %}.js"></script> <script type="text/javascript" src="/assets/vendors/jquery/jquery{% if not app.debug %}.min{% endif %}.js"></script>
{#<script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui.js"></script>#}
<script type="text/javascript" src="/assets/common/js/common{% if not app.debug %}.min{% endif %}.js"></script> <script type="text/javascript" src="/assets/common/js/common{% if not app.debug %}.min{% endif %}.js"></script>
<script type="text/javascript" src="/assets/vendors/bootstrap/js/bootstrap{% if not app.debug %}.min{% endif %}.js"></script> <script type="text/javascript" src="/assets/vendors/bootstrap/js/bootstrap{% if not app.debug %}.min{% endif %}.js"></script>
<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script> <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
@@ -29,8 +28,9 @@
<script type="text/javascript" <script type="text/javascript"
src="/assets/vendors/underscore/underscore{% if not app.debug %}.min{% endif %}.js"></script> src="/assets/vendors/underscore/underscore{% if not app.debug %}.min{% endif %}.js"></script>
{% block rss %}{% endblock %} {% block rss %}{% endblock %}
{% block javascript %}{% endblock %} {% block javascript %}
<script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui.js"></script> <script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui.js"></script>
{% endblock %}
</head> </head>
<body class="PNB"> <body class="PNB">
<div id="mainContainer" class="PNB"> <div id="mainContainer" class="PNB">