From beb3734d7ee6fb8fdcc3a401ec697eab428a3aa4 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni"
 <konstantina.galouni@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Fri, 18 Oct 2019 09:30:15 +0000
Subject: [PATCH] [Trunk | Library]: 1. depositFirstPage.component.ts: Minor
 changes in texts | Button for Zenodo is primary when on Explore portal and
 portal-button when on Connect portal. 2. resultLanding.component.html:
 Comment link for scrolling into accordion items.

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57408 d315682c-612b-4755-9ff5-7f18f6832af3
---
 deposit/depositFirstPage.component.ts            |  9 +++++----
 landingPages/result/resultLanding.component.html | 16 ++++++++--------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/deposit/depositFirstPage.component.ts b/deposit/depositFirstPage.component.ts
index f2ac51c8..8198795f 100644
--- a/deposit/depositFirstPage.component.ts
+++ b/deposit/depositFirstPage.component.ts
@@ -59,8 +59,8 @@ import {Meta, Title} from "@angular/platform-browser";
                   <span class="uk-width-expand">
                     <div class="uk-margin-small-bottom uk-h6">Publish</div>
                     <div class="uk-text-small">
-                      Find the Open Access journals that suit 
-                      <span *ngIf="communityId && communityId != 'openaire'">your community</span><span *ngIf="!communityId || communityId == 'openaire'">you</span> 
+                      Find the Open Access journals that suit your 
+                      <span *ngIf="communityId && communityId != 'openaire'">community </span><span *ngIf="!communityId || communityId == 'openaire'">needs </span> 
                       among those registered in the Directory of Open Access Journals (DOAJ).
                       <br>
                       To know more, read the OpenAIRE Open Access primer (<a target="_blank" href="https://www.openaire.eu/oa-basics">https://www.openaire.eu/oa-basics</a>)
@@ -122,12 +122,13 @@ import {Meta, Title} from "@angular/platform-browser";
               <svg xmlns="http://www.w3.org/2000/svg" width="173" height="56.685" viewBox="0 0 173 56.685"><defs><style>.a{fill:#191919;}</style></defs><path class="a" d="M171.749,22.311a16.158,16.158,0,0,0-3.364-4.953A15.511,15.511,0,0,0,157.4,12.837a15.213,15.213,0,0,0-6.074,1.206,16.4,16.4,0,0,0-2.63,1.424,16.2,16.2,0,0,0-2.325,1.891,14.893,14.893,0,0,0-1.242,1.383,19.241,19.241,0,0,0-1.173,1.7,19.372,19.372,0,0,0-1.482,3.343c.048-1.943.332-4.842,1.482-6.468V3.272a3.081,3.081,0,0,0-.993-2.323,3.251,3.251,0,0,0-5.556,2.323V15.765a17.084,17.084,0,0,0-4.261-2.156,14.8,14.8,0,0,0-4.781-.773,15.314,15.314,0,0,0-6.028,1.206,15.575,15.575,0,0,0-4.959,3.316,16.056,16.056,0,0,0-3.352,4.953c-.063.142-.118.286-.177.43-.056-.144-.111-.288-.173-.43a16.158,16.158,0,0,0-3.364-4.953,15.519,15.519,0,0,0-4.95-3.316,15.795,15.795,0,0,0-12.105,0,16.068,16.068,0,0,0-4.954,3.316,15.182,15.182,0,0,0-3.359,4.953c-.058.136-.109.272-.162.407-.056-.135-.109-.271-.167-.407a16.056,16.056,0,0,0-3.357-4.953,15.532,15.532,0,0,0-4.956-3.316,15.795,15.795,0,0,0-12.105,0,16.084,16.084,0,0,0-4.948,3.316,15.129,15.129,0,0,0-3.366,4.953c-.051.125-.1.253-.148.378-.051-.125-.1-.253-.155-.378a16.165,16.165,0,0,0-3.366-4.953,15.489,15.489,0,0,0-10.979-4.521,15.185,15.185,0,0,0-6.072,1.206,16.01,16.01,0,0,0-4.622,3.017v-.521A3.335,3.335,0,0,0,27.211,13.2H3.837a3.334,3.334,0,0,0,0,6.669h18.37L.658,48.884A3.333,3.333,0,0,0,0,50.872v2.176a3.337,3.337,0,0,0,3.336,3.336H28.214a3.335,3.335,0,0,0,3.324-3.09,15.693,15.693,0,0,0,3.675,2.184,15.189,15.189,0,0,0,6.031,1.207A14.892,14.892,0,0,0,49.857,54.1a15.447,15.447,0,0,0,4.827-5.188v4.5a3.245,3.245,0,0,0,3.277,3.275,3.194,3.194,0,0,0,2.281-.949,3.077,3.077,0,0,0,.991-2.326V41.733h-.012a.087.087,0,0,1,.012-.015h-8.17a3.175,3.175,0,0,0-1.851.558,3.007,3.007,0,0,0-1.161,1.507l-.535,1.1a8.969,8.969,0,0,1-8.271,5.254,9.141,9.141,0,0,1-3.493-.684,8.463,8.463,0,0,1-2.883-1.939,9.963,9.963,0,0,1-1.94-2.888,8.4,8.4,0,0,1-.729-3.447V38.252H61.234V28.34a8.74,8.74,0,0,1,.688-3.442,8.959,8.959,0,0,1,8.355-5.515,9.117,9.117,0,0,1,3.493.687,8.459,8.459,0,0,1,2.883,1.94,10.032,10.032,0,0,1,1.94,2.889,8.36,8.36,0,0,1,.734,3.442V53.409A3.233,3.233,0,0,0,82.6,56.684a3.211,3.211,0,0,0,2.286-.949,3.107,3.107,0,0,0,.986-2.326v-4.5a15.828,15.828,0,0,0,2.482,3.249,15.454,15.454,0,0,0,4.954,3.314,15.671,15.671,0,0,0,12.061,0,16.035,16.035,0,0,0,5-3.314,15.226,15.226,0,0,0,3.359-4.951c.044-.112.087-.225.129-.338.046.113.087.226.134.338a15.068,15.068,0,0,0,3.359,4.951,16.075,16.075,0,0,0,4.951,3.314,15.79,15.79,0,0,0,12.109,0,15.476,15.476,0,0,0,4.946-3.314,16.166,16.166,0,0,0,3.366-4.951c.06-.142.116-.283.173-.426.058.143.111.284.173.426a16.07,16.07,0,0,0,3.359,4.951,15.454,15.454,0,0,0,4.954,3.314,15.671,15.671,0,0,0,12.061,0,16.008,16.008,0,0,0,5-3.314A15.314,15.314,0,0,0,173,41.178V28.341A14.991,14.991,0,0,0,171.749,22.311ZM8.35,49.716,25.794,26.224a16.054,16.054,0,0,0-.143,2.117V41.178A14.759,14.759,0,0,0,26.9,47.211a16.514,16.514,0,0,0,1.366,2.5H8.35ZM50.285,31.7H32.2V28.34a8.738,8.738,0,0,1,.686-3.442,8.951,8.951,0,0,1,8.36-5.515,9.1,9.1,0,0,1,3.486.687,8.423,8.423,0,0,1,2.885,1.94,10.033,10.033,0,0,1,1.94,2.889,8.318,8.318,0,0,1,.729,3.442V31.7Zm58.093,9.48a8.7,8.7,0,0,1-.688,3.447,8.941,8.941,0,0,1-8.352,5.511,9.141,9.141,0,0,1-3.493-.684,8.417,8.417,0,0,1-2.883-1.939,9.917,9.917,0,0,1-1.94-2.888,8.353,8.353,0,0,1-.729-3.447V28.341A8.74,8.74,0,0,1,90.98,24.9a8.935,8.935,0,0,1,1.937-2.889,9.165,9.165,0,0,1,9.9-1.94,8.433,8.433,0,0,1,2.888,1.94,10.129,10.129,0,0,1,1.94,2.889,8.356,8.356,0,0,1,.729,3.442V41.178Zm29.035,0a8.32,8.32,0,0,1-.729,3.447,9.947,9.947,0,0,1-1.94,2.888,8.358,8.358,0,0,1-2.888,1.939,9.337,9.337,0,0,1-7.018,0,9.046,9.046,0,0,1-4.825-4.826,8.735,8.735,0,0,1-.69-3.447V28.341a8.439,8.439,0,0,1,.732-3.442,10.1,10.1,0,0,1,1.94-2.889,8.522,8.522,0,0,1,2.883-1.94,9.152,9.152,0,0,1,3.493-.687,8.985,8.985,0,0,1,8.357,5.515,8.775,8.775,0,0,1,.686,3.442V41.178Zm29.035,0a8.82,8.82,0,0,1-.686,3.447,9.129,9.129,0,0,1-11.85,4.826,8.424,8.424,0,0,1-2.882-1.939,9.946,9.946,0,0,1-1.942-2.888,8.337,8.337,0,0,1-.732-3.447V28.341a8.742,8.742,0,0,1,.69-3.442,8.935,8.935,0,0,1,1.937-2.889,9.169,9.169,0,0,1,9.905-1.94,8.423,8.423,0,0,1,2.885,1.94,10.088,10.088,0,0,1,1.942,2.889,8.356,8.356,0,0,1,.729,3.442V41.178Z"/></svg>
             </div>
             <div class="uk-margin-top">
-              <span class="uk-text-bold">Deposit</span> your research <span class="uk-text-bold">immediately</span>
+              <span class="uk-text-bold">Deposit</span> your research now.<span class="uk-text-bold">Instantly and easily.</span>
             </div>
             <a *ngIf="zenodoInformation.shareInZenodoUrl" type="submit"
                [queryParams]="properties.environment!='development'?{}:routerHelper.createQueryParam('communityId',communityId)" 
                routerLinkActive="router-link-active" [routerLink]="zenodoInformation.shareInZenodoUrl"
-               class="uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-medium-top uk-margin-bottom">
+               [class]="'uk-button uk-padding uk-padding-remove-vertical uk-margin-medium-top uk-margin-bottom' + 
+                        (communityId && communityId != 'openaire') ? ' portal-button' : ' uk-button-primary'">
               <span><span>Related zenodo communities</span><span uk-icon="arrow-right"></span></span>
             </a>
             <a *ngIf="!zenodoInformation.shareInZenodoUrl" target="_blank" href="{{zenodoInformation.url}}" type="submit"
diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html
index e70045be..caed46d7 100644
--- a/landingPages/result/resultLanding.component.html
+++ b/landingPages/result/resultLanding.component.html
@@ -17,14 +17,14 @@
             <schema2jsonld *ngIf="resultLandingInfo.record" [data]=resultLandingInfo.record
                            [URL]="properties.baseLink+linkToLandingPage+id"></schema2jsonld>
             <showTitle [titleName]="resultLandingInfo.title" [classNames]="(properties.environment != 'production' && resultLandingInfo.deletedByInferenceIds) ? 'uk-margin-remove-bottom' : ''"></showTitle>
-            <div *ngIf="testBrowser" class="uk-text-small">
-              <a class=""  (click)="gotoAccordions();">
-                View relations of this
-                <span *ngIf="type == 'publication' || type == 'software'">{{type}}</span>
-                <span *ngIf="type == 'dataset'">research data</span>
-                <span *ngIf="type == 'orp'">product</span>
-              </a>
-            </div>
+<!--            <div *ngIf="testBrowser" class="uk-text-small">-->
+<!--              <a class=""  (click)="gotoAccordions();">-->
+<!--                View relations of this-->
+<!--                <span *ngIf="type == 'publication' || type == 'software'">{{type}}</span>-->
+<!--                <span *ngIf="type == 'dataset'">research data</span>-->
+<!--                <span *ngIf="type == 'orp'">product</span>-->
+<!--              </a>-->
+<!--            </div>-->
             <div *ngIf="properties.environment != 'production' && resultLandingInfo.deletedByInferenceIds"
                  class="uk-text-muted uk-text-small uk-margin-bottom" (click)="openDeletedByInference()">
               The following information is the result of merging