From 5213e0d8e1a8b7f5d52c88ff0459ee4b7022441d Mon Sep 17 00:00:00 2001 From: Sudarshan Kumar Date: Wed, 7 Oct 2020 14:46:53 +0530 Subject: Added missing changes for Release3.3.0 Added missing changes for Release3.3.0 Issue-ID: PORTAL-1025 Change-Id: Ie74e211c7954f2ecf0722ab00c3fea0c8c63047f Signed-off-by: Sudarshan Kumar --- .../epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts | 4 +--- .../src/main/webapp/ngapp/src/app/admin/admin.module.ts | 5 +++-- .../src/app/layout/components/footer/footer.component.scss | 10 +++------- .../src/app/layout/components/sidebar/sidebar.component.html | 4 ++-- .../src/app/layout/components/sidebar/sidebar.component.scss | 12 ++++++++++-- .../main/webapp/ngapp/src/app/layout/layout.component.html | 2 +- .../main/webapp/ngapp/src/app/layout/layout.component.scss | 5 +++++ .../app/pages/analytics/Report_List/report-list.service.ts | 2 +- 8 files changed, 26 insertions(+), 18 deletions(-) (limited to 'ecomp-sdk') diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts index 2ee9957f..fb5f8130 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts @@ -5,7 +5,6 @@ import {PagesRoutingModule} from './pages-routing.module'; import {ReactiveFormsModule, FormsModule} from '@angular/forms'; import {HttpClientModule} from '@angular/common/http'; import {MaterialModule} from '../material-module'; -import {InformationModalComponent} from '../modals/information-modal/information-modal.component'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; import {MatTooltipModule} from '@angular/material/tooltip'; import {MatExpansionModule} from '@angular/material/expansion'; @@ -64,7 +63,6 @@ import {RefreshComponent} from './refresh/refresh.component'; declarations: [ PagesComponent, SearchComponent, - InformationModalComponent, ConfirmationModalComponent, SelfComponent, SuccessModalComponent, @@ -135,7 +133,7 @@ import {RefreshComponent} from './refresh/refresh.component'; jqxChartModule, RdpModule ], - entryComponents: [DialogOverviewExampleDialog, InformationModalComponent, SuccessModalComponent, ErrorModalComponent, SelfComponent, ConfirmationModalComponent], + entryComponents: [DialogOverviewExampleDialog, SuccessModalComponent, ErrorModalComponent, SelfComponent, ConfirmationModalComponent], exports: [ ], providers: [] diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts index ba546647..57554de5 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts @@ -20,9 +20,10 @@ import {RoleFunctionsComponent} from './role-functions/role-functions.component' import {RolesComponent} from './roles/roles.component'; import {NewRoleComponent} from './roles/new-role/new-role.component' import { UserService } from '../shared/services/user/user.service'; +import { InformationModalComponent } from '../modals/information-modal/information-modal.component'; @NgModule({ - declarations: [AdminComponent, CacheAdminComponent, RoleFunctionsComponent, RolesComponent, NewRoleComponent], + declarations: [AdminComponent, CacheAdminComponent, RoleFunctionsComponent, RolesComponent, NewRoleComponent, InformationModalComponent], imports: [ CommonModule, MenusModule, @@ -38,7 +39,7 @@ import { UserService } from '../shared/services/user/user.service'; MatPaginatorModule, MatInputModule ], - entryComponents: [NewRoleComponent], + entryComponents: [NewRoleComponent, InformationModalComponent], exports: [ ], providers: [UserService] diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.scss b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.scss index dbb5a100..365bd9ce 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.scss +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.scss @@ -15,16 +15,12 @@ $topnav-background-color: #222; } .footer { - position: fixed; + position: relative; bottom: 0; - // background-color: $topnav-background-color; width: 100%; - // height: 7.5em; z-index: 1002; - // bottom: 0px; - // right: 0px; - // width: 84%; - margin-bottom: -.5rem; + //margin-bottom: -0.5rem; + margin-top: calc(100vh - 250px); } .footer-logo { diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html index c86a0693..f91e8821 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html @@ -1,5 +1,5 @@
-
+
-
+
  diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.scss b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.scss index 02c969cc..50bc1b5f 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.scss +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.scss @@ -52,7 +52,7 @@ left: 235px; width: 235px; //height: 100%; - height: 76%; + height: 84%; margin-left: -235px; //margin-bottom: 48px; margin-bottom: 0px; @@ -153,6 +153,10 @@ } } } + + .remove-header-margin{ + top: 4.2em; + } .nested-menu { .list-group-item { @@ -215,7 +219,7 @@ } .toggle-button { position: fixed; - width: 236px; + width: 235px; cursor: pointer; padding: 12px; // bottom: 5.5em; @@ -238,6 +242,10 @@ -o-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } + + .toggle-button-no-header{ + top: 8px; + } .collapsed { width: 60px; diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html index bf4507f6..2ae6c463 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html @@ -4,7 +4,7 @@
-
+
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.scss b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.scss index 561f493b..141da812 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.scss +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.scss @@ -52,6 +52,11 @@ position: relative; overflow: hidden; } + +.remove-header{ + margin-top: -9px; +} + .collapsed { margin-left: 60px; } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts index aad435f5..d0094ab9 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts @@ -12,7 +12,7 @@ export class ReportListService { deleteReport(reportId : string) : Observable { - return this._http.get(environment.baseUrl + "/raptor.htm?action=report.delete&c_master=" + reportId); + return this._http.get(environment.baseUrl + "raptor.htm?action=report.delete&c_master=" + reportId); } getAllReports():Observable{ return this._http.get(environment.baseUrl + "raptor.htm?action=report.search.execute&r_page=0&show_all=true"); -- cgit 1.2.3-korg