Skip to content

Commit 095ff91

Browse files
davvernadavverna
committed
Restored missing dependencies
1 parent 0976d1e commit 095ff91

341 files changed

Lines changed: 30 additions & 19 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎knowagecockpitengine/src/main/webapp/Gruntfile.js‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,23 @@ module.exports = function (grunt) {
99
},
1010
basic_and_extras: {
1111
files: {
12-
"dist/knowagecockpit-lib-bundle.js": ["js/lib/angular/angular-gridster/angular-gridster.min.js", "js/lib/angular/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js", "js/lib/angular/angular-json-tree/json-tree.js", "js/lib/openlayers/v6.15.1-dist/ol.js", "js/lib/mathjs/4.0.1/math.min.js"],
12+
"dist/angular-bundle.js": ["js/lib/angular/angular_1.4/angular.min.js", "js/lib/angular/angular_1.4/angular-animate.min.js", "js/lib/angular/angular_1.4/angular-aria.min.js", "js/lib/angular/angular_1.4/angular-sanitize.min.js", "js/lib/angular/angular_1.4/angular-messages.min.js", "js/lib/angular/angular_1.4/angular-cookies.js"],
13+
"dist/knowagecockpit-lib-bundle.js": [
14+
"js/lib/angular/angular-gridster/angular-gridster.min.js",
15+
"js/lib/angular/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js",
16+
"js/lib/angular/angular-json-tree/json-tree.js",
17+
"js/lib/openlayers/v6.15.1-dist/ol.js",
18+
"js/lib/mathjs/4.0.1/math.min.js",
19+
"js/lib/angular/angular-material_1.1.0/angular-material.min.js",
20+
"js/lib/angular/angular-tree/angular-ui-tree.js",
21+
"js/lib/angular/contextmenu/ng-context-menu.js",
22+
"js/lib/angular/pagination/dirPagination.js",
23+
"js/lib/angular/expander-box/expanderBox.js",
24+
"js/lib/angular/color-picker/tinycolor-min.js",
25+
"js/lib/angular/color-picker/tinygradient.min.js",
26+
"js/lib/angular/color-picker/angularjs-color-picker.js",
27+
"js/lib/xml2js/xml2json.js",
28+
],
1329
"dist/knowagecockpit-modules-bundle.js": [
1430
"node_modules/ng-wysiwyg/dist/wysiwyg.min.js",
1531
"node_modules/jsonformatter/dist/json-formatter.min.js",

‎knowagecockpitengine/src/main/webapp/WEB-INF/jsp/commons/angular/angularImport.jsp‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,38 +27,30 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2727
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no" />
2828
<meta name="viewport" content="width=device-width">
2929

30-
<link rel="stylesheet" href="<%=urlBuilder.getResourcePath(spagoBiContext, "/node_modules/@fortawesome/fontawesome-free/css/all.css")%>">
31-
<link rel="stylesheet" href="<%=urlBuilder.getResourcePath(spagoBiContext, "/node_modules/weather-icons/css/weather-icons.min.css")%>">
30+
<link rel="stylesheet" href="<%=urlBuilder.getResourcePath(cockpitEngineContext, "/node_modules/@fortawesome/fontawesome-free/css/all.css")%>">
31+
<link rel="stylesheet" href="<%=urlBuilder.getResourcePath(cockpitEngineContext, "/node_modules/weather-icons/css/weather-icons.min.css")%>">
3232

3333
<!-- angular reference-->
34-
<script type="text/javascript" src="<%=urlBuilder.getResourcePath(spagoBiContext, "/dist/angular-bundle.js")%>"></script>
34+
<script type="text/javascript" src="<%=urlBuilder.getResourcePath(cockpitEngineContext, "/dist/angular-bundle.js")%>"></script>
3535

3636

37-
<!-- All internal/external libraries bundle -->
38-
<script type="text/javascript" src="<%=urlBuilder.getResourcePath(spagoBiContext, "/dist/knowage-lib-bundle.js")%>"></script>
39-
4037
<!-- All internal/external cockpit specific libraries bundle -->
4138
<script type="text/javascript" src="<%=urlBuilder.getResourcePath(cockpitEngineContext, "/dist/knowagecockpit-lib-bundle.js")%>"></script>
4239

43-
<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
44-
if(/MSIE \d|Trident.*rv:/.test(navigator.userAgent))
45-
document.write('<script type="text/javascript" src="<%= KnowageSystemConfiguration.getKnowageContext() %>/js/lib/rgbcolor/rgbcolor.js"><\/script>');
46-
</script>
47-
4840
<!-- All node_modules libraries bundle -->
4941
<script type="text/javascript" src="<%=urlBuilder.getResourcePath(cockpitEngineContext, "/dist/knowagecockpit-modules-bundle.js")%>"></script>
5042

5143
<!-- All external styles bundle -->
5244
<link rel="stylesheet" href="<%=urlBuilder.getResourcePath(cockpitEngineContext,"/dist/knowagecockpit-modules-styles-bundle.css")%>">
53-
<link rel="stylesheet" href="<%=urlBuilder.getResourcePath(spagoBiContext,"/node_modules/ng-wysiwyg/dist/editor.min.css")%>">
45+
<link rel="stylesheet" href="<%=urlBuilder.getResourcePath(cockpitEngineContext,"/node_modules/ng-wysiwyg/dist/editor.min.css")%>">
5446

5547
<!-- AngularJS Slider -->
56-
<link rel="stylesheet" href="<%=urlBuilder.getResourcePath(spagoBiContext, "/node_modules/angularjs-slider/dist/rzslider.min.css")%>">
57-
<script type="text/javascript" src="<%=urlBuilder.getResourcePath(spagoBiContext, "/node_modules/angularjs-slider/dist/rzslider.min.js")%>"></script>
48+
<link rel="stylesheet" href="<%=urlBuilder.getResourcePath(cockpitEngineContext, "/node_modules/angularjs-slider/dist/rzslider.min.css")%>">
49+
<script type="text/javascript" src="<%=urlBuilder.getResourcePath(cockpitEngineContext, "/node_modules/angularjs-slider/dist/rzslider.min.js")%>"></script>
5850

5951
<!-- OpenLayers Extension -->
60-
<link rel="stylesheet" href="<%=urlBuilder.getResourcePath(spagoBiContext, "/node_modules/ol-ext/dist/ol-ext.min.css")%>">
61-
<script type="text/javascript" src="<%=urlBuilder.getResourcePath(spagoBiContext, "/node_modules/ol-ext/dist/ol-ext.js")%>"></script>
52+
<link rel="stylesheet" href="<%=urlBuilder.getResourcePath(cockpitEngineContext, "/node_modules/ol-ext/dist/ol-ext.min.css")%>">
53+
<script type="text/javascript" src="<%=urlBuilder.getResourcePath(cockpitEngineContext, "/node_modules/ol-ext/dist/ol-ext.js")%>"></script>
6254

6355
<%@include file="/WEB-INF/jsp/commons/angular/sbiModule.jspf"%>
6456

@@ -79,6 +71,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
7971
<%}%>
8072

8173
<!-- KNOWAGE main css import -->
82-
<link rel="stylesheet" type="text/css" href="<%=urlBuilder.getResourcePath(spagoBiContext, "/themes/commons/css/customStyle.css")%>"/>
74+
<link rel="stylesheet" type="text/css" href="<%=urlBuilder.getResourcePath(cockpitEngineContext, "/themes/commons/css/customStyle.css")%>"/>
8375

8476

‎knowagecockpitengine/src/main/webapp/package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"dependencies": {
2929
"@fortawesome/fontawesome-free": "5.12.0",
3030
"ag-grid-community": "23.1.1",
31+
"angularjs-slider": "^7.1.0",
3132
"angular-tree-control": "0.2.30",
3233
"angular-ui-codemirror": "0.3.0",
3334
"canvg": "1.5.3",
@@ -39,7 +40,9 @@
3940
"luxon": "^3.1.1",
4041
"moment": "2.29.4",
4142
"ng-wysiwyg": "0.6.2",
42-
"toastify-js": "^1.6.1"
43+
"ol-ext": "^4.0.4",
44+
"toastify-js": "^1.6.1",
45+
"weather-icons": "1.3.2"
4346
},
4447
"devDependencies": {
4548
"angular": "^1.7.9",

knowage/src/main/webapp/themes/commons/css/SASS/_customPrj.scss renamed to knowagecockpitengine/src/main/webapp/themes/commons/css/SASS/_customPrj.scss

File renamed without changes.

knowage/src/main/webapp/themes/commons/css/SASS/_fonts.scss renamed to knowagecockpitengine/src/main/webapp/themes/commons/css/SASS/_fonts.scss

File renamed without changes.

knowage/src/main/webapp/themes/commons/css/SASS/_icons.scss renamed to knowagecockpitengine/src/main/webapp/themes/commons/css/SASS/_icons.scss

File renamed without changes.

knowage/src/main/webapp/themes/commons/css/SASS/_mixins.scss renamed to knowagecockpitengine/src/main/webapp/themes/commons/css/SASS/_mixins.scss

File renamed without changes.

knowage/src/main/webapp/themes/commons/css/SASS/_variables.scss renamed to knowagecockpitengine/src/main/webapp/themes/commons/css/SASS/_variables.scss

File renamed without changes.

knowage/src/main/webapp/themes/commons/css/SASS/components/_accessibility.scss renamed to knowagecockpitengine/src/main/webapp/themes/commons/css/SASS/components/_accessibility.scss

File renamed without changes.

knowage/src/main/webapp/themes/commons/css/SASS/components/_activation.scss renamed to knowagecockpitengine/src/main/webapp/themes/commons/css/SASS/components/_activation.scss

File renamed without changes.

0 commit comments

Comments
 (0)