Project

General

Profile

« Previous | Next » 

Revision 60203

[Monitor Dashboard|Trunk]

- package.json: clean up citation.js + wikidata
- Admin tools:
remove components- use directly library components
- Properties: updates for helptexts

View differences:

modules/uoa-monitor-portal/trunk/monitor_dashboard/package.json
44 44
    "@nguniversal/module-map-ngfactory-loader": "^6.0.0",
45 45
    "@types/express": "^4.16.1",
46 46
    "angular-datatables": "^4.4.1",
47
    "citation-js": "^0.3.4",
48 47
    "clipboard": "^1.5.16",
49 48
    "core-js": "^2.4.1",
50 49
    "datatables.net": "^1.10.19",
......
57 56
    "prom-client": "^11.3.0",
58 57
    "ts-md5": "^1.2.0",
59 58
    "tslib": "^1.9.0",
60
    "wikidata-sdk": "^5.2.9",
61 59
    "zone.js": "^0.8.26"
62 60
  },
63 61
  "devDependencies": {
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/monitor/monitor.component.html
253 253
        applied to a chart, that chart will appear grayed-out.</i></div>
254 254
      <ul class="uk-list uk-list-divider  uk-margin-medium">
255 255
        <li>
256
          <range-filter [filter]="periodFilter" yearMin="2000" yearMax="2020" [mandatoryRange]="true"
256
          <range-filter [filter]="periodFilter" yearMin="2000" [yearMax]="currentYear" [mandatoryRange]="true"
257 257
                        (onFilterChange)="filter()"></range-filter>
258 258
        </li>
259 259
        <ng-container *ngFor="let filter of filters ">
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/monitor/monitor.component.ts
64 64
  public routerHelper: RouterHelper = new RouterHelper();
65 65
  filters: Filter[] = [];
66 66
  queryParams = {};
67
  public currentYear = new Date().getFullYear();
67 68
  periodFilter: RangeFilter = {
68 69
    title: "Time range",
69 70
    filterId: "year",
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/pages/pages.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {PagesRoutingModule} from './pages-routing.module';
4
import {IsCommunityOrAdmin} from "../../openaireLibrary/connect/communityGuard/isCommunityOrAdmin";
5
import {PagesModule} from "../../openaireLibrary/dashboard/page/pages.module";
6
import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
7

  
8
@NgModule({
9
  imports: [
10
    CommonModule, PagesRoutingModule, PagesModule
11
  ],
12
    providers: [LoginGuard,IsCommunityOrAdmin],
13

  
14
})
15
export class MonitorPagesModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/pages/pages-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {PagesComponent} from "../../openaireLibrary/dashboard/page/pages.component";
4
import {IsCommunityOrAdmin} from "../../openaireLibrary/connect/communityGuard/isCommunityOrAdmin";
5
import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
6

  
7
@NgModule({
8
    imports: [
9
        RouterModule.forChild([
10
            { path: '', canActivate: [LoginGuard,IsCommunityOrAdmin], component: PagesComponent}
11
        ])
12
    ]
13
})
14
export class PagesRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/helpTexts/new-page-help-content-routing.module.ts
1
import {NgModule} from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {NewPageHelpContentComponent} from "../../openaireLibrary/dashboard/helpTexts/new-page-help-content.component";
4

  
5

  
6
@NgModule({
7
    imports: [
8
        RouterModule.forChild([
9
            { path: '', component: NewPageHelpContentComponent}
10
        ])
11
    ]
12
})
13
export class NewPageHelpContentRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/helpTexts/edit-page-help-content.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {CommonModule} from '@angular/common';
4
import {EditPageHelpContentRoutingModule} from "./edit-page-help-content-routing.module";
5
import {EditPageHelpContentModule} from "../../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module";
6

  
7
@NgModule({
8
    imports: [
9
        CommonModule,  RouterModule,
10
         EditPageHelpContentRoutingModule, EditPageHelpContentModule
11
    ],
12
    providers: []
13
})
14
export class MonitorEditPageHelpContentModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/helpTexts/page-help-contents.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {PageHelpContentsRoutingModule} from './page-help-contents-routing.module';
4
import {PageHelpContentsModule} from "../../openaireLibrary/dashboard/helpTexts/page-help-contents.module";
5

  
6
@NgModule({
7
  imports: [
8
    CommonModule,  PageHelpContentsRoutingModule,  PageHelpContentsModule
9
  ],
10
    providers: [],
11
 })
12
export class MonitorPageHelpContentsModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/helpTexts/new-page-help-content.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {CommonModule} from '@angular/common';
4
import {NewPageHelpContentRoutingModule} from "./new-page-help-content-routing.module";
5
import {NewPageHelpContentModule} from "../../openaireLibrary/dashboard/helpTexts/new-page-help-content.module";
6

  
7

  
8
@NgModule({
9
    imports: [
10
        CommonModule,  RouterModule,
11
         NewPageHelpContentRoutingModule, NewPageHelpContentModule
12
    ],
13
    providers: [],
14
})
15
export class MonitorNewPageHelpContentModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/helpTexts/edit-page-help-content-routing.module.ts
1
import {NgModule} from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {EditPageHelpContentComponent} from "../../openaireLibrary/dashboard/helpTexts/edit-page-help-content.component";
4

  
5

  
6
@NgModule({
7
    imports: [
8
        RouterModule.forChild([
9
            { path: '', component: EditPageHelpContentComponent}
10
        ])
11
    ]
12
})
13
export class EditPageHelpContentRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/helpTexts/page-help-contents-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {PageHelpContentsComponent} from "../../openaireLibrary/dashboard/helpTexts/page-help-contents.component";
4

  
5
@NgModule({
6
    imports: [
7
        RouterModule.forChild([
8
            { path: '',  component: PageHelpContentsComponent}
9
        ])
10
    ]
11
})
12
export class PageHelpContentsRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/entities/entities.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {EntitiesRoutingModule} from "./entities-routing.module";
4
import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard";
5
import {EntitiesModule} from "../../openaireLibrary/dashboard/entity/entities.module";
6

  
7
@NgModule({
8
  imports: [
9
    CommonModule, EntitiesModule, EntitiesRoutingModule
10
  ],
11
  providers: [AdminLoginGuard],
12
})
13
export class MonitorEntitiesModule {
14
}
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/entities/entities-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard";
4
import {EntitiesComponent} from "../../openaireLibrary/dashboard/entity/entities.component";
5

  
6
@NgModule({
7
  imports: [
8
    RouterModule.forChild([
9
      { path: '', canActivate: [AdminLoginGuard], component: EntitiesComponent}
10
    ])
11
  ]
12
})
13
export class EntitiesRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/portals/portals-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {PortalsComponent} from "../../openaireLibrary/dashboard/portal/portals.component";
4
import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard";
5

  
6
@NgModule({
7
  imports: [
8
    RouterModule.forChild([
9
      { path: '',  component: PortalsComponent}
10
    ])
11
  ]
12
})
13
export class PortalsRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/portals/portals.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {PortalModule} from "../../openaireLibrary/dashboard/portal/portals.module";
4
import {PortalsRoutingModule} from "./portals-routing.module";
5

  
6
@NgModule({
7
  imports: [
8
    CommonModule, PortalModule, PortalsRoutingModule
9
  ],
10
  declarations: [],
11
  providers: [],
12
  exports: []
13
})
14
export class PortalsModule {
15
}
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/classHelpTexts/new-div-help-content.module.ts
1
import { NgModule } from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {NewDivHelpContentRoutingModule} from "./new-div-help-content-routing.module";
4
import {NewDivHelpContentModule} from "../../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.module";
5
import {AdminDashboardGuard} from "../../utils/adminDashboard.guard";
6

  
7

  
8
@NgModule({
9
    imports: [
10
        CommonModule, NewDivHelpContentRoutingModule, NewDivHelpContentModule
11
    ],
12
    providers: [AdminDashboardGuard],
13
})
14
export class MonitorNewDivHelpContentModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/classHelpTexts/div-help-contents-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {DivHelpContentsComponent} from "../../openaireLibrary/dashboard/divhelpcontent/div-help-contents.component";
4
import {AdminDashboardGuard} from "../../utils/adminDashboard.guard";
5

  
6
@NgModule({
7
    imports: [
8
        RouterModule.forChild([
9
            { path: '', canActivate: [ AdminDashboardGuard], component: DivHelpContentsComponent}
10
        ])
11
    ]
12
})
13
export class DivHelpContentsRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/classHelpTexts/edit-div-help-content-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {EditDivHelpContentComponent} from "../../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.component";
4
import {AdminDashboardGuard} from "../../utils/adminDashboard.guard";
5

  
6

  
7
@NgModule({
8
    imports: [
9
        RouterModule.forChild([
10
            { path: '', canActivate: [AdminDashboardGuard], component: EditDivHelpContentComponent}
11
        ])
12
    ]
13
})
14
export class EditDivHelpContentRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/classHelpTexts/new-div-help-content-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {NewDivHelpContentComponent} from "../../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.component";
4
import {AdminDashboardGuard} from "../../utils/adminDashboard.guard";
5

  
6
@NgModule({
7
    imports: [
8
        RouterModule.forChild([
9
            { path: '', canActivate: [AdminDashboardGuard], component: NewDivHelpContentComponent}
10
        ])
11
    ]
12
})
13
export class NewDivHelpContentRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/classHelpTexts/div-help-contents.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {DivHelpContentsRoutingModule} from './div-help-contents-routing.module';
4
import {DivHelpContentsModule} from "../../openaireLibrary/dashboard/divhelpcontent/div-help-contents.module";
5

  
6
@NgModule({
7
  imports: [
8
    CommonModule,  DivHelpContentsRoutingModule, DivHelpContentsModule
9
  ],
10

  
11
    providers: [],
12
})
13
export class MonitorDivHelpContentsModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/classHelpTexts/edit-div-help-content.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3

  
4
import {EditDivHelpContentRoutingModule} from './edit-div-help-content-routing.module';
5
import {EditDivHelpContentModule} from "../../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.module";
6
import {AdminDashboardGuard} from "../../utils/adminDashboard.guard";
7

  
8
@NgModule({
9
    imports: [
10
        CommonModule, EditDivHelpContentRoutingModule, EditDivHelpContentModule
11
    ],
12
    providers: [AdminDashboardGuard],
13
})
14
export class MonitorEditDivHelpContentModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/classes/classes.module.ts
1
import { NgModule } from '@angular/core';
2
import {ClassesRoutingModule} from "./classes-routing.module";
3
import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard";
4
import {DivIdsModule} from "../../openaireLibrary/dashboard/divId/divIds.module";
5
import {CommonModule} from "@angular/common";
6

  
7

  
8

  
9
@NgModule({
10
    imports: [
11
        CommonModule, ClassesRoutingModule, DivIdsModule
12
    ],
13
    providers: [AdminLoginGuard],
14
})
15
export class ClassesModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/classes/classes-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard";
4
import {DivIdsComponent} from "../../openaireLibrary/dashboard/divId/divIds.component";
5

  
6

  
7
@NgModule({
8
    imports: [
9
        RouterModule.forChild([
10
            { path: '', canActivate: [AdminLoginGuard], component: DivIdsComponent}
11
        ])
12
    ]
13
})
14
export class ClassesRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/admin-tool-routing.module.ts
10 10
      {path: '', redirectTo: '/admin', pathMatch: 'full'},
11 11
      {
12 12
        path: 'portals',
13
        loadChildren: './portals/portals.module#PortalsModule',
13
        loadChildren: '../openaireLibrary/dashboard/portal/portals.module#PortalsModule',
14 14
        canActivate:[AdminLoginGuard],
15 15
        resolve: { envSpecific: EnvironmentSpecificResolver  },
16 16
        data: {hasAdminMenu: true}
17 17
      },
18 18
      {
19 19
        path: 'entities',
20
        loadChildren: './entities/entities.module#MonitorEntitiesModule',
20
        loadChildren: '../openaireLibrary/dashboard/entity/entities.module#EntitiesModule',
21 21
        canActivate:[AdminLoginGuard],
22 22
        resolve: { envSpecific: EnvironmentSpecificResolver  },
23 23
        data: {hasAdminMenu: true}
24 24
      },
25

  
26 25
      {
26
        path: 'classes',
27
        loadChildren: '../openaireLibrary/dashboard/divId/divIds.module#DivIdsModule',
28
        canActivate:[AdminLoginGuard],
29
        resolve: { envSpecific: EnvironmentSpecificResolver  },
30
        data: {hasAdminMenu: true}
31
      },
32
      {
27 33
        path: 'classContents',
28
        loadChildren: './classHelpTexts/div-help-contents.module#MonitorDivHelpContentsModule',
34
        loadChildren: '../openaireLibrary/dashboard/divhelpcontent/div-help-contents.module#DivHelpContentsModule',
29 35
        canActivate:[AdminLoginGuard],
30 36
        resolve: { envSpecific: EnvironmentSpecificResolver  },
31 37
        data: {hasAdminMenu: true}
32 38
      },
33 39
      {
34 40
        path: 'classContents/new',
35
        loadChildren: './classHelpTexts/new-div-help-content.module#MonitorNewDivHelpContentModule',
41
        loadChildren: '../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.module#NewDivHelpContentModule',
36 42
        canActivate:[AdminLoginGuard],
37 43
        resolve: { envSpecific: EnvironmentSpecificResolver  },
38 44
        data: {hasAdminMenu: true}
39 45
      },
40 46
      {
41 47
        path: 'classContents/edit',
42
        loadChildren: './classHelpTexts/edit-div-help-content.module#MonitorEditDivHelpContentModule',
48
        loadChildren: '../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.module#EditDivHelpContentModule',
43 49
        canActivate:[AdminLoginGuard],
44 50
        resolve: { envSpecific: EnvironmentSpecificResolver  },
45 51
        data: {hasAdminMenu: true}
46 52
      },
47 53
      {
48 54
        path: 'helptexts',
49
        loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
55
        loadChildren: '../openaireLibrary/dashboard/helpTexts/page-help-contents.module#PageHelpContentsModule',
50 56
        canActivate:[AdminLoginGuard],
51 57
        resolve: { envSpecific: EnvironmentSpecificResolver  },
52 58
        data: {hasAdminMenu: true}
53 59
      },
54 60
      {
55 61
        path: 'helptexts/new',
56
        loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
62
        loadChildren: '../openaireLibrary/dashboard/helpTexts/new-page-help-content.module#NewPageHelpContentModule',
57 63
        canActivate:[AdminLoginGuard],
58 64
        resolve: { envSpecific: EnvironmentSpecificResolver  },
59 65
        data: {hasAdminMenu: true}
60 66
      },
61 67
      {
62 68
        path: 'helptexts/edit',
63
        loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
69
        loadChildren: '../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule',
64 70
        canActivate:[AdminLoginGuard],
65 71
        resolve: { envSpecific: EnvironmentSpecificResolver  },
66 72
        data: {hasAdminMenu: true}
67 73
      },
68 74
      {
69 75
        path: 'pages',
70
        loadChildren: './pages/pages.module#MonitorPagesModule',
76
        loadChildren: '../openaireLibrary/dashboard/page/pages.module#PagesModule',
71 77
        canActivate:[AdminLoginGuard],
72 78
        resolve: { envSpecific: EnvironmentSpecificResolver  },
73 79
        data: {hasAdminMenu: true}
74 80
      },
75 81
      {
76 82
        path: 'pageContents',
77
        loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
83
        loadChildren: '../openaireLibrary/dashboard/helpTexts/page-help-contents.module#PageHelpContentsModule',
78 84
        canActivate:[AdminLoginGuard],
79 85
        resolve: { envSpecific: EnvironmentSpecificResolver  },
80 86
        data: {hasAdminMenu: true}
81 87
      },
82 88
      {
83 89
        path: 'pageContents/new',
84
        loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
90
        loadChildren: '../openaireLibrary/dashboard/helpTexts/new-page-help-content.module#NewPageHelpContentModule',
85 91
        canActivate:[AdminLoginGuard],
86 92
        resolve: { envSpecific: EnvironmentSpecificResolver  },
87 93
        data: {hasAdminMenu: true}
88 94
      },
89 95
      {
90 96
        path: 'pageContents/edit',
91
        loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
97
        loadChildren: '../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule',
92 98
        canActivate:[AdminLoginGuard],
93 99
        resolve: { envSpecific: EnvironmentSpecificResolver  },
94 100
        data: {hasAdminMenu: true}
95 101
      },
96 102

  
97 103

  
98
    //  stakeholder:
99

  
104
     // stakeholder:
100 105
      {
101 106
        path: ':stakeholder/entities',
102
        loadChildren: './entities/entities.module#MonitorEntitiesModule',
107
        loadChildren: '../openaireLibrary/dashboard/entity/entities.module#EntitiesModule',
103 108
        canActivate:[AdminDashboardGuard],
104 109
        resolve: { envSpecific: EnvironmentSpecificResolver  },
105 110
        data: {hasAdminMenu: true}
106 111
      },
107 112
      {
108 113
        path: ':stakeholder/classContents',
109
        loadChildren: './classHelpTexts/div-help-contents.module#MonitorDivHelpContentsModule',
114
        loadChildren: '../openaireLibrary/dashboard/divhelpcontent/div-help-contents.module#DivHelpContentsModule',
110 115
        canActivate:[AdminDashboardGuard],
111 116
        resolve: { envSpecific: EnvironmentSpecificResolver  },
112 117
        data: {hasAdminMenu: true}
113 118
      },
114 119
      {
115 120
        path: ':stakeholder/classContents/new',
116
        loadChildren: './classHelpTexts/new-div-help-content.module#MonitorNewDivHelpContentModule',
121
        loadChildren: '../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.module#NewDivHelpContentModule',
117 122
        canActivate:[AdminDashboardGuard],
118 123
        resolve: { envSpecific: EnvironmentSpecificResolver  },
119 124
        data: {hasAdminMenu: true}
120 125
      },
121 126
      {
122 127
        path: ':stakeholder/classContents/edit',
123
        loadChildren: './classHelpTexts/edit-div-help-content.module#MonitorEditDivHelpContentModule',
128
        loadChildren: '../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.module#EditDivHelpContentModule',
124 129
        canActivate:[AdminDashboardGuard],
125 130
        resolve: { envSpecific: EnvironmentSpecificResolver  },
126 131
        data: {hasAdminMenu: true}
127 132
      },
128 133
      {
129 134
        path: ':stakeholder/helptexts',
130
        loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
135
        loadChildren: '../openaireLibrary/dashboard/helpTexts/page-help-contents.module#PageHelpContentsModule',
131 136
        canActivate:[AdminDashboardGuard],
132 137
        resolve: { envSpecific: EnvironmentSpecificResolver  },
133 138
        data: {hasAdminMenu: true}
134 139
      },
135 140
      {
136 141
        path: ':stakeholder/helptexts/new',
137
        loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
142
        loadChildren: '../openaireLibrary/dashboard/helpTexts/new-page-help-content.module#NewPageHelpContentModule',
138 143
        canActivate:[AdminDashboardGuard],
139 144
        resolve: { envSpecific: EnvironmentSpecificResolver  },
140 145
        data: {hasAdminMenu: true}
141 146
      },
142 147
      {
143 148
        path: ':stakeholder/helptexts/edit',
144
        loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
149
        loadChildren: '../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule',
145 150
        canActivate:[AdminDashboardGuard],
146 151
        resolve: { envSpecific: EnvironmentSpecificResolver  },
147 152
        data: {hasAdminMenu: true}
148 153
      },
149 154
      {
150 155
        path: ':stakeholder/pages',
151
        loadChildren: './pages/pages.module#MonitorPagesModule',
156
        loadChildren: '../openaireLibrary/dashboard/page/pages.module#PagesModule',
152 157
        canActivate:[AdminDashboardGuard],
153 158
        resolve: { envSpecific: EnvironmentSpecificResolver  },
154 159
        data: {hasAdminMenu: true}
155 160
      },
156 161
      {
157 162
        path: ':stakeholder/pageContents',
158
        loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
163
        loadChildren: '../openaireLibrary/dashboard/helpTexts/page-help-contents.module#PageHelpContentsModule',
159 164
        canActivate:[AdminDashboardGuard],
160 165
        resolve: { envSpecific: EnvironmentSpecificResolver  },
161 166
        data: {hasAdminMenu: true}
162 167
      },
163 168
      {
164 169
        path: ':stakeholder/pageContents/new',
165
        loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
170
        loadChildren: '../openaireLibrary/dashboard/helpTexts/new-page-help-content.module#NewPageHelpContentModule',
166 171
        canActivate:[AdminDashboardGuard],
167 172
        resolve: { envSpecific: EnvironmentSpecificResolver  },
168 173
        data: {hasAdminMenu: true}
169 174
      },
170 175
      {
171 176
        path: ':stakeholder/pageContents/edit',
172
        loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
177
        loadChildren: '../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule',
173 178
        canActivate:[AdminDashboardGuard],
174 179
        resolve: { envSpecific: EnvironmentSpecificResolver  },
175 180
        data: {hasAdminMenu: true}
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/app.component.ts
247 247
        this.userMenuItems.push(new MenuItem("", "Manage profiles",
248 248
          "", "/admin", false, [], [], {}));
249 249
      }
250
      if(Session.isPortalAdministrator(this.user) ) {
251
        this.userMenuItems.push( new MenuItem("adminOptions", "Super Admin options","", "/admin-tools/portals", false, [], [], {}));
252
        this.userMenuItems.push(new MenuItem("monitorOptions", "Monitor portal options","", "/admin-tools/pages", false, [], [], {communityId: 'monitor'}));
253

  
254
      }
250 255
      this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {}));
