Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: scheduling: indication for external plugin ......................................................................
webadmin: scheduling: indication for external plugin the text '(EXT)' will be added next to each module that is loaded by the external proxy. Change-Id: Ica7522ed5a46012c3c1205044c57723d4067aa11 Signed-off-by: Gilad Chaplik <[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/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/ClusterPolicyPopupView.ui.xml 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 5 files changed, 42 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/18564/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 add53a4..291fee8 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 @@ -3085,4 +3085,7 @@ "needed. Setting it when creating a policy generates the default values, which may " + "be overridden in each specific cluster using this policy.") String clusterPolicyPropertiesInfo(); + + @DefaultStringValue("(EXT)") + String externalPolicyUnitLabel(); } 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 816002a..6ddab45 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 @@ -32,10 +32,10 @@ import com.google.gwt.resources.client.CssResource; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Label; import com.google.inject.Inject; public class ClusterPolicyPopupView extends AbstractModelBoundPopupView<NewClusterPolicyModel> implements ClusterPolicyPopupPresenterWidget.ViewDef { - interface Driver extends SimpleBeanEditorDriver<NewClusterPolicyModel, ClusterPolicyPopupView> { } @@ -48,6 +48,7 @@ } private final Driver driver = GWT.create(Driver.class); + private ApplicationConstants constants; @UiField @Path(value = "name.entity") @@ -95,12 +96,17 @@ @UiField(provided = true) InfoIcon propertiesInfoIcon; + @UiField + @Ignore + Label externalLabel; + @Inject public ClusterPolicyPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, ApplicationTemplates templates) { super(eventBus, resources); + this.constants = constants; initListBoxEditors(); initPanels(); initInfoIcons(resources, constants, templates); @@ -202,6 +208,11 @@ 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$ + } } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml index d43f3ea..0d0d1c2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml @@ -75,6 +75,10 @@ .iconInfoStyle { margin-left: 10px; } + .externalLabel { + line-height: 30px; + font-weight: bold; + } </ui:style> <d:SimpleDialogPanel width="700px" height="650px"> @@ -157,8 +161,11 @@ <g:HTML> <hr style="width:100%;" /> </g:HTML> + <g:HorizontalPanel> <e:ListModelListBoxOnlyEditor ui:field="loadBalanceListEditor" /> + <g:Label ui:field="externalLabel" addStyleNames="{style.externalLabel}"/> + </g:HorizontalPanel> </g:FlowPanel> <g:HorizontalPanel> <g:Label addStyleNames="{style.sectionLabel}" 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 261ca0d..c7a3666 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 @@ -36,10 +36,10 @@ @Override public void initWidget() { HorizontalPanel panel = new HorizontalPanel(); - Label policyUnitLabel = new Label(policyUnit.getName()); + Panel namePanel = getNamePanel(policyUnit); if (!used) { panel.setStyleName(style.unusedPolicyUnitStyle()); - panel.add(policyUnitLabel); + panel.add(namePanel); } else { HorizontalPanel weightPanel = new HorizontalPanel(); final Label weightLabel = new Label(String.valueOf(factor)); @@ -86,7 +86,7 @@ weightPanel.setStyleName(style.positionLabelStyle()); panel.add(weightPanel); Panel policyUnitLablePanel = new SimplePanel(); - policyUnitLablePanel.add(policyUnitLabel); + policyUnitLablePanel.add(namePanel); policyUnitLablePanel.setStyleName(style.usedFilterPolicyUnitStyle()); panel.add(policyUnitLablePanel); } 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 1b3dd52..84cf1af 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 @@ -10,6 +10,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; +import com.google.gwt.dom.client.Style.FontWeight; import com.google.gwt.event.dom.client.ContextMenuEvent; import com.google.gwt.event.dom.client.ContextMenuHandler; import com.google.gwt.event.dom.client.DragDropEventBase; @@ -80,13 +81,13 @@ public void initWidget() { HorizontalPanel panel = new HorizontalPanel(); - Label policyUnitLabel = new Label(policyUnit.getName()); + Panel namePanel = getNamePanel(policyUnit); if (!used) { panel.setStyleName(style.unusedPolicyUnitStyle()); - panel.add(policyUnitLabel); + panel.add(namePanel); } else { Panel policyUnitLablePanel = new SimplePanel(); - policyUnitLablePanel.add(policyUnitLabel); + policyUnitLablePanel.add(namePanel); policyUnitLablePanel.setStyleName(style.usedFilterPolicyUnitStyle()); Label label = new Label(); label.setStyleName(style.positionLabelStyle()); @@ -106,6 +107,19 @@ setWidget(panel); } + protected Panel getNamePanel(PolicyUnit policyUnit) { + HorizontalPanel panel = new HorizontalPanel(); + Label label = new Label(policyUnit.getName()); + if (!policyUnit.isInternal()) { + Label extLabel = new Label(constants.externalPolicyUnitLabel()); + extLabel.getElement().getStyle().setFontWeight(FontWeight.BOLD); + panel.add(extLabel); + panel.setWidth("40%"); //$NON-NLS-1$ + } + panel.add(label); + return panel; + } + protected void showContextMenu(PolicyUnitPanel sourcePanel, int clientX, int clientY) { MenuBar menuBar = createMenu(); fillMenuBar(menuBar); -- To view, visit http://gerrit.ovirt.org/18564 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ica7522ed5a46012c3c1205044c57723d4067aa11 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
