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/app/fusion/scripts/DS2-view-models | |
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/app/fusion/scripts/DS2-view-models')
5 files changed, 28 insertions, 154 deletions
diff --git a/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html index 36b8c2a42..25c081a9c 100644 --- a/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html +++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html @@ -17,7 +17,7 @@ <th>User ID</th> <th>Manager User ID</th> <th>Edit</th> - <th>Active?</th> + <th ng-show="(isAppCentralized=='false')">Active?</th> </tr> </thead> <tbody type="body" ng-repeat="rowData in tableData"> @@ -31,11 +31,12 @@ <!-- Include an edit image with respective redirection --> <td><a href="#/profile/{{rowData.id}}" class="icon-misc-pen" style="color: #888; font-size: 20px;"></a></td> - <td> + <td ng-show="(isAppCentralized=='false')"> <div class="form-row"> <label class="btn-switch-label" tabindex="0" role="option"> - <input type="checkbox" b2b-switches ng-model="rowData.active" - ng-disabled="allDisabled" aria-disabled="{{allDisabled}}"> + <input type="checkbox" b2b-switches + ng-model="rowData.active" ng-click="toggleProfileActive(rowData)" + ng-disabled="allDisabled" aria-disabled="{{allDisabled}}" /> <div class="sr-text hidden-spoken" ng-if="!allDisabled">Double tap to turn</div> </label> diff --git a/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html index 3b5ef525a..ca317616f 100644 --- a/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html +++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html @@ -4,14 +4,15 @@ <div ng-show="showLoader" class="span loader-container"> <i class="icon-primary-spinner" role="img" aria-label="Please wait while we load your content"></i> </div> - <div ng-hide="showLoader" > - <h3 class="heading-small">Please edit the profile details below:</h3> + <div ng-hide="showLoader" > + <h3 class="heading-small" ng-show="isAppCentralized=='true'" style="color:red;">Please use Portal for access management</h3> + <h3 class="heading-small" ng-show="isAppCentralized=='false'">Please edit the profile details below:</h3> <div class="row-nowrap"> <div class="span12"> <div class="form-row"> <label for="textinputID-2a">*First Name</label> <div class="field-group"> - <input id="textinputID-2a" b2b-reset="" class="span12" type="text" data-ng-model="profile.lastName"> + <input id="textinputID-2a" b2b-reset="" class="span12" type="text" data-ng-model="profile.firstName" ng-disabled="(isAppCentralized == 'true')"> </div> </div> </div> @@ -19,7 +20,7 @@ <div class="form-row"> <label for="textinputID-3a">*Last Name</label> <div class="field-group"> - <input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.firstName"> + <input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.lastName" ng-disabled="(isAppCentralized == 'true')"> </div> </div> </div> @@ -62,7 +63,7 @@ <div class="form-row"> <label for="textinputID-3a">*Phone</label> <div class="field-group"> - <input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.phone"> + <input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.phone" ng-disabled="(isAppCentralized == 'true')"> </div> </div> </div> @@ -70,7 +71,7 @@ <div class="form-row"> <label for="textinputID-3a">Fax</label> <div class="field-group"> - <input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.fax"> + <input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.fax" ng-disabled="(isAppCentralized == 'true')"> </div> </div> </div> @@ -81,7 +82,7 @@ <div class="form-row"> <label for="textinputID-2a">Cellular</label> <div class="field-group"> - <input id="textinputID-2a" b2b-reset="" class="span12" type="text" data-ng-model="profile.cellular"> + <input id="textinputID-2a" b2b-reset="" class="span12" type="text" data-ng-model="profile.cellular" ng-disabled="(isAppCentralized == 'true')"> </div> </div> </div> @@ -89,7 +90,7 @@ <div class="form-row"> <label for="textinputID-3a">*Email</label> <div class="field-group"> - <input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.email"> + <input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.email" ng-disabled="(isAppCentralized == 'true')"> </div> </div> </div> @@ -97,7 +98,7 @@ <div class="form-row"> <label for="textinputID-3a">Address 1</label> <div class="field-group"> - <input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.address1"> + <input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.address1" ng-disabled="(isAppCentralized == 'true')"> </div> </div> </div> @@ -105,7 +106,7 @@ <div class="form-row"> <label for="textinputID-3a">Address 2</label> <div class="field-group"> - <input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.address2"> + <input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.address2" ng-disabled="(isAppCentralized == 'true')"> </div> </div> </div> @@ -116,14 +117,14 @@ <div class="form-row"> <label for="textinputID-2a">City</label> <div class="field-group"> - <input id="textinputID-2a" b2b-reset="" class="span12" type="text" data-ng-model="profile.city"> + <input id="textinputID-2a" b2b-reset="" class="span12" type="text" data-ng-model="profile.city" ng-disabled="(isAppCentralized == 'true')"> </div> </div> </div> <div class="span12"> <div class="form-row"> <label for="textinputID-3a">State</label> - <select name="dropdown1" b2b-dropdown ng-model="stateList.selected.value"> + <select name="dropdown1" b2b-dropdown ng-model="stateList.selected.value" ng-disabled="(isAppCentralized == 'true')"> <option b2b-dropdown-list option-repeat="d in stateList.options" value="{{d.value}}" init-value="{{stateList.selected.title}}">{{d.title}}</option> </select> </div> @@ -132,14 +133,14 @@ <div class="form-row"> <label for="textinputID-3a">Zip Code</label> <div class="field-group"> - <input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.zipCode"> + <input id="textinputID-3a" b2b-reset="" class="span12" type="text" data-ng-model="profile.zipCode" ng-disabled="(isAppCentralized == 'true')"> </div> </div> </div> <div class="span12"> <div class="form-row"> <label for="textinputID-3a">Country</label> - <select name="dropdown1" b2b-dropdown ng-model="selectedCountry.value"> + <select name="dropdown1" b2b-dropdown ng-model="selectedCountry.value" ng-disabled="(isAppCentralized == 'true')"> <option b2b-dropdown-list option-repeat="d in countries" value="{{d.value}}" init-value="{{selectedCountry.title}}">{{d.title}}</option> </select> </div> @@ -148,17 +149,17 @@ <div class="span3"> <div class="form-row"> <label for="textinputID-3a">Time Zone</label> - <select name="dropdown1" b2b-dropdown ng-model="selectedTimeZone.value"> + <select name="dropdown1" b2b-dropdown ng-model="selectedTimeZone.value" ng-disabled="(isAppCentralized == 'true')"> <option b2b-dropdown-list option-repeat="d in timeZones" value="{{d.value}}" init-value="{{selectedTimeZone.title}}">{{d.title}}</option> </select> </div> </div> - <div> - <button class="btn btn-alt btn-small" type="button" ng-click="saveProfile()">Save</button> + <div class="form-row"> + <button class="btn btn-alt btn-small" type="button" ng-click="saveProfile()" ng-show="(isAppCentralized=='false')">Save</button> </div> <br> - <div> + <div ng-show="(isAppCentralized=='false')"> Role <a ng-click="addNewRoleFunctionModalPopup(role.roleFunctions,role.name, role);" class="icon-primary-accordion-plus" size="small"></a> </div> @@ -168,14 +169,14 @@ <thead> <tr> <th>Name</th> - <th>Delete</th> + <th ng-show="(isAppCentralized=='false')">Delete</th> </tr> </thead> <tbody type="body" ng-repeat="rowData in profile.roles"> <tr> <td ng-bind="rowData['name']"></td> - <td> + <td ng-show="(isAppCentralized=='false')"> <div style="font-size: 20px;"> <a href="javascript:void(0)" ng-click="removeRole(rowData);" class="icon-misc-trash"></a> </div> diff --git a/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html deleted file mode 100644 index 523bfe71e..000000000 --- a/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html +++ /dev/null @@ -1,62 +0,0 @@ -<!DOCTYPE html> -<!-- Single-page application for EPSDK-App demonstration pages using DS2 look and feel --> -<html> -<head> - <meta charset="ISO-8859-1"> - <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1" /> - <title>Sample Page</title> - - <!-- B2b Library --> - <link rel="stylesheet" type="text/css" href="app/fusion/external/b2b/css/b2b-angular/b2b-angular.css"> - - <!-- icons in open source --> - <link rel="stylesheet" type="text/css" href="app/fusion/external/ds2/css/digital-ng-library/ionicons.css"> - <link rel="stylesheet" type="text/css" href="app/fusion/styles/onap.css"> - - <!-- Common scripts --> - - <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script> - <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script> - <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script> - <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script> - <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script> - <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script> - <script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script> - <script src="app/fusion/external/jquery/dist/jquery.min.js"></script> - <script src="app/fusion/external/javascript-detect-element-resize/jquery.resize.js"></script> - <script src="app/fusion/external/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> - <script src="app/fusion/external/angular-gridster/dist/angular-gridster.min.js"></script> - <script src="app/fusion/scripts/DS2-services/ds2-modal/modalService.js"></script> - <script src="app/fusion/external/ds2/js/appDS2.js"></script> - - <script src="app/fusion/scripts/DS2-services/userInfoServiceDS2.js"></script> - <script src="app/fusion/scripts/DS2-services/headerServiceDS2.js"></script> - <script src="app/fusion/scripts/DS2-services/leftMenuServiceDS2.js"></script> - <script src="app/fusion/scripts/DS2-services/manifestService.js"></script> - <script src="app/fusion/scripts/DS2-directives/footer.js"></script> - <script src="app/fusion/scripts/DS2-directives/ds2Header.js"></script> - <script src="app/fusion/scripts/DS2-directives/ds2LeftMenu.js"></script> - <script src="app/fusion/scripts/DS2-directives/b2b-leftnav-ext.js"></script> - <script src="app/fusion/external/utils/js/browserCheck.js"></script> - - <!-- Page-specific items --> - <script src="app/fusion/scripts/DS2-services/adminService.js"></script> - <script src="app/fusion/scripts/DS2-services/adminMenuService.js"></script> - - <script src="app/fusion/scripts/DS2-controllers/samplePage-route.js"></script> - <script src="app/fusion/scripts/DS2-controllers/collaborateList-route.js"></script> - <script src="app/fusion/scripts/DS2-controllers/collaborate-list-controller.js"></script> - <script src="app/fusion/scripts/DS2-services/ds2-sample-page/droolsService.js"></script> - <script src="app/fusion/scripts/DS2-controllers/ds2-sample/drools-controller.js"></script> - <script src="app/fusion/scripts/DS2-controllers/ds2-sample/notebook-controller.js"></script> - <script src="app/fusion/scripts/DS2-controllers/ds2-sample/notebookFrameController.js"></script> - <script src="app/fusion/scripts/DS2-controllers/ds2-sample/nbook-framecontroller.js"></script> - -</head> - <body class="appBody" ng-app="abs"> - <div ds2-Header class="header-container" ></div> - <div ds2-menu id="menuContainer" class="menu-container" ></div> - <div ng-view id="rightContentProfile" class="content-container"></div> - <div ds2-Footer class="footer-container"></div> - </body> -</html> diff --git a/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2Header.html b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2Header.html deleted file mode 100644 index 444514939..000000000 --- a/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2Header.html +++ /dev/null @@ -1,68 +0,0 @@ -<div class="header-main-div" > - <header class="b2b-header-tabs" b2b-header-responsive ng-show="{{showHeader}}"> - <ul class="header__items" role="navigation"> - <li class="header__item icon__item" tabindex="0" ng-click="returnToPortal()"> - <span class="globe-text">ONAP Portal</span> - </li> - <li b2b-header-menu class="header__item b2b-headermenu" ng-repeat="item in menuItems" role="presentation"> - <a href="javascript:void(0);" class="menu__item" role="menuitem" ng-bind="item.text"></a> - <div class="header-secondary-wrapper"> - <ul class="header-secondary" role="menu"> - <li class="header-subitem" b2b-header-submenu - ng-repeat="secondLevMenu in item.children" role="presentation"> - <a href="{{secondLevMenu.action}}" ng-if="secondLevMenu.childMenus.length==0" class="menu__item" role="menuitem" ng-bind="secondLevMenu.label"></a> - <a href="javascript:void(0);" ng-if="secondLevMenu.childMenus.length!=0" class="menu__item" role="menuitem" ng-bind="secondLevMenu.label" ></a> - <div class="header-tertiary-wrapper"> - <ul class="header-tertiary" role="menu"> - <li b2b-header-tertiarymenu ng-repeat="thirdLevMenu in secondLevMenu.childMenus"role="presentation"> - <a href="{{thirdLevMenu.action}}"role="menuitem" aria-haspopup="true" ng-bind="thirdLevMenu.label"></a> - </li> - </ul> - </div> - </li> - </ul> - </div></li> - <li class="header__item profile"> - <b2b-flyout> - <div b2b-flyout-toggler class="header-profile" > - <div class="icon-people-oneperson" id="header-user-icon" tabindex="0" b2b-accessibility-click="13,32" aria-label="notifications" aria-haspopup="true" aria-expanded="{{flyoutOpened}}" role="button"></div> - <div id="login-snippet-text" class="login-snippet-text">{{userFirstName}}</div> - </div> - <b2b-flyout-content horizontal-placement="center" vertical-placement="below"> - <div> - <div id="reg-header-snippet"> - <div tabindex="0" class="reg-profileDetails" id="reg-profiledetails-id"> - <ul class="reg-Details-table"> - <li> - <div class="reg-userName-table"> - <div id="reg-userName-table-row"> - <div id="reg-userName-table-cell"> - <h3 ng-bind="userName"> </h3> - <span> </span> - </div> - </div> - </div> - </li> - <li><div class="reg-userEmail-label"><span class="reg-userEmail-label-spn" style=font-weight:bold>Email<span class="visuallyhidden">: - </span></span></div></li> - <li><div class="reg-userEmail-value"><span class="reg-userEmail-value-spn"> - {{userEmail}}</span></div></li> - <li> </li> - <li><div class="reg-userRole-label"><span class="reg-userRole-label-spn" style=font-weight:bold> - User Id<span class="visuallyhidden">:</span></span></div></li> - <li><div class="reg-userRole-value"><span class="reg-userRole-value-spn"> - {{userId}}<span class="visuallyhidden"></span></span></div></li> - </ul> - <div id="reg-logout-div" style="padding-top: 8px"> - <a href="logout.htm" id="allLogout" class="btn btn-alt btn-small"> - Log out - </a> - </div> - </div> - </div> - </div> - </b2b-flyout-content> - </b2b-flyout> - </ul> - </header> -</div> diff --git a/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html new file mode 100644 index 000000000..2eec0cfbb --- /dev/null +++ b/ONAP-SDK-APP/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html @@ -0,0 +1,2 @@ +<img src="app/fusionapp/icons/logo_onap_transbg.png" class="header-image"> +<span class="globe-text">ONAP Portal</span>
\ No newline at end of file |