251 256
    }
252 257
    if (this.stakeholder) {
......
327 332
        this.adminMenuItems.push(new MenuItem("indicators", "Indicators", "", "/admin/" + this.stakeholder.alias + '/indicators', false, [], [], {}, "<i uk-icon=\"image\"></i>"));
328 333
        this.adminMenuItems.push(new MenuItem("users", "Users", "", "/admin/" + this.stakeholder.alias + "/users", false, [], [], {}, "<i uk-icon=\"users\"></i>"));
329 334
        if(Session.isPortalAdministrator(this.user) ) {
330
          let monitorOptions = new MenuItem("monitorOptions", "Monitor Options", "", "", false, [], [], {});
331
          monitorOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/" + this.stakeholder.alias +  "/pages", false, [], [], {communityId:this.stakeholder.alias}));
332
          monitorOptions.items.push(new MenuItem("entities", "Entities", "","/admin-tools/" + this.stakeholder.alias +  "/entities", false, [], [], {communityId:this.stakeholder.alias}));
333
          // monitorOptions.items.push(new MenuItem("classes", "Class help texts", "","/admin-tools/" + this.stakeholder.alias +  "/classContents", false, [], [], {}));
334
          monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "","/admin-tools/" + this.stakeholder.alias +  "/helptexts", false, [], [], {communityId:this.stakeholder.alias}));
