Greg Sheremeta has uploaded a new change for review. Change subject: userportal, webadmin: switch to GwtBootstrap3CDN module ......................................................................
userportal, webadmin: switch to GwtBootstrap3CDN module Switched to GwtBootstrap3CDN module from which to inherit gwt-common, userportal, and and webadmin. Previously used GwtBootstrap3NoTheme. The effect of this change is to stop gwtbootstrap3 from injecting jquery.js and bootstrap.js. As we move to a move modular UI, we have decided to control JavaScript and CSS assets outside of GWT as much as possible. If we want to support a newer version of jquery in the future (for, say, UI plugin usage), we won't be tied to the version that ships with gwtbootstrap3. Added bootstrap.min.js and jquery.min.js includes in javascripts.tag to replace the gwtbootstrap3-injected copies of bootstrap.js and jquery.js. Also added patternfly.min.js, which is not currently required but is useful. It includes script for a few PatternFly widgets that we do not yet use. Change-Id: I77f50562ea8bc67f59246eb68a17f87584a5fd9b Signed-off-by: Greg Sheremeta <gsher...@redhat.com> --- M backend/manager/modules/branding/src/main/resources/META-INF/tags/obrand/javascripts.tag M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/GwtCommon.gwt.xml 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/38554/1 diff --git a/backend/manager/modules/branding/src/main/resources/META-INF/tags/obrand/javascripts.tag b/backend/manager/modules/branding/src/main/resources/META-INF/tags/obrand/javascripts.tag index 8e8e4d2..0310ee4 100644 --- a/backend/manager/modules/branding/src/main/resources/META-INF/tags/obrand/javascripts.tag +++ b/backend/manager/modules/branding/src/main/resources/META-INF/tags/obrand/javascripts.tag @@ -4,6 +4,9 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"; %> <c:set var="baseTheme" value="${requestScope['brandingStyle'][0]}" /> +<script type="text/javascript" src="${pageContext.request.contextPath}${initParam['obrandThemePath']}${baseTheme.path}/patternfly/components/jquery/jquery.min.js"></script> +<script type="text/javascript" src="${pageContext.request.contextPath}${initParam['obrandThemePath']}${baseTheme.path}/patternfly/components/bootstrap/dist/js/bootstrap.min.js"></script> +<script type="text/javascript" src="${pageContext.request.contextPath}${initParam['obrandThemePath']}${baseTheme.path}/patternfly/js/patternfly.min.js"></script> <c:choose> <c:when test="${fn:containsIgnoreCase(header['User-Agent'],'MSIE 8.0')}"> <script type="text/javascript" src="${pageContext.request.contextPath}${initParam['obrandThemePath']}${baseTheme.path}/patternfly/components/respond/dest/respond.min.js"></script> diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/GwtCommon.gwt.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/GwtCommon.gwt.xml index 03dc459..caa8842 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/GwtCommon.gwt.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/GwtCommon.gwt.xml @@ -7,7 +7,7 @@ <inherits name="com.google.gwt.user.User" /> <inherits name="com.google.gwt.inject.Inject" /> - <inherits name="org.gwtbootstrap3.GwtBootstrap3NoTheme"/> + <inherits name="org.gwtbootstrap3.GwtBootstrap3CDN"/> <inherits name="com.google.gwt.uibinder.GinUiBinder" /> <!-- Inherit GWTP MVP module with automatic EntryPoint support --> -- To view, visit https://gerrit.ovirt.org/38554 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I77f50562ea8bc67f59246eb68a17f87584a5fd9b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <gsher...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
