Yevgeny Zaspitsky has uploaded a new change for review.

Change subject: webadmin: Warning about display/migration network change. 
(tooltip in the UI)
......................................................................

webadmin: Warning about display/migration network change.
(tooltip in the UI)

The warning that let the user to understand that the changes in
display network will be applied not instantly, but on the next
VM restart.

Change-Id: I93151d3893aedeccb7e6e7cd7a06d907f1b36d83
Bug-Url: https://bugzilla.redhat.com/1078836
Signed-off-by: Yevgeny Zaspitsky <[email protected]>
---
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, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/26537/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 3a0b016..4aec8a7 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
@@ -3578,4 +3578,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 840c44b..7e93aeb 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
@@ -91,10 +91,13 @@
                 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$
 
         networks.addColumn(
                 new 
MigrationNetworkIndicatorCheckboxColumn(multipleSelectionAllowed,


-- 
To view, visit http://gerrit.ovirt.org/26537
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93151d3893aedeccb7e6e7cd7a06d907f1b36d83
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yevgeny Zaspitsky <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to