diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index 9687f58..2ebb567 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -178,7 +178,7 @@
@@ -244,7 +245,7 @@
{{urlParameterizedMessage}}
- +
@@ -353,7 +354,7 @@
{{urlParameterizedMessage}}
- +
@@ -401,7 +402,7 @@
diff --git a/src/app/topic/indicators.component.ts b/src/app/topic/indicators.component.ts index 58479cf..bb7e6a3 100644 --- a/src/app/topic/indicators.component.ts +++ b/src/app/topic/indicators.component.ts @@ -37,6 +37,7 @@ import {NotifyFormComponent} from "../openaireLibrary/notifications/notify-form/ import {NotificationService} from "../openaireLibrary/notifications/notification.service"; import {properties} from "../../environments/environment"; import {response} from "express"; +import {NotificationHandler} from "../openaireLibrary/utils/notification-handler"; declare var UIkit; @@ -1418,29 +1419,19 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV }); } - copyToClipboard(val: string) { - if(val === 'numberURL') { - var inputElement = document.getElementById("numberURL").children[1].children[0].children[1].children[0] as HTMLInputElement; - } - if(val === 'chartURL') { - var inputElement = document.getElementById("chartURL").children[1].children[0].children[1].children[0] as HTMLInputElement; - } + copyToClipboard(value) { const tempBox = document.createElement('textarea'); tempBox.style.position = 'fixed'; tempBox.style.left = '0'; tempBox.style.top = '0'; tempBox.style.opacity = '0'; - tempBox.value = inputElement.value; + tempBox.value = value; document.body.appendChild(tempBox); tempBox.focus(); tempBox.select(); tempBox.setSelectionRange(0,99999); document.execCommand('copy'); document.body.removeChild(tempBox); - UIkit.notification('Copied to clipboard', { - status: 'success', - timeout: 5000, - pos: 'bottom-right' - }); + NotificationHandler.rise('Copied to clipboard'); } } diff --git a/src/assets/common-assets b/src/assets/common-assets index 170a049..ee3a9a4 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 170a0490e6ecf0d2e31d5a4cea3967cc14efa5af +Subproject commit ee3a9a4868bbdeb26d7a9c5ed15dbf8b2b765b39 diff --git a/src/assets/monitor-dashboard-custom.css b/src/assets/monitor-dashboard-custom.css index bbdc510..e3b3bc2 100644 --- a/src/assets/monitor-dashboard-custom.css +++ b/src/assets/monitor-dashboard-custom.css @@ -61,6 +61,12 @@ stop-color: var(--monitor-dark-color) } +/*TODO check to change in theme*/ + +iframe.uk-height-medium { + height: 320px; +} + #print_toggle { top: 320px !important; } diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 7cb184f..0de97ee 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 7cb184f4f8dd1d0e0b75ce414e24c81ef42ed426 +Subproject commit 0de97ee578684ce690efe2754fd0018293ce63c9