Lior Vernia has uploaded a new change for review.

Change subject: webadmin: Redesigned Discovery popup
......................................................................

webadmin: Redesigned Discovery popup

It now inherits from HorizontalSplitTable, showing a provider's
networks in the top table and the networks to be imported in the
bottom table.

EntityModelCellTable also required some modification to not steal the
click events from the checkbox and listbox columns.

Change-Id: I013e125c3e0f6dba91addb55727904904faf8164
Signed-off-by: Lior Vernia <lver...@redhat.com>
---
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/DiscoverNetworksModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ExternalNetwork.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/presenter/popup/provider/DiscoverNetworkPopupPresenterWidget.java
M 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/DiscoverNetworkPopupView.java
M 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/DiscoverNetworkPopupView.ui.xml
7 files changed, 109 insertions(+), 142 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/16069/1

diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java
index dbae649..98e2b39 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java
@@ -17,6 +17,7 @@
 
 import com.google.gwt.cell.client.CheckboxCell;
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.safehtml.shared.SafeHtml;
 import com.google.gwt.safehtml.shared.SafeHtmlUtils;
@@ -171,7 +172,7 @@
         switch (selectionMode) {
         case MULTIPLE:
             setSelectionModel(new MultiSelectionModel<EntityModel>(),
-                    DefaultSelectionEventManager.<EntityModel> 
createCheckboxManager());
+                    new DefaultSelectionEventManager<EntityModel>(new 
DefaultSelectionEventManager.CheckboxEventTranslator<EntityModel>(0)) {});
             break;
         case NONE:
             setSelectionModel(new NoSelectionModel<EntityModel>());
@@ -274,6 +275,12 @@
                         if (event.getColumn() == 0) {
                             return;
                         }
+                        // Let input elements deal with this
+                        Element target = 
event.getNativeEvent().getEventTarget().cast();
+                        String tagName = target.getTagName().toLowerCase();
+                        if ("input".equals(tagName) || 
"select".equals(tagName)) { //$NON-NLS-1$ $NON-NLS-2$
+                            return;
+                        }
                         getSelectionModel().setSelected(event.getValue(),
                                 
!getSelectionModel().isSelected(event.getValue()));
                     }
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/DiscoverNetworksModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/DiscoverNetworksModel.java
index ecd44cf..52a3eeb 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/DiscoverNetworksModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/DiscoverNetworksModel.java
@@ -17,15 +17,15 @@
 import org.ovirt.engine.ui.uicommonweb.Linq;
 import org.ovirt.engine.ui.uicommonweb.UICommand;
 import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider;
+import org.ovirt.engine.ui.uicommonweb.models.HorizontalSplitTableModel;
 import org.ovirt.engine.ui.uicommonweb.models.ListModel;
-import org.ovirt.engine.ui.uicommonweb.models.Model;
 import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel;
 import org.ovirt.engine.ui.uicompat.ConstantsManager;
 import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult;
 import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback;
 
 @SuppressWarnings("deprecation")