335
          this.adminMenuItems.push(monitorOptions);
335
          this.adminMenuItems.push(new MenuItem("monitorOptions", "Pages & Entities", "", "/admin-tools/" + this.stakeholder.alias +  "/pages", false, [], [],  {communityId:this.stakeholder.alias}));
336 336
        }
337 337
        this.specialSideBarMenuItem = new MenuItem("back", "Manage profiles", "", "/admin", false, [], null, {});
338 338
        this.specialSideBarMenuItem.icon = '<span class="uk-icon-button small uk-icon uk-button-secondary">' + arrow_left.data + '</span>'; // '<span class="uk-icon-button uk-icon portal-button  " uk-icon="chevron-left"></span>';
......
379 379
        this.adminMenuItems = [];
380 380
        this.specialSideBarMenuItem = null;
381 381
        this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, "<i uk-icon=\"cog\"></i>"));
382
       if(Session.isPortalAdministrator(this.user) ) {
383
         let adminOptions = new MenuItem("adminOptions", "Admin Options", "", "", false, [], [], {})
384
         adminOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/pages", false, [], [], {}));
385
         adminOptions.items.push(new MenuItem("portals", "Portals", "", "/admin-tools/portals", false, [], [], {}));
386
         adminOptions.items.push(new MenuItem("entities", "Entities", "", "/admin-tools/entities", false, [], [], {}));
387
         // adminOptions.items.push(new MenuItem("classes", "Class help texts", "", "/admin-tools/classes", false, [], [], {}));
388
         this.adminMenuItems.push(adminOptions);
389
         let monitorOptions = new MenuItem("monitorOptions", "Monitor Options", "", "", false, [], [], {});
390
         monitorOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/pages", false, [], [], {communityId: 'monitor'}));
391
         monitorOptions.items.push(new MenuItem("entities", "Entities", "", "/admin-tools/entities", false, [], [], {communityId: 'monitor'}));
392
         // monitorOptions.items.push(new MenuItem("classes", "Class help texts", "", "/admin-tools/classContents", false, [], [], {communityId: 'monitor'}));
393
         monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "", "/admin-tools/helptexts", false, [], [], {communityId: 'monitor'}));
