diff options
author | 2017-08-23 18:27:19 -0400 | |
---|---|---|
committer | 2017-08-23 21:12:56 -0400 | |
commit | 978dbcf0a196acbafad72fe1e2478ec0e384f02f (patch) | |
tree | 17e1ceaa4a12a599320cbb317947e990bf1a5383 /ecomp-portal-FE-common/client/app/views/dashboard | |
parent | bc7350dce5b7b1dcd1c472a3922b42c4ea99809d (diff) |
Deliver centralized role management feature
Repair multiple defects also.
Revise deployment to use docker-compose.
Remove all zip archives.
Issue: PORTAL-21, PORTAL-25, PORTAL-28, PORTAL-52, PORTAL-69,
PORTAL-74, PORTAL-76, PORTAL-80, PORTAL-82
Change-Id: Ie72fec7d35ba78beb162bba6ed27b2caee340c61
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-portal-FE-common/client/app/views/dashboard')
7 files changed, 207 insertions, 83 deletions
diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-manage.html b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-manage.html index f47e17c2..5e78201e 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-manage.html +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-manage.html @@ -17,17 +17,23 @@ limitations under the License. ================================================================================ --> -<div style="margin-top: 10px; margin-bottom: 10psx;"> - <h1 class="heading1"></h1> -</div> -<br /> + + +<div class="manage-widget-txt"> + + <div class="b2b-modal-header"> + <h2 class="title" id="manage-contactUs-home-manageWidgets-title">Manage {{widgetTypeDisplay}} Widgets</h2> + + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" + ng-click="$dismiss('cancel')"></button> + </div> + </div> -<div style="margin-top: 25px;"> - <div id="title" class="manage-contactUs-home-manageWidgets-title">Manage {{widgetTypeDisplay}} Widgets</div> - <div class="widgets-popup-margin"> +<div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content" > <div class="get-access-table"> - <div class="table-control" style="margin:30px;"> - <div class="c-ecomp-portal-abs-table" style="height:300px""> + <div class="table-control widget-table-control"> + <div class="c-ecomp-portal-abs-table widget-table" > <table b2b-table id="table-main" table-data="ignoredTableData" current-page="ignoredCurrentPage"> @@ -70,7 +76,7 @@ <span class="icon-edit"></span> </div> <span ng-show="rowData.showEdit"> - <a id="save-button" att-button btn-type="primary" ng-click="modify($index);" class="button button--primary" size="small" >Save</a> + <a id="save-button" ng-click="modify($index);" class="btn btn-alt btn-small" size="small" >Save</a> </span> </td> <td b2b-table-body> @@ -83,11 +89,10 @@ </table> </div> - <div att-divider-lines></div> - <div style="margin-top: 15px; margin-left: -80px;" > + <div class="widget-field" > <form name = "widgetForm" novalidate> <div id="addWidgetHeader" class="contact-us-margin"> - <h1 style="font-size:18px;">Add</h1> + <h1 class="widget-add">Add</h1> <div class="errMsg">{{errMsg}}</div> <div class="sucessMsg" ng-bind="successMsg"></div> </div> @@ -107,44 +112,43 @@ <input id="widget-input-add-order" class="input-text-area" type="text" ng-model="newWidgetObject.sortOrder"/> </div> </div> - <div class="add-widget-field" ng-controller="DatePickerController" ng-show="{{widgetType=='EVENTS'}}"> - <h4>Event Date</h4> - <div> - <div> - <p class="input-group"> - <input id="widget-input-add-date" type="text" name = "eventDate" datetime="yyyy-MM-dd" class="input-text-area" uib-datepicker-popup="{{format}}" - ng-model="newWidgetObject.eventDate" is-open="popup1.opened" datepicker-options="dateOptions" close-text="Close" alt-input-formats="altInputFormats" - ng-focus="open1()" - ng-required = "widgetType =='EVENTS'" /> - </p> - </div> - </div> - </div> + <div class="add-widget-field"> + <h4>Event Date</h4> + <input class="notif-input-calendar" type="text" id="datepicker-end" + ng-model="newWidgetObject.eventDate" b2b-datepicker min="minDate" max="maxDate" + required /> + </div> <div class="add-contact-us-field-des" ng-show="{{widgetType=='EVENTS'}}"> <div class="property-label">Content</div> - <textarea style="margin-top: 0px; margin-bottom: 0px; height: 150px" ng-model="newWidgetObject.content" name="content" ng-required = "widgetType =='EVENTS'"> + <textarea class="widget-type-txt-area" ng-model="newWidgetObject.content" name="content" ng-required = "widgetType =='EVENTS'"> </textarea> </div> </div> - <div style="height:50px;"> - <a id="add-button" style="float:right; margin-top:20px;" att-button btn-type="primary" class="button button--primary" size="small" ng-click="saveNew()">Add New</a> - - </div> - <div att-divider-lines></div> + </div> </form> </div> - <div style="height:50px;"> - <a id="close-button" style="float:right;" att-button btn-type="primary" class="button button--primary" size="small" ng-click="closeDialog()">Close</a> - </div> + </div> - </div> </div> -</div> + </div> + <br> + <div class="b2b-modal-footer"> + <div class="dialog-control"> + <a id="add-button" class="btn btn-alt btn-small" ng-click="saveNew()">Add New</a> + + <a id="close-button" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')">Close</a> + + </div> + + </div> + +</div> + <script type="application/javascript"> $(document).ready(function(){ $(".ngdialog-content").css("width","85%"); diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameter-manage.html b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameter-manage.html index 1f958b7f..e5e7bdc2 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameter-manage.html +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameter-manage.html @@ -17,10 +17,19 @@ limitations under the License. ================================================================================ --> -<div class="manage-widget-parameters-header"></div> -<div id="title" class="manage-widget-parameters-title">Manage - Widgets Parameters Page</div> -<div class="widgets-popup-margin"> +<div class="manage-widget-parameter-header"> + + <div class="b2b-modal-header"> + <h2 class="title" id="manage-widget-parameters-title">Manage Widgets Parameters Page</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"> + <div class="widgets-popup-margin"> <div class="get-access-table"> <div class="table-control manage-widget-parameters-table"> <div class="c-ecomp-att-abs-table manage-widget-parameters-table-details"> @@ -60,9 +69,8 @@ <td b2b-table-body> <div ng-hide="rowData.showEdit" ng-click="setEdit($index);"> <span class="icon-edit"></span> - </div> <span ng-show="rowData.showEdit"> <a att-button - btn-type="primary" ng-click="modify($index);" - class="button button--primary" size="small">Save</a> + </div> <span ng-show="rowData.showEdit"> + <button class="btn btn-alt btn-small" id="admin-button-add" ng-click="modify($index);">Save</button> </span> </td> <td b2b-table-body> @@ -84,9 +92,13 @@ </div> </div> </div> + + </div> + <br> + </div> <script> $(document).ready(function(){ $(".ngdialog-close").attr('id','dialog-close'); }); -</script> +</script>
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.js b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.js index fb9a254f..10ccb9bf 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.js +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.js @@ -21,7 +21,8 @@ (function () { class WidgetParameterController { - constructor($scope, widgetsCatalogService, userProfileService) { + constructor($scope, widgetsCatalogService, userProfileService, $state,items) { + $scope.ngDialogData=items; let widgetId = $scope.ngDialogData.widgetId; $scope.modflag = false; $scope.isLoadingTable = false; @@ -70,12 +71,13 @@ if(res.status == 'OK'){ $scope.modflag = false; $scope.widgetParam[index].showEdit = false; + $state.reload(); } }); }; } } - WidgetParameterController.$inject = ['$scope', 'widgetsCatalogService', 'userProfileService']; + WidgetParameterController.$inject = ['$scope', 'widgetsCatalogService', 'userProfileService', '$state','items']; angular.module('ecompApp').controller('WidgetParameterController', WidgetParameterController); -})(); +})();
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.less b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.less index 8f326c42..5c0ce37d 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.less +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.less @@ -79,4 +79,59 @@ padding-bottom: 20px; height: 32px; border-color: slategrey !important; width:100%; - }
\ No newline at end of file + } + .heading1-txt { + margin-top: 10px; + margin-bottom: 10px; + } + .manage-widgets-txt { + margin-top: 25px; + } + .widget-table-control { + margin:30px; + } + .widget-table { + height:300px; + } + .widget-field { + margin-top: 15px; + margin-left: -80px; + } + .widget-add { + font-size:18px; + } + .widget-type-txt-area { + margin-top: 0px; + margin-bottom: 0px; + height: 150px; + } + .widget-button-height { + height:50px; + } + .widget-button { + float:right; + margin-top:20px; + } + .widget-close-button { + float:right; + } + + .btn-calendar-icon { + position: relative; + width: 10px; + right:25px; + top:0px; +} +.dialog-control{ +bottom:30px; +} +input[type="text"]:focus { + z-index: 0; +} + + .get-access-table{ + height:500px; + overflow:auto; + } + +
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js index 8481b5ed..4c5ee2cf 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js @@ -54,9 +54,10 @@ function _classCallCheck(instance, Constructor) { $scope.editWidgetModalPopup = function(availableData, resourceType) { $scope.editData = JSON.stringify(availableData); $scope.availableDataTemp = $scope.availableData; - ngDialog.open({ + var modalInstance = $modal.open({ templateUrl: 'app/views/dashboard/dashboard-widget-manage.html', controller: 'CommonWidgetController', + windowClass: 'modal-docked', resolve: { message: function message() { var message = { @@ -66,30 +67,41 @@ function _classCallCheck(instance, Constructor) { return message; } } - }).closePromise.then(needUpdate => { - if (resourceType == 'NEWS') { - $scope.updateNews(); - } else if (resourceType == 'EVENTS') { - $scope.updateEvents(); - } else if (resourceType == 'IMPORTANTRESOURCES') { - $scope.updateImportRes(); - } - }); + }) + + modalInstance.result.finally(function (needUpdate){ + if (resourceType == 'NEWS') { + $scope.updateNews(); + } else if (resourceType == 'EVENTS') { + $scope.updateEvents(); + } else if (resourceType == 'IMPORTANTRESOURCES') { + $scope.updateImportRes(); + } + }); }; $scope.editWidgetParameters = function(widgetId) { let data = { widgetId: widgetId } - ngDialog.open({ + var modalInstance = $modal.open({ templateUrl: 'app/views/dashboard/dashboard-widget-parameter-manage.html', controller: 'WidgetParameterController', - data: data - }).closePromise.then(needUpdate => { + windowClass: 'modal-docked', - }); + resolve: { + items: function () { + return data; + } + } + }) + + modalInstance.result.then(function (needUpdate) { + }); }; + + $scope.sort_options = [{ index: 0, value: 'N', @@ -488,7 +500,8 @@ function _classCallCheck(instance, Constructor) { } - }; + + }; this.auditLog = function(app) { console.log(app); diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less index 8d8f39fe..02cd960d 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less @@ -33,7 +33,7 @@ flex-flow: row wrap; width: @table-width; //margin-left: 230px; - margin-bottom: 63px; + margin-bottom: 0px; margin:auto; .app-gridster-header { background-color: @u; @@ -478,10 +478,7 @@ On click the images will be displayed at normal size to complete the effect -webkit-transition: background-color 0.3s ease-out; -moz-transition: background-color 0.3s ease-out; transition: background-color 0.3s ease-out; - span{ - color: #888; } - } .widgetHeaderBtnPosition { width: 30px; @@ -910,4 +907,40 @@ ul { } .icon-content-gridguide{ cursor:move; -}
\ No newline at end of file +} + .error-info-txt { + display: none; + font-size: 12px; + margin-left: 5px; + } + .account-info-msg { + color: red; + } + .icon-info { + margin-left: 50%; + font-size: 90px; + color: black; + } + .gridster-box-pointer { + cursor: pointer; + } + .gridster-txt{ + font-size: 12px; + } + .gridster-icon { + font-size: 80px; + color: #067ab4; + } + .widget-gridster { + cursor:move; + } + .widgetHeaderBtns-span { + color: #888; + } + .widgetHeaderBtns-img { + margin-bottom: 3px; + margin-left: 3px; + } + .widget-menu-options { + display: block; + }
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html index d71b8f79..a981fd66 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html @@ -19,12 +19,11 @@ --> <div class="w-ecomp-dashboard-home" id="widgets"> <div class="dashboard-home-container" id="page-content"> - <div align="center" id="errorInfo" - style="display: none; font-size: 12px; margin-left: 5px"> - <span style="color: red">You don't have a user account in that + <div align="center" id="errorInfo" class="error-info-txt"> + <span class="">You don't have a user account in that application. Please ask the system administrator. </span> </div> - <div class="portals-list" style="margin-bottom: 0px;"> + <div class="portals-list"> <div> <div class="simulateGridHeader"> <span class="simulateGridHeaderTitle">Applications <span @@ -43,7 +42,7 @@ <div ng-if="appsViewData.length==0"> <div class="app-error-block"> <i class="icon-information full-linear-icon-information" - style="margin-left: 50%; font-size: 90px; color: black"></i> <br> + class="icon-info"></i> <br> <div class="activity-error-msg1"> You do not have access to any application or function in ECOMP Portal. @@ -68,13 +67,13 @@ 'background-image': 'url('+(item.imageLink)+')', 'background-color':'white', 'background-repeat': 'no-repeat', - 'background-size': '170px 130px'}" + 'background-size': '168px 118px'}" ng-click="dashboard.goToPortal(item);dashboard.auditLog(item)" ng-hide="users.isLoadingTable && !users.getUserAppsIsDone"> </div> </div> <div class="gridster-box" ng-if="item.addRemoveApps"> - <div class="gridster-box-header" style="cursor: pointer;" + <div class="gridster-box-header gridster-box-pointer" ng-click="dashboard.goToCatalog()"> <i class="icon-content-gridguide"></i> <h3>Select applications...</h3> @@ -91,10 +90,10 @@ 'padding': '4px', 'opacity': '1'}" ng-click="dashboard.goToCatalog()" class="gridsterContent"> - <label id="add-icon-label" style="font-size: 12px;">Click + <label id="add-icon-label" class="gridster-txt">Click here to personalize <br> this applications page </label> <i id="add-icon" class="icon-controls-add-maximize" - style="font-size: 80px; color: #067ab4"></i> + class="gridster-icon"></i> </div> </div> </li> @@ -108,7 +107,10 @@ <br> <br> - + <div class="simulateGridHeader"> + <span class="simulateGridHeaderTitle">Widgets </span> + </div> + <div ng-show=dashboard.isCommError>Failed to communicate with the widget microservice.</div> @@ -118,7 +120,7 @@ <li gridster-item="widget" ng-repeat="widget in widgetsViewData"> <div class="box"> <div class="box-header"> - <i id="widget-gridster-{{widget.headerText.split(' ').join('-')}}-icon" style="cursor:move;" class="icon-content-gridguide"></i> + <i id="widget-gridster-{{widget.headerText.split(' ').join('-')}}-icon" class="icon-content-gridguide widget-gridster"></i> <h3>{{ widget.headerText}}</h3> <div class="box-header-btns pull-right" ng-if="isAdminPortalAdmin == true" class="ng-scope"> @@ -128,10 +130,13 @@ ng-mousedown="showImpResOption=!showImpResOption" ng-mouseleave="showImpResOption=false" title="Settings" ddh-accessibility-click="13,32" tabindex="0"><span - class="icon-controls-moreapplications"></span></a> + class="widgetHeaderBtns-span"><img + ng-src="assets/images/generic.png" + class="widgetHeaderBtns-img" alt="..." + aria-label="Tap or Click to move" + src="assets/images/generic.png"></span></a> - <ul class="optionsMenu" - style="display: block" + <ul class="optionsMenu widget-menu-options" ng-show="showImpResOption" ng-mouseenter="showImpResOption=true" ng-mouseleave="showImpResOption=false"> |