From e4053567789d6aa906bf6a3ccf97dee0d237632a Mon Sep 17 00:00:00 2001
From: "argiro.kokogiannaki"
 <argiro.kokogiannaki@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Tue, 23 Jul 2019 15:14:27 +0000
Subject: [PATCH] [Connect|Trunk]

Deposit:
	theme/customization related issues (margins, titles)
	update routes inside the components

Organizations: remove margins

Invite: theme/customization related issues (margins, titles)
	get back drop down

Customization:
	apply some css changes according to the above



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@56737 d315682c-612b-4755-9ff5-7f18f6832af3
---
 .../zenodo/shareInZenodo.component.html       |  2 +-
 .../organizationsPage.component.ts            |  2 +-
 .../customization/customization.component.ts  | 28 ++++++++++++-------
 .../subscribe/invite/invite.component.html    | 10 +++----
 src/assets/env-properties.json                |  2 +-
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/app/deposit/zenodo/shareInZenodo.component.html b/src/app/deposit/zenodo/shareInZenodo.component.html
index 0519495..b0533ab 100644
--- a/src/app/deposit/zenodo/shareInZenodo.component.html
+++ b/src/app/deposit/zenodo/shareInZenodo.component.html
@@ -2,7 +2,7 @@
       <div class="communityPanelBackground uk-margin-top uk-padding-small">
         <div class="uk-container uk-container-large uk-margin-top uk-margin-bottom">
           <ul class="uk-breadcrumb">
-            <li><a class="breadcrumb" routerLinkActive="router-link-active" routerLink="/deposit">Deposit</a></li>
+            <li><a class="breadcrumb" routerLinkActive="router-link-active" routerLink="/participate/deposit/learn-how">Deposit</a></li>
             <li><span class="active">Deposit in Zenodo</span></li>
           </ul>
         </div>