-public class DiscoverNetworksModel extends Model {
+public class DiscoverNetworksModel extends HorizontalSplitTableModel {
 
     private static final String CMD_DISCOVER = "OnDiscover"; //$NON-NLS-1$
     private static final String CMD_CANCEL = "Cancel"; //$NON-NLS-1$
@@ -33,23 +33,22 @@
     private final SearchableListModel sourceListModel;
     private final Provider provider;
 
-    private ListModel dataCenters;
-    private ListModel networkList;
+    private final ListModel dataCenters = new ListModel();
+    private final ListModel providerNetworks = new ListModel();
+    private final ListModel importedNetworks = new ListModel();
+
+    @Override
+    public ListModel getSourceListModel() {
+        return providerNetworks;
+    }
+
+    @Override
+    public ListModel getTargetListModel() {
+        return importedNetworks;
+    }
 
     public ListModel getDataCenters() {
         return dataCenters;
-    }
-
-    private void setDataCenters(ListModel dc) {
-        this.dataCenters = dc;
-    }
-
-    public ListModel getNetworkList() {
-        return networkList;
-    }
-
-    private void setNetworkList(ListModel networkList) {
-        this.networkList = networkList;
     }
 
     public DiscoverNetworksModel(SearchableListModel sourceListModel, Provider 
provider) {
@@ -58,9 +57,6 @@
 
         
setTitle(ConstantsManager.getInstance().getConstants().discoverNetworksTitle());
         setHashName("discover_networks"); //$NON-NLS-1$
-
-        setDataCenters(new ListModel());
-        setNetworkList(new ListModel());
 
         UICommand tempVar = new UICommand(CMD_DISCOVER, this);
         
tempVar.setTitle(ConstantsManager.getInstance().getConstants().importNetworksTitle());
@@ -84,15 +80,13 @@
                 for (Network network : networks) {
                     ExternalNetwork externalNetwork = new ExternalNetwork();
                     externalNetwork.setNetwork(network);
-                    externalNetwork.setAttached(false);
-                    externalNetwork.getDataCenters().setIsChangable(false);
                     Iterable<Object> dcList = getDataCenters().getItems();
                     externalNetwork.getDataCenters().setItems(dcList);
                     
externalNetwork.getDataCenters().setSelectedItem(Linq.firstOrDefault(dcList));
                     externalNetwork.setPublicUse(false);
                     items.add(externalNetwork);
                 }
-                getNetworkList().setItems(items);
+                providerNetworks.setItems(items);
 
                 stopProgress();
             }
@@ -125,15 +119,13 @@
         ArrayList<VdcActionParametersBase> mulipleActionParameters =
                 new ArrayList<VdcActionParametersBase>();
 
-        for (ExternalNetwork externalNetwork : (List<ExternalNetwork>) 
getNetworkList().getItems()) {
-            if (externalNetwork.isAttached()) {
-                Guid dcId = ((StoragePool) 
externalNetwork.getDataCenters().getSelectedItem()).getId();
-                externalNetwork.getNetwork().setDataCenterId(dcId);
-                AddNetworkStoragePoolParameters params =
-                        new AddNetworkStoragePoolParameters(dcId, 
externalNetwork.getNetwork());
-                params.setPublicUse(externalNetwork.isPublicUse());
-                mulipleActionParameters.add(params);
-            }
+        for (ExternalNetwork externalNetwork : (Iterable<ExternalNetwork>) 
importedNetworks.getItems()) {
+            Guid dcId = ((StoragePool) 
externalNetwork.getDataCenters().getSelectedItem()).getId();
+            externalNetwork.getNetwork().setDataCenterId(dcId);
+            AddNetworkStoragePoolParameters params =
+                    new AddNetworkStoragePoolParameters(dcId, 
externalNetwork.getNetwork());
+            params.setPublicUse(externalNetwork.isPublicUse());
+            mulipleActionParameters.add(params);
         }
 
         Frontend.RunMultipleActions(VdcActionType.AddNetwork, 
mulipleActionParameters, new IFrontendActionAsyncCallback() {
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ExternalNetwork.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ExternalNetwork.java
index 0ecf79c..ea7219f 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ExternalNetwork.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ExternalNetwork.java
@@ -6,9 +6,8 @@
 
 public class ExternalNetwork extends EntityModel {
 
-    Network network;
-    ListModel dcList;
-    boolean attached;
+    private Network network;
+    private ListModel dcList;
     private boolean publicUse;
 
     public ExternalNetwork() {
@@ -25,14 +24,6 @@
 
     public ListModel getDataCenters() {
         return dcList;
-    }
-
-    public boolean isAttached() {
-        return attached;
-    }
-
-    public void setAttached(boolean attached) {
-        this.attached = attached;
     }
 
     public boolean isPublicUse() {
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 32070c1..1b7b1fe 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
@@ -2854,11 +2854,11 @@
     @DefaultStringValue("Name")
     String nameNetworkHeader();
 
-    @DefaultStringValue("ID")
+    @DefaultStringValue("External ID")
     String idNetworkHeader();
 
-    @DefaultStringValue("All Networks Public")
-    String publicAllNetworks();
+    @DefaultStringValue("Data Center")
+    String dcNetworkHeader();
 
     @DefaultStringValue("Public Network")
     String publicNetwork();
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/provider/DiscoverNetworkPopupPresenterWidget.java
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/provider/DiscoverNetworkPopupPresenterWidget.java
index 064d54c..58db39c 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/provider/DiscoverNetworkPopupPresenterWidget.java
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/provider/DiscoverNetworkPopupPresenterWidget.java
@@ -1,6 +1,6 @@
 package org.ovirt.engine.ui.webadmin.section.main.presenter.popup.provider;
 
-import 
org.ovirt.engine.ui.common.presenter.AbstractModelBoundPopupPresenterWidget;
+import 
org.ovirt.engine.ui.common.presenter.popup.HorizontalSplitTablePopupPresenterWidget;
 import org.ovirt.engine.ui.uicommonweb.models.ListModel;
 import org.ovirt.engine.ui.uicommonweb.models.providers.DiscoverNetworksModel;
 import org.ovirt.engine.ui.uicompat.Event;
@@ -10,10 +10,9 @@
 import com.google.gwt.event.shared.EventBus;
 import com.google.inject.Inject;
 
-public class DiscoverNetworkPopupPresenterWidget extends 
AbstractModelBoundPopupPresenterWidget<DiscoverNetworksModel, 
DiscoverNetworkPopupPresenterWidget.ViewDef> {
+public class DiscoverNetworkPopupPresenterWidget extends 
HorizontalSplitTablePopupPresenterWidget<DiscoverNetworksModel, 
DiscoverNetworkPopupPresenterWidget.ViewDef> {
 
-    public interface ViewDef extends 
AbstractModelBoundPopupPresenterWidget.ViewDef<DiscoverNetworksModel> {
-        void setNetworkList(ListModel networkList);
+    public interface ViewDef extends 
HorizontalSplitTablePopupPresenterWidget.ViewDef<DiscoverNetworksModel> {
         void setDataCenterList(ListModel dcList);
     }
 
@@ -25,7 +24,6 @@
     @Override
     public void init(final DiscoverNetworksModel model) {
         super.init(model);
-        getView().setNetworkList(model.getNetworkList());
 
         model.getDataCenters().getItemsChangedEvent().addListener(new 
IEventListener() {
 
@@ -35,4 +33,5 @@
             }
         });
     }
+
 }
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/DiscoverNetworkPopupView.java
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/DiscoverNetworkPopupView.java
index 60eddf3..37fe92d 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/DiscoverNetworkPopupView.java
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/DiscoverNetworkPopupView.java
@@ -3,10 +3,9 @@
 import java.util.ArrayList;
 
 import org.ovirt.engine.core.common.businessentities.StoragePool;
-import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView;
+import org.ovirt.engine.ui.common.view.HorizontalSplitTablePopupView;
 import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel;
 import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable;
-import 
org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable.SelectionMode;
 import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer;
 import org.ovirt.engine.ui.common.widget.table.column.CheckboxColumn;
 import org.ovirt.engine.ui.common.widget.table.column.ListModelListBoxColumn;
@@ -26,12 +25,13 @@
 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;
+import com.google.gwt.user.cellview.client.Column;
 import com.google.inject.Inject;
 
-public class DiscoverNetworkPopupView extends 
AbstractModelBoundPopupView<DiscoverNetworksModel> implements 
DiscoverNetworkPopupPresenterWidget.ViewDef {
+public class DiscoverNetworkPopupView extends 
HorizontalSplitTablePopupView<DiscoverNetworksModel> implements 
DiscoverNetworkPopupPresenterWidget.ViewDef {
 
     interface Driver extends SimpleBeanEditorDriver<DiscoverNetworksModel, 
DiscoverNetworkPopupView> { }
 
@@ -41,86 +41,55 @@
         ViewUiBinder uiBinder = GWT.create(ViewUiBinder.class);
     }
 
-    @UiField(provided = true)
     @Ignore
-    public final EntityModelCellTable<ListModel> networksTable;
+    public EntityModelCellTable<ListModel> providerNetworks;
+
+    @Ignore
+    public EntityModelCellTable<ListModel> importedNetworks;
 
     private ListModelListBoxColumn<EntityModel, StoragePool> dcColumn;
 
     @Inject
     public DiscoverNetworkPopupView(EventBus eventBus, ApplicationResources 
resources,
             ApplicationConstants constants, ApplicationTemplates templates) {
-        super(eventBus, resources);
+        super(eventBus, resources, constants);
         // Initialize Editors
-        this.networksTable = new 
EntityModelCellTable<ListModel>(SelectionMode.NONE, true);
+        providerNetworks = sourceTable;
+        importedNetworks = targetTable;
         initWidget(ViewUiBinder.uiBinder.createAndBindUi(this));
-        initEntityModelCellTable(constants, templates);
+        initEntityModelCellTables(constants, templates);
         driver.initialize(this);
     }
 
     @SuppressWarnings("unchecked")
-    Iterable<ExternalNetwork> getNetworksTableItems() {
-        ListModel tableModel = networksTable.flush();
+    Iterable<ExternalNetwork> getAllImportedNetworks() {
+        ListModel tableModel = importedNetworks.flush();
         return tableModel != null && tableModel.getItems() != null ? 
tableModel.getItems()
                 : new ArrayList<ExternalNetwork>();
     }
 
-    void refreshNetworksTable() {
-        networksTable.edit(networksTable.flush());
+    public void refreshImportedNetworks() {
+        importedNetworks.edit(importedNetworks.flush());
     }
 
-    void initEntityModelCellTable(final ApplicationConstants constants, final 
ApplicationTemplates templates) {
-        CheckboxHeader assignAllHeader = new 
CheckboxHeader(templates.textForCheckBoxHeader("")) { //$NON-NLS-1$
+    void initEntityModelCellTables(final ApplicationConstants constants, final 
ApplicationTemplates templates) {
+        Column<EntityModel, String> nameColumn = new 
TextColumnWithTooltip<EntityModel>() {
             @Override
-            protected void selectionChanged(Boolean value) {
-                for (ExternalNetwork model : getNetworksTableItems()) {
-                    model.setAttached(value);
-                }
-                refreshNetworksTable();
-            }
-
-            @Override
-            public Boolean getValue() {
-                for (ExternalNetwork model : getNetworksTableItems()) {
-                    if (!model.isAttached()) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-
-            @Override
-            public boolean isEnabled() {
-                return true;
+            public String getValue(EntityModel model) {
+                return ((ExternalNetwork) model).getNetwork().getName();
             }
         };
+        providerNetworks.addColumn(nameColumn, constants.nameNetworkHeader());
+        importedNetworks.addColumn(nameColumn, constants.nameNetworkHeader());
 
-        networksTable.addColumn(new CheckboxColumn<EntityModel>(new 
FieldUpdater<EntityModel, Boolean>() {
+        Column<EntityModel, String> idColumn = new 
TextColumnWithTooltip<EntityModel>() {
             @Override
-            public void update(int index, EntityModel model, Boolean value) {
-                ExternalNetwork externalNetwork = (ExternalNetwork) model;
-                externalNetwork.setAttached(value);
-                externalNetwork.getDataCenters().setIsChangable(value);
-                refreshNetworksTable();
+            public String getValue(EntityModel model) {
+                return ((ExternalNetwork) 
model).getNetwork().getProvidedBy().getExternalId();
             }
-        }) {
-            @Override
-            public Boolean getValue(EntityModel model) {
-                return ((ExternalNetwork) model).isAttached();
-            }
-
-            @Override
-            protected boolean canEdit(EntityModel model) {
-                return true;
-            }
-
-            @Override
-            public void render(Context context, EntityModel object, 
SafeHtmlBuilder sb) {
-                super.render(context, object, sb);
-                sb.append(templates.textForCheckBox("")); //$NON-NLS-1$
-            }
-
-        }, assignAllHeader, "80px"); //$NON-NLS-1$
+        };
+        providerNetworks.addColumn(idColumn, constants.idNetworkHeader());
+        importedNetworks.addColumn(idColumn, constants.idNetworkHeader());
 
         dcColumn = new ListModelListBoxColumn<EntityModel, StoragePool>(new 
NullSafeRenderer<StoragePool>() {
             @Override
@@ -134,35 +103,21 @@
                 return ((ExternalNetwork) network).getDataCenters();
             }
         };
-        networksTable.addColumn(dcColumn);
-
-        networksTable.addEntityModelColumn(new 
TextColumnWithTooltip<EntityModel>() {
-            @Override
-            public String getValue(EntityModel model) {
-                return ((ExternalNetwork) model).getNetwork().getName();
-            }
-        }, constants.nameNetworkHeader());
-
-        networksTable.addEntityModelColumn(new 
TextColumnWithTooltip<EntityModel>() {
-            @Override
-            public String getValue(EntityModel model) {
-                return ((ExternalNetwork) 
model).getNetwork().getProvidedBy().getExternalId();
-            }
-        }, constants.idNetworkHeader());
+        importedNetworks.addColumn(dcColumn, constants.dcNetworkHeader()); 
//$NON-NLS-1$
 
         CheckboxHeader publicAllHeader =
-                new 
CheckboxHeader(templates.textForCheckBoxHeader(constants.publicAllNetworks())) {
+                new 
CheckboxHeader(templates.textForCheckBoxHeader(constants.publicNetwork())) {
                     @Override
                     protected void selectionChanged(Boolean value) {
-                        for (ExternalNetwork model : getNetworksTableItems()) {
+                        for (ExternalNetwork model : getAllImportedNetworks()) 
{
                             model.setPublicUse(value);
                         }
-                        refreshNetworksTable();
+                        refreshImportedNetworks();
                     }
 
                     @Override
                     public Boolean getValue() {
-                        for (ExternalNetwork model : getNetworksTableItems()) {
+                        for (ExternalNetwork model : getAllImportedNetworks()) 
{
                             if (!model.isPublicUse()) {
                                 return false;
                             }
@@ -176,12 +131,12 @@
                     }
                 };
 
-        networksTable.addColumn(new CheckboxColumn<EntityModel>(new 
FieldUpdater<EntityModel, Boolean>() {
+        importedNetworks.addColumn(new CheckboxColumn<EntityModel>(new 
FieldUpdater<EntityModel, Boolean>() {
             @Override
             public void update(int index, EntityModel model, Boolean value) {
                 ExternalNetwork externalNetwork = (ExternalNetwork) model;
                 externalNetwork.setPublicUse(value);
-                refreshNetworksTable();
+                refreshImportedNetworks();
             }
         }) {
             @Override
@@ -197,7 +152,7 @@
             @Override
             public void render(Context context, EntityModel object, 
SafeHtmlBuilder sb) {
                 super.render(context, object, sb);
-                
sb.append(templates.textForCheckBox(constants.publicNetwork()));
+                sb.append(templates.textForCheckBox("")); //$NON-NLS-1$
             }
 
         }, publicAllHeader, "80px"); //$NON-NLS-1$
@@ -214,13 +169,11 @@
     }
 
     @Override
-    public void setNetworkList(ListModel networkList) {
-        networksTable.edit(networkList);
-    }
-
-    @Override
     public void setDataCenterList(ListModel dcList) {
         dcColumn.setOptions(dcList);
     }
 
+    interface Style extends CssResource {
+    }
+
 }
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/DiscoverNetworkPopupView.ui.xml
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/DiscoverNetworkPopupView.ui.xml
index a952459..69d73d6 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/DiscoverNetworkPopupView.ui.xml
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/DiscoverNetworkPopupView.ui.xml
@@ -2,15 +2,40 @@
 <!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:d="urn:import:org.ovirt.engine.ui.common.widget.dialog"
-       xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor" 
xmlns:we="urn:import:org.ovirt.engine.ui.webadmin.widget.editor">
+       xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor">
 
-       <ui:with field='constants' 
type='org.ovirt.engine.ui.webadmin.ApplicationConstants' />
+       <ui:style 
type="org.ovirt.engine.ui.webadmin.section.main.view.popup.provider.DiscoverNetworkPopupView.Style">
+               .buttonStyle {
+                       width: auto;
+                       margin-left: 20px;
+                       margin-right: 20px;
+               }
+       </ui:style>
 
        <d:SimpleDialogPanel ui:field="mainPanel" width="620px" height="520px">
                <d:content>
-                       <g:ScrollPanel>
-                               <e:EntityModelCellTable 
ui:field="networksTable" />
-                       </g:ScrollPanel>
+                       <g:SplitLayoutPanel>
+                               <g:north size="190">
+                                       <g:ScrollPanel>
+                                               <e:EntityModelCellTable 
ui:field="sourceTable" />
+                                       </g:ScrollPanel>
+                               </g:north>
+                               <g:center>
+                                       <g:HorizontalPanel height="100%" 
width="100%">
+                                               <g:cell 
horizontalAlignment="ALIGN_CENTER" verticalAlignment="ALIGN_MIDDLE">
+                                                       <g:HorizontalPanel>
+                                                               <g:Button 
ui:field="addButton" addStyleNames="{style.buttonStyle}" />
+                                                               <g:Button 
ui:field="removeButton" addStyleNames="{style.buttonStyle}" />
+                                                       </g:HorizontalPanel>
+                                               </g:cell>
+                                       </g:HorizontalPanel>
+                               </g:center>
+                               <g:south size="190">
+                                       <g:ScrollPanel>
+                                               <e:EntityModelCellTable 
ui:field="targetTable" />
+                                       </g:ScrollPanel>
+                               </g:south>
+                       </g:SplitLayoutPanel>
                </d:content>
        </d:SimpleDialogPanel>
 


-- 
To view, visit http://gerrit.ovirt.org/16069
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I013e125c3e0f6dba91addb55727904904faf8164
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

Reply via email to