From 25ceec0d6a7d2c9b6155e4021a97dd0640f4d1be Mon Sep 17 00:00:00 2001
From: "argiro.kokogiannaki"
 <argiro.kokogiannaki@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Tue, 23 Jul 2019 12:51:41 +0000
Subject: [PATCH] [Admin|Trunk]

merging branch newlinking into trunk 56306:56718
adding margins after theme update




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@56723 d315682c-612b-4755-9ff5-7f18f6832af3
---
 deploy/beta-properties.json                      | 4 +++-
 src/app/app.component.html                       | 7 ++++---
 src/app/app.component.ts                         | 4 ++--
 src/app/pages/dashboard/dashboard.component.html | 4 ++--
 src/app/pages/wellcome/wellcome.component.ts     | 2 +-
 src/assets/env-properties.json                   | 4 +++-
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/deploy/beta-properties.json b/deploy/beta-properties.json
index c90e16e..bb3f2f0 100644
--- a/deploy/beta-properties.json
+++ b/deploy/beta-properties.json
@@ -101,5 +101,7 @@
   "showLastIndexInformationLink" : true,
 
   "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
-  "claimsInformationLink": "https://beta.openaire.eu/linking"
+  "claimsInformationLink": "https://beta.openaire.eu/linking",
+   "lastIndexUpdate": "2019-05-16",
+   "indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/"
 }
diff --git a/src/app/app.component.html b/src/app/app.component.html
index d305494..0cd5b99 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -2,11 +2,12 @@
         [homeurl] = false [userMenuItems]=userMenuItems [menuItems]=menuItems [properties]=properties
           [community]=community class="adminMenu"></navbar>
 
-<div  id="wrapper" class="uk-section uk-margin-top uk-padding-remove-bottom">
+<div  id="wrapper" class="uk-section  uk-padding-remove">
   <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':''"
+    <sidebar *ngIf="showSidebar" [menuItems]="sideMenuItems" class="uk-width-1-5 uk-light sidebar "></sidebar>
+    <div class="uk-width-expand uk-overflow-auto" [ngClass]="(!wellcome)?'uk-container uk-container-large  uk-padding':''"
          [ngStyle]="{height: (!wellcome)?'85vh':'90vh'}">
+
       <router-outlet></router-outlet>
     </div>
     <!--
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 9b9ccd5..2dce8f3 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -192,13 +192,13 @@ export class AppComponent implements OnInit{
         ukIcon: 'cog'
       });
       this.sideMenuItems.push(  {
-        rootItem: new MenuItem('communities', 'Manage Explore', '',
+        rootItem: new MenuItem('communities', 'Explore', '',
           '/dashboard', false, [], [], {communityId: 'openaire'}),
         items: [],
         ukIcon: 'cog'
       });
       this.sideMenuItems.push(  {
-        rootItem: new MenuItem('communities', 'Manage Connect', '',
+        rootItem: new MenuItem('communities', 'Connect', '',
           '/dashboard', false, [], [], {communityId: 'connect'}),
         items: [],
         ukIcon: 'cog'
diff --git a/src/app/pages/dashboard/dashboard.component.html b/src/app/pages/dashboard/dashboard.component.html
index cea68a4..cab176f 100644
--- a/src/app/pages/dashboard/dashboard.component.html
+++ b/src/app/pages/dashboard/dashboard.component.html
@@ -12,8 +12,8 @@
                       Edit community information, change logo url, add community managers or organizations related to community.
                     </div>
                     <div>
-                      <a routerLink="/community-edit-form"  [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Edit Community Profile</a><br>
-                      <a routerLink="/organizations"  [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Edit Community Organizations</a>
+                      <a routerLink="/community-edit-form"  [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Community Profile</a><br>
+                      <a routerLink="/organizations"  [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Community Organizations</a>
                     </div>
                   </div>
                   <div *ngIf="communityId != 'openaire' && this.communityId !== 'connect'" class="uk-card uk-card-default uk-card-body uk-card-hover">
diff --git a/src/app/pages/wellcome/wellcome.component.ts b/src/app/pages/wellcome/wellcome.component.ts
index d0a4507..e3a4355 100644
--- a/src/app/pages/wellcome/wellcome.component.ts
+++ b/src/app/pages/wellcome/wellcome.component.ts
@@ -27,7 +27,7 @@ import {HelperFunctions} from '../../openaireLibrary/utils/HelperFunctions.class
           <div *ngIf="communities.length > 0" class="uk-container uk-container-large uk-section">
             <div class="uk-container">
               <div class="uk-grid-match uk-grid-small  uk-child-width-1-4@m uk-child-width-1-2@s uk-child-width-1-1@xs
-                                uk-text-center" uk-grid>
+                                uk-text-center uk-margin-large-top" uk-grid>
                 <div *ngFor="let community of communities;">
                   <div class="uk-padding-small uk-height-max-medium uk-card uk-card-default communityCard">
                     <div class="uk-container" *ngIf="community">
diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json
index 60b22b8..ec02a24 100644
--- a/src/assets/env-properties.json
+++ b/src/assets/env-properties.json
@@ -102,5 +102,7 @@
   "showLastIndexInformationLink" : false,
 
   "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
-  "claimsInformationLink": "https://www.openaire.eu/linking-beta"
+  "claimsInformationLink": "https://www.openaire.eu/linking-beta",
+  "lastIndexUpdate": "2019-05-16",
+  "indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/"
 }