Alona Kaplan has uploaded a new change for review. Change subject: webadmin: adding description to vnic profile dialogs and tables ......................................................................
webadmin: adding description to vnic profile dialogs and tables Adding description field to vnic profile dialogs and adding description column to vnic profile tables (Main tab and Network sub tab). Change-Id: I84792a871c7e9dfbb39d4227d7ce82d84be25f1b Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/EditVnicProfileModel.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/profile/VnicProfilePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVnicProfileView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkProfileView.java 5 files changed, 40 insertions(+), 27 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/17572/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/EditVnicProfileModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/EditVnicProfileModel.java index f3053e4..9dcee63 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/EditVnicProfileModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/EditVnicProfileModel.java @@ -20,6 +20,7 @@ setProfile(profile); getName().setEntity(profile.getName()); + getDescription().setEntity(profile.getDescription()); getPortMirroring().setEntity(getProfile().isPortMirroring()); getPublicUse().setIsAvailable(false); 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 b4c8f20..2fe4edc7 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 @@ -1097,14 +1097,23 @@ @DefaultStringValue("Used Storage/Total") String usedStorageTotalQuotaStorage(); - // Network Profile + // Vnic Profile + @DefaultStringValue("Network") + String networkVnicProfile(); + @DefaultStringValue("Name") - String nameNetworkProfile(); + String nameVnicProfile(); + + @DefaultStringValue("Description") + String descriptionVnicProfile(); @DefaultStringValue("Port Mirroring") - String portMirroringNetworkProfile(); + String portMirroringVnicProfile(); - @DefaultStringValue("Virtual Machines") + @DefaultStringValue("Allow all users to use this Profile") + String publicUseVnicProfile(); + + @DefaultStringValue("Virtual Machines") String vnicProfileVmSubTabLabel(); @DefaultStringValue("Templates") @@ -3110,19 +3119,4 @@ @DefaultStringValue("Action Items") String actionItems(); - - @DefaultStringValue("Network") - String networkProfilePopup(); - - @DefaultStringValue("Name") - String nameProfilePopup(); - - @DefaultStringValue("Description") - String descriptionProfilePopup(); - - @DefaultStringValue("Port Mirroring") - String portMirroringProfilePopup(); - - @DefaultStringValue("Allow all users to use this Profile") - String publicUseProfilePopup(); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/profile/VnicProfilePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/profile/VnicProfilePopupView.java index d1fac52..0265d90 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/profile/VnicProfilePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/profile/VnicProfilePopupView.java @@ -100,11 +100,11 @@ } private void localize(ApplicationConstants constants) { - networkEditor.setLabel(constants.networkProfilePopup()); - nameEditor.setLabel(constants.nameProfilePopup()); - descriptionEditor.setLabel(constants.descriptionProfilePopup()); - portMirroringEditor.setLabel(constants.portMirroringProfilePopup()); - publicUseEditor.setLabel(constants.publicUseProfilePopup()); + networkEditor.setLabel(constants.networkVnicProfile()); + nameEditor.setLabel(constants.nameVnicProfile()); + descriptionEditor.setLabel(constants.descriptionVnicProfile()); + portMirroringEditor.setLabel(constants.portMirroringVnicProfile()); + publicUseEditor.setLabel(constants.publicUseVnicProfile()); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVnicProfileView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVnicProfileView.java index 9527197..b4c05d1 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVnicProfileView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVnicProfileView.java @@ -45,7 +45,16 @@ } }; - getTable().addColumn(nameColumn, constants.nameNetworkProfile(), "200px"); //$NON-NLS-1$ + getTable().addColumn(nameColumn, constants.nameVnicProfile(), "200px"); //$NON-NLS-1$ + + TextColumnWithTooltip<VnicProfileView> descriptionColumn = new TextColumnWithTooltip<VnicProfileView>() { + @Override + public String getValue(VnicProfileView object) { + return object.getDescription(); + } + }; + + getTable().addColumn(descriptionColumn, constants.descriptionVnicProfile(), "400px"); //$NON-NLS-1$ getTable().addActionButton(new WebAdminButtonDefinition<VnicProfileView>(constants.newVnicProfile()) { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkProfileView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkProfileView.java index 546ad61..f85f313 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkProfileView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkProfileView.java @@ -36,7 +36,16 @@ return object.getName(); } }; - getTable().addColumn(nameColumn, constants.nameNetworkProfile(), "400px"); //$NON-NLS-1$ + getTable().addColumn(nameColumn, constants.nameVnicProfile(), "400px"); //$NON-NLS-1$ + + TextColumnWithTooltip<VnicProfileView> descriptionColumn = + new TextColumnWithTooltip<VnicProfileView>() { + @Override + public String getValue(VnicProfileView object) { + return object.getDescription(); + } + }; + getTable().addColumn(descriptionColumn, constants.descriptionVnicProfile(), "400px"); //$NON-NLS-1$ BooleanColumn<VnicProfileView> portMirroringColumn = new BooleanColumn<VnicProfileView>(constants.portMirroringEnabled()) { @@ -45,7 +54,7 @@ return object.isPortMirroring(); } }; - getTable().addColumnWithHtmlHeader(portMirroringColumn, constants.portMirroringNetworkProfile(), "85px"); //$NON-NLS-1$ + getTable().addColumnWithHtmlHeader(portMirroringColumn, constants.portMirroringVnicProfile(), "85px"); //$NON-NLS-1$ getTable().addActionButton(new WebAdminButtonDefinition<VnicProfileView>(constants.newNetworkProfile()) { @Override -- To view, visit http://gerrit.ovirt.org/17572 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84792a871c7e9dfbb39d4227d7ce82d84be25f1b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
