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

Migration of Action History to vaadin grid (#420)

Browse Source 
* Migration of Action History to vaadin Grid
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
Marcel Mager
2017-03-24 14:03:39 +01:00
committed by Kai Zimmermann
parent 081c3cccbf
commit c8db41ff85
65 changed files with 4713 additions and 1585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/action-history.scss
View File

@@ -18,9 +18,21 @@
padding-bottom: 25px;
padding-top: 5px;
}
//Color of forced label
.action-history-table-col-forced-label {
color: $hawkbit-primary-color;
.action-history-message-grid {
.v-grid-cell {
border: none !important;
cursor: move;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
-icab-text-overflow: ellipsis;
-khtml-text-overflow: ellipsis;
-moz-text-overflow: ellipsis;
-webkit-text-overflow: ellipsis;
font-size: $v-font-size--small !important;
box-shadow: none !important;
}
}
}

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

@@ -23,8 +23,9 @@
}
.view-header-layout{
width: 100%;
width: 100% !important;
padding-right: 20px;
padding-bottom: 0.3em
}
.v-ui {
@@ -51,10 +52,10 @@
padding-right: 20px;
padding-left: 20px;
min-width: 1000px;
min-height: 400px;
min-height: 500px;
border: 0px;
background-color: transparent;
box-shadow: none;
box-shadow: none
}
//View background styles
@@ -65,7 +66,7 @@
background-position: bottom;
background-repeat: no-repeat;
border-left: 0 solid #fff;
padding-top: 80px;
padding-top: 70px;
overflow: auto;
}
@@ -76,7 +77,7 @@
font-weight: bold;
height: 32px;
line-height: 50px;
padding-bottom: 5px;
padding-bottom: 0px;
padding-left: 15px;
padding-top: 0;
position: absolute;
@@ -103,7 +104,7 @@
background: $logo-image no-repeat right top;
background-position: $logo-position;
content: "";
height: 80px;
height: 70px;
position: absolute;
top: 0;
width: 100%;
@@ -316,5 +317,11 @@
.form-lastrow {
padding-bottom: 12px !important;
}
.text-cut {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
}

33
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/grid.scss Normal file
View File

