Skip to content

Commit 6c6a901

Browse files
jamesfwoodjamesfwood
committed
Updated camunda_mods index.html pages
1 parent b1f43b5 commit 6c6a901

5 files changed

Lines changed: 156 additions & 225 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1717
### Removed
1818
### Fixed
1919
### Security
20+
- Updated dependency libraries
2021
### Breaking Changes
2122
- Update Database Schema from Camunda 7.23.0-ee to Camunda 7.24.0-ee:
2223
- Go to the <root-dir>/sql/upgrade/ dir and use the upgrade script:

‎cws-installer/src/main/java/jpl/cws/task/CwsInstaller.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ public static void main(String args[]) {
323323
print(" ./start_cws.sh");
324324
print("");
325325
print(" Then access CWS with a browser at:");
326-
print(" https://" + cws_console_host + ":" + cws_console_ssl_port + "/cws-ui");
326+
print(" https://" + cws_console_host + ":" + cws_console_ssl_port + "/cws-ui/home");
327327
print("---------------------------------------------------------------");
328328
print("");
329329
if (cws_auth_scheme.equals("CAMUNDA")) {
@@ -3180,10 +3180,10 @@ private static void updateCwsUiConfig() throws IOException {
31803180
mkDir(cws_tomcat_webapps + SEP + cws_project_webapp_root);
31813181
Path indexHtml = Paths.get(cws_tomcat_webapps + SEP + cws_project_webapp_root + SEP + "index.html");
31823182
writeToFile(indexHtml,
3183-
"<html><head><meta http-equiv=\"refresh\" content=\"10;url=/cws-ui/\" /></head>" +
3183+
"<html><head><meta http-equiv=\"refresh\" content=\"10;url=/cws-ui/home\" /></head>" +
31843184
"<body>You have configured CWS to have a project web page.\n" +
31853185
"Put your custom content here by editing the '" + indexHtml + "' file...<br/><br/><hr/>" +
3186-
"Automatically redirecting to <a href=\"/cws-ui\">CWS Home</a> in 10 seconds...</body></html>");
3186+
"Automatically redirecting to <a href=\"/cws-ui/home\">CWS Home</a> in 10 seconds...</body></html>");
31873187
}
31883188
}
31893189

‎install/camunda_mods/admin/index.html‎

