Arik Hadas has uploaded a new change for review. Change subject: webadmin: improve import conflict (for vm) dialogue ......................................................................
webadmin: improve import conflict (for vm) dialogue The dialogue which is shown when trying to import VM or that already exists in the system is modified: 1. the term "clone" was replaced with a string that better express what happens during the cloning operation 2. the term "suffix:" was replaced with a string that better express that the given string will be the suffix of the cloned VMs 2. the layout was changed to better reflect that the given new name is related to the "import as cloned" option and "Suffix to add to the.." is related to the "apply to all" option Change-Id: Ia6fe863e52e9bad1d620bce75b8252bca4d0d414 Bug-Url: https://bugzilla.redhat.com/878495 Signed-off-by: Arik Hadas <aha...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelRadioButtonEditor.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/storage/backup/ImportCloneDialogPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.ui.xml 4 files changed, 40 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/11435/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelRadioButtonEditor.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelRadioButtonEditor.java index 0b8cf31..924a684 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelRadioButtonEditor.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelRadioButtonEditor.java @@ -11,6 +11,7 @@ import com.google.gwt.dom.client.Style.BorderStyle; import com.google.gwt.dom.client.Style.Display; import com.google.gwt.dom.client.Style.Float; +import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.editor.client.IsEditor; import com.google.gwt.user.client.ui.RadioButton; @@ -37,6 +38,7 @@ // align content widget container to the left and hide the LabelElement if (useRadioButtonWidgetLabel) { getContentWidgetContainer().getElement().getStyle().setFloat(Float.LEFT); + getContentWidgetContainer().getElement().getStyle().setWidth(100, Unit.PCT); getLabelElement().getStyle().setDisplay(Display.NONE); } } @@ -76,7 +78,7 @@ @Override public String getLabel() { if (useRadioButtonWidgetLabel) { - return asRadioButton().getText(); + return asRadioButton().getHTML(); } else { return super.getLabel(); } @@ -85,7 +87,7 @@ @Override public void setLabel(String label) { if (useRadioButtonWidgetLabel) { - asRadioButton().setText(label); + asRadioButton().setHTML(label); } else { super.setLabel(label); } 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 4918224..2376eed 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 @@ -2436,9 +2436,6 @@ @DefaultStringValue("Clone Only Duplicated Templates") String importTemplate_cloneOnlyDuplicateTemplates(); - @DefaultStringValue("Suffix:") - String import_cloneSuffix(); - @DefaultStringValue("New Name:") String import_newName(); @@ -2478,10 +2475,19 @@ @DefaultStringValue("Don't import") String cloneDontImport(); - @DefaultStringValue("Clone") - String clone(); + @DefaultStringValue("Import as cloned<br> Changing name, MAC addresses, and cloning all disks removing all snapshots") + String cloneImportVm(); - @DefaultStringValue("Please select a name for the cloned VM(s)") + @DefaultStringValue("Clone") + String cloneImportTemplate(); + + @DefaultStringValue("Suffix to add to the cloned VMs:") + String cloneImportSuffixVm(); + + @DefaultStringValue("Suffix to add to the cloned Templates:") + String cloneImportSuffixTemplate(); + + @DefaultStringValue("VM ${VmName} already exist") String sameVmNameExists(); @DefaultStringValue("Please select a name for the cloned Template(s)") diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java index dfd9a40..1e279ae 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java @@ -80,21 +80,23 @@ private void localize(ApplicationConstants constants) { nameEditor.setLabel(constants.import_newName()); - suffixEditor.setLabel(constants.import_cloneSuffix()); selectLabelEditor.setText(constants.cloneSelect()); applyToAllEditor.setLabel(constants.cloneApplyToAll()); noCloneEditor.setLabel(constants.cloneDontImport()); - cloneEditor.setLabel(constants.clone()); //$NON-NLS-1$ } @Override public void edit(ImportCloneModel object) { if (object.getEntity() instanceof VM) { dialogLabelEditor.setText(constants.sameVmNameExists() - + " (" + ((VM) object.getEntity()).getVmName() + ")");//$NON-NLS-1$ //$NON-NLS-2$ + .replaceFirst("\\$\\{VmName\\}", ((VM) object.getEntity()).getVmName())); //$NON-NLS-1$ + cloneEditor.setLabel(constants.cloneImportVm()); + suffixEditor.setLabel(constants.cloneImportSuffixVm()); } else { dialogLabelEditor.setText(constants.sameTemplateNameExists() + " (" + ((VmTemplate) object.getEntity()).getname() + ")");//$NON-NLS-1$ //$NON-NLS-2$ + cloneEditor.setLabel(constants.cloneImportTemplate()); + suffixEditor.setLabel(constants.cloneImportSuffixTemplate()); } Driver.driver.edit(object); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.ui.xml index dec5df2..2c6719f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.ui.xml @@ -6,18 +6,25 @@ xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor"> <ui:style> + .innerPanel { + padding-left: 30px; + } </ui:style> -<d:SimpleDialogPanel height="400px" width="500px"> - <d:content> - <g:VerticalPanel> - <g:Label ui:field="dialogLabelEditor"/> - <g:Label ui:field="selectLabelEditor"/> - <e:EntityModelRadioButtonEditor ui:field="noCloneEditor"/> - <e:EntityModelRadioButtonEditor ui:field="cloneEditor"/> - <e:EntityModelTextBoxEditor ui:field="nameEditor" /> - <e:EntityModelCheckBoxEditor ui:field="applyToAllEditor" /> - <e:EntityModelTextBoxEditor ui:field="suffixEditor" /> - </g:VerticalPanel> - </d:content> +<d:SimpleDialogPanel height="400px" width="540px"> + <d:content> + <g:VerticalPanel> + <g:Label ui:field="dialogLabelEditor"/> + <g:Label ui:field="selectLabelEditor"/> + <e:EntityModelRadioButtonEditor ui:field="noCloneEditor"/> + <e:EntityModelRadioButtonEditor ui:field="cloneEditor"/> + <g:FlowPanel addStyleNames="{style.innerPanel}"> + <e:EntityModelTextBoxEditor ui:field="nameEditor" /> + </g:FlowPanel> + <e:EntityModelCheckBoxEditor ui:field="applyToAllEditor" /> + <g:FlowPanel addStyleNames="{style.innerPanel}"> + <e:EntityModelTextBoxEditor ui:field="suffixEditor" /> + </g:FlowPanel> + </g:VerticalPanel> + </d:content> </d:SimpleDialogPanel> </ui:UiBinder> \ No newline at end of file -- To view, visit http://gerrit.ovirt.org/11435 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6fe863e52e9bad1d620bce75b8252bca4d0d414 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <aha...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
