diff options
author | 2017-12-04 16:45:55 -0500 | |
---|---|---|
committer | 2017-12-08 10:45:57 -0500 | |
commit | 428150834ee60899b9a8da019bae3c8bf009adf1 (patch) | |
tree | 7197eb324477cad918cf527c7a479302cb5029f7 /ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp | |
parent | 775f45908025e46a40c9c147fca2066af5c8c5b8 (diff) |
Upgraded the latest ONAP SDK
Upgraded latest ONAP SDK Code.
Change-Id: I669d6cfcefe068b1e4c078889d7d6c77ce788e2e
Issue-ID: POLICY-432
Signed-off-by: rb7147 <rb7147@att.com>
Diffstat (limited to 'ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp')
-rw-r--r-- | ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp index edb040504..0d62c7865 100644 --- a/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp +++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp @@ -20,35 +20,15 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ page isELIgnored="false"%> -<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> -<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties"%> -<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants"%> -<%@ page import="org.openecomp.portalsdk.core.domain.MenuData"%> +<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%> +<%@ page import="org.onap.portalsdk.core.onboarding.util.PortalApiProperties"%> +<%@ page import="org.onap.portalsdk.core.onboarding.util.PortalApiConstants"%> +<%@ page import="org.onap.portalsdk.core.domain.MenuData"%> <link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/ebz_header/header.css"> <link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/ebz_header/portal_ebz_header.css"> <link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/style.css" > -<!-- <script src= "app/fusion/external/ebz/angular_js/angular.js"></script> -<script src= "app/fusion/external/ebz/angular_js/angular-route.min.js"></script> -<script src= "app/fusion/external/ebz/angular_js/angular-sanitize.js"></script> -<script src= "app/fusion/external/ebz/angular_js/angular-cookies.js"></script> -<script src= "app/fusion/external/ebz/angular_js/app.js"></script> -<script src= "app/fusion/external/ebz/angular_js/gestures.js"></script> -<script src="static/js/jquery-1.10.2.js"></script> -<script src="app/fusion/scripts/modalService.js"></script> -<script src="static/js/jquery.mask.min.js" type="text/javascript"></script> -<script src="static/js/jquery-ui.js" type="text/javascript"></script> -<script src="app/fusion/external/ebz/sandbox/att-abs-tpls.js" type="text/javascript"></script> -<script src="static/fusion/js/att_angular_gridster/ui-gridster-tpls.js"></script> -<script src="static/fusion/js/att_angular_gridster/angular-gridster.js"></script> -<script src= "app/fusion/external/ebz/angular_js/checklist-model.js"></script> -<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/0.10.0/lodash.min.js"></script> -<script src="app/fusion/external/angular-ui/ui-bootstrap-tpls-1.1.2.min.js"></script> -<script src="app/fusion/scripts/services/userInfoService.js"></script> -<script src="app/fusion/scripts/services/leftMenuService.js"></script> --> - - <jsp:include page="/WEB-INF/fusion/jsp/ebz/loginSnippet.html" ></jsp:include> @@ -57,7 +37,7 @@ <% String contactUsLink = SystemProperties.getProperty(SystemProperties.CONTACT_US_LINK); - String redirectUrl = PortalApiProperties.getProperty(PortalApiConstants.ONAP_REDIRECT_URL); + String redirectUrl = PortalApiProperties.getProperty(PortalApiConstants.ECOMP_REDIRECT_URL); String portalUrl = redirectUrl.substring(0, redirectUrl.lastIndexOf('/')) + "/process_csp"; String getAccessLink = redirectUrl.substring(0, redirectUrl.lastIndexOf('/')) + "/get_access"; %> @@ -83,8 +63,7 @@ <div parentmenu-tabs mega-menu="true" menu-items="megaMenuDataObject" style="height:55px;"> <div style="float:left"> <li class="megamenu__item" style="line-height:55px;" onclick="returnToPortal()"> - <img src="app/fusion/external/ebz/images/att_logo.png" class="ATTLogo" ></span> - <strong style="font-weight: 400 !important; font-family: "Omnes-ONAP-W02", Arial !important; font-size: 18px;" id='returnPortal' >ONAP Portal</strong> + <div ng-include src="'app/fusion/scripts/DS2-view-models/header-logo.html'"></div> </li> <div menu-tabs mega-menu="true" tab-name="item.text" menu-item="item" active-menu="activeClickMenu.x" ng-repeat="item in megaMenuDataObject" style="font-size: 18px;" ng-mousedown="loadFavorites()" > |