diff --git a/src/app/htmlPages/organizations/organizationsPage.component.ts b/src/app/htmlPages/organizations/organizationsPage.component.ts
index bdb7483..ad11a6d 100644
--- a/src/app/htmlPages/organizations/organizationsPage.component.ts
+++ b/src/app/htmlPages/organizations/organizationsPage.component.ts
@@ -8,7 +8,7 @@ import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
 @Component({
     selector: 'organizations',
     template: `
-      <div class=" uk-section  uk-margin-large-top tm-middle uk-container" id="tm-main">
+      <div class=" uk-section tm-middle uk-container uk-padding-remove-top uk-margin-top" id="tm-main">
         <div class="uk-container  uk-margin-bottom">
           <div class="uk-article-title custom-article-title uk-margin-bottom"> Organizations related to the community</div>
           <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" [texts]="pageContents['top']"></helper>
diff --git a/src/app/utils/customization/customization.component.ts b/src/app/utils/customization/customization.component.ts
index b5c62f0..6835251 100644
--- a/src/app/utils/customization/customization.component.ts
+++ b/src/app/utils/customization/customization.component.ts
@@ -63,15 +63,16 @@ export class CustomizationComponent {
     document.documentElement.style.setProperty('--portal-dark-color', this.layout.secondaryColor);
     let css = `
             /*Panel background*/
+.communityPanelBackground:not(bottom)  {   
+    border-style: ` + (this.layout.panel.background.borderStyle != null ? this.layout.panel.background.borderStyle : 'solid') + `;
+    border-color:` + (this.layout.panel.background.borderColor != null ? this.layout.panel.background.borderColor : 'transparent') + `;
+    border-width: ` + (this.layout.panel.background.borderWidth != null ? this.layout.panel.background.borderWidth : '1px') + `;`+`
+}
 .communityPanelBackground, .communityPanelBackground .uk-section-primary {
     background-image: linear-gradient(` +
       (this.layout.panel.background.gradientDirection != null ? this.layout.panel.background.gradientDirection : 'to right') + `,` +
       this.layout.mainColor + `,` +
-      this.layout.secondaryColor + `);` +
-      `
-    border-style: ` + (this.layout.panel.background.borderStyle != null ? this.layout.panel.background.borderStyle : 'solid') + `;
-    border-color:` + (this.layout.panel.background.borderColor != null ? this.layout.panel.background.borderColor : 'transparent') + `;
-    border-width: ` + (this.layout.panel.background.borderWidth != null ? this.layout.panel.background.borderWidth : '1px') + `;
+      this.layout.secondaryColor + `);
 }
 
 /*Panel fonts*/
@@ -84,11 +85,15 @@ export class CustomizationComponent {
       `
 }
 
-.communityPanelBackground .uk-h5:not(.ignoreCommunityPanelBackground) {
+.communityPanelBackground .uk-h6:not(.ignoreCommunityPanelBackground),.communityPanelBackground .uk-h5:not(.ignoreCommunityPanelBackground),.communityPanelBackground .uk-h4:not(.ignoreCommunityPanelBackground),.communityPanelBackground .uk-h3:not(.ignoreCommunityPanelBackground), .communityPanelBackground .uk-h2:not(.ignoreCommunityPanelBackground),.communityPanelBackground .uk-h1:not(.ignoreCommunityPanelBackground) {
     color: ` + (this.layout.panel.title.color != null ? this.layout.panel.title.color : 'white') + ` !important;` +
+
+      `
+}
+.communityPanelBackground .uk-h5:not(.ignoreCommunityPanelBackground){
+`+
       (this.layout.panel.title.family != null ? ('font-family: ' + this.layout.panel.title.family + ' !important;') : '') +
       (this.layout.panel.title.size != null ? ('font-size: ' + this.layout.panel.title.size + ' !important;') : '') +
-
       `
 }
 
@@ -135,17 +140,20 @@ export class CustomizationComponent {
 }
 
 
-.uk-button:not(.uk-button-text), .portal-button {
+.uk-button:not(.uk-button-text){
+  border-radius:` + (this.layout.buttons.borderRadius != null ? this.layout.buttons.borderRadius : `4px`) + `;
+}
+.uk-button:not(.uk-button-text):not(.uk-button-default):not(.uk-button-primary), .portal-button {
     background-color:` + (this.layout.buttons.backgroundColor != null ? this.layout.buttons.backgroundColor : `var(--portal-main-color)`) + `;
     color: ` + (this.layout.buttons.color != null ? this.layout.buttons.color : `white`) + `;
     border-color: ` + (this.layout.buttons.borderColor != null ? this.layout.buttons.borderColor : `transparent`) + `;
     border-style: ` + (this.layout.buttons.borderStyle != null ? this.layout.buttons.borderStyle : `solid`) + `;
     border-width: ` + (this.layout.buttons.borderWidth != null ? this.layout.buttons.borderWidth : `1px`) + `;
-    border-radius:` + (this.layout.buttons.borderRadius != null ? this.layout.buttons.borderRadius : `4px`) + `;
+  
 
 }
 
-.uk-button:not(.uk-button-text):hover, .portal-button:hover {
+.uk-button:not(.uk-button-text):not(.uk-button-default):not(.uk-button-primary):hover, .portal-button:hover {
     background-color: ` + (this.layout.buttons.onHover.backgroundColor != null ? this.layout.buttons.onHover.backgroundColor : `var(--portal-dark-color)`) + `;
     color: ` + (this.layout.buttons.onHover.color != null ? this.layout.buttons.onHover.color : `white`) + `;
     border-color: ` + (this.layout.buttons.onHover.color != null ? this.layout.buttons.onHover.color : `white`) + `;
diff --git a/src/app/utils/subscribe/invite/invite.component.html b/src/app/utils/subscribe/invite/invite.component.html
index 55402de..c99fedf 100644
--- a/src/app/utils/subscribe/invite/invite.component.html
+++ b/src/app/utils/subscribe/invite/invite.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="longView == true">
-  <div class=" uk-section  uk-margin-small-top tm-middle uk-container" id="tm-main">
+  <div class="uk-section uk-padding-remove-top tm-middle uk-container" id="tm-main">
 
     <div class="uk-container  uk-margin-bottom">
       <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"
@@ -154,7 +154,7 @@
 <button *ngIf="!longView" [class]=" ((buttonSizeSmall)?'uk-button-small':'') + ' uk-button  uk-button-primary'">
   Invite users
 </button>
-<!--<div uk-dropdown="mode: click" class="uk-form uk-margin-small uk-alert uk-background-default" id="toggle-usage">
+<div uk-dropdown="mode: click" class="uk-form uk-margin-small uk-alert uk-background-default" id="toggle-usage">
   <div class="uk-margin-top">
     <errorMessages [status]="[status]" [type]="'community'"></errorMessages>
   </div>
@@ -178,9 +178,9 @@
          required>
   <div class="uk-width-medium uk-text-muted uk-text-small">separate with commas</div>
   <div class="uk-margin-small-top uk-text-center ">
-    <button class=" uk-button uk-button-primary uk-button-small " (click)="invite()">Invite</button>
+    <button class=" uk-button portal-button ignoreCommunityPanelBackground uk-button-small " (click)="invite()">Invite</button>
     {{" "}}
-    <a class=" uk-button uk-button-default uk-button-small " [queryParams]="communityIdParam"
+    <a class=" uk-button uk-button-default uk-button-small ignoreCommunityPanelBackground " [queryParams]="communityIdParam"
        routerLinkActive="router-link-active" routerLink="/invite">
                       <span class="uk-margin-xsmall-left uk-icon">
                           <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="cog"
@@ -192,4 +192,4 @@
       Customize
     </a>
   </div>
-</div>-->
+</div>
diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json
index e08d852..0076e76 100644
--- a/src/assets/env-properties.json
+++ b/src/assets/env-properties.json
@@ -56,7 +56,7 @@
 
   "cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
 
-  "adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools",
+  "adminToolsAPIURL" :"http://mpagasas.di.uoa.gr:8080/uoa-admin-tools",
 
   "adminToolsCommunity" :"connect",
   "datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/",