Merge branch 'new-theme' of code-repo.d4science.org:MaDgIK/openaire-library into new-theme

connect/community/CustomizationOptions.ts

@@ -20,6 +20,7 @@ export class Layout {
       if(options.backgrounds){
         variables['@general-search-form-background'] = options.backgrounds.form.color;
         variables['@general-search-form-background-image'] = (options.backgrounds.form.imageFile?(this.getUrl(properties.utilsService + '/download/' +options.backgrounds.form.imageFile)): 'none') ;
+        variables['@general-search-form-background-position'] = options.backgrounds.form.position;
        variables['@base-body-background'] = options.backgrounds.light.color;
       }
       return variables;
@@ -71,7 +72,7 @@ export class CustomizationOptions {
         color: this.identity.mainColor,
       },
       light : {
-        color: CustomizationOptions.getRGBA(this.identity.mainColor,0.05),
+        color: "#f9f9f9" //CustomizationOptions.getRGBA(this.identity.mainColor,0.05),
       },
       form : {
         color: CustomizationOptions.getRGBA(this.identity.mainColor,0.15),

deposit/searchDataprovidersToDeposit.component.ts

@@ -12,14 +12,15 @@ import {ZenodoInformationClass} from "./utils/zenodoInformation.class";
 import {RouterHelper} from "../utils/routerHelper.class";
 import {Breadcrumb} from "../utils/breadcrumbs/breadcrumbs.component";
 import {properties} from "../../../environments/environment";
+import {SearchForm} from "../searchPages/searchUtils/newSearchPage.component";
 
 @Component({
   selector: 'deposit-search-dataproviders',
   template: `
-
+  <div [ngClass]="searchForm.class" [class.uk-light]="searchForm.dark" class="uk-margin-medium-bottom">
     <div class="uk-section uk-padding-remove-bottom uk-padding-remove-top">
       <div class="uk-padding-small">
-        <div class="uk-container uk-container-large uk-margin-small-top uk-margin-small-bottom">
+        <div class="uk-container uk-container-large uk-margin-small-top uk-margin-small-bottom" [class.uk-light]="searchForm.dark">
           <breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
         </div>
       </div>
@@ -27,9 +28,9 @@ import {properties} from "../../../environments/environment";
     <div class="">
       <div class="uk-container uk-container-large">
         <div class="uk-margin-top uk-flex uk-flex-center">
-          <div class="uk-width-large">
+          <div class="uk-width-large" [class.dark]="searchForm.dark">
             <div search-input [(value)]="keyword" placeholder="Search by name, description, subject..." (searchEmitter)="keywordChanged()"></div>
-						<div class="uk-margin-top uk-text-center">
+						<div class="uk-margin-top uk-text-center uk-margin-medium-bottom">
 							<a *ngIf="zenodoInformation.url" [href]="zenodoInformation.url" target="_blank" class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text">
 								<span class="uk-flex uk-flex-middle">
 									<span>Zenodo Repository</span><span class="custom-external custom-icon space"></span>
@@ -42,15 +43,17 @@ import {properties} from "../../../environments/environment";
           </div>
         </div>
       </div>
-      <search-dataproviders  [simpleView]="true" [searchForm]="{class: null, dark: false}" type="deposit" simpleSearchLink="/participate/deposit/search" [includeOnlyResultsAndFilter]="true" >
-      </search-dataproviders>
     </div>
+  </div>
+  <search-dataproviders  [simpleView]="true" [searchForm]="{class: null, dark: false}" type="deposit" simpleSearchLink="/participate/deposit/search" [includeOnlyResultsAndFilter]="true" >
+  </search-dataproviders>
     `
 })
 export class SearchDataprovidersToDepositComponent {
   private errorCodes: ErrorCodes;
   private errorMessages: ErrorMessagesComponent;
   @Input() piwikSiteId = null;
+  @Input() searchForm: SearchForm = {class: null, dark: false};
   public results =[];
   public filters =[];
   public totalResults:number  = 0 ;

login/user.component.html

@@ -52,7 +52,7 @@
                    <button (click)="login()" class=" uk-button uk-button-primary">Login</button>
                 </div>
            </form-->
-          <div *ngIf="errorCode == '1' || (!loggedIn && errorCode != '3')" class="uk-alert uk-alert-warning">
+          <div *ngIf="errorCode == '1' || (!loggedIn && errorCode != '3'  && errorCode != '6')" class="uk-alert uk-alert-warning">
             The requested page requires authentication.
             <span *ngIf="!loggedIn">Please  <a class="uk-link" (click)="logIn()"> sign in</a> to continue.
             </span>

login/user.component.ts

@@ -52,7 +52,7 @@ export class UserComponent {
           this.errorCode = params["errorCode"];
           this.redirectUrl = params["redirectUrl"];
           this.errorMessage = "";
-          if (this.loggedIn && (this.errorCode == '1' || this.errorCode == '3')) {
+          if (this.loggedIn && (this.errorCode == '1' || this.errorCode == '3'  || this.errorCode == '7')) {
             this.redirect();
           } else {
             this.loading = false;
@@ -70,7 +70,11 @@ export class UserComponent {
     });
   }
 
-  redirect() {
+  redirect(redirectUrl = null) {
+    //if parameters are not read yet, force them to use the function parameter
+    if(!this.redirectUrl && redirectUrl){
+      this.redirectUrl = redirectUrl
+    }
     if (this.redirectUrl && this.redirectUrl != "") {
       this.redirectUrl = decodeURIComponent(this.redirectUrl);
       this.userManagementsService.setRedirectUrl(this.redirectUrl);

searchPages/searchUtils/newSearchPage.component.html

@@ -156,7 +156,7 @@
 </div>
 <schema2jsonld *ngIf="url" [URL]="url" type="search" [name]=pageTitleWithFilters
 							[searchAction]=false [description]="metaDescription"></schema2jsonld>
-<div id="tm-main" class="uk-margin-medium-top" [class.uk-margin-top]="stickyForm">
+<div id="tm-main" [class.uk-margin-medium-top]="!includeOnlyResultsAndFilter" [class.uk-margin-top]="stickyForm">
   <ng-template #loading>
     <loading [ngClass]="'uk-height-medium uk-display-block uk-margin-xlarge-top'"></loading>
   </ng-template>

utils/properties/env-properties.ts

@@ -142,4 +142,5 @@ export interface EnvProperties {
   myOrcidLinksPage?: string;
   footerGrantText?: string;
   egiNotebookLink?: string;
+  portalBuildTime?;
 }