diff --git a/src/app/app.component.ts b/src/app/app.component.ts index dd50527..5ba311f 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -35,7 +35,7 @@ import {AlertModal} from "./openaireLibrary/utils/modal/alert"; Get Started - -
- Our team will respond to your submission soon. -
-
+ ` @@ -78,8 +74,6 @@ export class AppComponent { properties: EnvProperties = properties; showMenu: boolean = false; user: User; - params: BehaviorSubject = new BehaviorSubject(null); - url: string; header: Header; logoPath: string = 'assets/common-assets/logo-services/monitor/'; /* Contact */ @@ -91,6 +85,7 @@ export class AppComponent { 'Research Infrastructure', 'Government', 'Non-profit', 'Industry', 'Other' ]; + public images: string[] = ['assets/monitor-assets/avatar1.jpg', 'assets/monitor-assets/avatar2.jpg'] public sending = false; @ViewChild('modal') modal: AlertModal; @ViewChild('quickContact') quickContact: QuickContactComponent; @@ -104,13 +99,6 @@ export class AppComponent { private emailService: EmailService) { this.subscriptions.push(router.events.forEach((event) => { if (event instanceof NavigationEnd) { - this.url = event.url; - let r = this.route; - while (r.firstChild) { - r = r.firstChild; - } - let params = r.snapshot.params; - this.params.next(params); if (event.url === '/contact-us') { this.quickContactService.setDisplay(false); } else if (event.url !== '/contact-us' && !this.showQuickContact) { @@ -156,7 +144,7 @@ export class AppComponent { this.stakeholderService.clearSubscriptions(); this.smoothScroll.clearSubscriptions(); } - + public buildMenu() { this.menuItems = []; this.menuItems.push({ @@ -167,10 +155,6 @@ export class AppComponent { rootItem: new MenuItem("stakeholders", "Browse Dashboards", "", "/browse", false, [], null, {}), items: [] }); - /*this.menuItems.push({ - rootItem: new MenuItem("contact-us", "Contact us", "", "/contact-us", false, [], null, {}), - items: [] - });*/ this.bottomMenuItems = [ new MenuItem("", "About", "https://beta.openaire.eu/project-factsheets", "", false, [], [], {}), new MenuItem("", "News - Events", "https://beta.openaire.eu/news-events", "", false, [], [], {}), @@ -237,7 +221,7 @@ export class AppComponent { public modalOpen() { this.modal.okButton = true; this.modal.alertTitle = 'Your request has been successfully submitted'; - this.modal.alertMessage = false; + this.modal.message = 'Our team will respond to your submission soon.'; this.modal.cancelButton = false; this.modal.okButtonLeft = false; this.modal.okButtonText = 'OK'; diff --git a/src/app/browse-stakeholder/browse-stakeholder.component.html b/src/app/browse-stakeholder/browse-stakeholder.component.html index 72f55da..49bc11d 100644 --- a/src/app/browse-stakeholder/browse-stakeholder.component.html +++ b/src/app/browse-stakeholder/browse-stakeholder.component.html @@ -29,8 +29,4 @@ - -
- You will be navigated to a new tab. Are you sure that you want to proceed? -
-
+ diff --git a/src/app/browse-stakeholder/browse-stakeholder.component.ts b/src/app/browse-stakeholder/browse-stakeholder.component.ts index 8fb1971..a34581f 100644 --- a/src/app/browse-stakeholder/browse-stakeholder.component.ts +++ b/src/app/browse-stakeholder/browse-stakeholder.component.ts @@ -59,7 +59,7 @@ export class BrowseStakeholderComponent { this.modal.cancelButton = true; this.modal.okButton = true; this.modal.alertTitle = 'You are going to visit ' + this.stakeholder.name + ' Monitor Dashboard'; - this.modal.alertMessage = false; + this.modal.message = 'You will be navigated to a new tab. Are you sure that you want to proceed?'; this.modal.okButtonLeft = false; this.modal.okButtonText = 'Yes'; this.modal.cancelButtonText = 'No'; diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 03852c6..b2cb5a3 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -218,9 +218,11 @@
-

Dashboards in action.

-
- View existing dashboards from collaborating organizations. Get a preview on how they work and how our service can be customized to serve you. +
+

Dashboards in action.

+
+ View existing dashboards from collaborating organizations. Get a preview on how they work and how our service can be customized to serve you. +
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 135638a..23a3c8a 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 135638ad6364f7cabdcef68e4fadfbc667c75cee +Subproject commit 23a3c8a508f720dc155f30ce69bcfda72a200a19 diff --git a/src/assets/monitor-custom.css b/src/assets/monitor-custom.css index a48242b..c7368d2 100644 --- a/src/assets/monitor-custom.css +++ b/src/assets/monitor-custom.css @@ -12,6 +12,7 @@ /*backgrounds*/ --background-primary:var(--monitor-color); + --background-primary-rgb:var(--monitor-color-rgb); --background-primary-image:none; --background-secondary: var(--grey-color); --background-secondary-image:none; @@ -56,8 +57,8 @@ main { min-height: calc(100vh - 90px); } -.monitorApp .searchForm { - background: var(--monitor-contrast-color) !important; +.search-form { + background: var(--secondary-color); } diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index e7f2543..e032e8c 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit e7f2543b7a01368a09f9100c001fe7fb76018658 +Subproject commit e032e8ce0a597da6e447451e53ed7e6bdfed2323