@@ -0,0 +1,33 @@
/**
* 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 grid {
.v-grid-cell.centeralign {
text-align: center;
}
.v-grid-cell.leftalign {
text-align: left;
}
.v-grid-cell.rightalign {
text-align: right;
}
.v-grid-cell {
font-size: $v-font-size--small !important
}
.v-grid-cell.frozen{
box-shadow: none !important;
}
.v-grid-cell.frozen + th {
border-left: $v-grid-border-size solid $widget-border-color ;
}
}

103
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/others.scss
View File

@@ -92,7 +92,7 @@
}
//Pin style - when hovered on pin and when row is selected
tr.v-selected .v-button-targetStatusPinToggle:hover:after {
widget-bg .v-button-targetStatusPinToggle:hover:after {
background-color: $widget-bg;
color: $hawkbit-primary-color !important;
}
@@ -195,56 +195,97 @@
content: "\f08d";
color: $widget-bg;
}
.statusIconPending {
// pending status label not selected
tr:not(.v-selected) .statusIconForced:after {
color: $hawkbit-primary-color;
}
.statusIconActive {
// pending status label selected
tr.v-selected .statusIconForced:after {
color: $widget-bg;
}
// pending status label not selected
tr:not(.v-selected) .statusIconPending:after {
color: $hawkbit-primary-color;
}
// pending status label selected
tr.v-selected .statusIconPending:after {
color: $widget-bg;
}
// active status label not selected
tr:not(.v-grid-row-selected) .statusIconActive {
@include valo-spinner($size:16px,$speed:1200ms);
color: $hawkbit-primary-color;
}
.statusIconNeutral {
color: $hawkbit-primary-color;
// active status label selected
tr.v-grid-row-selected .statusIconActive {
@include valo-spinner($size:16px,$speed:1200ms,$color: $grey-light);
color: $grey-light;
}
// neutral status label not selected
tr:not(.v-selected) .statusIconNeutral:after {
color: $hawkbit-primary-color;
}
// neutral status label selected
tr.v-selected .statusIconNeutral:after {
color: $widget-bg;
}
// red status label not selected
tr:not(.v-selected) .borderless.statusIconRed:after {
color: $hawkbit-primary-color;
content: '';
}
// red status label not selected
tr.v-selected .borderless.statusIconRed:after {
color: $widget-bg;
content: '';
}
.redSpinner{
@include valo-spinner($size: $v-font-size--small,$color: $red-color);
pointer-events: auto !important;
}
.greySpinner{
@include valo-spinner($size: $v-font-size--small,$color: $grey-color);
pointer-events: auto !important;
}
.greySpinner{
@include valo-spinner($size: $v-font-size--small,$color: $grey-color);
pointer-events: auto !important;
}
.yellowSpinner{
@include valo-spinner($size: $v-font-size--small,$color: $signal-yellow-color);
pointer-events: auto !important;
}
.blueSpinner{
@include valo-spinner($size: $v-font-size--small,$color: $signal-light-blue-color);
pointer-events: auto !important;
}
.yellowSpinner{
@include valo-spinner($size: $v-font-size--small,$color: $signal-yellow-color);
pointer-events: auto !important;
}
.blueSpinner{
@include valo-spinner($size: $v-font-size--small,$color: $signal-light-blue-color);
pointer-events: auto !important;
}
// Disabled row style when distribution is incomplete
.v-table-row-incomplete-distribution {
color: $disabled-row-color-grey !important;
}
.v-table-row-incomplete-distribution {
color: $disabled-row-color-grey !important;
}
.v-link {
text-decoration: none;
padding-right: 10px;
font-weight: 300;
}
.v-link {
text-decoration: none;
padding-right: 10px;
font-weight: 300;
}
.v-tooltip{
max-width:43em;
}
.v-tooltip{
max-width:43em;
}
.breadcrumbPaddingLeft{
.breadcrumbPaddingLeft{
padding-left: 3px !important;
}
}
}

164
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss
View File

@@ -7,97 +7,76 @@
* http://www.eclipse.org/legal/epl-v10.html
*/
@mixin rollout {
.rollout-option-group {
font-size: 12px;
font-weight: 400;
margin-left: 8px;
}
.rollout-action-type-layout {
.v-caption-padding-right-style {
padding-right: 0px !important;
}
}
.v-context-menu .v-context-menu-item-basic-icon-container {
height: 0px !important;
width: 0px !important;
}
.v-context-menu .v-context-menu-item-basic {
background-color: #feffff !important;
border-radius: 4px;
font-family: $app-font-family;
font-size: $app-text-font-size;
font-weight: normal;
font-style: normal;
}
.v-context-menu {
background-color: #feffff !important;
border-radius: 4px;
}
.v-context-menu .v-context-menu-item-basic:focus, .v-context-menu .v-context-menu-item-basic-submenu:focus, .v-context-menu .v-context-menu-item-basic-open {
@include valo-gradient($color: $hawkbit-primary-color);
background-color: $hawkbit-primary-color !important;
color: #e8eef3;
height: 30px;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.05);
}
.disable-action-type-layout {
opacity: 0.5;
}
.action-type-padding {
padding: 0 0px !important;
}
.rollout-caption-links {
font-weight: 400;
height: 25px;
padding: 0px 4px;
}
.rollout-target-count-message {
color: $info-message-color-grey;
}
.rollout-table {
.v-table-cell-wrapper {
cursor: default;
}
}
.v-grid-cell.centeralign {
text-align: center;
}
.v-grid-cell {
font-size: $v-font-size--small !important;
height: 34px !important;
}
.v-grid-row {
height: 34px !important;
}
.v-grid-cell.frozen {
box-shadow: none !important;
}
.v-grid-cell.frozen + th {
border-left: $v-grid-border-size solid $widget-border-color;
}
.v-button-boldhide {
text-decoration: none;
}
.groups-pie-chart {
.rollout-option-group{
font-size:12px;
font-weight:400;
margin-left:8px;
}
.rollout-action-type-layout {
.v-caption-padding-right-style{
padding-right:0px !important;
}
}
.v-context-menu .v-context-menu-item-basic-icon-container{
height:0px !important;
width:0px !important;
}
.v-context-menu .v-context-menu-item-basic{
background-color: #feffff !important;
border-radius: 4px;
font-family : $app-font-family;
font-size : $app-text-font-size;
font-weight : normal;
font-style : normal;
}
.v-context-menu{
background-color: #feffff !important;
border-radius: 4px;
}
.v-context-menu .v-context-menu-item-basic:focus, .v-context-menu .v-context-menu-item-basic-submenu:focus, .v-context-menu .v-context-menu-item-basic-open {
@include valo-gradient($color: $hawkbit-primary-color);
background-color: $hawkbit-primary-color !important;
color: #e8eef3;
height: 30px;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.05);
}
.disable-action-type-layout{
opacity: 0.5;
}
.action-type-padding{
padding: 0 0px !important;
}
.rollout-caption-links{
font-weight: 400;
height: 25px ;
padding: 0px 4px ;
}
.rollout-target-count-message{
color: $info-message-color-grey;
}
.rollout-table{
.v-table-cell-wrapper {
cursor: default;
}
}
.v-button-boldhide{
text-decoration:none;
}
.groups-pie-chart {
float: right;
svg {
@@ -209,5 +188,6 @@
.v-slot:nth-child(16n+15) .rollout-group-count { border-left-color: #BBDE8F }
.v-slot:nth-child(16n+16) .rollout-group-count { border-left-color: #7FB0A4 }
}
}

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

@@ -36,7 +36,6 @@
}
.v-table-resizer {
height: 37px !important;
margin-left: -8px !important;
}

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

@@ -38,10 +38,13 @@ $v-grid-cell-horizontal-border: 0px ;
$v-grid-cell-focused-border: 0px ;
$v-grid-cell-padding-horizontal:6px;
$v-table-row-height: 31px;
$v-animations-enabled: true;
@import '../valo/valo';
@import 'customstyles/table';
@import 'customstyles/grid';
@import 'customstyles/filter-status';
@import 'customstyles/colorpicker';
@import 'customstyles/tags';
@@ -79,6 +82,7 @@ $v-included-components: remove($v-included-components, form);
@include valo;
@include generic-styles;
@include table;
@include grid;
@include filter-status;
@include colorpicker;
@include tags;

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

@@ -213,7 +213,6 @@ textfield.vendor = Vendor
textfield.description = Description
textfield.customfiltername = Filter name
textfield.value = Value
ui.version = Powered by Bosch IoT Software Provisioning
prompt.target.id = Controller ID