Alexander Wels has uploaded a new change for review. Change subject: userportal,webadmin: Update GeneralFormPanel ......................................................................
userportal,webadmin: Update GeneralFormPanel - Updated the GeneralFormPanel to use bootstrap grids instead of GWT Grid Views. To help with the conversion to the patternfly look and feel. Change-Id: I0f50ce04fa064a22d3f124360918c31db599e105 Signed-off-by: Alexander Wels <aw...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/AbstractFormPanel.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/FormBuilder.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/GeneralFormPanel.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/GeneralFormPanel.ui.xml M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoGeneral.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralHardwareView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralInfoView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralSoftwareView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java 15 files changed, 153 insertions(+), 86 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/37527/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/AbstractFormPanel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/AbstractFormPanel.java index 80dbf23..6572ba6 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/AbstractFormPanel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/AbstractFormPanel.java @@ -1,18 +1,20 @@ package org.ovirt.engine.ui.common.widget.form; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; +import org.gwtbootstrap3.client.ui.Column; +import org.gwtbootstrap3.client.ui.Container; +import org.gwtbootstrap3.client.ui.Row; +import org.gwtbootstrap3.client.ui.constants.ColumnSize; import org.ovirt.engine.ui.common.idhandler.HasElementId; import org.ovirt.engine.ui.common.utils.ElementIdUtils; +import com.google.gwt.resources.client.CssResource; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.Grid; -import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; @@ -20,17 +22,25 @@ * Represents a form panel that renders name/value items organized in columns. */ public abstract class AbstractFormPanel extends Composite implements HasElementId { + interface Style extends CssResource { + String formPanelLabel(); + String formPanelValue(); + } + + //There can be a max of 12 columns + private static final int BOOTSTRAP_GRID_SIZE = 12; + private static final String COL_PREFIX = "md_"; //$NON-NLS-1$ protected String elementId = DOM.createUniqueId(); @UiField - public HorizontalPanel contentPanel; + public Container container; - // List of detail views, each one representing a column of form items - private final List<Grid> detailViews = new ArrayList<Grid>(); + @UiField + public Style style; // Used with form item auto placement feature - private Map<Integer, Integer> nextAvailableRowForColumn = new HashMap<Integer, Integer>(); + private final Map<Integer, Integer> nextAvailableRowForColumn = new HashMap<Integer, Integer>(); public int getNextAvailableRow(int column) { if(!nextAvailableRowForColumn.containsKey(column)) { @@ -47,14 +57,31 @@ /** * Adds new detail view (column) to the form panel. */ - public void addFormDetailView(int numOfRows) { - Grid view = new Grid(numOfRows, 2); - view.setStyleName("formPanel_detailView"); //$NON-NLS-1$ - view.getColumnFormatter().setStyleName(0, "formPanel_detailViewNameColumn"); //$NON-NLS-1$ - view.getColumnFormatter().setStyleName(1, "formPanel_detailViewValueColumn"); //$NON-NLS-1$ + public void addFormDetailView(int numOfRows, int numOfColumns) { + container.clear(); + for (int i = 0; i < numOfRows; i++) { + Row row = createRow(numOfColumns); + container.add(row); + } + } - detailViews.add(view); - contentPanel.add(view); + public void setRelativeColumnWidth(int columnNum, int widthInGridColumns) { + for(int i = 0; i < container.getWidgetCount(); i++) { + Row row = (Row) container.getWidget(i); + Column column = (Column) row.getWidget(columnNum); + column.setSize(COL_PREFIX + widthInGridColumns); + } + } + + private Row createRow(int numOfColumns) { + Row row = new Row(); + //Evenly distribute by default. + String columnSize = COL_PREFIX + (BOOTSTRAP_GRID_SIZE / numOfColumns); + for (int i = 0; i < numOfColumns; i++) { + Column column = new Column(columnSize); + row.add(column); + } + return row; } /** @@ -63,11 +90,16 @@ public void addFormItem(FormItem item) { // Create item label Label itemLabel = new Label(item.getName()); - itemLabel.setStyleName("formPanel_detailViewItemName"); //$NON-NLS-1$ + itemLabel.getElement().setId(ElementIdUtils.createFormGridElementId(elementId, item.getColumn(), + item.getRow(), "_label")); //$NON-NLS-1$ + itemLabel.setStyleName(style.formPanelLabel()); - // Add item label - Grid view = getDetailView(item.getColumn()); - view.setWidget(item.getRow(), 0, itemLabel); + Row itemRow = new Row(); + Column labelColumn = new Column(ColumnSize.MD_6); + labelColumn.add(itemLabel); + itemRow.add(labelColumn); + Column itemColumn = findColumn(item.getRow(), item.getColumn()); + itemColumn.add(itemRow); // Update the item updateFormItem(item); @@ -76,31 +108,40 @@ incNextAvailableRow(item.getColumn()); } + private Column findColumn(int row, int column) { + Column result = null; + IsWidget rowWidget = container.getWidget(row); + if (rowWidget instanceof Row) { + IsWidget columnWidget = ((Row) rowWidget).getWidget(column); + if (columnWidget instanceof Column) { + result = (Column) columnWidget; + } + } + return result; + } + /** * Updates the value and visibility of the given item. */ public void updateFormItem(FormItem item) { Widget valueWidget = item.resolveValueWidget(); + valueWidget.getElement().setId( + ElementIdUtils.createFormGridElementId(elementId, item.getColumn(), item.getRow(), "_value")); //$NON-NLS-1$ + valueWidget.setStyleName(style.formPanelValue()); boolean visible = item.getIsAvailable(); - // Update item value - valueWidget.setStyleName("formPanel_detailViewItemValue"); //$NON-NLS-1$ - Grid view = getDetailView(item.getColumn()); - view.setWidget(item.getRow(), 1, valueWidget); - - // Update item visibility - view.getWidget(item.getRow(), 0).setVisible(visible); - view.getWidget(item.getRow(), 1).setVisible(visible); - - // set item ids - view.getWidget(item.getRow(), 0).getElement().setId( - ElementIdUtils.createFormGridElementId(elementId, item.getColumn(), item.getRow(), "_label")); //$NON-NLS-1$ - view.getWidget(item.getRow(), 1).getElement().setId( - ElementIdUtils.createFormGridElementId(elementId, item.getColumn(), item.getRow(), "_value")); //$NON-NLS-1$ - } - - Grid getDetailView(int column) { - return detailViews.get(column); + IsWidget itemCell = findColumn(item.getRow(), item.getColumn()).getWidget(0); + if (itemCell instanceof Row) { + Row itemCellRow = (Row)itemCell; + // Update item visibility + itemCellRow.setVisible(visible); + if(itemCellRow.getWidgetCount() > 1) { + itemCellRow.remove(1); //Clear out old value. + } + Column valueColumn = new Column(ColumnSize.MD_6); + valueColumn.add(valueWidget); + itemCellRow.add(valueColumn); + } } @Override diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/FormBuilder.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/FormBuilder.java index c87cfe4..09c14c4 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/FormBuilder.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/FormBuilder.java @@ -19,15 +19,25 @@ // form items whenever the given model property changes its value private final Map<String, List<FormItem>> propertyNameMap = new HashMap<String, List<FormItem>>(); - private EntityModel model; + private EntityModel<?> model; public FormBuilder(AbstractFormPanel formPanel, int numOfColumns, int numOfRows) { this.formPanel = formPanel; - // Add columns to the form panel - for (int i = 0; i < numOfColumns; i++) { - formPanel.addFormDetailView(numOfRows); + formPanel.addFormDetailView(numOfRows, numOfColumns); + } + + /** + * Set the relative width of the column in bootstrap grid columns, acceptable values are between 1 and 12. + * Make sure your total for all columns does not exceed 12 or your results will be unpredictable. + * @param columnNum The column you want to set the relative width for. + * @param widthInColumns The number of grid columns you want your column to occupy. + */ + public void setRelativeColumnWidth(int columnNum, int widthInGridColumns) { + if (widthInGridColumns < 1 || widthInGridColumns > 12) { + throw new IllegalArgumentException("The widthInGridColumns has to be between 1 and 12"); //$NON-NLS-1$ } + formPanel.setRelativeColumnWidth(columnNum, widthInGridColumns); } /** @@ -60,7 +70,7 @@ /** * Updates all items within the form panel. */ - public void update(EntityModel model) { + public void update(EntityModel<?> model) { // Detach property change listener from old model if (this.model != null) { this.model.getPropertyChangedEvent().removeListener(propertyChangedEventListener); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/GeneralFormPanel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/GeneralFormPanel.java index 698873b..53a9310 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/GeneralFormPanel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/GeneralFormPanel.java @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.common.widget.form; + import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.user.client.ui.Widget; diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/GeneralFormPanel.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/GeneralFormPanel.ui.xml index 3d8de66..d219d1c 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/GeneralFormPanel.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/GeneralFormPanel.ui.xml @@ -1,51 +1,50 @@ <?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"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui" + xmlns:b="urn:import:org.gwtbootstrap3.client.ui"> - <ui:style> - .contentPanel { - width: 100%; - } + <ui:style type="org.ovirt.engine.ui.common.widget.form.AbstractFormPanel.Style"> + .container { + width: 100%; + } - @external formPanel_detailView; - .formPanel_detailView { - display: block; - padding-left: 16px; - padding-right: 16px; - line-height: 18px; - } +<!-- @external formPanel_detailView; --> +<!-- .formPanel_detailView { --> +<!-- display: block; --> +<!-- padding-left: 16px; --> +<!-- padding-right: 16px; --> +<!-- line-height: 18px; --> +<!-- } --> - @external formPanel_detailViewNameColumn; - .formPanel_detailViewNameColumn { - min-width: 100px; - } +<!-- @external formPanel_detailViewNameColumn; --> +<!-- .formPanel_detailViewNameColumn { --> +<!-- min-width: 100px; --> +<!-- } --> - @external formPanel_detailViewValueColumn; - .formPanel_detailViewValueColumn { - min-width: 100px; - width: 100%; - } +<!-- @external formPanel_detailViewValueColumn; --> +<!-- .formPanel_detailViewValueColumn { --> +<!-- min-width: 100px; --> +<!-- width: 100%; --> +<!-- } --> - @external formPanel_detailViewItemName; - .formPanel_detailViewItemName { - white-space: nowrap; - color: black; - font-family: Arial, sans-serif; - padding-top: 1px; - padding-bottom: 2px; - } + .formPanelLabel { + white-space: nowrap; + color: black; + font-family: Arial, sans-serif; + padding-top: 1px; + padding-bottom: 2px; + } - @external formPanel_detailViewItemValue; - .formPanel_detailViewItemValue { - white-space: nowrap; - color: #777777; - font-family: Arial, sans-serif; - padding-left: 4px; - padding-top: 1px; - padding-bottom: 2px; - } - </ui:style> + .formPanelValue { + white-space: nowrap; + color: #777777; + font-family: Arial, sans-serif; + padding-left: 4px; + padding-top: 1px; + padding-bottom: 2px; + } + </ui:style> - <g:HorizontalPanel ui:field="contentPanel" addStyleNames="{style.contentPanel}" /> + <b:Container fluid="true" ui:field="container" addStyleNames="{style.container}" /> </ui:UiBinder> diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoGeneral.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoGeneral.java index cf7600b..04206b8 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoGeneral.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoGeneral.java @@ -30,6 +30,7 @@ formBuilder.addFormItem(new FormItem(constants.physMemGauranteedVm(), minAllocatedMemory, 1, 0)); formBuilder.addFormItem(new FormItem(constants.numOfCpuCoresVm(), cpuInfo, 2, 0)); + formBuilder.setRelativeColumnWidth(0, 5); setWidth("100%"); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java index bd4aa1b..7f60cd4 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java @@ -92,6 +92,7 @@ return getDetailModel().isQuotaAvailable(); } }); + formBuilder.setRelativeColumnWidth(0, 3); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java index ea2b846..2273142 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java @@ -92,6 +92,7 @@ } } }); + formBuilder.setRelativeColumnWidth(0, 3); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralHardwareView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralHardwareView.java index 1ecb784..0e3f5a2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralHardwareView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralHardwareView.java @@ -82,6 +82,9 @@ // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 3, 4); + formBuilder.setRelativeColumnWidth(0, 3); + formBuilder.setRelativeColumnWidth(1, 4); + formBuilder.setRelativeColumnWidth(2, 5); formBuilder.addFormItem(new FormItem(constants.hardwareManufacturerGeneral(), hardwareManufacturer, 0, 0)); formBuilder.addFormItem(new FormItem(constants.hardwareFamilyGeneral(), hardwareFamily, 0, 1)); formBuilder.addFormItem(new FormItem(constants.hardwareProductNameGeneral(), hardwareProductName, 0, 2)); @@ -145,7 +148,7 @@ hbaFormBuilder.addFormItem(new FormItem(constants.hbaDeviceType(), interfaceType, 1, 0)); hbaFormBuilder.addFormItem(new FormItem(constants.hbaWWNN(), interfaceWWNN, 2, 0)); hbaFormBuilder.addFormItem(new FormItem(constants.hbaWWPNs(), portWWPNs, 3, 0)); - + hbaFormBuilder.setRelativeColumnWidth(0, 3); hbaInventory.add(hbaFormPanel); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralInfoView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralInfoView.java index 5d7cfd8..6c9c882 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralInfoView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralInfoView.java @@ -138,6 +138,9 @@ // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 3, 6); + formBuilder.setRelativeColumnWidth(0, 3); + formBuilder.setRelativeColumnWidth(1, 4); + formBuilder.setRelativeColumnWidth(2, 5); formBuilder.addFormItem(new FormItem(constants.spmPriority(), spmPriority, 0, 0, virtSupported).withAutoPlacement()); formBuilder.addFormItem(new FormItem(constants.activeVmsHostGeneral(), activeVms, 0, virtSupported).withAutoPlacement()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralSoftwareView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralSoftwareView.java index 9d93ad6..b08aa46 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralSoftwareView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralSoftwareView.java @@ -76,7 +76,8 @@ boolean glusterSupported = ApplicationModeHelper.isModeSupported(ApplicationMode.GlusterOnly); // Build a form using the FormBuilder - formBuilder = new FormBuilder(formPanel, 3, 9); + formBuilder = new FormBuilder(formPanel, 1, 7); + formBuilder.setRelativeColumnWidth(0, 3); formBuilder.addFormItem(new FormItem(constants.osVersionHostGeneral(), oS, 0).withAutoPlacement()); formBuilder.addFormItem(new FormItem(constants.kernelVersionHostGeneral(), kernelVersion, 0).withAutoPlacement()); formBuilder.addFormItem(new FormItem(constants.kvmVersionHostGeneral(), kvmVersion, 0, virtSupported).withAutoPlacement()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java index b887d74..708ac02 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java @@ -73,7 +73,8 @@ // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 2, 4); - + formBuilder.setRelativeColumnWidth(0, 4); + formBuilder.setRelativeColumnWidth(1, 3); formBuilder.addFormItem(new FormItem(constants.nameNetwork(), name, 0, 0)); formBuilder.addFormItem(new FormItem(constants.idNetwork(), id, 1, 0)); formBuilder.addFormItem(new FormItem(constants.descriptionNetwork(), description, 2, 0)); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java index bd251f6..64bfe99 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java @@ -82,6 +82,9 @@ // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 3, 7); + formBuilder.setRelativeColumnWidth(0, 3); + formBuilder.setRelativeColumnWidth(1, 4); + formBuilder.setRelativeColumnWidth(2, 5); formBuilder.addFormItem(new FormItem(constants.namePoolGeneral(), name, 0, 0)); formBuilder.addFormItem(new FormItem(constants.descriptionPoolGeneral(), description, 1, 0)); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java index b188f25..a92cc4f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java @@ -67,6 +67,7 @@ // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 1, 4); + formBuilder.setRelativeColumnWidth(0, 4); formBuilder.addFormItem(new FormItem(constants.nameProvider(), name, 0, 0)); formBuilder.addFormItem(new FormItem(constants.typeProvider(), type, 1, 0)); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java index d23fd5b..168f6e8 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java @@ -94,7 +94,7 @@ // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 1, 12); - + formBuilder.setRelativeColumnWidth(0, 4); formBuilder.addFormItem(new FormItem(constants.sizeStorageGeneral(), totalSize, 0, 0)); formBuilder.addFormItem(new FormItem(constants.availableStorageGeneral(), availableSize, 1, 0)); formBuilder.addFormItem(new FormItem(constants.usedStorageGeneral(), usedSize, 2, 0)); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java index 4cab14e..034b623 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java @@ -62,6 +62,7 @@ // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 1, 3); + formBuilder.setRelativeColumnWidth(0, 3); formBuilder.addFormItem(new FormItem(constants.authz(), domain, 0, 0)); formBuilder.addFormItem(new FormItem(constants.emailUserGeneral(), email, 2, 0) { -- To view, visit http://gerrit.ovirt.org/37527 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f50ce04fa064a22d3f124360918c31db599e105 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <aw...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches