Skip to content

Commit

Permalink
feat(webapp): add community edition end of life banner
Browse files Browse the repository at this point in the history
related to #4171
  • Loading branch information
danielkelemen authored Mar 18, 2024
1 parent b4c93dc commit 482cc12
Show file tree
Hide file tree
Showing 16 changed files with 256 additions and 194 deletions.
16 changes: 15 additions & 1 deletion distro/camunda-welcome/assets/css/welcome.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body.dashboard {
background-color: #e5e5e5;
padding-top: 70px;
padding-top: 90px;
}

[cam-widget-header] .btn-primary,
Expand All @@ -12,6 +12,20 @@ body.dashboard {
display: flex;
align-items: center;
}
[cam-widget-header] .ce-eol-banner {
background-color: #B5152BFF;
color: white;
text-align: center;
height: 20px;
font-size: 0.9em;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
[cam-widget-header] .ce-eol-banner a {
color: white;
text-decoration: underline;
}

.navbar-brand .logo {
margin-right: 5px;
Expand Down
6 changes: 6 additions & 0 deletions distro/camunda-welcome/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
</head>
<body class="dashboard">
<header cam-widget-header>
<div class="ce-eol-banner">
Heads-up – it is time to try out Camunda 8. The last release of Camunda 7 CE will be in October 2025. If you have
any more questions, please get in touch with us in the
<a href="https://forum.camunda.io/t/important-update-camunda-7-community-edition-end-of-life-announced/50921"
target="_blank">forum</a>.
</div>
<div class="container">
<div class="row">
<div class="col-xs-8">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<div ng-if="isCommunityEdition" class="ce-eol-banner"
ng-bind-html="trustAsHtml('BANNER_CE_EOL_TEXT' | translate)">
</div>

<div class="navbar-header">
<button type="button"
class="navbar-toggle"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ module.exports = function() {
configuration.getAppVendor() + ' ' + configuration.getAppName();
$('head title').text($scope.brandName);

$scope.trustAsHtml = $sce.trustAsHtml;
// eslint-disable-next-line
$scope.isCommunityEdition = CAMUNDA_EDITION === 'CE';

$scope.logout = AuthenticationService.logout;
$scope.getTargetRoute = function() {
return $scope.authentication ? '' : '#/login';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
body {
padding-top: @header-height;
padding-top: @header-height + @ce-banner-height;
}

// Not nested to allow for custom CSS
Expand All @@ -16,6 +16,22 @@ body {
[cam-widget-header] {
.cam-corporate-header();

.ce-eol-banner {
background-color: @main-color;
color: white;
text-align: center;
height: @ce-banner-height;
font-size: 0.9em;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;

a {
color: white;
text-decoration: underline;
}
}

.navbar-brand {
display: flex;
align-items: center;
Expand Down
1 change: 1 addition & 0 deletions webapps/frontend/public/app/admin/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
"AUTH_LOGOUT_SUCCESSFUL": "Logout successful",
"AUTH_LOGOUT_THANKS": "Thank you for using Camunda today. Have a great {{dayContext}}!",
"BACK": "Back",
"BANNER_CE_EOL_TEXT": "Heads-up – it is time to try out Camunda 8. The last release of Camunda 7 CE will be in October 2025. If you have any more questions, please get in touch with us in the <a href=\"https://forum.camunda.io/t/important-update-camunda-7-community-edition-end-of-life-announced/50921\" target=\"_blank\">forum</a>.",
"BOOLEAN": "Boolean",
"CAM_WIDGET_BPMN_VIEWER_ERROR": "Could not render diagram:",
"CAM_WIDGET_BPMN_VIEWER_LOADING": "Loading diagram",
Expand Down
1 change: 1 addition & 0 deletions webapps/frontend/public/app/cockpit/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
"AUTH_LOGOUT_SUCCESSFUL": "Logout successful",
"AUTH_LOGOUT_THANKS": "Thank you for using Camunda today. Have a great {{dayContext}}!",
"BACK": "Back",
"BANNER_CE_EOL_TEXT": "Heads-up – it is time to try out Camunda 8. The last release of Camunda 7 CE will be in October 2025. If you have any more questions, please get in touch with us in the <a href=\"https://forum.camunda.io/t/important-update-camunda-7-community-edition-end-of-life-announced/50921\" target=\"_blank\">forum</a>.",
"BATCHES_BREAD_BATCHES": "Batches",
"BATCHES_DELETE_BATCH_FAILED": "Could not delete batch: {{message}}",
"BATCHES_DELETE_BATCH_STATUS": "Finished",
Expand Down
1 change: 1 addition & 0 deletions webapps/frontend/public/app/tasklist/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@
"AddUserLink": "Add User Link",
"Assign": "Assign",
"BACK": "Back",
"BANNER_CE_EOL_TEXT": "Heads-up – it is time to try out Camunda 8. The last release of Camunda 7 CE will be in October 2025. If you have any more questions, please get in touch with us in the <a href=\"https://forum.camunda.io/t/important-update-camunda-7-community-edition-end-of-life-announced/50921\" target=\"_blank\">forum</a>.",
"BEFORE": "before",
"BOOLEAN": "Boolean",
"BUSINESS_KEY": "Business Key",
Expand Down
1 change: 1 addition & 0 deletions webapps/frontend/public/app/welcome/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"AUTH_LOGOUT_SUCCESSFUL": "Logout successful",
"AUTH_LOGOUT_THANKS": "Thank you for using Camunda today. Have a great {{dayContext}}!",
"BACK": "Back",
"BANNER_CE_EOL_TEXT": "Heads-up – it is time to try out Camunda 8. The last release of Camunda 7 CE will be in October 2025. If you have any more questions, please get in touch with us in the <a href=\"https://forum.camunda.io/t/important-update-camunda-7-community-edition-end-of-life-announced/50921\" target=\"_blank\">forum</a>.",
"BOOLEAN": "Boolean",
"CAM_WIDGET_BPMN_VIEWER_ERROR": "Could not render diagram:",
"CAM_WIDGET_BPMN_VIEWER_LOADING": "Loading diagram",
Expand Down
2 changes: 1 addition & 1 deletion webapps/frontend/ui/admin/client/styles/styles.less
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ table.cam-table > tbody > tr > td.action {
.ctn-main {
position: absolute;
width: 100%;
top: @header-height;
top: @header-height + @ce-banner-height;
bottom: @footer-height;
}

Expand Down
2 changes: 1 addition & 1 deletion webapps/frontend/ui/cockpit/client/styles/ctn.less
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

.ctn-main {
position: absolute;
top: @header-height;
top: @header-height + @ce-banner-height;
bottom: @footer-height;
left: 0;
right: 0;
Expand Down
2 changes: 1 addition & 1 deletion webapps/frontend/ui/common/styles/_three-cols-layout.less
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@

.page-wrap {
z-index: 1;
top: @navbar-height;
top: @navbar-height + @ce-banner-height;
bottom: @footer-height;
}

Expand Down
2 changes: 1 addition & 1 deletion webapps/frontend/ui/welcome/client/styles/styles.less
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ form .btn {
.welcome-page {
background-color: @custom-gray-light;
position: absolute;
min-height: ~"calc(100% - (@{header-height} + @{footer-height}))";
min-height: ~"calc(100% - (@{header-height} + @{ce-banner-height} + @{footer-height}))";
width: 100%;
// padding-top: @grid-gutter-width;
// padding-bottom: @grid-gutter-width;
Expand Down
Loading

0 comments on commit 482cc12

Please sign in to comment.