Greg Sheremeta has uploaded a new change for review. Change subject: engine: make documentation mapping brandable ......................................................................
engine: make documentation mapping brandable Move path of documentation mapping file into branding. This fixes 404s caused by RHEV documentation mapping files not existing in oVirt. Change-Id: I1eeb58f8293be21e33b60030d2720fb9dc39140e Bug-Url: https://bugzilla.redhat.com/1002353 Signed-off-by: Greg Sheremeta <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationDynamicMessages.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java 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/ApplicationDynamicMessages.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java 7 files changed, 39 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/19333/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java index a680326..44658ea 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java @@ -39,7 +39,8 @@ CLIENT_RESOURCES("client_resources"), //$NON-NLS-1$ CONSOLE_CLIENT_RESOURCES("console_client_resources"), //$NON-NLS-1$ CONSOLE_CLIENT_RESOURCES_URL("console_client_resources_url"), //$NON-NLS-1$ - DOC("doc"); //$NON-NLS-1$ + DOC("doc"), //$NON-NLS-1$ + DOC_MAPPING_FILE("doc_mapping_file"); //$NON-NLS-1$ private final String value; @@ -319,4 +320,14 @@ return getString(DynamicMessageKey.DOC); } + /** + * Get the application documentation mapping file using the {@code Dictionary} in the host page. + * With a fall back to the standard GWT Constant. + * + * @return The application documentation mapping file. + */ + public String documentationMappingFileName() { + return getString(DynamicMessageKey.DOC_MAPPING_FILE); + } + } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java index f761744..ef3818d 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java @@ -47,6 +47,9 @@ @DefaultStringValue("Guide") String guideLinkLabel(); + @DefaultStringValue("") + String docMappingFile(); + @DefaultStringValue("Basic") String basicMainTabLabel(); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationDynamicMessages.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationDynamicMessages.java index 24226cd..1d6b2d4 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationDynamicMessages.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationDynamicMessages.java @@ -17,6 +17,7 @@ addFallback(DynamicMessageKey.COPY_RIGHT_NOTICE, constants.copyRightNotice()); addFallback(DynamicMessageKey.DOC, constants.userPortalDoc()); addFallback(DynamicMessageKey.GUIDE_LINK_LABEL, constants.guideLinkLabel()); + addFallback(DynamicMessageKey.DOC_MAPPING_FILE, constants.docMappingFile()); } } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java index ebb653e..20d3f8e 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java @@ -5,6 +5,7 @@ import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.ui.common.uicommon.ClientAgentType; import org.ovirt.engine.ui.common.uicommon.DocumentationPathTranslator; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.uicommon.model.UiCommonInitEvent; import org.ovirt.engine.ui.common.uicommon.model.UiCommonInitEvent.UiCommonInitHandler; import org.ovirt.engine.ui.frontend.AsyncQuery; @@ -41,12 +42,16 @@ private final UserPortalPlaceManager placeManager; + private DynamicMessages dynamicMessages; + private static final ClientAgentType clientAgentType = new ClientAgentType(); @Inject - public UserPortalConfigurator(UserPortalPlaceManager placeManager, EventBus eventBus) { + public UserPortalConfigurator(UserPortalPlaceManager placeManager, EventBus eventBus, + DynamicMessages dynamicMessages) { super(); this.placeManager = placeManager; + this.dynamicMessages = dynamicMessages; eventBus.addHandler(UiCommonInitEvent.getType(), this); // This means that it is UserPortal application. @@ -151,7 +156,10 @@ } protected void fetchDocumentationFile() { - fetchFile(getDocumentationBaseURL() + "UserPortalDocumentationPath.csv", documentationFileFetchedEvent); //$NON-NLS-1$ + String docMappingFileName = dynamicMessages.documentationMappingFileName(); + if (docMappingFileName != null && docMappingFileName.trim().length() > 0) { + fetchFile(getDocumentationBaseURL() + docMappingFileName, documentationFileFetchedEvent); + } } } 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 93f514c..c3da9b6 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 @@ -49,6 +49,9 @@ @DefaultStringValue("Guide") String guideLinkLabel(); + @DefaultStringValue("") + String docMappingFile(); + @DefaultStringValue("Search") String searchLabel(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationDynamicMessages.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationDynamicMessages.java index 13c445f..e200917 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationDynamicMessages.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationDynamicMessages.java @@ -18,6 +18,7 @@ addFallback(DynamicMessageKey.DOC, constants.engineWebAdminDoc()); addFallback(DynamicMessageKey.FEEDBACK_LINK_LABEL, constants.feedbackMessage()); addFallback(DynamicMessageKey.GUIDE_LINK_LABEL, constants.guideLinkLabel()); + addFallback(DynamicMessageKey.DOC_MAPPING_FILE, constants.docMappingFile()); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java index 25890e5..542a997 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java @@ -7,6 +7,7 @@ import org.ovirt.engine.ui.common.uicommon.DocumentationPathTranslator; import org.ovirt.engine.ui.common.uicommon.model.UiCommonInitEvent; import org.ovirt.engine.ui.common.uicommon.model.UiCommonInitEvent.UiCommonInitHandler; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.uicommonweb.Configurator; import org.ovirt.engine.ui.uicommonweb.models.vms.ISpice; import org.ovirt.engine.ui.uicommonweb.models.vms.WANDisableEffects; @@ -32,9 +33,12 @@ private static final ClientAgentType clientAgentType = new ClientAgentType(); + private DynamicMessages dynamicMessages; + @Inject - public WebAdminConfigurator(EventBus eventBus) { + public WebAdminConfigurator(EventBus eventBus, DynamicMessages dynamicMessages) { super(); + this.dynamicMessages = dynamicMessages; eventBus.addHandler(UiCommonInitEvent.getType(), this); // This means that this is WebAdmin application. @@ -100,7 +104,10 @@ } protected void fetchDocumentationFile() { - fetchFile(getDocumentationBaseURL() + "DocumentationPath.csv", documentationFileFetchedEvent); //$NON-NLS-1$ + String docMappingFileName = dynamicMessages.documentationMappingFileName(); + if (docMappingFileName != null && docMappingFileName.trim().length() > 0) { + fetchFile(getDocumentationBaseURL() + docMappingFileName, documentationFileFetchedEvent); + } } } -- To view, visit http://gerrit.ovirt.org/19333 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1eeb58f8293be21e33b60030d2720fb9dc39140e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
