MaDgIK
/
connect-admin
13
0
Fork 0
Code Issues Pull Requests Projects Releases 8 Wiki Activity

[Trunk|Admin]: Update ngx-color-picker. Add Admin Tools on home page too. 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@56501 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2019-07-12 09:11:38 +00:00
parent 95a664287e
commit d72989f3db
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -36,7 +36,7 @@
"jquery": "^3.4.1",
"ng2-ckeditor": "1.1.9",
"ngx-bootstrap": "^1.6.6",
"ngx-color-picker": "^4.5.3",
"ngx-color-picker": "^8.0.1",
"ngx-json-ld": "0.1.6",
"ts-md5": "^1.2.0",
"tslib": "^1.9.0",

8
src/app/app.component.html
View File

@ -3,10 +3,10 @@
[community]=community class="adminMenu"></navbar>
<div id="wrapper" class="uk-section uk-margin-top uk-padding-remove-bottom">
<div class="uk-grid" uk-height-viewport="expand: true">
<sidebar *ngIf="showSidebar && !wellcome" [menuItems]="sideMenuItems" class="uk-width-1-5 uk-light sidebar uk-margin-top uk-margin-left"></sidebar>
<div class="uk-width-expand uk-margin-large-top" [ngClass]="(!wellcome)?'uk-container uk-container-large uk-overflow-auto':''"
[ngStyle]="{height: (!wellcome)?'85vh':''}">
<div class="uk-grid-collapse" uk-height-viewport="expand: true" uk-grid>
<sidebar *ngIf="showSidebar" [menuItems]="sideMenuItems" class="uk-width-1-5 uk-light sidebar uk-margin-top"></sidebar>
<div class="uk-width-expand uk-margin-top uk-overflow-auto" [ngClass]="(!wellcome)?'uk-container uk-container-large uk-padding':''"
[ngStyle]="{height: (!wellcome)?'85vh':'90vh'}">
<router-outlet></router-outlet>
</div>
<!--

5
src/app/app.component.ts
View File

@ -35,7 +35,7 @@ export class AppComponent implements OnInit{
wellcome = false;
showMenu:boolean = false;
constructor(private route: ActivatedRoute,
constructor(private route: ActivatedRoute,
private propertiesService: EnvironmentSpecificService,
private _communitiesService: CommunitiesService,
private router: Router) {
@ -61,7 +61,7 @@ export class AppComponent implements OnInit{
this.router.events.forEach((event) => {
if(event instanceof RoutesRecognized) {
HelperFunctions.scroll();
if(event.url === '/' || event.url.indexOf('/user-info') !== -1) {
if(event.url === '/') {
this.wellcome = true;
} else {
this.wellcome = false;
@ -150,6 +150,7 @@ export class AppComponent implements OnInit{
private buildSideBar() {
this.sideMenuItems = [];
this.showSidebar = false;
if ((!this.communityId || this.communityId == '') && this.isPortalAdministrator) {
const adminTools: SideMenuItem = {
rootItem: new MenuItem('adminTools', 'Admin Tools', '',

2
src/app/pages/dashboard/dashboard.component.html
View File

@ -1,4 +1,4 @@
<div id="dashboard">
<div id="dashboard" class="uk-margin-large-bottom">
<div id="content">
<div class="content-wrapper">