Yevgeny Zaspitsky has uploaded a new change for review. Change subject: webadmin: Warning about display/migration network change. ......................................................................
webadmin: Warning about display/migration network change. The warning that let the user to understand that the changes in display/migration network will be applied not instantly, but on the next VM restart. Change-Id: Ib9df4cd96fe71b3a44132004f17a7889dbe912b2 Bug-Url: https://bugzilla.redhat.com/1034309 Signed-off-by: Yevgeny Zaspitsky <yzasp...@redhat.com> --- 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/cluster/ClusterManageNetworkPopupView.java 3 files changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/26256/1 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 6ee4deb..7002f43 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 @@ -3575,4 +3575,7 @@ @DefaultStringValue("iSCSI Multipathing") String dataCenterIscsiMultipathingSubTabLabel(); + + @DefaultStringValue("The change will be applied on the attached VMs on the VMs restart") + String restartVMwarning(); } 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 677d8e1..790972c 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 @@ -166,4 +166,7 @@ @Template("<div style='max-width: 250px; display:inline-block;'>{0}</div>") SafeHtml maxWidthNteworkItemPopup(String text); + + @Template("<abbr title='{1}'>{0}</abbr>") + SafeHtml textWithTooltip(String text, String tooltip); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java index 3835eca..feedb48 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java @@ -92,15 +92,21 @@ new VmNetworkImageSafeHtmlWithSafeHtmlTooltipColumn(constants), constants.vmNetwork(), "80px"); //$NON-NLS-1$ + final SafeHtml displayNetworkColumnHeader = templates.textWithTooltip( + constants.displayNetwork(), + constants.restartVMwarning()); networks.addColumn( new DisplayNetworkIndicatorCheckboxColumn(multipleSelectionAllowed, new DisplayNetworkIndicatorFieldUpdater()), - constants.displayNetwork(), "100px"); //$NON-NLS-1$ + displayNetworkColumnHeader, "100px"); //$NON-NLS-1$ + SafeHtml migrationNetworkColumnHeader = templates.textWithTooltip( + constants.migrationNetwork(), + constants.restartVMwarning()); networks.addColumn( new MigrationNetworkIndicatorCheckboxColumn(multipleSelectionAllowed, new MigrationNetworkIndicatorFieldUpdater()), - constants.migrationNetwork(), "105px"); //$NON-NLS-1$ + migrationNetworkColumnHeader, "105px"); //$NON-NLS-1$ } @Override -- To view, visit http://gerrit.ovirt.org/26256 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9df4cd96fe71b3a44132004f17a7889dbe912b2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <yzasp...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