394
         this.adminMenuItems.push(monitorOptions);
395
       }
382
//        if(Session.isPortalAdministrator(this.user) ) {
383
//          let adminOptions = new MenuItem("adminOptions", "Admin Options","", "/admin-tools/admin-pages", false, [], [], {});
384
// /*         adminOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/pages", false, [], [], {}));
385
//          adminOptions.items.push(new MenuItem("portals", "Portals", "", "/admin-tools/portals", false, [], [], {}));
386
//          adminOptions.items.push(new MenuItem("entities", "Entities", "", "/admin-tools/entities", false, [], [], {}));
387
//          // adminOptions.items.push(new MenuItem("classes", "Class help texts", "", "/admin-tools/classes", false, [], [], {}));*/
388
//          this.adminMenuItems.push(adminOptions);
389
//          let monitorOptions = new MenuItem("monitorOptions", "Monitor Options","", "/admin-tools/admin-pages", false, [], [], {communityId: 'monitor'});
390
//         /* monitorOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/pages", false, [], [], {communityId: 'monitor'}));
391
//          monitorOptions.items.push(new MenuItem("entities", "Entities", "", "/admin-tools/entities", false, [], [], {communityId: 'monitor'}));
392
//          // monitorOptions.items.push(new MenuItem("classes", "Class help texts", "", "/admin-tools/classContents", false, [], [], {communityId: 'monitor'}));
393
//          monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "", "/admin-tools/helptexts", false, [], [], {communityId: 'monitor'}));*/
394
//          this.adminMenuItems.push(monitorOptions);
395
//        }
396 396
        
