Gilad Chaplik has uploaded a new change for review.
Change subject: webadmin: show notification of disabled policy unit
......................................................................
webadmin: show notification of disabled policy unit
When the external scheduler doesn't load an already loaded
plugin, the ui will show notification foreach one, with
disabled caption and graying it out.
Change-Id: Ia9f33eb9305ca639d15717362f0590cb8445d13a
Signed-off-by: Gilad Chaplik <gchap...@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/section/main/view/popup/scheduling/ClusterPolicyPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/panels/FunctionPolicyUnitPanel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/panels/PolicyUnitPanel.java
4 files changed, 29 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/18234/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 99a10f3..635bf80 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
@@ -3182,4 +3182,7 @@
@DefaultStringValue("(EXT)")
String externalPolicyUnitLabel();
+
+ @DefaultStringValue("(Disabled)")
+ String disabledPolicyUnit();
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.java
index 6ddab45..8cef7e9 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.java
@@ -208,11 +208,14 @@
PolicyUnit selectedItem = (PolicyUnit)
model.getLoadBalanceList().getSelectedItem();
if (selectedItem != null) {
loadBalanceListEditor.getElement().setTitle(selectedItem.getDescription());
- if (selectedItem.isInternal()) {
- externalLabel.setText(""); //$NON-NLS-1$
- } else {
- externalLabel.setText(constants.externalPolicyUnitLabel());
//$NON-NLS-1$
+ String text = ""; //$NON-NLS-1$
+ if (!selectedItem.isInternal()) {
+ text = constants.externalPolicyUnitLabel() + " "; //$NON-NLS-1$
}
+ if (!selectedItem.isEnabled()) {
+ text += constants.disabledPolicyUnit();
+ }
+ externalLabel.setText(text);
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/panels/FunctionPolicyUnitPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/panels/FunctionPolicyUnitPanel.java
index c7a3666..60cba46 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/panels/FunctionPolicyUnitPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/panels/FunctionPolicyUnitPanel.java
@@ -76,11 +76,11 @@
});
upButton.setWidth("12px"); //$NON-NLS-1$
upButton.getElement().getStyle().setPadding(0, Unit.PX);
- if (!locked) {
+ if (!locked || policyUnit.isEnabled()) {
weightPanel.add(downButton);
}
weightPanel.add(weightLabel);
- if (!locked) {
+ if (!locked || policyUnit.isEnabled()) {
weightPanel.add(upButton);
}
weightPanel.setStyleName(style.positionLabelStyle());
@@ -90,6 +90,9 @@
policyUnitLablePanel.setStyleName(style.usedFilterPolicyUnitStyle());
panel.add(policyUnitLablePanel);
}
+ if (!policyUnit.isEnabled()) {
+ panel.getElement().getStyle().setOpacity(0.5);
+ }
setWidget(panel);
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/panels/PolicyUnitPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/panels/PolicyUnitPanel.java
index 84cf1af..c1a5ec0 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/panels/PolicyUnitPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/panels/PolicyUnitPanel.java
@@ -47,7 +47,7 @@
this.locked = locked;
this.style = style;
getElement().setTitle(policyUnit.getDescription());
- if (!locked) {
+ if (!locked && (policyUnit.isEnabled() || used)) {
addDomHandler(new ContextMenuHandler() {
@Override
@@ -104,6 +104,9 @@
panel.setWidth("100%"); //$NON-NLS-1$
panel.add(policyUnitLablePanel);
}
+ if (!policyUnit.isEnabled()) {
+ panel.getElement().getStyle().setOpacity(0.5);
+ }
setWidget(panel);
}
@@ -114,16 +117,24 @@
Label extLabel = new Label(constants.externalPolicyUnitLabel());
extLabel.getElement().getStyle().setFontWeight(FontWeight.BOLD);
panel.add(extLabel);
- panel.setWidth("40%"); //$NON-NLS-1$
+
}
panel.add(label);
+ if (!policyUnit.isEnabled()) {
+ Label disabledLabel = new Label(constants.disabledPolicyUnit());
+
disabledLabel.getElement().getStyle().setFontWeight(FontWeight.BOLD);
+ panel.add(disabledLabel);
+ }
+ panel.setSpacing(2);
return panel;
}
protected void showContextMenu(PolicyUnitPanel sourcePanel, int clientX,
int clientY) {
MenuBar menuBar = createMenu();
fillMenuBar(menuBar);
- addSubMenu(menuBar);
+ if (policyUnit.isEnabled()) {
+ addSubMenu(menuBar);
+ }
menuPopup.setWidget(menuBar);
menuPopup.setPopupPosition(clientX, clientY);
menuPopup.show();
--
To view, visit http://gerrit.ovirt.org/18234
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9f33eb9305ca639d15717362f0590cb8445d13a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