Lines changed: 104 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -1,138 +1,116 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta http-equiv="X-UA-Compatible"
5-
content="IE=edge" />
6-
7-
<title>Camunda Admin</title>
8-
9-
<meta charset="utf-8" />
10-
<meta name="viewport"
11-
content="width=device-width, initial-scale=1.0" />
12-
13-
<meta name="description"
14-
content="camunda Admin" />
15-
<meta name="author"
16-
content="camunda services GmbH" />
17-
18-
<!-- settings the base path for relative links -->
19-
<base href="$BASE"
20-
admin-api="$APP_ROOT/api/admin/"
21-
engine-api="$APP_ROOT/api/engine/"
22-
app-root="$APP_ROOT"
23-
app-name="admin"/>
24-
25-
<!-- an example of plugin/feature exclusion -->
26-
<!--
27-
<base href="$BASE"
28-
admin-api="$APP_ROOT/api/admin/"
29-
engine-api="$APP_ROOT/api/engine/"
30-
app-root="$APP_ROOT"
31-
cam-exclude-plugins="admin.dashboard:process-definition-tiles" />
32-
-->
33-
34-
35-
<!-- styles -->
36-
<link rel="icon" href="$APP_ROOT/favicon.ico">
37-
<script defer src="$APP_ROOT/lib/runtime.js?bust=7.20.0" $CSP_NONCE charset="UTF-8"></script>
38-
<script defer src="$APP_ROOT/lib/deps.js?bust=7.20.0" $CSP_NONCE charset="UTF-8"></script>
39-
<script defer src="$APP_ROOT/app/admin/camunda-admin-bootstrap.js?bust=7.20.0" $CSP_NONCE charset="UTF-8"></script>
40-
<link href="$APP_ROOT/app/admin/camunda-admin-bootstrap.css?bust=7.20.0" rel="stylesheet">
41-
42-
<link rel="stylesheet"
43-
type="text/css"
44-
href="$APP_ROOT/app/admin/styles/user-styles.css?bust=7.20.0">
45-
46-
</head>
47-
<body ng-controller="camAdminAppCtrl" ng-class="{'no-breadcrumbs': !$root.showBreadcrumbs}">
48-
<!-- navigation -->
49-
<div cam-widget-header
50-
authentication="authentication"
51-
user-name="userFullName"
52-
current-app="admin"
53-
brand-name="Camunda Admin"
54-
ng-cloak>
55-
<ul cam-if-logged-in
56-
ng-controller="NavigationController">
57-
58-
<li ng-class="activeClass('#/user')">
59-
<a href="#/users">{{ 'USERS_USERS' | translate }}</a>
60-
</li>
61-
62-
<li ng-class="activeClass('#/group')">
63-
<a href="#/groups">{{ 'GROUPS_GROUPS' | translate }}</a>
64-
</li>
65-
66-
<li ng-class="activeClass('#/tenant')">
67-
<a href="#/tenants">{{ 'TENANTS_TENANTS' | translate }}</a>
68-
</li>
69-
70-
<li ng-class="activeClass('#/authorization')"
71-
show-if-authorized
72-
auth-permission="READ"
73-
auth-resource-name="authorization">
74-
<a href="#/authorization?resource=0">{{ 'AUTHORIZATION_AUTHORIZATIONS' | translate }}</a>
75-
</li>
76-
<li ng-class="activeClass('#/system')">
77-
<a href="#/system?section=system-settings-general">{{ 'SYSTEM_SYSTEM' | translate }}</a>
78-
</li>
79-
<li><a class="cam-widget-header" href="/cws-ui/home">CWS</a></li>
80-
</ul>
81-
</div>
82-
83-
<!-- content -->
84-
<div class="ctn-main">
85-
<div class="ctn-wrapper">
86-
<div ng-if="showBreadcrumbs"
87-
cam-breadcrumbs-panel
88-
divider="&raquo;"
89-
ng-cloak
90-
class="breadcrumbs-panel"></div>
91-
92-
<div notifications-panel
93-
class="page-notifications"></div>
3+
<head>
4+
<meta http-equiv="X-UA-Compatible"
5+
content="IE=edge"/>
6+
7+
<title>Camunda Admin</title>
8+
9+
<meta charset="utf-8"/>
10+
<meta name="viewport"
11+
content="width=device-width, initial-scale=1.0"/>
12+
13+
<meta name="description"
14+
content="camunda Admin"/>
15+
<meta name="author"
16+
content="camunda services GmbH"/>
17+
18+
<!-- settings the base path for relative links -->
19+
<base href="$BASE"
20+
admin-api="$APP_ROOT/api/admin/"
21+
cockpit-api="$APP_ROOT/api/cockpit/"
22+
tasklist-api="$APP_ROOT/api/tasklist/"
23+
welcome-api="$APP_ROOT/api/welcome/"
24+
engine-api="$APP_ROOT/api/engine/"
25+
app-root="$APP_ROOT"
26+
app-name="admin"/>
27+
28+
<!-- an example of plugin/feature exclusion -->
29+
<!--
30+
<base href="$BASE"
31+
admin-api="$APP_ROOT/api/admin/"
32+
cockpit-api="$APP_ROOT/api/cockpit/"
33+
tasklist-api="$APP_ROOT/api/tasklist/"
34+
welcome-api="$APP_ROOT/api/welcome/"
35+
engine-api="$APP_ROOT/api/engine/"
36+
app-root="$APP_ROOT"
37+
cam-exclude-plugins="admin.dashboard:process-definition-tiles" />
38+
-->
39+
40+
<link rel="icon" href="$APP_ROOT/favicon.ico"><script defer src="$APP_ROOT/lib/runtime.js?bust=7.24.6" $CSP_NONCE charset="UTF-8"></script><script defer src="$APP_ROOT/lib/deps.js?bust=7.24.6" $CSP_NONCE charset="UTF-8"></script><script defer src="$APP_ROOT/app/admin/camunda-admin-bootstrap.js?bust=7.24.6" $CSP_NONCE charset="UTF-8"></script><link href="$APP_ROOT/app/admin/camunda-admin-bootstrap.css?bust=7.24.6" rel="stylesheet">
41+
42+
<link rel="stylesheet"
43+
type="text/css"
44+
href="$APP_ROOT/app/admin/styles/user-styles.css?bust=7.24.6-ee">
45+
</head>
46+
<body ng-controller="camAdminAppCtrl" ng-class="{'no-breadcrumbs': !$root.showBreadcrumbs}">
47+
<!-- navigation -->
48+
<div cam-widget-header
49+
authentication="authentication"
50+
user-name="userFullName"
51+
current-app="admin"
52+
ng-cloak>
53+
<ul cam-if-logged-in
54+
ng-controller="NavigationController">
55+
56+
<li ng-class="activeClass('#/user')">
57+
<a href="#/users">{{ 'USERS_USERS' | translate }}</a>
58+
</li>
59+
60+
<li ng-class="activeClass('#/group')">
61+
<a href="#/groups">{{ 'GROUPS_GROUPS' | translate }}</a>
62+
</li>
63+
64+
<li ng-class="activeClass('#/tenant')">
65+
<a href="#/tenants">{{ 'TENANTS_TENANTS' | translate }}</a>
66+
</li>
67+
68+
<li ng-class="activeClass('#/authorization')">
69+
<a href="#/authorization?resource=0">{{ 'AUTHORIZATION_AUTHORIZATIONS' | translate }}</a>
70+
</li>
71+
<li ng-class="activeClass('#/system')">
72+
<a href="#/system?section=system-settings-general">{{ 'SYSTEM_SYSTEM' | translate }}</a>
73+
</li>
74+
<li><a href="/cws-ui/home">CWS</a></li>
75+
</ul>
76+
</div>
77+
78+
<!-- content -->
79+
<div class="ctn-main">
80+
<div class="ctn-wrapper">
81+
<div ng-if="showBreadcrumbs"
82+
cam-breadcrumbs-panel
83+
divider="&raquo;"
84+
ng-cloak
85+
class="breadcrumbs-panel"></div>
86+
87+
<div notifications-panel
88+
class="page-notifications"></div>
9489

