lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

New event strategy (#380)

Browse Source 
* Add notfication overview for remote events

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Refactor css for notification button

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Remove todo

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* - Style notfication button (css) 
- Add i18n message keys
- Add switch slider for auto refresh event

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Insert Label in MenuItem for displaying occurred events

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* - Style notfication button (css) 
- Add i18n message keys
- Add switch slider for auto refresh event
- Insert Label in MenuItem for displaying occurred events

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Solve merge conflicts and add menu item counter

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* CSS refactor

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Adapt JUnit test for events, because constructor is changed

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Skip delete event

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* - Insert Id for notification menu

- Enable push mechanism for target and ds tag and add notfications

- Fix several typos

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Add update ui events for tags and add different id's for menue item

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Insert push for SoftwareModule

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Set button enablement

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Add Software module update push event
Add unit test software module push events
Adapt test for software push event

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Close window and set pop id
Update the target table to set the new icon

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* - several code improvements
- Correct license header

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Update vaadin version
Rename the base entity and redefine constructors
unread counter was not correct

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Closebox of notificationButton is invisible: 
Insert height for HorizontalLayout of NotificationUnreadButton

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Add software modules to the new event types

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Introduce animation in unreadNotificationButton

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Fix close  on safari

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Add publish events direct to the tag entities.


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
This commit is contained in:
Melanie Retter
2016-12-19 16:05:23 +01:00
committed by Kai Zimmermann
parent ccc23bf634
commit 2dec35915c
115 changed files with 1891 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
View File

@@ -9,18 +9,25 @@
// scss-lint:disable ImportantRule, PropertySortOrder
@include keyframes(animate-in-scale-up) {
0% {
@include transform(scale(0));
}
}
@mixin dashboard-common {
.v-ui {
//View caption style
.v-caption-view-content {
.v-caption-header-content {
padding-left: 20px;
color: $widget-caption-color;
font: $view-caption-font-style;
font: $view-caption-font-style !important;
}
.view-header-layout{
width: 100%;
padding-right: 20px;
}
.v-ui {
//Menu style
.valo-menu {
@@ -32,6 +39,11 @@
position: relative;
padding-bottom: 20px;
}
.labelwrapper {
position: relative;
padding: 0 !important;
}
}
// View main content.When view content width and height is less than min-width and min-height ,scroll bars are displayed
@@ -114,6 +126,15 @@
font-size: 14px;
font-weight: 400;
}
.valo-menu .valo-menu-badge,
.dashboard-view .notifications.unread .v-button-caption {
@include valo-badge-style;
position: absolute;
right: round($v-unit-size/3);
font-size: round($v-font-size * 0.9);
pointer-events: none;
}
//Menu item - white border is displayed after each menu item
.valo-menu-item,

81
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/notification-unread-change.scss Normal file
View File

@@ -0,0 +1,81 @@
/**
* Copyright (c) 2015 Bosch Software Innovations GmbH and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
@mixin notification-unread-change {
.notifications-unread{
width: 37px !important;
height: 37px !important;
padding-left: 10px !important;
}
.notifications-unread-popup.v-window {
overflow: visible !important;
// top: 3 * $v-unit-size !important;
right: $view-padding;
left: auto !important;
max-width: 90%;
$window-outline: $v-overlay-shadow;
@if list-of-lists($window-outline) {
$window-outline: last($v-overlay-shadow);
}
$window-outline: flatten-list(valo-bevel-and-shadow($bevel: null, $shadow: $window-outline));
$outline-width: nth($window-outline, length($window-outline) - 1);
$outline-color: last($window-outline);
@include transform-origin(296px - (2 * $v-unit-size - round($v-unit-size / 3)) -7px);
&.v-window-animate-in {
@include animation(animate-in-scale-up 260ms cubic-bezier(.68,.37,.51,1.37));
}
&:before,
&:after {
content: "";
position: absolute;
top: -12px;
right: (2 * $v-unit-size - round($v-unit-size / 3)) - 55px !important;
border: 7px solid transparent;
width: 0;
height: 0;
border-bottom-color: $v-window-background-color;
}
&:before {
@if type-of($outline-width) == number and $outline-width > 0 {
top: -15px - 2 * $outline-width;
margin-right: -$outline-width;
border-width: 7px + $outline-width;
border-bottom-width: 8px;
border-bottom-color: $outline-color;
} @else {
content: none;
}
}
.v-window-header {
color: $v-selection-color;
}
.notification-item {
font-size: round($v-font-size * 0.9);
}
}
// Need to use normal media queries because Responsive doesn't work for overlay elements just yet
@media screen and (max-width: 480px) {
.notifications-unread-popup.v-window {
right: round($view-padding / 2);
}
}
}

5
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-window.scss
View File

@@ -166,4 +166,9 @@
margin-top: 30px;
margin-bottom: 10px;
}
.v-window-no-closebox .v-window-closebox:before {
height: 0px !important;
content: "" !important;
}
}

7
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/hawkbittheme.scss
View File

@@ -38,6 +38,8 @@ $v-grid-cell-horizontal-border: 0px ;
$v-grid-cell-focused-border: 0px ;
$v-grid-cell-padding-horizontal:6px;
$v-animations-enabled: true;
@import '../valo/valo';
@import 'customstyles/table';
@import 'customstyles/filter-status';
@@ -62,7 +64,7 @@ $v-grid-cell-padding-horizontal:6px;
@import 'customstyles/target-filter-query';
@import 'customstyles/statusprogressbar';
@import 'customstyles/rollout';
@import 'customstyles/notification-unread-change';
// Optimize the CSS output
$v-included-components: remove($v-included-components, calendar);
@@ -95,11 +97,10 @@ $v-included-components: remove($v-included-components, form);
@include table-header-common;
@include footer-common;
@include popup-common;
@include valo-menu-responsive;
@include target-filter-query;
@include statusprogressbar;
@include rollout;
@include notification-unread-change;
.v-app-loading {
background-color: rgba(0, 0, 0, 0);

16
hawkbit-ui/src/main/resources/messages.properties
View File

@@ -27,6 +27,8 @@ button.auto.assignment.desc = Select auto assign distribution set
bulk.targets.upload = Please upload csv file.
bulkupload.ds.name = DS Name
button.discard=Discard
notification.unread.button.title=Notifications
notification.unread.button.description=Notifications ({0} unread)
# Headers prefix with - header
header.target.table=Targets
@@ -60,6 +62,20 @@ header.action.pause=Pause
header.action.update=Edit
header.status=Status
# event container
target.created.event.container.notifcation.message=targets created
target.deleted.event.container.notifcation.message=targets deleted
distribution.created.event.container.notifcation.message=distribution sets created
distribution.deleted.event.container.notifcation.message=distribution sets deleted
target.tag.created.event.container.notifcation.message=target tags created
target.tag.deleted.event.container.notifcation.message=target tags deleted
target.tag.updated.event.container.notifcation.message=target tags changed
software.module.created.event.container.notifcation.message=software module created
software.module.deleted.event.container.notifcation.message=software module deleted
distribution.set.tag.created.event.container.notifcation.message=distribution set tags created
distribution.set.tag.deleted.event.container.notifcation.message=distribution set tags deleted
distribution.set.tag.updated.event.container.notifcation.message=distribution set tags changed
# Captions prefix with - caption
caption.action.history = Action history for {0}
caption.error = Error