Commit 17b95fb9 authored by Matija Obreza's avatar Matija Obreza
Browse files

Missing colorpicker in minified CSS and JS

parent cc350345
...@@ -603,6 +603,7 @@ ...@@ -603,6 +603,7 @@
<include>leaflet.min.js</include> <include>leaflet.min.js</include>
<include>leaflet.locationfilter.min.js</include> <include>leaflet.locationfilter.min.js</include>
<include>crophub.min.js</include> <include>crophub.min.js</include>
<include>syronex-colorpicker.min.js</include>
</includes> </includes>
</aggregation> </aggregation>
...@@ -632,6 +633,7 @@ ...@@ -632,6 +633,7 @@
<include>jquery-ui.min.css</include> <include>jquery-ui.min.css</include>
<include>leaflet.min.css</include> <include>leaflet.min.css</include>
<include>leaflet.locationfilter.min.css</include> <include>leaflet.locationfilter.min.css</include>
<include>syronex-colorpicker.min.css</include>
<include>custom.min.css</include> <include>custom.min.css</include>
<include>responsive.min.css</include> <include>responsive.min.css</include>
<include>forza.min.css</include> <include>forza.min.css</include>
......
...@@ -51,15 +51,16 @@ ...@@ -51,15 +51,16 @@
<script type="text/javascript" src="<c:url value="/html/js/leaflet.min.js" />"></script> <script type="text/javascript" src="<c:url value="/html/js/leaflet.min.js" />"></script>
<script type="text/javascript" src="<c:url value="/html/js/leaflet.locationfilter.min.js" />"></script> <script type="text/javascript" src="<c:url value="/html/js/leaflet.locationfilter.min.js" />"></script>
<script type="text/javascript" src="<c:url value="/html/js/genesys.min.js" />"></script> <script type="text/javascript" src="<c:url value="/html/js/genesys.min.js" />"></script>
<script type="text/javascript" src="<c:url value="/html/js/syronex-colorpicker-min.js" />"></script>
</c:when> </c:when>
<c:when test="${requestContext.theme.name eq 'all'}"> <c:when test="${requestContext.theme.name eq 'all'}">
<script type="text/javascript" src="<c:url value="/html/js/syronex-colorpicker.js" />"></script>
<script type="text/javascript" src="<c:url value="/html/js/jquery.js" />"></script> <script type="text/javascript" src="<c:url value="/html/js/jquery.js" />"></script>
<script type="text/javascript" src="<c:url value="/html/js/jquery-ui.js" />"></script> <script type="text/javascript" src="<c:url value="/html/js/jquery-ui.js" />"></script>
<script type="text/javascript" src="<c:url value="/html/js/bootstrap.js" />"></script> <script type="text/javascript" src="<c:url value="/html/js/bootstrap.js" />"></script>
<script type="text/javascript" src="<c:url value="/html/js/leaflet.js" />" />"></script> <script type="text/javascript" src="<c:url value="/html/js/leaflet.js" />" />"></script>
<script type="text/javascript" src="<c:url value="/html/js/leaflet.locationfilter.js" />"></script> <script type="text/javascript" src="<c:url value="/html/js/leaflet.locationfilter.js" />"></script>
<script type="text/javascript" src="<c:url value="/html/js/genesys.js" />"></script> <script type="text/javascript" src="<c:url value="/html/js/genesys.js" />"></script>
<script type="text/javascript" src="<c:url value="/html/js/syronex-colorpicker.js" />"></script>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<script type="text/javascript" src="<c:url value="/html/js/jquery.js" />"></script> <script type="text/javascript" src="<c:url value="/html/js/jquery.js" />"></script>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment