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

Distribution bar : tooltip changes

Browse Source 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
This commit is contained in:
asharani-murugesh
2016-02-19 16:39:13 +01:00
parent af1503e390
commit 5d7d33d1da
7 changed files with 67 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributionbar/client/StringDistributionBarRendererConnector.java
View File

@@ -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<String> {
public class StringDistributionBarRendererConnector extends AbstractRendererConnector<String> {
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;
}
}

1
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributionbar/client/renderers/HtmlButtonRenderer.java
View File

@@ -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");
}
}

21
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributionbar/client/renderers/StringDistributionBarRenderer.java
View File

@@ -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<String, GwtDistributionBar> {
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<String, GwtDis
return true;
}
private void setBarPartSize(final GwtDistributionBar bar, final String statusName, final int count,
final int index) {
bar.setPartSize(index, count);
@@ -82,4 +91,12 @@ public class StringDistributionBarRenderer extends WidgetRenderer<String, GwtDis
bar.setPartStyleName(index, index, "status-bar-part-" + statusName);
}
public String getUiWidgetClassName() {
return uiWidgetClassName;
}
public void setUiWidgetClassName(String uiWidgetClassName) {
this.uiWidgetClassName = uiWidgetClassName;
}
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/AbstractSimpleGrid.java
View File

@@ -39,7 +39,7 @@ public abstract class AbstractSimpleGrid extends Grid {
setHeight("200px");
setWidth("200px");
addStyleName("sp-table rollout-table");
// addStyleName("sp-table rollout-table");
addStyleName(ValoTheme.TABLE_NO_VERTICAL_LINES);
addStyleName(ValoTheme.TABLE_SMALL);

15
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutGroupListGrid.java
View File

@@ -37,6 +37,7 @@ import com.vaadin.server.FontAwesome;
import com.vaadin.spring.annotation.SpringComponent;
import com.vaadin.spring.annotation.ViewScope;
import com.vaadin.ui.renderers.ClickableRenderer.RendererClickEvent;
import com.vaadin.ui.UI;
import com.vaadin.ui.renderers.HtmlRenderer;
@SpringComponent
@@ -146,7 +147,7 @@ public class RolloutGroupListGrid extends AbstractSimpleGrid {
@Override
protected void setColumnExpandRatio() {
getColumn(SPUILabelDefinitions.VAR_NAME).setExpandRatio(1);
getColumn(SPUILabelDefinitions.VAR_NAME).setMaximumWidth(300);
getColumn(SPUILabelDefinitions.VAR_NAME).setMaximumWidth(150);
getColumn(SPUILabelDefinitions.VAR_TOTAL_TARGETS).setExpandRatio(0);
getColumn(SPUILabelDefinitions.VAR_TOTAL_TARGETS).setMinimumWidth(95);
@@ -155,11 +156,17 @@ public class RolloutGroupListGrid extends AbstractSimpleGrid {
getColumn(SPUILabelDefinitions.VAR_STATUS).setMinimumWidth(75);
getColumn(SPUILabelDefinitions.VAR_TOTAL_TARGETS_COUNT_STATUS).setExpandRatio(2);
getColumn(SPUILabelDefinitions.VAR_TOTAL_TARGETS_COUNT_STATUS).setMinimumWidth(600);
getColumn(SPUILabelDefinitions.VAR_TOTAL_TARGETS_COUNT_STATUS).setMinimumWidth(400);
getColumn(SPUILabelDefinitions.ROLLOUT_GROUP_INSTALLED_PERCENTAGE).setExpandRatio(0);
getColumn(SPUILabelDefinitions.ROLLOUT_GROUP_INSTALLED_PERCENTAGE).setMinimumWidth(80);
getColumn(SPUILabelDefinitions.ROLLOUT_GROUP_ERROR_THRESHOLD).setExpandRatio(0);
getColumn(SPUILabelDefinitions.ROLLOUT_GROUP_ERROR_THRESHOLD).setMinimumWidth(100);
getColumn(SPUILabelDefinitions.ROLLOUT_GROUP_THRESHOLD).setExpandRatio(0);
getColumn(SPUILabelDefinitions.ROLLOUT_GROUP_THRESHOLD).setMinimumWidth(140);
getColumn(SPUILabelDefinitions.VAR_CREATED_DATE).setExpandRatio(0);
getColumn(SPUILabelDefinitions.VAR_CREATED_USER).setExpandRatio(0);
getColumn(SPUILabelDefinitions.VAR_MODIFIED_DATE).setExpandRatio(0);
@@ -180,7 +187,7 @@ public class RolloutGroupListGrid extends AbstractSimpleGrid {
getColumn(SPUILabelDefinitions.ROLLOUT_GROUP_THRESHOLD)
.setHeaderCaption(i18n.get("header.rolloutgroup.threshold"));
getColumn(SPUILabelDefinitions.VAR_CREATED_USER).setHeaderCaption(i18n.get("header.createdBy"));
getColumn(SPUILabelDefinitions.VAR_CREATED_DATE).setHeaderCaption(i18n.get("header.createdBy"));
getColumn(SPUILabelDefinitions.VAR_CREATED_DATE).setHeaderCaption(i18n.get("header.createdDate"));
getColumn(SPUILabelDefinitions.VAR_MODIFIED_DATE).setHeaderCaption(i18n.get("header.modifiedDate"));
getColumn(SPUILabelDefinitions.VAR_MODIFIED_BY).setHeaderCaption(i18n.get("header.modifiedBy"));
getColumn(SPUILabelDefinitions.VAR_DESC).setHeaderCaption(i18n.get("header.description"));
@@ -267,7 +274,7 @@ public class RolloutGroupListGrid extends AbstractSimpleGrid {
result = "<div class=\"statusIconBlue\">" + FontAwesome.BULLSEYE.getHtml() + "</div>";
break;
case RUNNING:
result = "<div class=\"statusIconYellow\">" + FontAwesome.ADJUST.getHtml() + "</div>";
result = "<div class=\"statusIconYellow\"><span title=\"xxx\">" + FontAwesome.ADJUST.getHtml() + "</span></div>";
break;
case READY:
result = "<div class=\"statusIconLightBlue\"> <span title=\"xxx\">"

22
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutGroupTargetsListGrid.java
View File

@@ -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 = "<div class=\"statusIconYellow\">" + FontAwesome.ADJUST.getHtml() + "</div>";
break;
case CANCELED:
case CANCELING:
result = "<div class=\"statusIconPending\">" + FontAwesome.TIMES_CIRCLE.getHtml() + "</div>";
break;
case CANCELING:
case CANCELED:
result = "<div class=\"statusIconGreen\">" + FontAwesome.TIMES_CIRCLE.getHtml() + "</div>";
break;
case ERROR:

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

@@ -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;
}
}