Alona Kaplan has uploaded a new change for review.
Change subject: webadmin: Network tab, minor sub tab fixes
......................................................................
webadmin: Network tab, minor sub tab fixes
network->host.
- default should be attached.
- s/Nic/Network Device (on all the columns that contain Nic)
- add Speed column
network->cluster
- s/Netwrok Required/Required Network
- s/Network Attached/Attached Network
- centralize checkbox columns
Change-Id: I7d95ba68ae691a3b62d5cc7cf24b0a3957150812
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/ViewRadioGroup.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/CheckboxColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java
6 files changed, 53 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/10329/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
index 6bb9018..90d45f3 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
@@ -1068,16 +1068,19 @@
String refreshRate();
// Network Host
- @DefaultStringValue("Nic Status")
+ @DefaultStringValue("Network Device Status")
String statusNetworkHost();
- @DefaultStringValue("Nic")
+ @DefaultStringValue("Network Device")
String nicNetworkHost();
- @DefaultStringValue("Nic Rx")
+ @DefaultStringValue("Network Device Speed")
+ String speedNetworkHost();
+
+ @DefaultStringValue("Network Device Rx")
String rxNetworkHost();
- @DefaultStringValue("Nic Tx")
+ @DefaultStringValue("Network Device Tx")
String txNetworkHost();
// Network VM
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/ViewRadioGroup.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/ViewRadioGroup.java
index 83aae29..07a9279 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/ViewRadioGroup.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/ViewRadioGroup.java
@@ -1,6 +1,5 @@
package org.ovirt.engine.ui.common.view;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -19,19 +18,17 @@
private final List<? extends ViewFilter<K>> items;
private final Map<K, RadioButton> buttons = new HashMap<K, RadioButton>();
-
public ViewRadioGroup(List<? extends ViewFilter<K>> items) {
this.items = items;
initWidget(getRadioGroupPanel());
}
-
private Widget getRadioGroupPanel() {
FlowPanel buttonsPanel = new FlowPanel();
buttonsPanel.getElement().getStyle().setProperty("marginLeft",
"auto"); //$NON-NLS-1$ //$NON-NLS-2$
buttonsPanel.getElement().getStyle().setProperty("marginRight",
"auto"); //$NON-NLS-1$ //$NON-NLS-2$
- for (ViewFilter<K> item : items){
+ for (ViewFilter<K> item : items) {
RadioButton radioButton = new RadioButton("viewRadioGroup",
item.toString()); //$NON-NLS-1$
radioButton.getElement().getStyle().setMarginRight(20, Unit.PX);
radioButton.setText(item.getText());
@@ -45,7 +42,7 @@
}
public void addClickHandler(ClickHandler clickHandler) {
- for (RadioButton button : buttons.values()){
+ for (RadioButton button : buttons.values()) {
button.addClickHandler(clickHandler);
}
}
@@ -55,8 +52,8 @@
}
public K getSelectedValue() {
- for (Map.Entry<K, RadioButton> buttonEntry : buttons.entrySet()){
- if (buttonEntry.getValue().getValue()){
+ for (Map.Entry<K, RadioButton> buttonEntry : buttons.entrySet()) {
+ if (buttonEntry.getValue().getValue()) {
return buttonEntry.getKey();
}
}
@@ -66,8 +63,13 @@
public void setSelectedValue(K value) {
RadioButton button = buttons.get(value);
- if (button != null)
- {
+ if (button != null) {
+ // Reset old selected radio
+ if (buttons.get(getSelectedValue()) != null) {
+ buttons.get(getSelectedValue()).setValue(false);
+ }
+
+ // Initialize new selected radio
button.setValue(true);
}
}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/CheckboxColumn.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/CheckboxColumn.java
index 5566e3c..5085731 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/CheckboxColumn.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/CheckboxColumn.java
@@ -11,6 +11,8 @@
public abstract class CheckboxColumn<T> extends Column<T, Boolean> {
+ private boolean isCentralized = false;
+
static class EnabledDisabledCheckboxCell extends CheckboxCell {
public EnabledDisabledCheckboxCell() {
@@ -43,6 +45,11 @@
super(new EnabledDisabledCheckboxCell());
}
+ public CheckboxColumn(boolean isCentralized) {
+ super(new EnabledDisabledCheckboxCell());
+ this.isCentralized = isCentralized;
+ }
+
public CheckboxColumn(FieldUpdater<T, Boolean> fieldUpdater) {
this();
setFieldUpdater(fieldUpdater);
@@ -52,7 +59,15 @@
public void render(Context context, T object, SafeHtmlBuilder sb) {
Cell<Boolean> cell = getCell();
if (cell instanceof EnabledDisabledCheckboxCell) {
+ if (isCentralized) {
+ sb.appendHtmlConstant("<div style='text-align: center'>");
//$NON-NLS-1$
+ }
+
((EnabledDisabledCheckboxCell) cell).renderEditable(context,
getValue(object), canEdit(object), sb);
+
+ if (isCentralized) {
+ sb.appendHtmlConstant("</div>"); //$NON-NLS-1$
+ }
} else {
super.render(context, object, sb);
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
index c9befd5..42b82cb 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
@@ -949,13 +949,13 @@
@DefaultStringValue("Name")
String nameCluster();
- @DefaultStringValue("Network Attached")
+ @DefaultStringValue("Attached Network")
String attachedNetworkCluster();
@DefaultStringValue("Compatibility Version")
String comptVersCluster();
- @DefaultStringValue("Network Required")
+ @DefaultStringValue("Required Network")
String requiredNetCluster();
@DefaultStringValue("Network Role")
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java
index 6c28856..407de6a 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java
@@ -62,7 +62,8 @@
};
getTable().addColumn(versionColumn, constants.comptVersCluster(),
"130px"); //$NON-NLS-1$
- CheckboxColumn<PairQueryable<VDSGroup, network_cluster>>
attachedColumn = new CheckboxColumn<PairQueryable<VDSGroup, network_cluster>>()
{
+ CheckboxColumn<PairQueryable<VDSGroup, network_cluster>>
attachedColumn =
+ new CheckboxColumn<PairQueryable<VDSGroup,
network_cluster>>(true) {
@Override
public Boolean getValue(PairQueryable<VDSGroup, network_cluster>
object) {
return object.getSecond() != null;
@@ -78,7 +79,8 @@
getTable().addColumn(new NetworkClusterStatusColumn(),
constants.networkStatus(), "120px"); //$NON-NLS-1$
- CheckboxColumn<PairQueryable<VDSGroup, network_cluster>>
netRequiredColumn = new CheckboxColumn<PairQueryable<VDSGroup,
network_cluster>>() {
+ CheckboxColumn<PairQueryable<VDSGroup, network_cluster>>
netRequiredColumn =
+ new CheckboxColumn<PairQueryable<VDSGroup,
network_cluster>>(true) {
@Override
public Boolean getValue(PairQueryable<VDSGroup, network_cluster>
object) {
if (object.getSecond() != null)
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java
index c87cd55..ab7c2fa 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java
@@ -43,6 +43,7 @@
this.constants = constants;
this.templates = templates;
viewRadioGroup = new
ViewRadioGroup<NetworkHostFilter>(Arrays.asList(NetworkHostFilter.values()));
+ viewRadioGroup.setSelectedValue(NetworkHostFilter.attached);
initTable();
initWidget(getTable());
}
@@ -106,6 +107,17 @@
}
};
+ private final TextColumnWithTooltip<PairQueryable<VdsNetworkInterface,
VDS>> speedColumn =
+ new TextColumnWithTooltip<PairQueryable<VdsNetworkInterface,
VDS>>() {
+ @Override
+ public String getValue(PairQueryable<VdsNetworkInterface, VDS>
object) {
+ if (object.getFirst() != null &&
object.getFirst().getSpeed() != null) {
+ return String.valueOf(object.getFirst().getSpeed());
+ }
+ return null;
+ }
+ };
+
private final TextColumnWithTooltip<PairQueryable<VdsNetworkInterface,
VDS>> nicRxColumn = new RxTxRateColumn<PairQueryable<VdsNetworkInterface,
VDS>>() {
@Override
protected Double getRate(PairQueryable<VdsNetworkInterface, VDS>
object) {
@@ -156,8 +168,9 @@
getTable().ensureColumnPresent(nameColumn, constants.nameHost(), all
|| attached || unattached);
getTable().ensureColumnPresent(clusterColumn, constants.clusterHost(),
all || attached || unattached);
getTable().ensureColumnPresent(dcColumn, constants.dcHost(), all ||
attached || unattached);
- getTable().ensureColumnPresent(nicStatusColumn,
constants.statusNetworkHost(), attached, "70px"); //$NON-NLS-1$
+ getTable().ensureColumnPresent(nicStatusColumn,
constants.statusNetworkHost(), attached, "140px"); //$NON-NLS-1$
getTable().ensureColumnPresent(nicColumn, constants.nicNetworkHost(),
attached);
+ getTable().ensureColumnPresent(speedColumn,
constants.speedNetworkHost(), attached);
getTable().ensureColumnPresent(nicRxColumn,
templates.sub(constants.rxNetworkHost(), constants.mbps()).asString(),
attached);
getTable().ensureColumnPresent(nicTxColumn,
templates.sub(constants.txNetworkHost(), constants.mbps()).asString(),
attached);
}
--
To view, visit http://gerrit.ovirt.org/10329
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d95ba68ae691a3b62d5cc7cf24b0a3957150812
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alona Kaplan <alkap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
