Merge pull request #1288 from MetadataConsulting/fix-jquery-bootstrap…

…-duplicate remove duplicated reference to bootstrap and jquery
MetadataConsulting · May 23, 2018 · 25fcb1e · 25fcb1e
2 parents 48d64e7 + bfc809c
commit 25fcb1e
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/ModelCatalogueCorePluginTestApp/grails-app/views/layouts/main.gsp b/ModelCatalogueCorePluginTestApp/grails-app/views/layouts/main.gsp
@@ -12,19 +12,10 @@
 
 
 
-
-    <%--bootstrap --%>
-    <%--<asset:stylesheet href="bootstrap/dist/css/bootstrap.css"/>--%>
-
-    <asset:javascript src="bootstrap/dist/js/bootstrap.js"/>
-
-    %{--Strangely, the dashboard advanced search dropdown won't work if jquery is before bootstrap,
-    and it's fine if it's after,
-    although the console complains that bootstrap needs jquery...--}%
-    <asset:javascript src="jquery/dist/jquery.js"/>
-
     <asset:stylesheet src="application.css"/>
 
+    <asset:javascript src="application.js"/>
+
     <g:layoutHead/>
 </head>
 <body>
@@ -111,7 +102,6 @@
 <div id="spinner" class="spinner" style="display:none;">
     <g:message code="spinner.alt" default="Loading&hellip;"/>
 </div>
-<asset:javascript src="application.js"/>
 
 </body>
 </html>