Alona Kaplan has uploaded a new change for review. Change subject: webadmin: SetupNetwork- long network names shouldn't break the layout ......................................................................
webadmin: SetupNetwork- long network names shouldn't break the layout Adding '...' to long network names that break the layout. Change-Id: Ife6ef384a5eac71398b397d8475ec312ed97eeb5 Bug-Url: https://bugzilla.redhat.com/1133598 Signed-off-by: Alona Kaplan <[email protected]> (cherry picked from commit b970ff0d12579e6894abb18db77b899625fe64c5) --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanelsStyle.java 4 files changed, 62 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/32634/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java index a54c1be..99dbb60 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java @@ -56,8 +56,8 @@ @DefaultMessage("The Network will be added to the Data Center {0} as well.") String theNetworkWillBeAddedToTheDataCenterAsWell(String dcName); - @DefaultMessage("{0} (VLAN {1})") - String vlanNetwork(String name, String vlanId); + @DefaultMessage("(VLAN {0})") + String vlanNetwork(int vlanId); @DefaultMessage("Virtual Machine {0} already exists") String sameVmNameExists(String vmName); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml index cf27ff7..f4547f8 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml @@ -83,6 +83,16 @@ box-shadow: 1px 1px 1px 1px rgba(33, 33, 33, 0.3); } + .networkPanelAttached { + width: 233px; + overflow: hidden; + } + + .networkPanelNotAttached { + width: 244px; + overflow: hidden; + } + .networkPanel { background-color: #FFFFFF; border-color: #C5C5C5; @@ -230,6 +240,18 @@ font-weight: bold; padding-top: 6px; } + + .vlanLabel{ + padding-left: 3px; + padding-right: 3px; + white-space: nowrap; + } + + .titleLabel{ + white-space: nowrap; + overflow: hidden;; + text-overflow: ellipsis; + } </ui:style> <d:SimpleDialogPanel width="900px" height="600px"> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java index 2e60983..c3a2ee4 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java @@ -1,23 +1,29 @@ package org.ovirt.engine.ui.webadmin.section.main.view.popup.host.panels; +import org.ovirt.engine.ui.common.utils.ElementUtils; import org.ovirt.engine.ui.uicommonweb.models.hosts.network.LogicalNetworkModel; import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkCommand; import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkOperation; import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkOperationFactory.OperationMap; +import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.Grid; +import com.google.gwt.user.client.ui.HTMLTable.ColumnFormatter; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.Widget; -import com.google.gwt.user.client.ui.HTMLTable.ColumnFormatter; public abstract class NetworkPanel extends NetworkItemPanel { + Label titleLabel; + public NetworkPanel(LogicalNetworkModel item, NetworkPanelsStyle style, boolean draggable) { super(item, style, draggable); + getElement().addClassName(item.getAttachedToNic() != null ? style.networkPanelAttached() + : style.networkPanelNotAttached()); if (item.isManagement()) { getElement().addClassName(style.mgmtNetwork()); } @@ -105,26 +111,33 @@ if (statusImage != null) { statusPanel.add(new Image(statusImage)); } - Label titleLabel = new Label(getItemTitle()); - rowPanel.setWidget(0, 2, titleLabel); + + rowPanel.setWidget(0, 2, createTitlePanel()); rowPanel.setWidget(0, 3, mgmtNetworkImage); rowPanel.setWidget(0, 4, monitorImage); rowPanel.setWidget(0, 5, vmImage); rowPanel.setWidget(0, 6, migrationImage); rowPanel.setWidget(0, 7, notSyncImage); rowPanel.setWidget(0, 8, actionButton); + return rowPanel; } - protected abstract ImageResource getStatusImage(); - - private String getItemTitle() { + private Panel createTitlePanel() { LogicalNetworkModel networkModel = (LogicalNetworkModel) item; + titleLabel = new Label(networkModel.getName()); + titleLabel.getElement().addClassName(style.titleLabel()); + Panel titlePanel = new HorizontalPanel(); + titlePanel.add(titleLabel); if (networkModel.hasVlan()) { - return messages.vlanNetwork(networkModel.getName(), String.valueOf(networkModel.getVlanId())); + Label vlanLabel = new Label(messages.vlanNetwork(networkModel.getVlanId())); + vlanLabel.getElement().addClassName(style.vlanLabel()); + titlePanel.add(vlanLabel); } - return item.getName(); + return titlePanel; } + + protected abstract ImageResource getStatusImage(); @Override protected void onAction() { @@ -138,4 +151,13 @@ } } + @Override + protected void onLoad() { + super.onLoad(); + + while (ElementUtils.detectOverflowUsingScrollWidth(getElement())) { + titleLabel.getElement().getStyle().setWidth(titleLabel.getElement().getClientWidth() - 1, Unit.PX); + } + } + } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanelsStyle.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanelsStyle.java index 48ad16a..817ddb2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanelsStyle.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanelsStyle.java @@ -27,6 +27,10 @@ String networkPanel(); + String networkPanelAttached(); + + String networkPanelNotAttached(); + String disabledNetworkPanel(); String nicPanel(); @@ -50,4 +54,8 @@ String requiredTitlePanel(); String requiredLabel(); + + String vlanLabel(); + + String titleLabel(); } -- To view, visit http://gerrit.ovirt.org/32634 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife6ef384a5eac71398b397d8475ec312ed97eeb5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
