Commit c0a3db96 authored by Lukasz Waskiewicz's avatar Lukasz Waskiewicz
Browse files

refs #1453 wydzielenie skryptów i styli codeMirror

parent ca06dbfe
@charset "UTF-8";
@import "variables";
@import "mixins";
......@@ -8,7 +7,6 @@
@import "common";
@import "filters";
@import "contact";
@import "codeMirror";
@import "layout/_main.scss";
@import "layout/_header.scss";
......
......@@ -6,6 +6,8 @@
layout:decorator="administration/administration_content.xhtml">
<head>
<th:block th:replace="utils/codemirror.xhtml :: imports" />
<script th:src="@{/app/custom/administration/configuration/configurationEdit.js}" defer="defer"></script>
<link th:href="@{/app/custom/administration/configuration/configurationEdit.css}" media="all" type="text/css" rel="stylesheet" href="" />
<script th:src="@{/libs/jsoneditor/dist/jsoneditor.min.js}"/>
......
......@@ -14,7 +14,7 @@
<link th:href="@{/wro/all.css}" rel="stylesheet" type="text/css" />
</th:block>
<script th:if="${properties['cocos.portal.reCaptcha.enabled']}" src='https://www.google.com/recaptcha/api.js'></script>
<script async="async" th:if="${properties['cocos.portal.reCaptcha.enabled']}" src='https://www.google.com/recaptcha/api.js'></script>
<th:block th:if="${properties['debug'] == 'true'}">
<script type="text/javascript" th:src="@{/libs/jquery-min.js}"></script>
......@@ -42,20 +42,6 @@
<script th:src="@{/libs/sockjs-min.js}"></script>
<script th:src="@{/libs/stomp.js}"></script>
<link rel="stylesheet" th:href="@{/libs/CodeMirror/lib/codemirror.css}" />
<script th:src="@{/libs/CodeMirror/lib/codemirror.js}"></script>
<script th:src="@{/libs/CodeMirror/mode/sql/sql.js}"></script>
<script th:src="@{/libs/CodeMirror/mode/javascript/javascript.js}"></script>
<script th:src="@{/libs/CodeMirror/addon/formatting/formatting.js}"></script>
<script th:src="@{/libs/CodeMirror/addon/hint/show-hint.js}"></script>
<script th:src="@{/libs/CodeMirror/addon/hint/sql-hint.js}"></script>
<script th:src="@{/libs/CodeMirror/mode/htmlmixed/htmlmixed.js}"></script>
<script th:src="@{/libs/CodeMirror/mode/xml/xml.js}"></script>
<script th:src="@{/libs/CodeMirror/mode/css/css.js}"></script>
<link rel="stylesheet" th:href="@{/libs/CodeMirror/addon/hint/show-hint.css}" />
<script th:src="@{/libs/jquery.popconfirm/jquery.popconfirm.js}"></script>
<script th:src="@{/libs/jquery.easyautocomplete/jquery.easy-autocomplete.min.js}"></script>
<link rel="stylesheet" th:href="@{/libs/jquery.easyautocomplete/easy-autocomplete.min.css}" />
......
......@@ -8,6 +8,7 @@
<head>
<title th:text="#{cocos.portal.simulationsPages.particles.downloadRequests.title}">TITLE</title>
<script th:src="@{/app/custom/simulation/particles/fileInformation.js}" defer="defer"></script>
<script th:src="@{/app/common/js/table.js}"></script>
<script th:src="@{/app/custom/simulation/queryTable.js}" ></script>
......@@ -18,6 +19,9 @@
<script th:src="@{/app/custom/simulation/particles/querySubmit.js}" defer="defer" ></script>
<script th:src="@{/app/custom/simulation/sqlInput.js}" defer="defer" ></script>
<link th:href="@{/app/custom/simulation/particles/requestDownload.css}" rel="stylesheet" type="text/css" />
<th:block th:replace="utils/codemirror.xhtml :: imports" />
<script type="text/javascript" th:inline="javascript">
/*<![CDATA[*/
......
......@@ -20,6 +20,8 @@
<script th:src="@{/app/custom/simulation/sampleQueries.js}" defer="defer" ></script>
<link media="all" type="text/css" rel="stylesheet" href="" th:href="@{/app/custom/simulation/queriesExecutions.css}" />
<th:block th:replace="utils/codemirror.xhtml :: imports" />
<script type="text/javascript" th:inline="javascript">
/*<![CDATA[*/
......
......@@ -18,6 +18,8 @@
<script th:src="@{/app/custom/simulation/tables/querySubmit.js}" defer="defer" ></script>
<script th:src="@{/app/custom/simulation/sqlInput.js}" defer="defer" ></script>
<th:block th:replace="utils/codemirror.xhtml :: imports" />
<script type="text/javascript" th:inline="javascript">
/*<![CDATA[*/
......
<!DOCTYPE html >
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
<th:block th:fragment="imports">
<th:block th:unless="${properties['debug'] == 'true'}">
<script type="text/javascript" th:src="@{/wro/codemirror.js}"></script>
<link th:href="@{/wro/codemirror.css}" rel="stylesheet" type="text/css" />
</th:block>
<th:block th:if="${properties['debug'] == 'true'}">
<script th:src="@{/libs/CodeMirror/lib/codemirror.js}"></script>
<script th:src="@{/libs/CodeMirror/mode/sql/sql.js}"></script>
<script th:src="@{/libs/CodeMirror/mode/javascript/javascript.js}"></script>
<script th:src="@{/libs/CodeMirror/addon/formatting/formatting.js}"></script>
<script th:src="@{/libs/CodeMirror/addon/hint/show-hint.js}"></script>
<script th:src="@{/libs/CodeMirror/addon/hint/sql-hint.js}"></script>
<script th:src="@{/libs/CodeMirror/mode/htmlmixed/htmlmixed.js}"></script>
<script th:src="@{/libs/CodeMirror/mode/xml/xml.js}"></script>
<script th:src="@{/libs/CodeMirror/mode/css/css.js}"></script>
<link rel="stylesheet" th:href="@{/libs/CodeMirror/lib/codemirror.css}" />
<link rel="stylesheet" th:href="@{/libs/CodeMirror/addon/hint/show-hint.css}" />
<link media="all" type="text/css" rel="stylesheet" href="" th:href="@{/app/common/css/codemirror.css}" />
</th:block>
</th:block>
</html>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<groups xmlns="http://www.isdc.ro/wro">
<group name="codemirror">
<js>classpath:META-INF/web-resources/libs/CodeMirror/lib/codemirror.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/mode/sql/sql.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/mode/javascript/javascript.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/addon/formatting/formatting.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/addon/hint/show-hint.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/addon/hint/sql-hint.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/mode/htmlmixed/htmlmixed.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/mode/xml/xml.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/mode/css/css.js</js>
<css>classpath:META-INF/web-resources/libs/CodeMirror/lib/codemirror.css</css>
<css>classpath:META-INF/web-resources/libs/CodeMirror/addon/hint/show-hint.css</css>
</group>
<group name="all">
<js>classpath:META-INF/web-resources/libs/jquery-min.js</js>
<js>classpath:META-INF/web-resources/libs/jquery-ui/jquery-ui.min.js</js>
......@@ -21,17 +35,6 @@
<js>classpath:META-INF/web-resources/app/common/js/common.js</js>
<js>classpath:META-INF/web-resources/app/common/js/cookies.js</js>
<js>classpath:META-INF/web-resources/app/common/js/cookiesWarning.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/lib/codemirror.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/mode/sql/sql.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/mode/javascript/javascript.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/addon/formatting/formatting.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/addon/hint/show-hint.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/addon/hint/sql-hint.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/mode/htmlmixed/htmlmixed.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/mode/xml/xml.js</js>
<js>classpath:META-INF/web-resources/libs/CodeMirror/mode/css/css.js</js>
<css>classpath:META-INF/web-resources/libs/CodeMirror/lib/codemirror.css</css>
<css>classpath:META-INF/web-resources/libs/CodeMirror/addon/hint/show-hint.css</css>
<js>classpath:META-INF/web-resources/libs/jquery.popconfirm/jquery.popconfirm.js</js>
<js>classpath:META-INF/web-resources/libs/jquery.easyautocomplete/jquery.easy-autocomplete.min.js</js>
<css>classpath:META-INF/web-resources/libs/jquery.easyautocomplete/easy-autocomplete.min.css</css>
......
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