Tal Nisan has uploaded a new change for review. Change subject: webadmin: Fix visibility issues in VM/Template import conflict dialog ......................................................................
webadmin: Fix visibility issues in VM/Template import conflict dialog Change-Id: I5038eab75d71408b1336ae445e8ee2bb93e0cca8 Signed-off-by: Tal Nisan <tni...@redhat.com> Bug-Url: https://bugzilla.redhat.com/1149490 --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.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/ApplicationTemplates.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 7 files changed, 17 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/22/34322/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java index 3c78895..b9b5192 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java @@ -378,4 +378,8 @@ protected String getListName() { return "TemplateBackupModel"; //$NON-NLS-1$ } + + protected String getImportConflictTitle() { + return ConstantsManager.getInstance().getConstants().importTemplateConflictTitle(); + } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java index ea3024f..2ce6444 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java @@ -284,7 +284,7 @@ ImportCloneModel entity = new ImportCloneModel(); Object object = objectsToClone.iterator().next(); entity.setEntity(object); - entity.setTitle(ConstantsManager.getInstance().getConstants().importConflictTitle()); + entity.setTitle(getImportConflictTitle()); entity.setHelpTag(HelpTag.import_conflict); entity.setHashName("import_conflict"); //$NON-NLS-1$ UICommand command = new UICommand("onClone", this); //$NON-NLS-1$ @@ -659,4 +659,8 @@ return result; } } + + protected String getImportConflictTitle() { + return ConstantsManager.getInstance().getConstants().importVmConflictTitle(); + } } diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index 26ae328..3403028 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -1901,8 +1901,11 @@ @DefaultStringValue("Missing Quota for the selected Cluster, Please define proper Quota") String missingQuotaClusterEnforceMode(); - @DefaultStringValue("Import Conflict") - String importConflictTitle(); + @DefaultStringValue("Import Virtual Machine Conflict") + String importVmConflictTitle(); + + @DefaultStringValue("Import Template Conflict") + String importTemplateConflictTitle(); // Network- Host @DefaultStringValue("Attached") 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 dc68fa7..13d3522 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 @@ -3105,10 +3105,7 @@ @DefaultStringValue("Don't import") String cloneDontImport(); - @DefaultStringValue("Import as cloned") - String cloneImportVm(); - - @DefaultStringValue("Changing name, MAC addresses, and cloning all disks removing all snapshots") + @DefaultStringValue("Import as cloned (Changing name, MAC addresses and cloning all disks removing all snapshots)") String cloneImportVmDetails(); @DefaultStringValue("Clone") diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java index ffe3ed8..23d6bdc 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java @@ -145,9 +145,6 @@ @Template("<div title=\'{1}'style='line-height: 100%; text-align: center; vertical-align: middle;'>{0}</div>") SafeHtml image(SafeHtml statusImage, String title); - @Template("{0}<br><span style=\"padding-left: 25px;\">{1}</span>") - SafeHtml twoLinesRadioButtonLabel(String firstLine, String secondLine); - @Template("<div title=\"{2}\"><table cellspacing='0' cellpadding='0' style='line-height: 5px;'>" + "<tr>" + "<td>{0} (</td>" + 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 4c16948..5288532 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 @@ -102,8 +102,7 @@ public void edit(ImportCloneModel object) { if (((ImportEntityData) object.getEntity()).getEntity() instanceof VM) { dialogLabelEditor.setText(messages.sameVmNameExists(((ImportVmData) object.getEntity()).getVm().getName())); - cloneEditor.asRadioButton().setHTML(templates.twoLinesRadioButtonLabel( - constants.cloneImportVm(), constants.cloneImportVmDetails()).asString()); + cloneEditor.setLabel(constants.cloneImportVmDetails()); suffixEditor.setLabel(constants.cloneImportSuffixVm()); } else { dialogLabelEditor.setText(constants.sameTemplateNameExists() 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 3b738e9..e83af62 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 @@ -11,7 +11,7 @@ padding-left: 30px; } </ui:style> -<d:SimpleDialogPanel height="400px" width="540px"> +<d:SimpleDialogPanel height="400px" width="600px"> <d:content> <g:VerticalPanel> <g:Label ui:field="dialogLabelEditor"/> -- To view, visit http://gerrit.ovirt.org/34322 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5038eab75d71408b1336ae445e8ee2bb93e0cca8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Tal Nisan <tni...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