397 397
      }
398 398
    }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/assets/new.css
238 238
.uk-modal-container .uk-modal-dialog {
239 239
  width: 900px;
240 240
}
241

  
241
.stakeholderPage .uk-card.uk-disabled, .stakeholderPage .uk-card.semiFiltered{
242
  opacity: 0.5;
243
}
244
.stakeholderPage .uk-card.semiFiltered > * > .highcharts-series-group{
245
  opacity: 0.5;
246
}
242 247
.stakeholderPage .selectedFilterLabel {
243 248
  background-color: #E6EEF2;
244 249
  border-color: #E6EEF2;
......
247 252
.landing .uk-dropdown, new-search-page .uk-dropdown, search-all .uk-dropdown {
248 253
  padding: 25px;
249 254
}
255
/*Admin tool pages*/
256
.form-header {
257
  background-color: #F2F2F2;
258
  box-shadow: 0 3px 6px #00000029;
259
  padding: 10px 20px;
260
  font-family: "Roboto", sans-serif;
261
  z-index: 1;
262
  position: relative;
263
}
264
.form-header th{
265
  color: #7A7A7A;
266
  font-weight: bold;
267
}
268
.admin-pages .filters{
269
  background-color: var(--background-color);
270
}
271
.admin-pages ul.pages .title{
272
  color: rgb(var(--text-color-rgb), 0.5) !important;
273
}
274

  
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/environments/environment.beta.ts
61 61
  adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service/",
62 62
  
63 63
  adminToolsCommunity: "monitor",
64
  useHelpTexts:false,
64 65
  datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
65 66
  contextsAPI: "https://beta.services.openaire.eu/openaire/context",
66 67
  communityAPI: "https://beta.services.openaire.eu/openaire/community/",
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/environments/environment.ts
64 64
  adminToolsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service/",
65 65
  
66 66
  adminToolsCommunity: "monitor",
67
  useHelpTexts: false,
67 68
  datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
68 69
  contextsAPI: "https://dev-openaire.d4science.org/openaire/context",
69 70
  communityAPI: "https://dev-openaire.d4science.org/openaire/community/",
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/environments/environment.prod.ts
60 60
  
61 61
  monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service",
62 62
  
63
  adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/",
63
  adminToolsAPIURL: "https://services.openaire.eu/uoa-monitor-service/",
64 64
  
65 65
  adminToolsCommunity: "monitor",
66
  useHelpTexts:false,
66 67
  contextsAPI: "https://services.openaire.eu/openaire/context",
67 68
  
68 69
  communityAPI: "https://services.openaire.eu/openaire/community/",

Also available in: Unified diff