From 882022eebc1443b695dd88545fb04496eb07df10 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 10 Aug 2017 18:57:15 +0200
Subject: [PATCH] order of css files modified (our css is the latest - most
important)
---
web/src/main/webapp/admin-new.xhtml | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/web/src/main/webapp/admin-new.xhtml b/web/src/main/webapp/admin-new.xhtml
index b64491c9cd..ce71ec471c 100644
--- a/web/src/main/webapp/admin-new.xhtml
+++ b/web/src/main/webapp/admin-new.xhtml
@@ -14,9 +14,8 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" type="text/javascript"/>
<script src="https://twitter.github.io/typeahead.js/releases/latest/typeahead.bundle.min.js" type="text/javascript"/>
- <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
- <script src="https://cdn.datatables.net/1.10.13/js/jquery.dataTables.min.js"></script>
-
+ <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+ <script src="https://cdn.datatables.net/1.10.13/js/jquery.dataTables.min.js"></script>
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.13/css/jquery.dataTables.min.css"/>
<link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"/>
@@ -44,13 +43,15 @@ function initMap(){
</script>
</h:head>
<h:body onload="initMap();" >
-<h:outputStylesheet library="css" name="style.css"/>
-<h:outputStylesheet library="css" name="pileup.css"/>
-<h:outputStylesheet library="css" name="bootstrap.min.css"/>
-<h:outputStylesheet library="css" name="minerva.css" />
-
- <h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
- <div id="minervaAppDiv" style="height: 100%;width: 100%;margin: 0;"/>
+ <f:facet name="last">
+ <h:outputStylesheet library="css" name="style.css"/>
+ <h:outputStylesheet library="css" name="pileup.css"/>
+ <h:outputStylesheet library="css" name="bootstrap.min.css"/>
+ <h:outputStylesheet library="css" name="minerva.css" />
+ </f:facet>
+
+ <h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
+ <div id="minervaAppDiv" style="height: 100%;width: 100%;margin: 0;"/>
</h:body>
</f:view>
--
GitLab