diff options
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts')
11 files changed, 349 insertions, 96 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js index 8d664fcb..3247ae7a 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js @@ -22,19 +22,12 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal } $scope.getCacheRegionsList = function(){ - // $scope.regions.length=0; AdminService.getCacheRegions().then(function(data){ var j = data; $scope.data = JSON.parse(j.data); - /* for(var i = 0; i< $scope.data.length; i++){ - if($scope.data[i].cacheName !== '[object Object]'){ - $scope.regions.push($scope.data[i]); - } - }*/ $scope.regions =$scope.data; },function(error){ console.log("failed"); - //reloadPageOnce(); }); } @@ -110,10 +103,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal $scope.cancel(); if(message.role){ $rootScope.$broadcast('updateRoleFunctions',{data:message.role}); - /*$modal.open({ - templateUrl: 'app/fusion/scripts/DS2-modal/success_modal.html', - sizeClass: 'modal-small', - })*/ }else{ $modal.open({ templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', @@ -161,11 +150,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal var message = msg; $scope.cancel(); if(message.role){ - //$rootScope.$broadcast('updateAvailbleRoles',{data:message.availableRoles}); - /*$modal.open({ - templateUrl: 'app/fusion/scripts/DS2-modal/success_modal.html', - sizeClass: 'modal-small', - })*/ }else{ $modal.open({ templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', @@ -243,10 +227,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal $scope.cancel(); if(message.role){ $rootScope.$broadcast('updateRoleFunctions',{data:message.role}); - /*$modal.open({ - templateUrl: 'app/fusion/scripts/DS2-modal/success_modal.html', - sizeClass: 'modal-small', - })*/ }else{ $modal.open({ templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', @@ -272,10 +252,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal $scope.cancel(); if(message.role){ $rootScope.$broadcast('updateRoleFunctions',{data:message.role}); - /*$modal.open({ - templateUrl: 'app/fusion/scripts/DS2-modal/success_modal.html', - sizeClass: 'modal-small', - })*/ }else{ $modal.open({ templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', @@ -301,10 +277,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal $scope.cancel(); if(message.availableRoles){ $rootScope.$broadcast('updateAvailbleRoles',{data:message.availableRoles}); - /*$modal.open({ - templateUrl: 'app/fusion/scripts/DS2-modal/success_modal.html', - sizeClass: 'modal-small', - })*/ }else{ $modal.open({ templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', @@ -330,10 +302,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal $scope.cancel(); if(message.availableRoles){ $rootScope.$broadcast('updateAvailbleRoles',{data:message.availableRoles}); - /*$modal.open({ - templateUrl: 'app/fusion/scripts/DS2-modal/success_modal.html', - sizeClass: 'modal-small', - })*/ }else{ $modal.open({ templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', @@ -359,7 +327,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal // Cancel for toggle switch on Role Fn $scope.cancelRoleFunSwitch = function (msg) { $scope.msg.availableRole.selected = !$scope.msg.availableRole.selected; - //$scope.msg.availableRoleFunctions[$scope.msg.availableRoleFunctions.indexOf($scope.msg.availableRole)] = $scope.selectedRoleFun; $modalInstance.dismiss('cancel'); }; @@ -481,7 +448,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal sizeClass: 'modal-small', resolve: { items: function () { - // return availableRoleFunction; } } }); @@ -512,7 +478,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal var modalInstance = $modal.open({ templateUrl: 'app/fusion/scripts/DS2-view-models/ds2-admin/modals/success_modalpopup.html', controller: ModalInstanceCtrl, - //sizeClass: 'modal-small', resolve: { items: function () { var message = { @@ -534,14 +499,9 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal var message = res.data; var msgParsed = JSON.stringify(message); - // alert('1 : '+msgParsed); var messaged = message.data; - var msgParsedd = JSON.stringify(messaged); - //alert('2 : '+msgParsedd); - //console.log('2 '+msgParsedd); - //console.log('4 '+msgParsedd.substr(3,msgParsedd.length -2).split('\\n')); - + var msgParsedd = JSON.stringify(messaged); if(message.data!=null && message.data!=''){ var status = res.status; @@ -554,7 +514,7 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal var htmlstring = message.data.toString(); var htmlStrReplace = htmlstring.replace(/['"]+/g, ''); var htmlStrReplaceSplit = htmlStrReplace.split('\n'); - var dataStr = htmlStrReplace.replace(/\\n/g, "\n"); //htmlstring.replace(/\n/g, " "); + var dataStr = htmlStrReplace.replace(/\\n/g, "\n"); $scope.successTestModelPopUp(dataStr); }else{ $scope.errorPopUp(''); @@ -705,11 +665,7 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal return message; } } - }); - - /*modalInstance.result.then(function (data) { - $scope.delRole(data); - });*/ + }); } // role activation @@ -727,7 +683,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal resolve: { items: function () { var message = { - //availableRole: $scope.msg.availableRole, text: toggleType, selected:selected, availableRole:availableRole, @@ -737,10 +692,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal } } }); - - /*modalInstance.result.then(function (data) { - $scope.activateRole(data); - });*/ } $scope.roleFnInit = function(){ @@ -748,12 +699,9 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal var j = data; $scope.data = JSON.parse(j.data); - $scope.role =JSON.parse($scope.data.role); - // console.log($scope.role); $scope.ociavailableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions); - // console.log($scope.ociavailableRoleFunctions); $scope.availableRoleFunctions=[]; if($scope.ociavailableRoleFunctions) @@ -770,25 +718,8 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal $scope.ociavailableRoles=JSON.parse($scope.data.availableRoles); - // console.log($scope.ociavailableRoles); - //console.log("testing roles if exist"); $scope.availableRoles=[]; - - if($scope.ociavailableRoles) - angular.forEach($scope.ociavailableRoles, function(a,i){ - var availableRole = a; - availableRole.selected = false; - if($scope.role.childRoles){ - angular.forEach($scope.role.childRoles, function(b,j){ - if(a.id === b.id) { - availableRole.selected = true; - } - }); - }; - $scope.availableRoles.push(availableRole); - }); - - + },function(error){ console.log("roleControllerDS2 failed: " + error); reloadPageOnce(); @@ -825,7 +756,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal return; } for (x in $scope.availableRoles){ - // console.log($scope.availableRoles[x].name); if ($scope.availableRoles[x].name==$scope.role.name){ errorMsg = 'Role already exists.'; var modalInstance = $modal.open({ @@ -849,7 +779,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal }; AdminService.saveRole(postData, $routeParams.roleId).then(function(msg){ if(msg.role){ - //$scope.role = msg.role; sessionStorage.setItem('addCall', true); location.href='admin#/role/'+msg.role.id; $scope.availableRoles.push(msg); @@ -891,7 +820,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal resolve: { items: function () { var message = { - roleFunctions:data, role:role, roleId:info.id, availableRoleFunctions:$scope.ociavailableRoleFunctions @@ -902,7 +830,8 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal }); } - $scope.addNewChildRoleFunctionModalPopup = function(data, role,info) { + $scope.addNewChildRoleFunctionModalPopup = function(data, role,info) { + data = $scope.role; var modalInstance = $modal.open({ templateUrl: 'app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html', controller: ModalInstanceCtrl, @@ -910,7 +839,7 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal resolve: { items: function () { var message = { - roleChildFunctions:data, + roleChildFunctions:$scope.ociavailableRoles, role:role, roleId:info.id }; diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-controller.js new file mode 100644 index 00000000..74a7423e --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-controller.js @@ -0,0 +1,5 @@ +appDS2.controller( + 'bootstrapSampleController', + function($scope, $interval, $http, $modal, $log, ManifestService) { + + }); diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-route.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-route.js new file mode 100644 index 00000000..ac1ba168 --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-route.js @@ -0,0 +1,7 @@ +appDS2.config(function($routeProvider) { + $routeProvider + .otherwise({ + templateUrl: 'app/fusion/scripts/DS2-view-models/bootstrap-sample-content.html', + controller : "bootstrapSampleController" + }); +}); diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/adminService.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/adminService.js index e92ebaf3..105f0202 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/adminService.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/adminService.js @@ -373,7 +373,7 @@ getFnMenuItems: function(){ confirmRoleChildRemove: function(selected,availableRole,id){ return $http({ method: "POST", - url: "role/removeChildRole.htm?role_id=" + roleId, + url: "role/removeChildRole.htm?role_id=" + id, data:JSON.stringify({roleFunction:availableRole}) }).then(function(response) { @@ -394,7 +394,7 @@ getFnMenuItems: function(){ confirmRoleChildAdd: function(selected,availableRole,id){ return $http({ method: "POST", - url: "role/addChildRole.htm?role_id=" + roleId, + url: "role/addChildRole.htm?role_id=" + id, data:JSON.stringify({roleFunction:availableRole}) }).then(function(response) { diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-content.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-content.html new file mode 100644 index 00000000..23d138eb --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-content.html @@ -0,0 +1,146 @@ +<div id="page-content" class="content"> + <div> + <h2>Bootstrap Sample Page</h2> + + <!-- dropdown sample --> + <h3>Bootstrap Dropdowns</h3> + <div class="dropdown"> + <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> + Dropdown + <span class="caret"></span> + </button> + <ul class="dropdown-menu" aria-labelledby="dropdownMenu1"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li role="separator" class="divider"></li> + <li><a href="#">Separated link</a></li> + </ul> + </div> + + + <!-- Button group --> + <h3>Bootstrap Button Group</h3> + <div class="btn-group" role="group" aria-label="..."> + <button type="button" class="btn btn-default">Left</button> + <button type="button" class="btn btn-default">Middle</button> + <button type="button" class="btn btn-default">Right</button> + </div> + + <!-- Single button dropdowns --> + <h3>Single Button Dropdowns</h3> + <div class="btn-group"> + <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + Action <span class="caret"></span> + </button> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li role="separator" class="divider"></li> + <li><a href="#">Separated link</a></li> + </ul> + </div> + + <!-- Table --> + <h3>Table Sample</h3> + <div class="panel panel-default"> + <!-- Default panel contents --> + <div class="panel-heading">Table heading</div> + <div class="panel-body"> + <p>Table description </p> + </div> + + <!-- Table --> + <table class="table"> + <thead> + <tr> + <th>#</th> + <th>First Name</th> + <th>Last Name</th> + <th>Username</th> + </tr> + </thead> + <tbody> + <tr> + <th scope="row">1</th> + <td>Mark</td> <td>Otto</td> + <td>@mdo</td> + </tr> + <tr> + <th scope="row">2</th> + <td>Jacob</td> + <td>Thornton</td> + <td>@fat</td> + </tr> + <tr> + <th scope="row">3</th> + <td>Larry</td> + <td>the Bird</td> + <td>@twitter</td> + </tr> + </tbody> + </table> + </div> + + + <!-- Checkboxes and radio addons --> + <h3>Checkboxes and radio addons</h3> + <p>In order to make bootstrap checkbox and radio button appear, please make sure b2b-bootstrap-common.css in app/fusion/external/ds2-bootstrap directory is included in the main HTML page.</p> + + <p>checkbox</p> + <div class="form-check"> + <label class="form-check-label"> + <input type="checkbox" class="form-check-input"> + Y/N + </label> + </div> + + <div> + <p>radio button</p> + <div class="radio"> + <label><input type="radio" name="optradio">Option 1</label> + </div> + <div class="radio"> + <label><input type="radio" name="optradio">Option 2</label> + </div> + <div class="radio disabled"> + <label><input type="radio" name="optradio" disabled>Option 3 (disabled)</label> + </div> + </div> + + <div class="row"> + <div class="col-lg-6"> + <div class="input-group"> <span class="input-group-addon"> <input type="checkbox" aria-label="Checkbox for following text input"> </span> <input class="form-control" aria-label="Text input with checkbox"> </div> + </div> + <div class="col-lg-6"> + <div class="input-group"> <span class="input-group-addon"> <input type="radio" aria-label="Radio button for following text input"> </span> <input class="form-control" aria-label="Text input with radio button"> </div> + </div> + </div> + + <h3>Available variations</h3> + <div> + <span class="label label-default">Default</span> + <span class="label label-primary">Primary</span> + <span class="label label-success">Success</span> + <span class="label label-info">Info</span> + <span class="label label-warning">Warning</span> + <span class="label label-danger">Danger</span> + </div> + + <h3>Checkbox</h3> + <div class="checkbox"> + <label> + <input type="checkbox" value=""> + Option one is this and that—be sure to include why it's great + </label> + </div> + <div class="checkbox disabled"> + <label> + <input type="checkbox" value="" disabled> + Option two is disabled + </label> + </div> + + </div> +</div>
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-page.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-page.html new file mode 100644 index 00000000..779b2c5f --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-page.html @@ -0,0 +1,146 @@ +<!DOCTYPE html> +<!-- Single-page application for EPSDK-App welcome page using DS2 look and feel. X--> +<html> +<head> + <meta charset="ISO-8859-1"> + <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1" /> + + <title>Welcome</title> + + <!-- B2b Library --> + <link rel="stylesheet" type="text/css" href="app/fusion/external/b2b/css/b2b-angular/b2b-angular.css"> + <link rel="stylesheet" type="text/css" href="app/fusion/external/b2b/css/b2b-angular/font_icons.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/external/ds2/css/digital-ng-library/ecomp-ionicons.css"> + + <link rel="stylesheet" type="text/css" href="app/fusion/external/angular-bootstrap/ui-bootstrap-csp.css"> + <link rel="stylesheet" type="text/css" href="app/fusion/external/angular-gridster/dist/angular-gridster.min.css"> + <link rel="stylesheet" type="text/css" href="static/fusion/sample/css/scribble.css" /> + <link rel="stylesheet" type="text/css" href="static/fusion/sample/css/welcome.css" /> + + <link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css"> + <link rel="stylesheet" type="text/css" href="app/fusion/external/bootstrap-3.3.7/css/bootstrap.min.css"> + <link rel="stylesheet" type="text/css" href="app/fusion/external/ds2-bootstrap/b2b-bootstrap-common.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/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> + + <!-- EPSDK App scripts and common services --> + <!-- B2b Library --> + <script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.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/scripts/DS2-services/userInfoServiceDS2.js"></script> + + <!-- Page specific items --> + <script src="app/fusion/scripts/DS2-controllers/bootstrap-sample-controller.js"></script> + <script src="app/fusion/scripts/DS2-controllers/bootstrap-sample-route.js"></script> + <script src="app/fusion/external/bootstrap-3.3.7/js/bootstrap.min.js"></script> + +<style> +.controls { + margin-bottom: 20px; +} +.page-header { + margin-top: 20px; +} +ul { + list-style: none; +} +.box { + height: 100%; + border: 1px solid #ccc; + background-color: #fff; + position: relative; + overflow: hidden; +} +.box-header { + background-color: #eee; + padding: 0px 0px 0px 0px; +/* border-bottom: 1px solid #ccc; */ + margin-bottom: -25px; + cursor: move; + position: relative; +} +.box-header h3 { + margin-top: 0px; + display: inline-block; +} +.box-content { + padding: 10px; + display:block; + height: 100%; + position: relative; + overflow-x:auto; + overflow-y:auto; +} +.box-header-btns { + top: 15px; + right: 10px; + cursor: pointer; + position: absolute; +} + +.gridster { + border: none; + position:relative; +} + +.box-content .box-content-frame{ +} + +.box table{ +border:none; +display:block; +} + +.box table tr{ +line-height:20px; +} + +.box table th{ +border:none; +line-height:20px; +} + +.menu-container{ +margin-top:0px +} + +.handle-e { +width:3px; +} + + + +</style> + +</head> + <body class="appBody" ng-app="abs"> + <!-- commented the header for now to avoid duplicate headers on portal --> + <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/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html index 62f05269..8a944d76 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html @@ -1,5 +1,5 @@ <div> - <div class="modal-header ng-scope in"> + <div class="b2b-modal-header ng-scope in"> <h1><i class="icon-primary-alert"></i></h1> <h2 id="myModalLabel" modal-title="">Confirm</h2> <div class="corner-button in"> @@ -7,17 +7,17 @@ ng-click="$dismiss('cancel')"></button> </div> </div> - <div class="modal-body ng-scope ng-isolate-scope in" tabindex="0" + <div class="b2b-modal-body ng-scope ng-isolate-scope in" tabindex="0" role="region" aria-label="Modal header text content" style="height: 55px;"> - You are about to add the role function {{msg.roleFun}} to the role for {{msg.role}}. Do you want to continue? + You are about to add the child role {{msg.roleFun}} to the role for {{msg.role}}. Do you want to continue? </div> - <div class="modal-footer ng-scope ng-isolate-scope in"> + <div class="b2b-modal-footer ng-scope ng-isolate-scope in"> <div class="cta-button-group in"> <button ng-if="!msg.selected" class="btn btn-alt btn-medium" type="button" - ng-click="confirmRoleChildRemove(msg.selected,msg.availableRole,msg.roleId);">Yes</button> + ng-click="confirmRoleChildRemove(msg.selected,msg.availableRole,msg.availableRole.id);">Yes</button> <button ng-if="msg.selected" class="btn btn-alt btn-medium" type="button" - ng-click="confirmRoleChildAdd(msg.selected,msg.availableRole,msg.roleId);">Yes</button> + ng-click="confirmRoleChildAdd(msg.selected,msg.availableRole,msg.availableRole.id);">Yes</button> <button class="btn btn-clear btn-medium" type="button" ng-click="$dismiss('cancel')">Cancel</button> </div> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html index 94211773..ec8b2b8e 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html @@ -12,15 +12,14 @@ <th>Role</th> </tr> </thead> - <tbody type="body" ng-repeat="role in role.childRoles"> + <tbody type="body" ng-repeat="role in msg.roleChildFunctions"> <tr> <td> - <label ng-click="activateRoleChildConfirmPopUp(roleFunction.selected,roleFunction);" class="btn-switch-label" tabindex="0" role="option"> - <input type="checkbox" ddh-switches ng-model="roleFunction.selected" - size-class="modal-small modal-alert" > - </label> + <label class="btn-switch-label" tabindex="0" role="option"> + <input ng-click="activateRoleChildConfirmPopUp(role.active, role);" type="checkbox" b2b-switches ng-model="role.active" size-class="modal-small modal-alert"> + </label> </td> - <td>{{ roleFunction.name }}</td> + <td>{{ role.name }}</td> </tr> </tbody> </table> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html index 12d8df70..e2aa188a 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html @@ -49,9 +49,10 @@ </div> <br/> - <div> + <!-- Commented code due to issues with child role activation and deactivation, should be revisited --> + <!-- <div> <h4 class="heading-small-emphasis">Child Roles</h4> - <button class="btn btn-alt btn-small" ng-click="addNewChildRoleFunctionModalPopup(role.roleFunctions,role.name, role);">Manage Child Roles</button> + <button class="btn btn-alt btn-small" ng-click="addNewChildRoleFunctionModalPopup(role.childRoles,role.name, role);">Manage Child Roles</button> <table class="striped" ng-if="role.childRoles.length"> <thead> @@ -69,7 +70,7 @@ </tr> </tbody> </table> - </div> + </div> --> <br/> <div> <a href="admin#/role_function_list">Manage Role Functions</a><br><br> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-report-name-validation.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-report-name-validation.html new file mode 100644 index 00000000..50132ecf --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-report-name-validation.html @@ -0,0 +1,20 @@ +<div style="height: 220px;"> + <div class="b2b-modal-header ng-scope in"> + <h2 id="myModalLabel" modal-title="">Warning</h2> + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" + ng-click="$dismiss('cancel')"></button> + </div> + </div> + <div class="b2b-modal-body ng-scope ng-isolate-scope in" style="margin-bottom: -50px;"> + <form name="workflowForm" class="css-form" novalidate> + <div class="b2b-modal-footer ng-scope ng-isolate-scope in"> + <p>Please enter the missing report name.</p> + + <button class="btn btn-alt btn-small" type="button" + ng-click="close()">close</button> + </div> + </form> + <br /> + </div> +</div>
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step1.json b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step1.json index 091d47e5..66562d4b 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step1.json +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step1.json @@ -15,7 +15,7 @@ { "input": "text", "name": "reportName", - "displayName": "Report Name:", + "displayName": "Report Name *:", "defaultValue": "" }, { |