9590
<!-- view body provided by ngView -->
9691
<div ng-view>
9792
<div class="app-splash"><div>
9893
<div class="spinner spinner-big"></div>
9994
</div></div><!-- / .app-splash -->
10095
</div>
101-
</div>
96+
</div><!-- / .app-splash -->
10297
</div>
98+
</div>
99+
</div>
100+
101+
<!-- footer -->
102+
<footer cam-widget-footer
103+
version="v7.24.6-ee"></footer>
104+
105+
<script type="application/javascript" $CSP_NONCE>
106+
var adminConf = window.camAdminConf = {};
107+
108+
window.PLUGIN_DEPENDENCIES = $PLUGIN_DEPENDENCIES || [];
109+
window.PLUGIN_PACKAGES = $PLUGIN_PACKAGES || [];
103110

104-
<!-- footer -->
105-
<footer cam-widget-footer
106-
version="v7.20.0"></footer>
107-
108-
<script type="application/javascript" $CSP_NONCE>
109-
var adminConf = window.camAdminConf = {};
110-
111-
window.PLUGIN_DEPENDENCIES = $PLUGIN_DEPENDENCIES || [];
112-
window.PLUGIN_PACKAGES = $PLUGIN_PACKAGES || [];
113-
114-
window.require = {
115-
waitSeconds: 0
116-
};
117-
</script>
118-
119-
<script type="application/javascript"
120-
src="$APP_ROOT/lib/require.js" $CSP_NONCE></script>
121-
<script type="text/javascript" $CSP_NONCE>
122-
123-
window.__define = window.define;
124-
window.__require = window.require;
125-
window.define = undefined;
126-
window.require = undefined;
127-
window.bust = '7.20.0';
128-
129-
requirejs.config({
130-
baseUrl: '$APP_ROOT/app/admin',
131-
urlArgs: 'bust=7.20.0'
132-
});
133-
requirejs(['$APP_ROOT/lib/deps.js'], function () {
134-
requirejs(['$APP_ROOT/app/admin/camunda-admin-bootstrap.js'], function () {});
135-
});
136-
</script>
137-
</body>
111+
window.require = {
112+
waitSeconds: 0
113+
};
114+
</script>
115+
</body>
138116
</html>

‎install/camunda_mods/cockpit/index.html‎

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,20 @@
2828
<!-- an example of plugin/feature exclusion -->
2929
<!--
3030
<base href="$BASE"
31+
admin-api="$APP_ROOT/api/admin/"
3132
cockpit-api="$APP_ROOT/api/cockpit/"
33+
tasklist-api="$APP_ROOT/api/tasklist/"
34+
welcome-api="$APP_ROOT/api/welcome/"
3235
engine-api="$APP_ROOT/api/engine/"
3336
app-root="$APP_ROOT"
3437
cam-exclude-plugins="cockpit.dashboard:process-definition-tiles" />
3538
-->
3639

