diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributionbar/client/StringDistributionBarRendererConnector.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributionbar/client/StringDistributionBarRendererConnector.java index 8fc205120..046a5be70 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributionbar/client/StringDistributionBarRendererConnector.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributionbar/client/StringDistributionBarRendererConnector.java @@ -1,17 +1,18 @@ package org.eclipse.hawkbit.ui.distributionbar.client; - import com.vaadin.client.connectors.AbstractRendererConnector; import com.vaadin.shared.ui.Connect; @Connect(org.eclipse.hawkbit.ui.distributionbar.renderers.StringDistributionBarRenderer.class) -public class StringDistributionBarRendererConnector extends - AbstractRendererConnector { +public class StringDistributionBarRendererConnector extends AbstractRendererConnector { - private static final long serialVersionUID = 7697966991925490786L; + private static final long serialVersionUID = 7697966991925490786L; - @Override + @Override public org.eclipse.hawkbit.ui.distributionbar.client.renderers.StringDistributionBarRenderer getRenderer() { - return (org.eclipse.hawkbit.ui.distributionbar.client.renderers.StringDistributionBarRenderer) super.getRenderer(); + org.eclipse.hawkbit.ui.distributionbar.client.renderers.StringDistributionBarRenderer renderer = (org.eclipse.hawkbit.ui.distributionbar.client.renderers.StringDistributionBarRenderer) super.getRenderer(); + renderer.setUiWidgetClassName(StringDistributionBarRendererConnector.this.getConnection().getUIConnector().getWidget().getParent().getStyleName()); + return renderer; } + } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributionbar/client/renderers/HtmlButtonRenderer.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributionbar/client/renderers/HtmlButtonRenderer.java index 14c67e6d4..a742e3b1d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributionbar/client/renderers/HtmlButtonRenderer.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributionbar/client/renderers/HtmlButtonRenderer.java @@ -16,5 +16,6 @@ public class HtmlButtonRenderer extends ButtonRenderer { // this is to allow the button to disappear, if the text is null button.setVisible(text != null); button.getElement().setId("rollout.action.button.id"); + button.getElement().setTitle("action"); } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributionbar/client/renderers/StringDistributionBarRenderer.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributionbar/client/renderers/StringDistributionBarRenderer.java index 94cb35299..d066e0175 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributionbar/client/renderers/StringDistributionBarRenderer.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributionbar/client/renderers/StringDistributionBarRenderer.java @@ -6,6 +6,7 @@ import java.util.Map; import java.util.Map.Entry; import org.vaadin.alump.distributionbar.gwt.client.GwtDistributionBar; +import org.vaadin.alump.distributionbar.gwt.client.dom.ToolTipPresenter.TooltipClassNameProvider; import com.google.gwt.core.client.GWT; import com.vaadin.client.renderers.WidgetRenderer; @@ -13,9 +14,18 @@ import com.vaadin.client.widget.grid.RendererCellReference; public class StringDistributionBarRenderer extends WidgetRenderer { + private String uiWidgetClassName; + @Override public GwtDistributionBar createWidget() { - return GWT.create(GwtDistributionBar.class); + GwtDistributionBar gwt = GWT.create(GwtDistributionBar.class); + gwt.setTooltipClassNameProvider(new TooltipClassNameProvider() { + @Override + public String getClassNames() { + return getUiWidgetClassName(); + } + }); + return gwt; } @Override @@ -74,7 +84,6 @@ public class StringDistributionBarRenderer extends WidgetRenderer" + FontAwesome.BULLSEYE.getHtml() + ""; break; case RUNNING: - result = "
" + FontAwesome.ADJUST.getHtml() + "
"; + result = "
" + FontAwesome.ADJUST.getHtml() + "
"; break; case READY: result = "
" diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutGroupTargetsListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutGroupTargetsListGrid.java index dbff2003d..939f73607 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutGroupTargetsListGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutGroupTargetsListGrid.java @@ -98,17 +98,31 @@ public class RolloutGroupTargetsListGrid extends AbstractSimpleGrid { @Override protected void setColumnExpandRatio() { + setSizeFull(); getColumn(SPUILabelDefinitions.VAR_NAME).setExpandRatio(1); - getColumn(SPUILabelDefinitions.VAR_NAME).setMaximumWidth(300); + getColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_BY).setMaximumWidth(200); getColumn(SPUILabelDefinitions.VAR_STATUS).setExpandRatio(0); - getColumn(SPUILabelDefinitions.VAR_STATUS).setMinimumWidth(75); + getColumn(SPUILabelDefinitions.VAR_STATUS).setMinimumWidth(100); getColumn(SPUILabelDefinitions.VAR_CREATED_DATE).setExpandRatio(0); + getColumn(SPUILabelDefinitions.VAR_CREATED_DATE).setMaximumWidth(200); + getColumn(SPUILabelDefinitions.VAR_CREATED_BY).setExpandRatio(0); + getColumn(SPUILabelDefinitions.VAR_CREATED_BY).setMaximumWidth(200); + + getColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_DATE).setExpandRatio(0); + getColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_DATE).setMaximumWidth(200); + + getColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_BY).setExpandRatio(0); + getColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_BY).setMaximumWidth(200); + + getColumn(SPUILabelDefinitions.VAR_DESC).setExpandRatio(0); + getColumn(SPUILabelDefinitions.VAR_DESC).setMaximumWidth(200); + getColumn(SPUILabelDefinitions.ASSIGNED_DISTRIBUTION_NAME_VER).setExpandRatio(0); } @@ -201,10 +215,10 @@ public class RolloutGroupTargetsListGrid extends AbstractSimpleGrid { case DOWNLOAD: result = "
" + FontAwesome.ADJUST.getHtml() + "
"; break; - case CANCELED: + case CANCELING: result = "
" + FontAwesome.TIMES_CIRCLE.getHtml() + "
"; break; - case CANCELING: + case CANCELED: result = "
" + FontAwesome.TIMES_CIRCLE.getHtml() + "
"; break; case ERROR: diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss index 3b3d810b6..ba951df24 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss @@ -59,5 +59,15 @@ .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; + } + } \ No newline at end of file