Lior Vernia has uploaded a new change for review. Change subject: webadmin: Added question mark to Import Networks dialog ......................................................................
webadmin: Added question mark to Import Networks dialog It explains the meaning of "Allow All" when importing a network. Change-Id: Ib5180f62ecbab5b9bad44559bf0a24950628c95a Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationTemplates.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.java 2 files changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/17014/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationTemplates.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationTemplates.java index bd15575..9c88000 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationTemplates.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationTemplates.java @@ -29,6 +29,9 @@ @Template("<span style='height:22px; width: 22px; vertical-align: middle; text-align: center; display: table-cell;' title='{1}'>{0}</span>") SafeHtml imageWithTitle(SafeHtml image, String title); + @Template("<span style='height:22px; width: 22px; vertical-align: middle; text-align: center;' title='{1}'>{0}</span>") + SafeHtml inlineImageWithTitle(SafeHtml image, String title); + @Template("<table cellspacing='0' cellpadding='0'><tr>" + "<td style='background: url({2});width:2px;'></td>" + "<td style='text-align:center;'>" + diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.java index 844bb40..f98e994 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ImportNetworksPopupView.java @@ -31,9 +31,11 @@ import com.google.gwt.event.shared.EventBus; import com.google.gwt.resources.client.CssResource; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; +import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.cellview.client.Column; +import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.inject.Inject; public class ImportNetworksPopupView extends AbstractModelBoundPopupView<ImportNetworksModel> implements ImportNetworksPopupPresenterWidget.ViewDef { @@ -90,7 +92,7 @@ constants.importedNetworks(), constants); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); - initEntityModelCellTables(constants, templates); + initEntityModelCellTables(constants, templates, resources); providersEditor.setLabel(constants.networkProvider()); providersEditor.addWrapperStyleName(style.providersStyle()); driver.initialize(this); @@ -107,7 +109,7 @@ importedNetworks.edit(importedNetworks.flush()); } - void initEntityModelCellTables(final ApplicationConstants constants, final ApplicationTemplates templates) { + void initEntityModelCellTables(final ApplicationConstants constants, final ApplicationTemplates templates, final ApplicationResources resources) { Column<EntityModel, String> nameColumn = new TextColumnWithTooltip<EntityModel>() { @Override public String getValue(EntityModel model) { @@ -164,6 +166,14 @@ public boolean isEnabled() { return true; } + + @Override + public void render(Context context, SafeHtmlBuilder sb) { + super.render(context, sb); + sb.append(templates.inlineImageWithTitle(SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.dialogIconHelp()) + .getHTML()), + constants.networkPublicUseLabel())); + } }; importedNetworks.addColumn(new CheckboxColumn<EntityModel>(new FieldUpdater<EntityModel, Boolean>() { -- To view, visit http://gerrit.ovirt.org/17014 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5180f62ecbab5b9bad44559bf0a24950628c95a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
