Daniel Erez has uploaded a new change for review. Change subject: webadmin: rename V.Disks sub-tabs to Disks (#850749) ......................................................................
webadmin: rename V.Disks sub-tabs to Disks (#850749) https://bugzilla.redhat.com/850749 Renamed all 'Virtual Disks' sub-tabs to 'Disks'. Change-Id: Id469b62f26e95c0e8d27a8ed8f1e9d9649ff6d81 Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolDiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.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/ImportTemplatePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java 8 files changed, 11 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/7480/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index 8b30135..dad8f4e 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -145,7 +145,7 @@ @DefaultStringValue("General") String generalLabel(); - @DefaultStringValue("Virtual Disks") + @DefaultStringValue("Disks") String disksLabel(); @DefaultStringValue("Network Interfaces") diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolDiskListModel.java index ac252ae..7632c5f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolDiskListModel.java @@ -27,7 +27,7 @@ public PoolDiskListModel() { - setTitle(ConstantsManager.getInstance().getConstants().virtualDisksTitle()); + setTitle(ConstantsManager.getInstance().getConstants().disksTitle()); setHashName("virtual_disks"); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java index fb7aec0..6f33166 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java @@ -57,7 +57,7 @@ public TemplateDiskListModel() { - setTitle(ConstantsManager.getInstance().getConstants().virtualDisksTitle()); + setTitle(ConstantsManager.getInstance().getConstants().disksTitle()); setHashName("virtual_disks"); //$NON-NLS-1$ setCopyCommand(new UICommand("Copy", this)); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java index cdf2a49..cf3970d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java @@ -150,7 +150,7 @@ public VmDiskListModel() { - setTitle(ConstantsManager.getInstance().getConstants().virtualDisksTitle()); + setTitle(ConstantsManager.getInstance().getConstants().disksTitle()); setHashName("virtual_disks"); //$NON-NLS-1$ setNewCommand(new UICommand("New", this)); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java index bac772d..65e81bf 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java @@ -196,9 +196,6 @@ @DefaultStringValue("Remove Template Disk(s)") String removeTemplateDisksTitle(); - @DefaultStringValue("Virtual Disks") - String virtualDisksTitle(); - @DefaultStringValue("Copy Disk(s)") String copyDisksTitle(); 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 8a2e20e..5801754 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 @@ -439,8 +439,8 @@ @DefaultStringValue("Network Interfaces") String importVmNetworkIntefacesSubTabLabel(); - @DefaultStringValue("Virtual Disks") - String importVmVirualDisksSubTabLabel(); + @DefaultStringValue("Disks") + String importVmDisksSubTabLabel(); @DefaultStringValue("Applications") String importVmApplicationslSubTabLabel(); @@ -478,7 +478,7 @@ @DefaultStringValue("Network Interfaces") String templateInterfaceSubTabLabel(); - @DefaultStringValue("Virtual Disks") + @DefaultStringValue("Disks") String templateDiskSubTabLabel(); @DefaultStringValue("Storage") @@ -1856,8 +1856,8 @@ @DefaultStringValue("Network Interfaces") String networkIntImpTempTab(); - @DefaultStringValue("Virtual Disks") - String virtualDisksImpTempTab(); + @DefaultStringValue("Disks") + String disksImpTempTab(); // Volume Brick @DefaultStringValue("Server") diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportTemplatePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportTemplatePopupView.java index 7e3d8ef..c0045e3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportTemplatePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportTemplatePopupView.java @@ -198,7 +198,7 @@ ScrollPanel diskPanel = new ScrollPanel(); diskPanel.add(diskTable); - subTabLayoutpanel.add(diskPanel, constants.virtualDisksImpTempTab()); + subTabLayoutpanel.add(diskPanel, constants.disksImpTempTab()); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java index cf815e5..fac0780 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java @@ -230,7 +230,7 @@ ScrollPanel diskPanel = new ScrollPanel(); diskPanel.add(diskTable); - subTabLayoutpanel.add(diskPanel, constants.importVmVirualDisksSubTabLabel()); + subTabLayoutpanel.add(diskPanel, constants.importVmDisksSubTabLabel()); ScrollPanel appPanel = new ScrollPanel(); appPanel.add(appTable); -- To view, visit http://gerrit.ovirt.org/7480 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id469b62f26e95c0e8d27a8ed8f1e9d9649ff6d81 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