37-
38-
<link rel="icon" href="$APP_ROOT/favicon.ico">
39-
<script defer src="$APP_ROOT/lib/runtime.js?bust=7.20.0" $CSP_NONCE charset="UTF-8"></script>
40-
<script defer src="$APP_ROOT/lib/deps.js?bust=7.20.0" $CSP_NONCE charset="UTF-8"></script>
41-
<script defer src="$APP_ROOT/app/cockpit/camunda-cockpit-bootstrap.js?bust=7.20.0" $CSP_NONCE charset="UTF-8"></script>
42-
<link href="$APP_ROOT/app/cockpit/camunda-cockpit-bootstrap.css?bust=7.20.0" rel="stylesheet">
40+
<link rel="icon" href="$APP_ROOT/favicon.ico"><script defer src="$APP_ROOT/lib/runtime.js?bust=7.24.6" $CSP_NONCE charset="UTF-8"></script><script defer src="$APP_ROOT/lib/deps.js?bust=7.24.6" $CSP_NONCE charset="UTF-8"></script><script defer src="$APP_ROOT/app/cockpit/camunda-cockpit-bootstrap.js?bust=7.24.6" $CSP_NONCE charset="UTF-8"></script><link href="$APP_ROOT/app/cockpit/camunda-cockpit-bootstrap.css?bust=7.24.6" rel="stylesheet">
4341

4442
<link rel="stylesheet"
4543
type="text/css"
46-
href="$APP_ROOT/app/cockpit/styles/user-styles.css?bust=7.20.0">
44+
href="$APP_ROOT/app/cockpit/styles/user-styles.css?bust=7.24.6-ee">
4745
</head>
4846
<body>
4947
<!-- navigation -->
@@ -60,7 +58,7 @@
6058
<li ng-repeat="actionProvider in menuActions"
6159
ng-if="actionProvider.accessible"
6260
ng-class="activeClass(actionProvider)">
63-
<view provider="actionProvider"></view>
61+
<view provider="actionProvider"></view>
6462
</li>
6563
<li class="dropdown"
6664
ng-if="dropdownActions.length"
@@ -72,11 +70,11 @@
7270
<li ng-repeat="actionProvider in dropdownActions"
7371
ng-if="actionProvider.accessible"
7472
ng-class="activeClass(actionProvider)">
75-
<view provider="actionProvider"></view>
73+
<view provider="actionProvider"></view>
7674
</li>
7775
</ul>
7876
</li>
79-
<li><a class="cam-widget-header" href="/cws-ui/home">CWS</a></li>
77+
<li><a href="/cws-ui/home">CWS</a></li>
8078
</ul>
8179
</div>
8280

@@ -103,36 +101,17 @@
103101

104102
<!-- footer -->
105103
<footer cam-widget-footer
106-
version="v7.20.0"></footer>
104+
version="v7.24.6-ee"></footer>
107105

108106
<script type="application/javascript" $CSP_NONCE>
109-
var cockpitConf = window.camCockpitConf = {};
110-
111-
window.PLUGIN_DEPENDENCIES = $PLUGIN_DEPENDENCIES || [];
112-
window.PLUGIN_PACKAGES = $PLUGIN_PACKAGES || [];
113-
114-
window.require = {
115-
waitSeconds: 0
116-
};
117-
</script>
118-
119-
<script type="application/javascript"
120-
src="$APP_ROOT/lib/require.js" $CSP_NONCE></script>
121-
<script type="text/javascript" $CSP_NONCE>
107+
window.camCockpitConf = {};
122108

123-
window.__define = window.define;
124-
window.__require = window.require;
125-
window.define = undefined;
126-
window.require = undefined;
127-
window.bust = '7.20.0';
109+
window.PLUGIN_DEPENDENCIES = $PLUGIN_DEPENDENCIES || [];
110+
window.PLUGIN_PACKAGES = $PLUGIN_PACKAGES || [];
128111

129-
requirejs.config({
130-
baseUrl: '$APP_ROOT/app/cockpit',
131-
urlArgs: 'bust=7.20.0'
132-
});
133-
requirejs(['$APP_ROOT/lib/deps.js'], function () {
134-
requirejs(['$APP_ROOT/app/cockpit/camunda-cockpit-bootstrap.js'], function(){});
135-
});
112+
window.require = {
113+
waitSeconds: 0
114+
};
136115
</script>
137116
</body>
138117
</html>

0 commit comments

Comments
 (0)