From e27936ccc530fd3c484a879f010a6ab51fd3dce1 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Mon, 11 Apr 2022 12:31:09 +0300
Subject: [PATCH] Some changes in grid of indicators, both monitor and
 indications pages. Update libraries

---
 src/app/app-routing.module.ts           |  2 +-
 src/app/monitor/monitor.component.ts    |  2 +-
 src/app/openaireLibrary                 |  2 +-
 src/app/topic/indicators.component.html | 14 +++++++-------
 src/app/topic/indicators.component.ts   |  2 +-
 src/assets/openaire-theme               |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index c81c5e2..9cf803b 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,5 +1,5 @@
 import {NgModule} from '@angular/core';
-import {NoPreloading, PreloadAllModules, RouterModule, Routes} from '@angular/router';
+import {RouterModule, Routes} from '@angular/router';
 import {OpenaireErrorPageComponent} from './error/errorPage.component';
 import {AdminLoginGuard} from "./openaireLibrary/login/adminLoginGuard.guard";
 import {AdminDashboardGuard} from "./utils/adminDashboard.guard";
diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts
index a11bbbe..827b45d 100644
--- a/src/app/monitor/monitor.component.ts
+++ b/src/app/monitor/monitor.component.ts
@@ -531,7 +531,7 @@ export class MonitorComponent implements OnInit, OnDestroy {
   
   public getNumberClassBySize(size: IndicatorSize) {
     if (size === 'small') {
-      return 'uk-width-medium';
+      return 'uk-width-medium@m uk-width-1-1';
     } else if (size === 'medium') {
       return 'uk-width-1-4@l uk-width-1-2@m uk-width-1-1';
     } else {
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 41d5926..337a56e 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 41d5926be3265f11808c954d5e4efe9737a1f8d3
+Subproject commit 337a56ec757edef9876c147211f89e8d646a6935
diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html
index 2b3f4b7..e03de46 100644
--- a/src/app/topic/indicators.component.html
+++ b/src/app/topic/indicators.component.html
@@ -31,7 +31,7 @@
                  (focusEmitter)="saveSection($event, numberSections.at(i), i, 'number')"
                  class="uk-width-1-3@m uk-width-1-1" placeholder="Title" inputClass="border-bottom"></div>
           </div>
-          <div [id]="'number-' + number._id" class="uk-grid-match uk-grid-small uk-grid" uk-sortable="group: chart" uk-grid>
+          <div [id]="'number-' + number._id" class="uk-grid" uk-sortable="group: number" uk-grid>
             <ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
               <div *ngIf="indicator" [id]="indicator._id"
                    [ngClass]="getNumberClassBySize(indicator.width)">
@@ -80,11 +80,11 @@
             </ng-template>
           </div>
           <div class="uk-margin-medium-top">
-            <div class="uk-grid uk-grid-small" uk-grid>
+            <div class="uk-grid" uk-grid>
               <div [ngClass]="getNumberClassBySize('small')">
                 <a class="uk-card uk-card-default uk-card-body uk-link-reset" (click)="editNumberIndicatorOpen(number)">
                   <h6 class="uk-text-bold uk-text-center">
-                    Create a new number Indicator
+                    Create a number Indicator
                   </h6>
                   <div class="uk-flex uk-flex-center uk-text-primary-gradient uk-margin-large-top">
                     <icon name="add" [flex]="true" ratio="3"></icon>
@@ -133,7 +133,7 @@
                  (focusEmitter)="saveSection($event, chartSections.at(i), i)"
                  class="uk-width-1-3@m uk-width-1-1" placeholder="Title" inputClass="border-bottom"></div>
           </div>
-          <div [id]="'chart-' + chart._id" class="uk-grid-match uk-grid-small uk-grid" uk-sortable="group: chart" uk-grid>
+          <div [id]="'chart-' + chart._id" class="uk-grid uk-grid-column-medium" uk-sortable="group: chart" uk-grid>
             <ng-template ngFor [ngForOf]="chart.indicators" let-indicator let-j="index">
               <div *ngIf="indicator" [id]="indicator._id" [ngClass]="getChartClassBySize(indicator.width)">
                 <div class="uk-card uk-card-default uk-card-body uk-position-relative">
@@ -190,12 +190,12 @@
             </ng-template>
           </div>
           <div class="uk-margin-medium-top">
-            <div class="uk-grid uk-grid-small" uk-grid>
+            <div class="uk-grid uk-grid-column-medium" uk-grid>
               <div [ngClass]="getChartClassBySize('small')">
                 <div class=" uk-card uk-card-default uk-card-body clickable" (click)="editChartIndicatorOpen(chart)">
-                  <h5 class="uk-text-bold">
+                  <h6 class="uk-text-bold uk-text-center">
                     Create a custom indicator
-                  </h5>
+                  </h6>
                   <div class="uk-text-muted uk-text-small">
                     Use our advance tool to create a custom Indicator that suit the needs of your funding
                     KPI's.
diff --git a/src/app/topic/indicators.component.ts b/src/app/topic/indicators.component.ts
index d818771..379a5a1 100644
--- a/src/app/topic/indicators.component.ts
+++ b/src/app/topic/indicators.component.ts
@@ -343,7 +343,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
   
   public getNumberClassBySize(size: IndicatorSize) {
     if (size === 'small') {
-      return 'uk-width-medium';
+      return 'uk-width-medium@m uk-width-1-1';
     } else if (size === 'medium') {
       return 'uk-width-1-4@l uk-width-1-2@m uk-width-1-1';
     } else {
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index 292419a..9fe876f 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit 292419ac8255d25af31ab835d22712a36c34f92e
+Subproject commit 9fe876f2cd1f3f6b8f99e03b5927d667c94657ef