Lior Vernia has uploaded a new change for review.
Change subject: webadmin: Face lift for Discovery popup
......................................................................
webadmin: Face lift for Discovery popup
Changed button styling, added table borders, added customizable table
headers, and changed a couple of network-specific text labels.
Change-Id: I247df809b2cf21488f0b6c3109294c24cb3db914
Signed-off-by: Lior Vernia <lver...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/HorizontalSplitTable.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/HorizontalSplitTable.ui.xml
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.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/popup/provider/ImportNetworksPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.ui.xml
6 files changed, 88 insertions(+), 30 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/16651/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/HorizontalSplitTable.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/HorizontalSplitTable.java
index 3d87f14..c6e8b40 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/HorizontalSplitTable.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/HorizontalSplitTable.java
@@ -5,6 +5,7 @@
import java.util.Set;
import org.ovirt.engine.ui.common.CommonApplicationConstants;
+import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogButton;
import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable;
import org.ovirt.engine.ui.uicommonweb.models.EntityModel;
import org.ovirt.engine.ui.uicommonweb.models.ListModel;
@@ -15,8 +16,9 @@
import com.google.gwt.resources.client.CssResource;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.ButtonBase;
import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.view.client.MultiSelectionModel;
import com.google.gwt.view.client.SelectionChangeEvent;
@@ -35,10 +37,10 @@
private final MultiSelectionModel<EntityModel> bottomSelectionModel;
@UiField
- protected Button downButton;
+ protected SimpleDialogButton downButton;
@UiField
- protected Button upButton;
+ protected SimpleDialogButton upButton;
@UiField(provided = true)
protected EntityModelCellTable<ListModel> topTable;
@@ -46,13 +48,23 @@
@UiField(provided = true)
protected EntityModelCellTable<ListModel> bottomTable;
+ @UiField(provided = true)
+ protected Label topTitle;
+
+ @UiField(provided = true)
+ protected Label bottomTitle;
+
@SuppressWarnings("unchecked")
public HorizontalSplitTable(EntityModelCellTable<ListModel> topTable,
EntityModelCellTable<ListModel> bottomTable,
+ String topTitle,
+ String bottomTitle,
CommonApplicationConstants constants) {
this.topTable = topTable;
this.bottomTable = bottomTable;
+ this.topTitle = new Label(topTitle);
+ this.bottomTitle = new Label(bottomTitle);
initWidget(WidgetUiBinder.uiBinder.createAndBindUi(this));
topSelectionModel = (MultiSelectionModel<EntityModel>)
topTable.getSelectionModel();
@@ -69,7 +81,7 @@
addClickHandler(upButton);
}
- private void addSelectionHandler(final Button button) {
+ private void addSelectionHandler(final ButtonBase button) {
final MultiSelectionModel<EntityModel> selectionModel =
getSelectionModelForButton(button);
selectionModel.addSelectionChangeHandler(new Handler() {
@@ -80,7 +92,7 @@
});
}
- private void addClickHandler(final Button button) {
+ private void addClickHandler(final ButtonBase button) {
button.addClickHandler(new ClickHandler() {
@SuppressWarnings("unchecked")
@@ -104,7 +116,7 @@
});
}
- private MultiSelectionModel<EntityModel> getSelectionModelForButton(Button
button) {
+ private MultiSelectionModel<EntityModel>
getSelectionModelForButton(ButtonBase button) {
return (button == downButton) ? topSelectionModel :
bottomSelectionModel;
}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/HorizontalSplitTable.ui.xml
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/HorizontalSplitTable.ui.xml
index d67b10c..ac2fcb6 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/HorizontalSplitTable.ui.xml
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/HorizontalSplitTable.ui.xml
@@ -1,37 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent";>
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
- xmlns:g="urn:import:com.google.gwt.user.client.ui"
xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor">
+ xmlns:g="urn:import:com.google.gwt.user.client.ui"
xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor"
+ xmlns:d="urn:import:org.ovirt.engine.ui.common.widget.dialog">
<ui:style
type="org.ovirt.engine.ui.common.widget.HorizontalSplitTable.Style">
- .centerPanel {
- height: 100%;
- width: 100%;
- border-top: solid thin;
- border-bottom: solid thin;
+ .headers {
+ font-weight: bold;
+ }
+
+ .tables {
+ height: 200px;
+ border-style: solid;
+ border-width: thin;
+ }
+
+ .buttons {
+ margin-left: 30px;
+ margin-right: 30px;
}
</ui:style>
- <g:DockLayoutPanel ui:field="splitLayoutPanel" height="520px"
width="100%">
+ <g:DockLayoutPanel ui:field="splitLayoutPanel" height="500px"
width="100%">
<g:north size="230">
- <g:ScrollPanel>
- <e:EntityModelCellTable ui:field="topTable" />
- </g:ScrollPanel>
+ <g:FlowPanel>
+ <g:Label ui:field="topTitle"
addStyleNames="{style.headers}" />
+ <g:ScrollPanel addStyleNames="{style.tables}">
+ <e:EntityModelCellTable
ui:field="topTable" />
+ </g:ScrollPanel>
+ </g:FlowPanel>
</g:north>
<g:center>
- <g:HorizontalPanel ui:field="centerPanel"
addStyleNames="{style.centerPanel}" >
+ <g:HorizontalPanel height="100%" width="100%">
<g:cell horizontalAlignment="ALIGN_CENTER"
verticalAlignment="ALIGN_MIDDLE">
- <g:Button ui:field="downButton" />
- </g:cell>
- <g:cell horizontalAlignment="ALIGN_CENTER"
verticalAlignment="ALIGN_MIDDLE">
- <g:Button ui:field="upButton" />
+ <g:HorizontalPanel>
+ <d:SimpleDialogButton
ui:field="downButton" addStyleNames="{style.buttons}" />
+ <d:SimpleDialogButton
ui:field="upButton" addStyleNames="{style.buttons}" />
+ </g:HorizontalPanel>
</g:cell>
</g:HorizontalPanel>
</g:center>
<g:south size="230">
- <g:ScrollPanel>
- <e:EntityModelCellTable ui:field="bottomTable"
/>
- </g:ScrollPanel>
+ <g:FlowPanel>
+ <g:Label ui:field="bottomTitle"
addStyleNames="{style.headers}" />
+ <g:ScrollPanel addStyleNames="{style.tables}">
+ <e:EntityModelCellTable
ui:field="bottomTable" />
+ </g:ScrollPanel>
+ </g:FlowPanel>
</g:south>
</g:DockLayoutPanel>
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.java
index 16ecf83..384e0a7 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.java
@@ -120,11 +120,12 @@
Iterable<StoragePool> dcList = getDataCenters().getItems();
externalNetwork.getDataCenters().setItems(dcList);
externalNetwork.getDataCenters().setSelectedItem(Linq.firstOrDefault(dcList));
- externalNetwork.setPublicUse(false);
+ externalNetwork.setPublicUse(true);
items.add(externalNetwork);
}
Collections.sort(items, new Linq.ExternalNetworkComparator());
providerNetworks.setItems(items);
+ importedNetworks.setItems(new LinkedList<ExternalNetwork>());
stopProgress();
}
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 943fdab..a4480dd 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
@@ -2887,15 +2887,21 @@
@DefaultStringValue("Name")
String nameNetworkHeader();
- @DefaultStringValue("External ID")
+ @DefaultStringValue("Provider Network ID")
String idNetworkHeader();
@DefaultStringValue("Data Center")
String dcNetworkHeader();
- @DefaultStringValue("Public Network")
+ @DefaultStringValue("Allow All")
String publicNetwork();
@DefaultStringValue("Network Provider")
String networkProvider();
+
+ @DefaultStringValue("Provider Networks")
+ String providerNetworks();
+
+ @DefaultStringValue("Networks to Import")
+ String importedNetworks();
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.java
index 8dee27b..92ce041 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.java
@@ -30,6 +30,7 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.editor.client.SimpleBeanEditorDriver;
import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.resources.client.CssResource;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
@@ -45,6 +46,13 @@
interface ViewUiBinder extends UiBinder<SimpleDialogPanel,
ImportNetworksPopupView> {
ViewUiBinder uiBinder = GWT.create(ViewUiBinder.class);
}
+
+ interface Style extends CssResource {
+ String providersStyle();
+ }
+
+ @UiField
+ Style style;
@UiField(provided = true)
@Path(value = "providers.selectedItem")
@@ -76,10 +84,16 @@
});
providerNetworks = new EntityModelCellTable<ListModel>(true, false,
true);
importedNetworks = new EntityModelCellTable<ListModel>(true, false,
true);
- splitTable = new HorizontalSplitTable(providerNetworks,
importedNetworks, constants);
+ splitTable =
+ new HorizontalSplitTable(providerNetworks,
+ importedNetworks,
+ constants.providerNetworks(),
+ constants.importedNetworks(),
+ constants);
initWidget(ViewUiBinder.uiBinder.createAndBindUi(this));
initEntityModelCellTables(constants, templates);
providersEditor.setLabel(constants.networkProvider());
+ providersEditor.addWrapperStyleName(style.providersStyle());
driver.initialize(this);
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.ui.xml
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.ui.xml
index 30e3e0a..86be241 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.ui.xml
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.ui.xml
@@ -4,10 +4,20 @@
xmlns:g="urn:import:com.google.gwt.user.client.ui"
xmlns:d="urn:import:org.ovirt.engine.ui.common.widget.dialog"
xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor"
xmlns:w="urn:import:org.ovirt.engine.ui.common.widget">
- <d:SimpleDialogPanel ui:field="mainPanel" width="620px" height="580px">
+ <ui:style
type="org.ovirt.engine.ui.webadmin.section.main.view.popup.provider.ImportNetworksPopupView.Style">
+ .providersStyle {
+ width: 400px;
+ }
+
+ .section {
+ margin-bottom: 30px;
+ }
+ </ui:style>
+
+ <d:SimpleDialogPanel ui:field="mainPanel" width="600px" height="650px">
<d:content>
<g:VerticalPanel>
- <g:FlowPanel>
+ <g:FlowPanel addStyleNames="{style.section}">
<e:ListModelListBoxEditor
ui:field="providersEditor" />
</g:FlowPanel>
<w:HorizontalSplitTable ui:field="splitTable" />
--
To view, visit http://gerrit.ovirt.org/16651
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I247df809b2cf21488f0b6c3109294c24cb3db914
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Lior Vernia <lver...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
